Browse Source

HUE-6375 [editor] Only list snippets which apps are enabled

List nice name instead of just type.
Romain Rigaux 8 years ago
parent
commit
e4f5f250ea

+ 1 - 1
desktop/core/src/desktop/models.py

@@ -1586,7 +1586,7 @@ class ClusterConfig():
       interpreters.append({
         'name': interpreter['name'],
         'type': interpreter['type'],
-        'displayName': interpreter['type'].title(),
+        'displayName': interpreter['name'],
         'tooltip': _('%s Query') % interpreter['type'].title(),
         'page': '/editor/?type=%(type)s' % interpreter,
       })

+ 0 - 1
desktop/core/src/desktop/views.py

@@ -72,7 +72,6 @@ def hue(request):
 
   return render('hue.mako', request, {
     'apps': apps,
-    'interpreters': get_ordered_interpreters(request.user),
     'is_s3_enabled': is_s3_enabled() and has_s3_access(request.user),
     'is_ldap_setup': 'desktop.auth.backend.LdapBackend' in desktop.conf.AUTH.BACKEND.get(),
     'leaflet': {

+ 10 - 8
desktop/libs/notebook/src/notebook/conf.py

@@ -173,12 +173,6 @@ def _default_interpreters(user):
       ('java', {
           'name': 'Java', 'interface': 'oozie', 'options': {}
       }),
-      ('sqoop1', {
-          'name': 'Sqoop 1', 'interface': 'oozie', 'options': {}
-      }),
-      ('distcp', {
-          'name': 'Distcp', 'interface': 'oozie', 'options': {}
-      }),
       ('spark2', {
           'name': 'Spark', 'interface': 'oozie', 'options': {}
       }),
@@ -188,14 +182,22 @@ def _default_interpreters(user):
       ('shell', {
           'name': 'Shell', 'interface': 'oozie', 'options': {}
       }),
+      ('sqoop1', {
+          'name': 'Sqoop 1', 'interface': 'oozie', 'options': {}
+      }),
+      ('distcp', {
+          'name': 'Distcp', 'interface': 'oozie', 'options': {}
+      }),
     ))
 
-  if 'search' in apps: # And Solr 6+
+  from dashboard.conf import get_properties  # Cyclic dependency
+  dashboards = get_properties()
+  if dashboards.get('solr') and dashboards['solr']['analytics']:
     interpreters.append(('solr', {
         'name': 'Solr SQL', 'interface': 'solr', 'options': {}
     }),)
 
-  if SHOW_NOTEBOOKS.get():
+  if 'spark' in apps:
     interpreters.extend((
       ('spark', {
           'name': 'Scala', 'interface': 'livy', 'options': {}