Эх сурвалжийг харах

HUE-5135 [metadata] Keep default filtering on list of allowed types by source

Romain Rigaux 9 жил өмнө
parent
commit
e05cb3eb39

+ 1 - 1
desktop/core/src/desktop/static/desktop/js/apiHelper.js

@@ -1198,7 +1198,7 @@ var ApiHelper = (function () {
     var self = this;
     $.post('/metadata/api/navigator/search_entities_interactive', {
       query_s: options.query,
-      limit: 5,
+      limit: 10,
       sources: '["' + options.source + '"]'
     }).done(function (data) {
       if (data.status === 0 && !self.successResponseIsError(data)) {

+ 1 - 1
desktop/libs/metadata/src/metadata/navigator_api.py

@@ -195,7 +195,7 @@ def search_entities_interactive(request):
     last_query_term = last_query_term.rstrip('*')
     (fname, fval) = last_query_term.split(':') if ':' in last_query_term else (last_query_term, '')
     field_facets = [f for f in field_facets if f.startswith(fname)]
-  field_facets = field_facets[:10]
+  field_facets = field_facets[:5]
 
   response = api.search_entities_interactive(
       query_s=query_s,

+ 3 - 3
desktop/libs/metadata/src/metadata/navigator_client.py

@@ -76,6 +76,7 @@ class NavigatorApi(object):
 
     return default_entity_types, entity_types
 
+
   def search_entities(self, query_s, limit=100, offset=0, **filters):
     """
     Solr edismax query parser syntax.
@@ -142,7 +143,6 @@ class NavigatorApi(object):
       }
 
       entity_types = []
-      defaultFilterQueries = []
       fq_type = []
       if filterQueries is None:
         filterQueries = []
@@ -172,7 +172,7 @@ class NavigatorApi(object):
             filterQueries.append(term)
 
       body = {'query': ' '.join(query) or '*'}
-      defaultFilterQueries += ['{!tag=type} %s' % ' OR '.join(['type:%s' % fq for fq in fq_type])]
+      filterQueries += ['{!tag=type} %s' % ' OR '.join(['type:%s' % fq for fq in fq_type])]
 
       body['facetFields'] = facetFields or [] # Currently mandatory in API
       if facetPrefix:
@@ -180,7 +180,7 @@ class NavigatorApi(object):
       if facetRanges:
         body['facetRanges'] = facetRanges
       if filterQueries:
-        body['filterQueries'] = filterQueries + defaultFilterQueries
+        body['filterQueries'] = filterQueries
       if firstClassEntitiesOnly:
         body['firstClassEntitiesOnly'] = firstClassEntitiesOnly