فهرست منبع

HUE-6182 [frontend] Fix the assist initialization in Hue 3 pages

Johan Ahlen 8 سال پیش
والد
کامیت
db6858c
24فایلهای تغییر یافته به همراه182 افزوده شده و 140 حذف شده
  1. 0 1
      apps/beeswax/src/beeswax/templates/create_database.mako
  2. 0 1
      apps/beeswax/src/beeswax/templates/create_table_manually.mako
  3. 0 1
      apps/beeswax/src/beeswax/templates/execute.mako
  4. 0 1
      apps/beeswax/src/beeswax/templates/import_wizard_choose_delimiter.mako
  5. 0 1
      apps/beeswax/src/beeswax/templates/import_wizard_choose_file.mako
  6. 0 1
      apps/beeswax/src/beeswax/templates/import_wizard_define_columns.mako
  7. 0 1
      apps/filebrowser/src/filebrowser/templates/listdir_components.mako
  8. 0 1
      apps/jobbrowser/src/jobbrowser/templates/job_browser.mako
  9. 0 1
      apps/metastore/src/metastore/templates/describe_partitions.mako
  10. 0 1
      apps/metastore/src/metastore/templates/metastore.mako
  11. 0 1
      apps/oozie/src/oozie/templates/editor2/workflow_editor.mako
  12. 0 1
      apps/pig/src/pig/templates/app.mako
  13. 0 3
      apps/security/src/security/templates/layout.mako
  14. 0 1
      apps/useradmin/src/useradmin/templates/list_configurations.mako
  15. 48 0
      desktop/core/src/desktop/static/desktop/js/clusterConfig.js
  16. 131 117
      desktop/core/src/desktop/templates/assist.mako
  17. 0 1
      desktop/core/src/desktop/templates/assist_m.mako
  18. 3 0
      desktop/core/src/desktop/templates/common_header.mako
  19. 0 1
      desktop/core/src/desktop/templates/common_home.mako
  20. 0 1
      desktop/libs/dashboard/src/dashboard/templates/common_search.mako
  21. 0 1
      desktop/libs/indexer/src/indexer/templates/importer.mako
  22. 0 1
      desktop/libs/indexer/src/indexer/templates/indexer.mako
  23. 0 1
      desktop/libs/notebook/src/notebook/templates/editor_components.mako
  24. 0 1
      desktop/libs/notebook/src/notebook/templates/editor_m.mako

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

@@ -32,7 +32,6 @@ ${layout.metastore_menubar()}
 <script src="${ static('desktop/ext/js/jquery/plugins/jquery-ui-1.10.4.custom.min.js') }"></script>
 <script src="${ static('desktop/ext/js/routie-0.3.0.min.js') }" type="text/javascript" charset="utf-8"></script>
 <script src="${ static('desktop/ext/js/selectize.min.js') }"></script>
-<script src="${ static('desktop/js/apiHelper.js') }"></script>
 <script src="${ static('metastore/js/metastore.ko.js') }"></script>
 <script src="${ static('desktop/js/ko.charts.js') }"></script>
 <script src="${ static('desktop/ext/js/knockout-sortable.min.js') }"></script>

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

@@ -30,7 +30,6 @@ ${ layout.metastore_menubar() }
 
 <script src="${ static('desktop/ext/js/jquery/plugins/jquery-ui-1.10.4.custom.min.js') }"></script>
 <script src="${ static('desktop/ext/js/selectize.min.js') }"></script>
-<script src="${ static('desktop/js/apiHelper.js') }"></script>
 <script src="${ static('metastore/js/metastore.ko.js') }"></script>
 <script src="${ static('desktop/js/ko.charts.js') }"></script>
 <script src="${ static('desktop/ext/js/knockout-sortable.min.js') }"></script>

+ 0 - 1
apps/beeswax/src/beeswax/templates/execute.mako

@@ -812,7 +812,6 @@ ${ commonshare() | n,unicode }
 <script src="${ static('desktop/js/sqlAutocompleter.js') }" type="text/javascript" charset="utf-8"></script>
 <script src="${ static('desktop/js/sqlAutocompleter2.js') }" type="text/javascript" charset="utf-8"></script>
 <script src="${ static('desktop/js/hdfsAutocompleter.js') }" type="text/javascript" charset="utf-8"></script>
