Преглед изворни кода

HUE-5688 [metadata] Filter out facet values when Sentry filtering is on

Romain Rigaux пре 8 година
родитељ
комит
74150a8

+ 1 - 1
apps/beeswax/src/beeswax/conf.py

@@ -99,7 +99,7 @@ LIST_PARTITIONS_LIMIT = Config(
 # Deprecated
 DOWNLOAD_CELL_LIMIT = Config(
   key='download_cell_limit',
-  default=5000000,
+  default=10000000,
   type=int,
   help=_t('A limit to the number of cells (rows * columns) that can be downloaded from a query '
           '(e.g. - 10K rows * 1K columns = 10M cells.) '

+ 11 - 0
desktop/core/src/desktop/templates/assist.mako

@@ -2263,6 +2263,17 @@ from notebook.conf import ENABLE_QUERY_BUILDER
       <li><span data-bind="text: $data"></span> <i class="fa fa-info"></i>
     </ul>
 
+    <form class="form-horizontal">
+      <fieldset>
+        ${ _('Fields') }<br/>
+        <ul>
+          <li>F1</li>
+          <li>F2</li>
+          <li>F3</li>
+        </ul>
+      </fieldset>
+    </form>
+
     <form class="form-horizontal">
       <fieldset>
         ${ _('Suggestions') }<br/>

+ 6 - 2
desktop/libs/metadata/src/metadata/navigator_api.py

@@ -33,7 +33,7 @@ from django.views.decorators.http import require_POST
 from desktop.lib.django_util import JsonResponse
 from desktop.lib.i18n import force_unicode, smart_str
 
-from metadata.conf import has_navigator
+from metadata.conf import has_navigator, NAVIGATOR
 from metadata.navigator_client import NavigatorApi
 
 
@@ -217,11 +217,15 @@ def search_entities_interactive(request):
 
   if response.get('facets'): # Remove empty facets
     for fname, fvalues in response['facets'].items():
-      fvalues = sorted([(k, v) for k, v in fvalues.items() if v > 0], key=lambda n: n[1], reverse=True)
+      if NAVIGATOR.APPLY_SENTRY_PERMISSIONS.get():
+        fvalues = []
+      else:
+        fvalues = sorted([(k, v) for k, v in fvalues.items() if v > 0], key=lambda n: n[1], reverse=True)
       response['facets'][fname] = OrderedDict(fvalues)
       if ':' in query_s and not response['facets'][fname]:
         del response['facets'][fname]
 
+
   _augment_highlighting(query_s, response.get('results'))
 
   response['status'] = 0