Przeglądaj źródła

HUE-7766 [dashboard] Return 0 instead of null when no data for textSqueezer for now

Romain Rigaux 8 lat temu
rodzic
commit
d6135f4

+ 5 - 3
desktop/libs/dashboard/src/dashboard/models.py

@@ -488,12 +488,14 @@ def augment_solr_response(response, collection, query):
         collection_facet = get_facet_field(category, name, collection['facets'])
 
         if collection_facet['properties']['compare']['is_enabled']:
-          orignal_number, final_number = response['facets'][name]['buckets'][0][name], response['facets'][name]['buckets'][1][name]
-          if collection_facet['properties']['compare']['use_percentage']:
+          orignal_number, final_number = response['facets'][name]['buckets'][0].get(name), response['facets'][name]['buckets'][1].get(name)
+          if orignal_number is None or final_number is None:
+            value = 0
+          elif collection_facet['properties']['compare']['use_percentage']:
             if orignal_number != 0:
               value = (final_number - orignal_number) / orignal_number * 100.0
             else:
-              value = None 
+              value = 0 
           else:
             value = final_number - orignal_number
         else:

+ 2 - 2
desktop/libs/dashboard/src/dashboard/templates/common_search.mako

@@ -1525,7 +1525,7 @@ ${ dashboard.layout_skeleton(suffix='search') }
         <!-- ko if: widgetType() == 'hit-widget' -->
           <!-- ko with: $parent -->
             <!-- ko if: counts().length > 0 -->
-              <i class="fa fa-rotate-90" data-bind="css: { 'fa-caret-down': counts()[0].count < 0, 'fa-caret-up': counts()[0].count >= 0 }"></i>
+              <i data-bind="css: { 'fa-caret-down': counts()[0].count < 0, 'fa-caret-up': counts()[0].count > 0 }"></i>
               <span class="big-counter" data-bind="textSqueezer: counts()[0].count"></span>
             <!-- /ko -->
           <!-- /ko -->
@@ -2015,7 +2015,7 @@ ${ dashboard.layout_skeleton(suffix='search') }
       <span class="pull-right" data-bind="template: { name: 'facet-compare', data: properties.compare }"></span>
     </div>
 
-    <i class="fa big-counter" data-bind="css: { 'fa-caret-down': counts() < 0, 'fa-caret-up': counts() >= 0 }"></i>
+    <i class="fa big-counter" data-bind="css: { 'fa-caret-down': counts() < 0, 'fa-caret-up': counts() > 0 }"></i>
     <span class="big-counter" data-bind="textSqueezer: counts"></span>
 
     <span data-bind="with: $root.collection.getFacetById($parent.id())">