-<script src="${ static('desktop/js/apiHelper.js') }" type="text/javascript" charset="utf-8"></script>
 <script src="${ static('desktop/js/sqlFunctions.js') }" type="text/javascript" charset="utf-8"></script>
 
 ${ assist.assistJSModels() }

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

@@ -30,7 +30,6 @@ ${ layout.metastore_menubar() }
 
 <script src="${ static('desktop/ext/js/jquery/plugins/jquery-ui-1.10.4.custom.min.js') }"></script>
 <script src="${ static('desktop/ext/js/selectize.min.js') }"></script>
-<script src="${ static('desktop/js/apiHelper.js') }"></script>
 <script src="${ static('metastore/js/metastore.ko.js') }"></script>
 <script src="${ static('desktop/js/ko.charts.js') }"></script>
 <script src="${ static('desktop/ext/js/knockout-sortable.min.js') }"></script>

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

@@ -29,7 +29,6 @@ ${ layout.metastore_menubar() }
 
 <script src="${ static('desktop/ext/js/jquery/plugins/jquery-ui-1.10.4.custom.min.js') }"></script>
 <script src="${ static('desktop/ext/js/selectize.min.js') }"></script>
-<script src="${ static('desktop/js/apiHelper.js') }"></script>
 <script src="${ static('metastore/js/metastore.ko.js') }"></script>
 <script src="${ static('desktop/js/ko.charts.js') }"></script>
 <script src="${ static('desktop/ext/js/knockout-sortable.min.js') }"></script>

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

@@ -30,7 +30,6 @@ ${ layout.metastore_menubar() }
 
 <script src="${ static('desktop/ext/js/jquery/plugins/jquery-ui-1.10.4.custom.min.js') }"></script>
 <script src="${ static('desktop/ext/js/selectize.min.js') }"></script>
-<script src="${ static('desktop/js/apiHelper.js') }"></script>
 <script src="${ static('metastore/js/metastore.ko.js') }"></script>
 <script src="${ static('desktop/js/ko.charts.js') }"></script>
 <script src="${ static('desktop/ext/js/knockout-sortable.min.js') }"></script>

+ 0 - 1
apps/filebrowser/src/filebrowser/templates/listdir_components.mako

@@ -681,7 +681,6 @@ from filebrowser.conf import ENABLE_EXTRACT_UPLOADED_ARCHIVE
 
   <script src="${ static('desktop/ext/js/jquery/plugins/jquery-ui-1.10.4.custom.min.js') }" type="text/javascript" charset="utf-8"></script>
   <script src="${ static('desktop/ext/js/datatables-paging-0.1.js') }" type="text/javascript" charset="utf-8"></script>
-  <script src="${ static('desktop/js/apiHelper.js') }"></script>
 
 
   <script charset="utf-8">

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

@@ -46,7 +46,6 @@ ${ commonheader("Job Browser", "jobbrowser", user, request) | n,unicode }
 <script src="${ static('oozie/js/dashboard-utils.js') }" type="text/javascript" charset="utf-8"></script>
 <script src="${ static('desktop/ext/js/jquery/plugins/jquery.basictable.min.js') }"></script>
 <script src="${ static('desktop/ext/js/jquery/plugins/jquery-ui-1.10.4.custom.min.js') }"></script>
-<script src="${ static('desktop/js/apiHelper.js') }"></script>
 <script src="${ static('desktop/js/ko.charts.js') }"></script>
 <script src="${ static('desktop/ext/js/knockout-sortable.min.js') }"></script>
 <script src="${ static('desktop/js/ko.editable.js') }"></script>

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

@@ -28,7 +28,6 @@ ${ components.menubar() }
 
 <script src="${ static('desktop/ext/js/jquery/plugins/jquery-ui-1.10.4.custom.min.js') }"></script>
 <script src="${ static('desktop/ext/js/selectize.min.js') }"></script>
-<script src="${ static('desktop/js/apiHelper.js') }"></script>
 <script src="${ static('metastore/js/metastore.ko.js') }"></script>
 <script src="${ static('desktop/js/ko.charts.js') }"></script>
 <script src="${ static('desktop/ext/js/knockout-sortable.min.js') }"></script>

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

