فهرست منبع

HUE-7503 [dashboard] Add more than one dimension

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

+ 1 - 1
desktop/libs/dashboard/src/dashboard/api.py

@@ -369,7 +369,7 @@ def _create_facet(collection, user, facet_id, facet_label, facet_field, widget_t
     'limit': 10,
     'mincount': 0,
     'isDate': False,
-    'aggregate': {'function': 'unique', 'formula': '', 'generated_formula': '', 'percentiles': [{'value': 50}]}
+    'aggregate': {'function': 'count', 'formula': '', 'generated_formula': '', 'percentiles': [{'value': 50}]}
   }
 
   if widget_type in ('tree-widget', 'heatmap-widget', 'map-widget'):

+ 13 - 9
desktop/libs/dashboard/src/dashboard/templates/common_search.mako

@@ -2072,7 +2072,7 @@ ${ dashboard.layout_skeleton(suffix='search') }
         <select data-bind="options: $parent.properties.facets_form.aggregate.metrics, optionsText: 'label', optionsValue: 'value', value: $data.function" class="input-small"></select>
       <!-- /ko -->
 
-      <!-- ko if: $data.function() != 'field' && $data.metrics -->
+      <!-- ko if: ($data.function() != 'field' || typeof properties == "undefined") && $data.metrics -->
         <select data-bind="options: $data.metrics, optionsText: 'label', optionsValue: 'value', value: $data.function" class="input-small"></select>
       <!-- /ko -->
 
@@ -2815,8 +2815,9 @@ var searchViewModel;
 moment.suppressDeprecationWarnings = true;
 
 var NUMERIC_HIT_OPTIONS = [
-    { value: "unique", label: "Count" },
-    { value: "unique", label: "${ _('Unique Count') }" },
+    { value: "count", label: "${ _('Group by') }" },
+    ## { value: "counts", label: "Count" },
+    { value: "unique", label: "${ _('Unique') }" },
     { value: "avg", label: "${ _('Average') }" },
     { value: "sum", label: "${ _('Sum') }" },
     { value: "min", label: "${ _('Min') }" },
@@ -2827,18 +2828,21 @@ var NUMERIC_HIT_OPTIONS = [
     { value: "variance", label: "${ _('Variance') }" }
 ];
 var DATETIME_HIT_OPTIONS = [
-    { value: "unique", label: "Count" },
-    { value: "unique", label: "${ _('Unique Count') }" },
+    { value: "count", label: "${ _('Group by') }" },
+    ## { value: "counts", label: "Count" },
+    { value: "unique", label: "${ _('Unique') }" },
 ];
 var ALPHA_HIT_COUNTER_OPTIONS = [
-    { value: "unique", label: "Count" },
-    { value: "unique", label: "${ _('Unique Count') }" },
+    { value: "count", label: "${ _('Group by') }" },
+    ## { value: "counts", label: "Count" },
+    { value: "unique", label: "${ _('Unique') }" },
     { value: "min", label: "${ _('Min') }" },
     { value: "max", label: "${ _('Max') }" }
 ];
 var ALPHA_HIT_OPTIONS = [
-    { value: "unique", label: "Count" },
-    { value: "unique", label: "${ _('Unique Count') }" },
+    { value: "count", label: "${ _('Group by') }" },
+    ## { value: "counts", label: "Count" },
+    { value: "unique", label: "${ _('Unique') }" },
     { value: "min", label: "${ _('Min') }" },
     { value: "max", label: "${ _('Max') }" }
 ];

+ 1 - 0
desktop/libs/libsolr/src/libsolr/api.py

@@ -806,6 +806,7 @@ class SolrApi(object):
 
   @classmethod
   def __get_aggregate_function(cls, f):
+    print f
     if f['function'] == 'field':
       return f['value']
     else: