Przeglądaj źródła

HUE-5982 [assist] Show all available DB sources in the assist panel

Johan Ahlen 8 lat temu
rodzic
commit
c9437a1

+ 0 - 4
apps/beeswax/src/beeswax/templates/create_database.mako

@@ -74,10 +74,6 @@ ${ assist.assistPanel() }
               params: {
                 user: '${user.username}',
                 sql : {
-                  sourceTypes: [{
-                    name: 'hive',
-                    type: 'hive'
-                  }],
                   navigationSettings: {
                     openItem: false,
                     showStats: true

+ 0 - 4
apps/beeswax/src/beeswax/templates/create_table_manually.mako

@@ -73,10 +73,6 @@ ${ assist.assistPanel() }
               params: {
                 user: '${user.username}',
                 sql: {
-                  sourceTypes: [{
-                    name: 'hive',
-                    type: 'hive'
-                  }],
                   navigationSettings: {
                     openItem: false,
                     showStats: true

+ 0 - 4
apps/beeswax/src/beeswax/templates/import_wizard_choose_delimiter.mako

@@ -73,10 +73,6 @@ ${ assist.assistPanel() }
               params: {
                 user: '${user.username}',
                 sql: {
-                  sourceTypes: [{
-                    name: 'hive',
-                    type: 'hive'
-                  }],
                   navigationSettings: {
                     openItem: false,
                     showStats: true

+ 0 - 4
apps/beeswax/src/beeswax/templates/import_wizard_choose_file.mako

@@ -71,10 +71,6 @@ ${ assist.assistPanel() }
               params: {
                 user: '${user.username}',
                 sql: {
-                  sourceTypes: [{
-                    name: 'hive',
-                    type: 'hive'
-                  }],
                   navigationSettings: {
                     openItem: false,
                     showStats: true

+ 0 - 4
apps/beeswax/src/beeswax/templates/import_wizard_define_columns.mako

@@ -73,10 +73,6 @@ ${ assist.assistPanel() }
               params: {
                 user: '${user.username}',
                 sql: {
-                  sourceTypes: [{
-                    name: 'hive',
-                    type: 'hive'
-                  }],
                   navigationSettings: {
                     openItem: false,
                     showStats: true

+ 0 - 4
apps/jobbrowser/src/jobbrowser/templates/job_browser.mako

@@ -106,10 +106,6 @@ ${ commonheader("Job Browser", "jobbrowser", user, request) | n,unicode }
               params: {
                 user: '${user.username}',
                 sql: {
-                  sourceTypes: [{
-                    name: 'hive',
-                    type: 'hive'
-                  }],
                   navigationSettings: {
                     openItem: false,
                     showStats: true

+ 0 - 4
apps/metastore/src/metastore/templates/describe_partitions.mako

@@ -70,10 +70,6 @@ ${ assist.assistPanel() }
               name: 'assist-panel',
               params: {
                 sql: {
-                  sourceTypes: [{
-                    name: 'hive',
-                    type: 'hive'
-                  }],
                   user: '${user.username}',
                   navigationSettings: {
                     openItem: false,

+ 0 - 4
apps/metastore/src/metastore/templates/metastore.mako

@@ -1043,10 +1043,6 @@ ${ components.menubar() }
             params: {
               user: '${user.username}',
               sql: {
-                sourceTypes: [{
-                  name: 'hive',
-                  type: 'hive'
-                }],
                 navigationSettings: {
                   openItem: true,
                   showStats: true

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

@@ -25,6 +25,7 @@ from desktop.views import _ko
 from metadata.conf import has_navigator
 from metastore.conf import ENABLE_NEW_CREATE_TABLE
 from notebook.conf import ENABLE_QUERY_BUILDER
+from notebook.conf import get_ordered_interpreters
 %>
 
 <%def name="assistJSModels()">
@@ -892,6 +893,18 @@ from notebook.conf import ENABLE_QUERY_BUILDER
         self.apiHelper = options.apiHelper;
         self.i18n = options.i18n;
 
+        if (typeof options.sourceTypes === 'undefined') {
+          options.sourceTypes = [];
+          % for interpreter in get_ordered_interpreters(request.user):
+            % if interpreter["interface"] in ["hiveserver2", "rdbms", "jdbc"]:
+              options.sourceTypes.push({
+                type: '${ interpreter["type"] }',
+                name: '${ interpreter["name"] }'
+              });
+            % endif
+          % endfor
+        }
+
         self.sources = ko.observableArray();
         self.sourceIndex = {};
         $.each(options.sourceTypes, function (idx, sourceType) {

+ 0 - 4
desktop/core/src/desktop/templates/assist_m.mako

@@ -53,10 +53,6 @@ ${ assist.assistPanel() }
     params: {
       user: '${user.username}',
       sql: {
-        sourceTypes: [{
-          name: 'hive',
-          type: 'hive'
-        }],
         navigationSettings: {
           enableActiveFilter: true,
           openDatabase: false,

+ 0 - 4
desktop/core/src/desktop/templates/home2.mako

@@ -180,10 +180,6 @@ ${ common_home.navbar() }
           params: {
             user: '${user.username}',
             sql: {
-              sourceTypes: [{
-                name: 'hive',
-                type: 'hive'
-              }],
               navigationSettings: {
                 openItem: false,
                 showStats: true

+ 0 - 4
desktop/core/src/desktop/templates/responsive.mako

@@ -335,10 +335,6 @@ ${ hueIcons.symbols() }
           params: {
             user: '${user.username}',
             sql: {
-              sourceTypes: [{
-                name: 'hive',
-                type: 'hive'
-              }],
               navigationSettings: {
                 openItem: false,
                 showStats: true

+ 0 - 4
desktop/libs/indexer/src/indexer/templates/importer.mako

@@ -297,10 +297,6 @@ ${ assist.assistPanel() }
                 user: '${user.username}',
                 onlySql: false,
                 sql: {
-                  sourceTypes: [{
-                    name: 'hive',
-                    type: 'hive'
-                  }],
                   navigationSettings: {
                     openItem: false,
                     showStats: true

+ 0 - 4
desktop/libs/indexer/src/indexer/templates/indexer.mako

@@ -151,10 +151,6 @@ ${ assist.assistPanel() }
                 user: '${user.username}',
                 onlySql: false,
                 sql: {
-                  sourceTypes: [{
-                    name: 'hive',
-                    type: 'hive'
-                  }],
                   navigationSettings: {
                     openItem: false,
                     showStats: true

+ 2 - 1
desktop/libs/notebook/src/notebook/static/notebook/js/notebook.ko.js

@@ -2356,6 +2356,7 @@ var EditorViewModel = (function() {
       );
     });
 
+    // TODO: Drop the SQL source types from the notebook. They're now set in AssistDbPanel.
     self.sqlSourceTypes = [];
     self.availableLanguages = [];
 
@@ -2364,7 +2365,7 @@ var EditorViewModel = (function() {
         self.availableLanguages.push({
           type: language.type,
           name: language.name,
-          interface: language.interface,
+          interface: language.interface
         });
         var viewSettings = options.snippetViewSettings[language.type];
         if (viewSettings && viewSettings.sqlDialect) {