@@ -36,7 +36,6 @@ ${ commonheader(_("Metastore"), app_name, user, request) | n,unicode }
 <script src="${ static('desktop/ext/js/jquery/plugins/jquery-ui-1.10.4.custom.min.js') }"></script>
 <script src="${ static('desktop/ext/js/jquery/plugins/jquery.mousewheel.min.js') }"></script>
 <script src="${ static('desktop/ext/js/selectize.min.js') }"></script>
-<script src="${ static('desktop/js/apiHelper.js') }"></script>
 <script src="${ static('desktop/js/ko.charts.js') }"></script>
 <script src="${ static('desktop/ext/js/knockout-sortable.min.js') }"></script>
 <script src="${ static('desktop/js/ko.editable.js') }"></script>

+ 0 - 1
apps/oozie/src/oozie/templates/editor2/workflow_editor.mako

@@ -585,7 +585,6 @@ ${ commonshare() | n,unicode }
 <script src="${ static('desktop/ext/chosen/chosen.jquery.min.js') }" type="text/javascript" charset="utf-8"></script>
 <script src="${ static('desktop/js/select2.full.patched.js') }" type="text/javascript" charset="utf-8"></script>
 <script src="${ static('desktop/js/share2.vm.js') }"></script>
-<script src="${ static('desktop/js/apiHelper.js') }" type="text/javascript" charset="utf-8"></script>
 
 ${ dashboard.import_bindings() }
 

+ 0 - 1
apps/pig/src/pig/templates/app.mako

@@ -735,7 +735,6 @@ ${ commonshare() | n,unicode }
 <script src="${ static('pig/js/utils.js') }" type="text/javascript" charset="utf-8"></script>
 <script src="${ static('pig/js/pig.ko.js') }" type="text/javascript" charset="utf-8"></script>
 <script src="${ static('desktop/js/share.vm.js') }" type="text/javascript" charset="utf-8"></script>
-<script src="${ static('desktop/js/apiHelper.js') }" type="text/javascript" charset="utf-8"></script>
 
 <script src="${ static('desktop/ext/js/routie-0.3.0.min.js') }" type="text/javascript" charset="utf-8"></script>
 <script src="${ static('desktop/ext/js/codemirror-3.11.js') }"></script>

+ 0 - 3
apps/security/src/security/templates/layout.mako

@@ -51,9 +51,6 @@ def is_selected(section, matcher):
   <link rel="stylesheet" href="${ static('desktop/ext/select2/select2.css') }">
   <script src="${ static('desktop/ext/select2/select2.min.js') }" type="text/javascript" charset="utf-8"></script>
 
-  <script src="${ static('desktop/js/apiHelper.js') }"></script>
-
-
   <div class="navbar hue-title-bar">
       <div class="navbar-inner">
         <div class="container-fluid">

+ 0 - 1
apps/useradmin/src/useradmin/templates/list_configurations.mako

@@ -31,7 +31,6 @@ ${layout.menubar(section='configurations')}
 
 <script src="${ static('desktop/ext/js/jquery/plugins/jquery-ui-1.10.4.custom.min.js') }"></script>
 <script src="${ static('desktop/ext/js/selectize.min.js') }"></script>
-<script src="${ static('desktop/js/apiHelper.js') }"></script>
 <script src="${ static('metastore/js/metastore.ko.js') }"></script>
 <script src="${ static('desktop/js/ko.charts.js') }"></script>
 <script src="${ static('desktop/ext/js/knockout-sortable.min.js') }"></script>

+ 48 - 0
desktop/core/src/desktop/static/desktop/js/clusterConfig.js

