فهرست منبع

HUE-7766 [dashboard] Query facet for widget level filtering

Romain Rigaux 8 سال پیش
والد
کامیت
8c4b41ec9c

+ 2 - 1
desktop/libs/dashboard/src/dashboard/models.py

@@ -499,7 +499,8 @@ def augment_solr_response(response, collection, query):
           else:
             value = final_number - orignal_number
         else:
-          value = response['facets'][name]
+          value = response['facets'][name]['count']
+#           value = response['facets'][name]
 
         facet = {
           'id': collection_facet['id'],

+ 14 - 10
desktop/libs/dashboard/src/dashboard/templates/common_search.mako

@@ -2040,21 +2040,25 @@ ${ dashboard.layout_skeleton(suffix='search') }
       <span class="facet-field-label">
         ${ _('Cohorts') }
       </span>
-      <input type="text"/>
-      <input type="number"/>
+      <input type="text" class="input-medium"/>
+      <input type="number" class="input-medium"/>
     </span>
   </div>
 
   <div class="facet-field-cnt">
     <span class="spinedit-cnt">
-      <span class="facet-field-label">
-        ${ _('Percentage') }
-      </span>
-      <input type="checkbox" data-bind="checked: use_percentage"/>
-      <span class="facet-field-label">
-        ${ _('Hide value') }
-      </span>
-      <input type="checkbox"/>
+      <label>
+        <span class="facet-field-label">
+          ${ _('Percentage') }
+        </span>
+        <input type="checkbox" data-bind="checked: use_percentage"/>
+      </label>
+      <label>
+        <span class="facet-field-label">
+          ${ _('Hide value') }
+        </span>
+        <input type="checkbox"/>
+      </label>
     </span>
   </div>
   <!-- /ko -->

+ 11 - 5
desktop/libs/libsolr/src/libsolr/api.py

@@ -180,11 +180,17 @@ class SolrApi(object):
             if facet['properties']['compare']['is_enabled']:
               # TODO: global compare override
               json_facets[facet['id']] = {
-                'type' : "range",
-                'field' : collection['timeFilter'].get('field'),
-                'start' : "2014-05-04T01:35:00Z/HOURS",
-                'end' : "2014-05-04T14:15:00Z/HOURS",
-                'gap' : "+12HOURS",
+                'type': "range",
+                'field': collection['timeFilter'].get('field'),
+                'start': "2014-05-04T01:35:00Z/HOURS",
+                'end': "2014-05-04T14:15:00Z/HOURS",
+                'gap': "+12HOURS",
+                'facet': {facet['id']: self._get_aggregate_function(facet['properties']['facets'][0])}
+              }
+            elif True:
+              json_facets[facet['id']] = {
+                'type': "query",
+                'q': 'bytes:[1000 TO *]',
                 'facet': {facet['id']: self._get_aggregate_function(facet['properties']['facets'][0])}
               }
             else: