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

HUE-7877 [reporting] Skeleton for creating a new report

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

+ 0 - 9
desktop/core/src/desktop/templates/common_dashboard.mako

@@ -69,15 +69,6 @@
       </div>
     </a>
     % endif
-    % if HAS_REPORT_ENABLED.get():
-    <a href="javascript: fullLayout(searchViewModel)" title="${ _('Report: static dashboard with multiple widgets executing independent queries') }" onmouseover="searchViewModel.previewColumns('dashboard')" onmouseout="searchViewModel.previewColumns('')">
-      <div class="layout-container">
-        <div class="layout-box" style="width: 100px;">
-          <i class="fa fa-area-chart"></i>
-        </div>
-      </div>
-    </a>
-    % endif
     <a href="javascript: fullLayout(searchViewModel)" title="${ _('Empty dashboard that can be used as a starting point') }" onmouseover="searchViewModel.previewColumns('full')" onmouseout="searchViewModel.previewColumns('')">
       <div class="layout-container">
         <div class="layout-box" style="width: 100px;"></div>

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

@@ -56,9 +56,9 @@ def search(request):
   if collection:
     try:
       if fetch_result:
-        response = get_engine(request.user, collection).fetch_result(collection, query, facet)
+        response = get_engine(request.user, collection, facet).fetch_result(collection, query, facet)
       else:
-        response = get_engine(request.user, collection).query(collection, query, facet)
+        response = get_engine(request.user, collection, facet).query(collection, query, facet)
     except RestException, e:
       response.update(extract_solr_exception_message(e))
     except Exception, e:

+ 4 - 1
desktop/libs/dashboard/src/dashboard/dashboard_api.py

@@ -21,10 +21,13 @@ import logging
 LOG = logging.getLogger(__name__)
 
 
-def get_engine(user, engine='solr'):
+def get_engine(user, engine='solr', facet=None):
   if isinstance(engine, dict):
     engine = engine.get('engine', 'solr')
 
+  if engine == 'report' and facet:
+    engine = facet.get('engine')
+
   if engine != 'solr':
     if engine == 'impala':
       from impala.dashboard_api import ImpalaDashboardApi

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

@@ -116,7 +116,7 @@ def index_m(request):
 
 def new_search(request):
   engine = request.GET.get('engine', 'solr')
-  collections = get_engine(request.user, engine).datasets()
+  collections = get_engine(request.user, engine).datasets() if engine != 'report' else ['default']
   if not collections:
     if engine == 'solr':
       return no_collections(request)