@@ -0,0 +1,48 @@
+// Licensed to Cloudera, Inc. under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  Cloudera, Inc. licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License.  You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+(function () {
+
+  function ClusterConfig () {
+    var self = this;
+
+    self.clusterConfig = undefined;
+    self.loading = true;
+
+    ApiHelper.getInstance().getClusterConfig().done(function (data) {
+      if (data.status === 0) {
+        self.loading = false;
+        self.clusterConfig = data;
+        huePubSub.publish('cluster.config.set.config', self.clusterConfig);
+      } else {
+        $(document).trigger("error", data.message);
+        huePubSub.publish('cluster.config.set.config');
+      }
+    }).fail(function () {
+      huePubSub.publish('clustser.config.set.config');
+    }).always(function () {
+      self.loading = false;
+    });
+
+    huePubSub.subscribe('cluster.config.get.config', function () {
+      if (! self.loading) {
+        huePubSub.publish('cluster.config.set.config', self.clusterConfig);
+      }
+    });
+  }
+
+  new ClusterConfig();
+}());

+ 131 - 117
desktop/core/src/desktop/templates/assist.mako

@@ -1411,147 +1411,161 @@ from notebook.conf import get_ordered_interpreters
 
         self.tabsEnabled = '${ USE_NEW_SIDE_PANELS.get() }' === 'True';
 
-        self.availablePanels = ko.pureComputed(function() {
-          var panels = [];
-          var appConfig = hueDebug.viewModel($('.top-nav')[0]).clusterConfig() && hueDebug.viewModel($('.top-nav')[0]).clusterConfig()['app_config']; // TODO clean-up
+        self.availablePanels = ko.observableArray();
+        self.visiblePanel = ko.observable();
 
-          if (! appConfig) { // TODO handle no panel and return []
-            return [new AssistInnerPanel({
-                panelData: new AssistDbPanel($.extend({
-                  apiHelper: self.apiHelper,
-                  i18n: i18n
-                }, params.sql)),
-                apiHelper: self.apiHelper,
-                name: '${ _("SQL") }',
-                type: 'sql',
-                icon: 'fa-database',
-                minHeight: 75
-              })];
-          }
+        // TODO handle panel reloading
+        self.lastOpenPanelType = ko.observable();
+        self.apiHelper.withTotalStorage('assist', 'last.open.panel', self.lastOpenPanelType);
+
+        self.visiblePanel.subscribe(function(newValue) {
+          newValue.panelData.init();
+        });
+
+        huePubSub.subscribe('cluster.config.set.config', function (clusterConfig) {
+          if (clusterConfig && clusterConfig['app_config']) {
+            var panels = [];
+            var appConfig = clusterConfig['app_config'];
+
+            if (appConfig['editor']) {
+              panels.push(
+                      new AssistInnerPanel({
+                        panelData: new AssistDbPanel($.extend({
+                          apiHelper: self.apiHelper,
+                          i18n: i18n
+                        }, params.sql)),
+                        apiHelper: self.apiHelper,
+                        name: '${ _("SQL") }',
+                        type: 'sql',
+                        icon: 'fa-database',
+                        minHeight: 75
+                      })
+              );
+            }
+
+            if (self.tabsEnabled) {
 
-          if (appConfig['editor']) {
-            panels.push(
-              new AssistInnerPanel({
-                panelData: new AssistDbPanel($.extend({
+              if (appConfig['browser'] && appConfig['browser']['interpreter_names'].indexOf('hdfs') != -1) {
+                panels.push(new AssistInnerPanel({
+                  panelData: new AssistHdfsPanel({
+                    apiHelper: self.apiHelper
+                  }),
                   apiHelper: self.apiHelper,
-                  i18n: i18n
-                }, params.sql)),
-                apiHelper: self.apiHelper,
-                name: '${ _("SQL") }',
-                type: 'sql',
-                icon: 'fa-database',
-                minHeight: 75
-              })
-            );
-          }
+                  name: '${ _("HDFS") }',
+                  type: 'hdfs',
+                  icon: 'fa-folder-o',
+                  minHeight: 50
+                }));
+              }
 
-          if (self.tabsEnabled) {
+              if (appConfig['browser'] && appConfig['browser']['interpreter_names'].indexOf('s3') != -1) {
+                panels.push(new AssistInnerPanel({
+                  panelData: new AssistS3Panel({
+                    apiHelper: self.apiHelper
+                  }),
+                  apiHelper: self.apiHelper,
+                  name: '${ _("S3") }',
+                  type: 's3',
+                  icon: 'fa-cubes',
+                  minHeight: 50
+                }));
+              }
 
-            if (appConfig['browser'] && appConfig['browser']['interpreter_names'].indexOf('hdfs') != -1) {
-              panels.push(new AssistInnerPanel({
-                panelData: new AssistHdfsPanel({
-                  apiHelper: self.apiHelper
-                }),
-                apiHelper: self.apiHelper,
-                name: '${ _("HDFS") }',
-                type: 'hdfs',
-                icon: 'fa-folder-o',
-                minHeight: 50
-              }));
-            }
+              if (appConfig['browser'] && appConfig['browser']['interpreter_names'].indexOf('indexes') != -1) {
+                panels.push(new AssistInnerPanel({
+                  panelData: new AssistCollectionsPanel({
+                    apiHelper: self.apiHelper
+                  }),
+                  apiHelper: self.apiHelper,
+                  name: '${ _("Collections") }',
+                  type: 'collections',
+                  icon: 'fa-search-plus',
+                  minHeight: 50,
+                  showNavSearch: false
+                }));
+              }
 
-            if (appConfig['browser'] && appConfig['browser']['interpreter_names'].indexOf('s3') != -1) {
-              panels.push(new AssistInnerPanel({
-                panelData: new AssistS3Panel({
-                  apiHelper: self.apiHelper
-                }),
-                apiHelper: self.apiHelper,
-                name: '${ _("S3") }',
-                type: 's3',
-                icon: 'fa-cubes',
-                minHeight: 50
-              }));
-            }
+              if (appConfig['browser'] && appConfig['browser']['interpreter_names'].indexOf('hbase') != -1) {
+                panels.push(new AssistInnerPanel({
+                  panelData: new AssistHBasePanel({
+                    apiHelper: self.apiHelper
+                  }),
+                  apiHelper: self.apiHelper,
+                  name: '${ _("HBase") }',
+                  type: 'hbase',
+                  icon: 'fa-th-large',
+                  minHeight: 50,
+                  showNavSearch: false
+                }));
+              }
 
-            if (appConfig['browser'] && appConfig['browser']['interpreter_names'].indexOf('indexes') != -1) {
               panels.push(new AssistInnerPanel({
-                panelData: new AssistCollectionsPanel({
-                  apiHelper: self.apiHelper
+                panelData: new AssistDocumentsPanel({
+                  user: params.user,
+                  apiHelper: self.apiHelper,
+                  i18n: i18n
                 }),
                 apiHelper: self.apiHelper,
-                name: '${ _("Collections") }',
-                type: 'collections',
-                icon: 'fa-search-plus',
+                name: '${ _("Documents") }',
+                type: 'documents',
+                icon: 'fa-files-o',
                 minHeight: 50,
-                showNavSearch: false
+                rightAlignIcon: true,
+                visible: params.visibleAssistPanels && params.visibleAssistPanels.indexOf('documents') !== -1
               }));
-            }
 
-            if (appConfig['browser'] && appConfig['browser']['interpreter_names'].indexOf('hbase') != -1) {
-              panels.push(new AssistInnerPanel({
-                panelData: new AssistHBasePanel({
-                  apiHelper: self.apiHelper
-                }),
-                apiHelper: self.apiHelper,
-                name: '${ _("HBase") }',
-                type: 'hbase',
-                icon: 'fa-th-large',
-                minHeight: 50,
-                showNavSearch: false
-              }));
+              var vcsKeysLength = ${ len(VCS.keys()) };
+              if (vcsKeysLength > 0) {
+                panels.push(new AssistInnerPanel({
+                  panelData: new AssistGitPanel({
+                    apiHelper: self.apiHelper
+                  }),
+                  apiHelper: self.apiHelper,
+                  name: '${ _("Git") }',
+                  type: 'git',
+                  icon: 'fa-github',
+                  minHeight: 50,
+                  showNavSearch: false,
+                  rightAlignIcon: true
+                }));
+              }
+
             }
 
-            panels.push(new AssistInnerPanel({
-              panelData: new AssistDocumentsPanel({
-                user: params.user,
+            self.availablePanels(panels);
+          } else {
+            self.availablePanels([new AssistInnerPanel({
+              panelData: new AssistDbPanel($.extend({
                 apiHelper: self.apiHelper,
                 i18n: i18n
-              }),
+              }, params.sql)),
               apiHelper: self.apiHelper,
-              name: '${ _("Documents") }',
-              type: 'documents',
-              icon: 'fa-files-o',
-              minHeight: 50,
-              rightAlignIcon: true,
-              visible: params.visibleAssistPanels && params.visibleAssistPanels.indexOf('documents') !== -1
-            }));
+              name: '${ _("SQL") }',
+              type: 'sql',
+              icon: 'fa-database',
+              minHeight: 75
+            })]);
+          }
 
-            if (${ len(VCS.keys()) } > 0) {
-              panels.push(new AssistInnerPanel({
-                panelData: new AssistGitPanel({
-                  apiHelper: self.apiHelper
-                }),
-                apiHelper: self.apiHelper,
-                name: '${ _("Git") }',
-                type: 'git',
-                icon: 'fa-github',
-                minHeight: 50,
-                showNavSearch: false,
-                rightAlignIcon: true
-              }));
-            }
+          if (!self.lastOpenPanelType()) {
+            self.lastOpenPanelType(self.availablePanels()[0].type);
+          }
 
+          var lastFoundPanel = self.availablePanels().filter(function (panel) { return panel.type === self.lastOpenPanelType() });
+          var dbPanel = self.availablePanels().filter(function (panel) { return panel.type === 'sql' });
+          if (lastFoundPanel.length === 1) {
+            dbPanel[0].panelData.init(); // always forces the db panel to load
           }
 
-          return panels;
+          self.visiblePanel(lastFoundPanel.length === 1 ? lastFoundPanel[0] : self.availablePanels()[0]);
         });
 
-        // TODO handle panel reloading
-        var lastOpenPanelType = self.apiHelper.getFromTotalStorage('assist', 'last.open.panel', self.availablePanels()[0].type);
-
-        var lastFoundPanel = self.availablePanels().filter(function (panel) { return panel.type === lastOpenPanelType });
-        var dbPanel = self.availablePanels().filter(function (panel) { return panel.type === 'sql' });
-        if (lastFoundPanel.length === 1) {
-          dbPanel[0].panelData.init(); // always forces the db panel to load
-        }
-        self.visiblePanel = ko.observable(lastFoundPanel.length === 1 ? lastFoundPanel[0] : self.availablePanels()[0]);
-
-        self.visiblePanel().panelData.init();
-
-        self.visiblePanel.subscribe(function(newValue) {
-          self.apiHelper.setInTotalStorage('assist', 'last.open.panel', newValue.type);
-          newValue.panelData.init();
-        });
+        window.setTimeout(function () {
+          // Main initialization trigger in hue.mako, this is for Hue 3
+          if (self.availablePanels().length === 0) {
+            huePubSub.publish('cluster.config.get.config');
+          }
+        }, 0);
 
         self.navigatorSearch = new NavigatorSearch(self, params.sql.navigationSettings);
       }

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

@@ -25,7 +25,6 @@ ${ commonheader_m(_('Assist'), 'assist', user, request) | n,unicode }
 
 <script src="${ static('desktop/ext/js/jquery/plugins/jquery-ui-1.10.4.custom.min.js') }"></script>
 <script src="${ static('desktop/ext/js/selectize.min.js') }"></script>
-<script src="${ static('desktop/js/apiHelper.js') }"></script>
 <script src="${ static('metastore/js/metastore.ko.js') }"></script>
 <script src="${ static('desktop/js/ko.charts.js') }"></script>
 <script src="${ static('desktop/ext/js/knockout-sortable.min.js') }"></script>

+ 3 - 0
desktop/core/src/desktop/templates/common_header.mako

@@ -163,6 +163,9 @@ if USE_NEW_EDITOR.get():
 
   ${ commonHeaderFooterComponents.header_pollers(user, is_s3_enabled, apps) }
 
+  <script src="${ static('desktop/js/apiHelper.js') }"></script>
+  <script src="${ static('desktop/js/clusterConfig.js') }"></script>
+
   <script type="text/javascript">
     var IS_HUE_4 = false;
 

+ 0 - 1
desktop/core/src/desktop/templates/common_home.mako

@@ -24,7 +24,6 @@
 <%def name="homeJSModels(is_embeddable=False)">
   <script src="${ static('desktop/ext/js/jquery/plugins/jquery-ui-1.10.4.custom.min.js') }"></script>
   <script src="${ static('desktop/ext/js/selectize.min.js') }"></script>
-  <script src="${ static('desktop/js/apiHelper.js') }"></script>
   <script src="${ static('desktop/ext/js/knockout-sortable.min.js') }"></script>
   <script src="${ static('desktop/js/ko.editable.js') }"></script>
   <script src="${ static('desktop/ext/js/jquery/plugins/jquery.mousewheel.min.js') }"></script>

+ 0 - 1
desktop/libs/dashboard/src/dashboard/templates/common_search.mako

@@ -2762,7 +2762,6 @@ ${ dashboard.import_layout(True) }
 <script src="${ static('desktop/ext/js/selectize.min.js') }"></script>
 <script src="${ static('desktop/js/ko.selectize.js') }"></script>
 <script src="${ static('dashboard/js/search.ko.js') }" type="text/javascript" charset="utf-8"></script>
-<script src="${ static('desktop/js/apiHelper.js') }" type="text/javascript" charset="utf-8"></script>
 
 ${ dashboard.import_bindings() }
 ${ dashboard.import_charts() }

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

@@ -42,7 +42,6 @@ ${ commonheader(_("Importer"), "indexer", user, request, "60px") | n,unicode }
 <script src="${ static('desktop/js/jquery.hiveautocomplete.js') }" type="text/javascript" charset="utf-8"></script>
 <script src="${ static('desktop/ext/js/jquery/plugins/jquery-ui-1.10.4.custom.min.js') }"></script>
 <script src="${ static('desktop/ext/js/selectize.min.js') }"></script>
-<script src="${ static('desktop/js/apiHelper.js') }"></script>
 <script src="${ static('metastore/js/metastore.ko.js') }"></script>
 <script src="${ static('desktop/js/ko.charts.js') }"></script>
 <script src="${ static('desktop/ext/js/knockout-sortable.min.js') }"></script>

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

@@ -28,7 +28,6 @@ ${ commonheader(_("Solr Indexes"), "search", user, request, "60px") | n,unicode
 
 <script src="${ static('desktop/ext/js/jquery/plugins/jquery-ui-1.10.4.custom.min.js') }"></script>
 <script src="${ static('desktop/ext/js/selectize.min.js') }"></script>
-<script src="${ static('desktop/js/apiHelper.js') }"></script>
 <script src="${ static('metastore/js/metastore.ko.js') }"></script>
 <script src="${ static('desktop/js/ko.charts.js') }"></script>
 <script src="${ static('desktop/ext/js/knockout-sortable.min.js') }"></script>

+ 0 - 1
desktop/libs/notebook/src/notebook/templates/editor_components.mako

@@ -46,7 +46,6 @@ from notebook.conf import ENABLE_QUERY_BUILDER, ENABLE_QUERY_SCHEDULING, ENABLE_
 % if not is_embeddable:
 <script src="${ static('desktop/ext/js/jquery/plugins/jquery-ui-1.10.4.custom.min.js') }"></script>
 <script src="${ static('desktop/ext/js/knockout-sortable.min.js') }"></script>
-<script src="${ static('desktop/js/apiHelper.js') }"></script>
 <script src="${ static('desktop/js/ko.charts.js') }"></script>
 <script src="${ static('desktop/js/ko.editable.js') }"></script>
 % endif

+ 0 - 1
desktop/libs/notebook/src/notebook/templates/editor_m.mako

@@ -164,7 +164,6 @@ ${ commonheader_m(editor_type, editor_type, user, request, "68px") | n,unicode }
 
 
 <script src="${ static('desktop/ext/js/jquery/plugins/jquery-ui-1.10.4.custom.min.js') }"></script>
-<script src="${ static('desktop/js/apiHelper.js') }"></script>
 <script src="${ static('desktop/js/ko.charts.js') }"></script>
 <script src="${ static('desktop/js/ace/ace.js') }"></script>
 <script src="${ static('desktop/js/ace/mode-impala.js') }"></script>