Browse Source

HUE-8687 [editor] Move additional editor dependencies into webpack and add a runtime bundle

Johan Ahlen 6 years ago
parent
commit
66f4daf
25 changed files with 41 additions and 63 deletions
  1. 0 8
      apps/beeswax/src/beeswax/templates/execute.mako
  2. 0 1
      apps/metastore/src/metastore/templates/metastore.mako
  3. 0 1
      apps/oozie/src/oozie/templates/dashboard/list_oozie_workflow.mako
  4. 0 1
      apps/oozie/src/oozie/templates/dashboard/list_oozie_workflow_graph.mako
  5. 0 3
      apps/oozie/src/oozie/templates/editor2/bundle_editor.mako
  6. 0 6
      apps/oozie/src/oozie/templates/editor2/coordinator_editor.mako
  7. 0 4
      apps/oozie/src/oozie/templates/editor2/workflow_editor.mako
  8. 0 5
      apps/rdbms/src/rdbms/templates/execute.mako
  9. 0 3
      apps/security/src/security/templates/layout.mako
  10. 0 1
      apps/sqoop/src/sqoop/templates/app.mako
  11. 5 2
      desktop/core/src/desktop/js/apps/notebook/notebook.js
  12. 7 0
      desktop/core/src/desktop/js/ext/bootstrap-editable.1.5.1.min.js
  13. 3 0
      desktop/core/src/desktop/js/ext/jquery.chosen.1.0.0.min.js
  14. 3 0
      desktop/core/src/desktop/js/ext/jquery.select2.3.5.1.min.js
  15. 0 0
      desktop/core/src/desktop/js/ext/markdown.min.js
  16. 1 0
      desktop/core/src/desktop/js/hue.js
  17. 2 0
      desktop/core/src/desktop/js/jquery/jquery.common.js
  18. 0 4
      desktop/core/src/desktop/static/desktop/ext/js/bootstrap-editable.min.js
  19. 2 1
      desktop/core/src/desktop/templates/hue.mako
  20. 0 5
      desktop/libs/dashboard/src/dashboard/templates/common_search.mako
  21. 0 2
      desktop/libs/indexer/src/indexer/templates/collections.mako
  22. 3 16
      desktop/libs/notebook/src/notebook/templates/editor_components.mako
  23. 10 0
      package-lock.json
  24. 2 0
      package.json
  25. 3 0
      webpack.config.js

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

@@ -849,13 +849,9 @@ ${ assist.assistJSModels() }
 <script src="${ static('desktop/js/codemirror-show-hint.js') }"></script>
 <script src="${ static('desktop/js/codemirror-show-hint.js') }"></script>
 
 
 <link href="${ static('desktop/ext/css/bootstrap-editable.css') }" rel="stylesheet">
 <link href="${ static('desktop/ext/css/bootstrap-editable.css') }" rel="stylesheet">
-<script src="${ static('desktop/ext/js/bootstrap-editable.min.js') }"></script>
 
 
 <script src="${ static('beeswax/js/stats.utils.js') }"></script>
 <script src="${ static('beeswax/js/stats.utils.js') }"></script>
 
 
-<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>
-
 ${ assist.assistPanel() }
 ${ assist.assistPanel() }
 
 
 <style type="text/css">
 <style type="text/css">
@@ -1129,12 +1125,8 @@ ${ assist.assistPanel() }
 
 
 <script src="${ static('desktop/ext/js/jquery/plugins/jquery-fieldselection.js') }" type="text/javascript"></script>
 <script src="${ static('desktop/ext/js/jquery/plugins/jquery-fieldselection.js') }" type="text/javascript"></script>
 
 
-<link rel="stylesheet" href="${ static('desktop/ext/chosen/chosen.min.css') }">
-<script src="${ static('desktop/ext/chosen/chosen.jquery.min.js') }" type="text/javascript" charset="utf-8"></script>
-
 ${ charting.import_charts() }
 ${ charting.import_charts() }
 
 
-
 <script type="text/javascript">
 <script type="text/javascript">
 
 
 // avoid blinking of the panels
 // avoid blinking of the panels

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

@@ -42,7 +42,6 @@ else:
 ${ commonheader(_("Metastore"), app_name, user, request) | n,unicode }
 ${ commonheader(_("Metastore"), app_name, user, request) | n,unicode }
 
 
 <script src="${ static('desktop/ext/js/jquery/plugins/jquery.mousewheel.min.js') }"></script>
 <script src="${ static('desktop/ext/js/jquery/plugins/jquery.mousewheel.min.js') }"></script>
-<script src="${ static('desktop/ext/js/bootstrap-editable.min.js') }"></script>
 
 
 ${ assist.assistJSModels() }
 ${ assist.assistJSModels() }
 
 

+ 0 - 1
apps/oozie/src/oozie/templates/dashboard/list_oozie_workflow.mako

@@ -376,7 +376,6 @@ ${ layout.menubar(section='workflows', dashboard=True) }
 
 
 ${ dashboard.import_layout() }
 ${ dashboard.import_layout() }
 
 
-<script src="${ static('desktop/ext/js/bootstrap-editable.min.js') }"></script>
 <script src="${ static('oozie/js/workflow-editor.ko.js') }" type="text/javascript" charset="utf-8"></script>
 <script src="${ static('oozie/js/workflow-editor.ko.js') }" type="text/javascript" charset="utf-8"></script>
 <script src="${ static('oozie/js/workflow-editor.utils.js') }" type="text/javascript" charset="utf-8"></script>
 <script src="${ static('oozie/js/workflow-editor.utils.js') }" type="text/javascript" charset="utf-8"></script>
 <script src="${ static('desktop/ext/js/jquery/plugins/jquery.curvedarrow.js') }" type="text/javascript" charset="utf-8"></script>
 <script src="${ static('desktop/ext/js/jquery/plugins/jquery.curvedarrow.js') }" type="text/javascript" charset="utf-8"></script>

+ 0 - 1
apps/oozie/src/oozie/templates/dashboard/list_oozie_workflow_graph.mako

@@ -29,7 +29,6 @@
 
 
 ${ dashboard.import_layout() }
 ${ dashboard.import_layout() }
 
 
-<script src="${ static('desktop/ext/js/bootstrap-editable.min.js') }"></script>
 <script src="${ static('oozie/js/workflow-editor.ko.js') }" type="text/javascript" charset="utf-8"></script>
 <script src="${ static('oozie/js/workflow-editor.ko.js') }" type="text/javascript" charset="utf-8"></script>
 <script src="${ static('oozie/js/workflow-editor.utils.js') }" type="text/javascript" charset="utf-8"></script>
 <script src="${ static('oozie/js/workflow-editor.utils.js') }" type="text/javascript" charset="utf-8"></script>
 <script src="${ static('desktop/ext/js/jquery/plugins/jquery.curvedarrow.js') }" type="text/javascript" charset="utf-8"></script>
 <script src="${ static('desktop/ext/js/jquery/plugins/jquery.curvedarrow.js') }" type="text/javascript" charset="utf-8"></script>

+ 0 - 3
apps/oozie/src/oozie/templates/editor2/bundle_editor.mako

@@ -259,7 +259,6 @@ ${ layout.menubar(section='bundles', is_editor=True, pullright=buttons, is_embed
 
 
 <link rel="stylesheet" href="${ static('desktop/ext/css/hue-filetypes.css') }">
 <link rel="stylesheet" href="${ static('desktop/ext/css/hue-filetypes.css') }">
 <link rel="stylesheet" href="${ static('desktop/ext/css/hue-charts.css') }">
 <link rel="stylesheet" href="${ static('desktop/ext/css/hue-charts.css') }">
-<link rel="stylesheet" href="${ static('desktop/ext/chosen/chosen.min.css') }">
 <link rel="stylesheet" href="${ static('oozie/css/common-editor.css') }">
 <link rel="stylesheet" href="${ static('oozie/css/common-editor.css') }">
 <link rel="stylesheet" href="${ static('oozie/css/coordinator-editor.css') }">
 <link rel="stylesheet" href="${ static('oozie/css/coordinator-editor.css') }">
 
 
@@ -269,8 +268,6 @@ ${ dashboard.import_layout() }
 ${ commonshare() | n,unicode }
 ${ commonshare() | n,unicode }
 %endif
 %endif
 
 
-<script src="${ static('desktop/ext/js/bootstrap-editable.min.js') }" type="text/javascript" charset="utf-8"></script>
-<script src="${ static('desktop/ext/chosen/chosen.jquery.min.js') }" type="text/javascript" charset="utf-8"></script>
 % if not is_embeddable:
 % if not is_embeddable:
 <script src="${ static('desktop/js/share2.vm.js') }"></script>
 <script src="${ static('desktop/js/share2.vm.js') }"></script>
 %endif
 %endif

+ 0 - 6
apps/oozie/src/oozie/templates/editor2/coordinator_editor.mako

@@ -111,24 +111,18 @@ ${ scheduler.import_modals() }
 
 
 <link rel="stylesheet" href="${ static('desktop/ext/css/hue-filetypes.css') }">
 <link rel="stylesheet" href="${ static('desktop/ext/css/hue-filetypes.css') }">
 <link rel="stylesheet" href="${ static('desktop/ext/css/hue-charts.css') }">
 <link rel="stylesheet" href="${ static('desktop/ext/css/hue-charts.css') }">
-<link rel="stylesheet" href="${ static('desktop/ext/chosen/chosen.min.css') }">
 <link rel="stylesheet" href="${ static('oozie/css/common-editor.css') }">
 <link rel="stylesheet" href="${ static('oozie/css/common-editor.css') }">
 <link rel="stylesheet" href="${ static('oozie/css/coordinator-editor.css') }">
 <link rel="stylesheet" href="${ static('oozie/css/coordinator-editor.css') }">
 
 
 <link href="${ static('desktop/css/jqCron.css') }" rel="stylesheet" type="text/css" />
 <link href="${ static('desktop/css/jqCron.css') }" rel="stylesheet" type="text/css" />
 <script src="${ static('desktop/js/jqCron.js') }" type="text/javascript"></script>
 <script src="${ static('desktop/js/jqCron.js') }" type="text/javascript"></script>
 
 
-<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>
-
 ${ dashboard.import_layout() }
 ${ dashboard.import_layout() }
 
 
 %if not is_embeddable:
 %if not is_embeddable:
 ${ commonshare() | n,unicode }
 ${ commonshare() | n,unicode }
 %endif
 %endif
 
 
-<script src="${ static('desktop/ext/js/bootstrap-editable.min.js') }" type="text/javascript" charset="utf-8"></script>
-<script src="${ static('desktop/ext/chosen/chosen.jquery.min.js') }" type="text/javascript" charset="utf-8"></script>
 % if not is_embeddable:
 % if not is_embeddable:
 <script src="${ static('desktop/js/share2.vm.js') }"></script>
 <script src="${ static('desktop/js/share2.vm.js') }"></script>
 %endif
 %endif

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

@@ -585,8 +585,6 @@ ${ workflow.render() }
 
 
 <link rel="stylesheet" href="${ static('desktop/ext/css/hue-filetypes.css') }">
 <link rel="stylesheet" href="${ static('desktop/ext/css/hue-filetypes.css') }">
 <link rel="stylesheet" href="${ static('desktop/ext/css/hue-charts.css') }">
 <link rel="stylesheet" href="${ static('desktop/ext/css/hue-charts.css') }">
-<link rel="stylesheet" href="${ static('desktop/ext/chosen/chosen.min.css') }">
-<link rel="stylesheet" href="${ static('desktop/ext/css/select2.min.css') }">
 <link rel="stylesheet" href="${ static('oozie/css/common-editor.css') }">
 <link rel="stylesheet" href="${ static('oozie/css/common-editor.css') }">
 <link rel="stylesheet" href="${ static('oozie/css/workflow-editor.css') }">
 <link rel="stylesheet" href="${ static('oozie/css/workflow-editor.css') }">
 
 
@@ -597,8 +595,6 @@ ${ dashboard.import_layout() }
 ${ commonshare() | n,unicode }
 ${ commonshare() | n,unicode }
 %endif
 %endif
 
 
-<script src="${ static('desktop/ext/js/bootstrap-editable.min.js') }" type="text/javascript" charset="utf-8"></script>
-<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/select2.full.patched.js') }" type="text/javascript" charset="utf-8"></script>
 % if not is_embeddable:
 % if not is_embeddable:
 <script src="${ static('desktop/js/share2.vm.js') }"></script>
 <script src="${ static('desktop/js/share2.vm.js') }"></script>

+ 0 - 5
apps/rdbms/src/rdbms/templates/execute.mako

@@ -365,12 +365,7 @@ ${ commonshare() | n,unicode }
 <script src="${ static('desktop/js/codemirror-sql-hint.js') }"></script>
 <script src="${ static('desktop/js/codemirror-sql-hint.js') }"></script>
 <script src="${ static('desktop/js/codemirror-show-hint.js') }"></script>
 <script src="${ static('desktop/js/codemirror-show-hint.js') }"></script>
 
 
-<link rel="stylesheet" href="${ static('desktop/ext/chosen/chosen.min.css') }">
-<script src="${ static('desktop/ext/chosen/chosen.jquery.min.js') }" type="text/javascript" charset="utf-8"></script>
-
 <link href="${ static('desktop/ext/css/bootstrap-editable.css') }" rel="stylesheet">
 <link href="${ static('desktop/ext/css/bootstrap-editable.css') }" rel="stylesheet">
-<script src="${ static('desktop/ext/js/bootstrap-editable.min.js') }"></script>
-<script src="${ static('desktop/ext/js/bootstrap-editable.min.js') }"></script>
 
 
 <script src="${ static('desktop/ext/js/jquery/plugins/jquery-fieldselection.js') }" type="text/javascript"></script>
 <script src="${ static('desktop/ext/js/jquery/plugins/jquery-fieldselection.js') }" type="text/javascript"></script>
 <script src="${ static('rdbms/js/autocomplete.utils.js') }" type="text/javascript" charset="utf-8"></script>
 <script src="${ static('rdbms/js/autocomplete.utils.js') }" type="text/javascript" charset="utf-8"></script>

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

@@ -48,9 +48,6 @@ def is_selected(section, matcher):
 <%def name="menubar(section='', is_embeddable=False)">
 <%def name="menubar(section='', is_embeddable=False)">
   <link href="${ static('security/css/security.css') }" rel="stylesheet">
   <link href="${ static('security/css/security.css') }" rel="stylesheet">
 
 
-  <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>
-
   <div class="navbar hue-title-bar">
   <div class="navbar hue-title-bar">
       <div class="navbar-inner">
       <div class="navbar-inner">
         <div class="container-fluid">
         <div class="container-fluid">

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

@@ -674,7 +674,6 @@ ${ commonheader(None, "sqoop", user, request) | n,unicode }
 <script>
 <script>
   routie.setPathname('/sqoop');
   routie.setPathname('/sqoop');
 </script>
 </script>
-<script src="${ static('desktop/ext/js/bootstrap-editable.min.js') }"></script>
 <script src="${ static('sqoop/js/cclass.js') }" type="text/javascript" charset="utf-8"></script>
 <script src="${ static('sqoop/js/cclass.js') }" type="text/javascript" charset="utf-8"></script>
 <script src="${ static('sqoop/js/koify.js') }" type="text/javascript" charset="utf-8"></script>
 <script src="${ static('sqoop/js/koify.js') }" type="text/javascript" charset="utf-8"></script>
 <script src="${ static('sqoop/js/sqoop.autocomplete.js') }" type="text/javascript" charset="utf-8"></script>
 <script src="${ static('sqoop/js/sqoop.autocomplete.js') }" type="text/javascript" charset="utf-8"></script>

+ 5 - 2
desktop/core/src/desktop/js/apps/notebook/notebook.js

@@ -14,9 +14,12 @@
 // See the License for the specific language governing permissions and
 // See the License for the specific language governing permissions and
 // limitations under the License.
 // limitations under the License.
 
 
+import Clipboard from 'clipboard';
+import 'jquery-mousewheel';
+
 import 'ext/bootstrap-datepicker.min';
 import 'ext/bootstrap-datepicker.min';
-import 'jquery/plugins/jquery.hdfstree';
 import 'ext/jquery.hotkeys';
 import 'ext/jquery.hotkeys';
-import Clipboard from 'clipboard';
+import 'jquery/plugins/jquery.hdfstree';
+import 'ext/markdown.min';
 
 
 window.Clipboard = Clipboard;
 window.Clipboard = Clipboard;

File diff suppressed because it is too large
+ 7 - 0
desktop/core/src/desktop/js/ext/bootstrap-editable.1.5.1.min.js


File diff suppressed because it is too large
+ 3 - 0
desktop/core/src/desktop/js/ext/jquery.chosen.1.0.0.min.js


File diff suppressed because it is too large
+ 3 - 0
desktop/core/src/desktop/js/ext/jquery.select2.3.5.1.min.js


File diff suppressed because it is too large
+ 0 - 0
desktop/core/src/desktop/js/ext/markdown.min.js


+ 1 - 0
desktop/core/src/desktop/js/hue.js

@@ -16,6 +16,7 @@
 
 
 import 'jquery/jquery.common';
 import 'jquery/jquery.common';
 import 'ext/bootstrap.2.3.2.min';
 import 'ext/bootstrap.2.3.2.min';
+import 'ext/bootstrap-editable.1.5.1.min';
 import _ from 'lodash';
 import _ from 'lodash';
 import Dropzone from 'dropzone';
 import Dropzone from 'dropzone';
 import filesize from 'filesize';
 import filesize from 'filesize';

+ 2 - 0
desktop/core/src/desktop/js/jquery/jquery.common.js

@@ -29,7 +29,9 @@ import 'jquery-ui/ui/widgets/droppable';
 import 'jquery-ui/ui/widgets/resizable';
 import 'jquery-ui/ui/widgets/resizable';
 import 'jquery-ui/ui/widgets/sortable';
 import 'jquery-ui/ui/widgets/sortable';
 
 
+import 'ext/jquery.chosen.1.0.0.min';
 import 'ext/jquery.dataTables.1.8.2.min';
 import 'ext/jquery.dataTables.1.8.2.min';
+import 'ext/jquery.select2.3.5.1.min';
 import 'ext/jquery.total-storage.1.1.3.min';
 import 'ext/jquery.total-storage.1.1.3.min';
 
 
 import 'jquery/plugins/jquery.datatables.sorting';
 import 'jquery/plugins/jquery.datatables.sorting';

File diff suppressed because it is too large
+ 0 - 4
desktop/core/src/desktop/static/desktop/ext/js/bootstrap-editable.min.js


+ 2 - 1
desktop/core/src/desktop/templates/hue.mako

@@ -90,6 +90,8 @@
   <link href="${ static('desktop/css/jquery-ui.css') }" rel="stylesheet">
   <link href="${ static('desktop/css/jquery-ui.css') }" rel="stylesheet">
   <link href="${ static('desktop/css/home.css') }" rel="stylesheet">
   <link href="${ static('desktop/css/home.css') }" rel="stylesheet">
 % endif
 % endif
+  <link rel="stylesheet" href="${ static('desktop/ext/chosen/chosen.min.css') }">
+  <link rel="stylesheet" href="${ static('desktop/ext/select2/select2.css') }">
   <script type="text/javascript">
   <script type="text/javascript">
 % if IS_EMBEDDED.get():
 % if IS_EMBEDDED.get():
   // Bootstrap 2.3.2 relies on the hide css class presence for modals but doesn't remove it when opened for fade type
   // Bootstrap 2.3.2 relies on the hide css class presence for modals but doesn't remove it when opened for fade type
@@ -464,7 +466,6 @@ ${ render_bundle('hue') | n,unicode }
 <script src="${ static('desktop/js/bootstrap-tooltip.js') }"></script>
 <script src="${ static('desktop/js/bootstrap-tooltip.js') }"></script>
 <script src="${ static('desktop/js/bootstrap-typeahead-touchscreen.js') }"></script>
 <script src="${ static('desktop/js/bootstrap-typeahead-touchscreen.js') }"></script>
 <script src="${ static('desktop/ext/js/bootstrap-better-typeahead.min.js') }"></script>
 <script src="${ static('desktop/ext/js/bootstrap-better-typeahead.min.js') }"></script>
-<script src="${ static('desktop/ext/js/bootstrap-editable.min.js') }"></script>
 
 
 <script src="${ static('desktop/js/ace/ace.js') }"></script>
 <script src="${ static('desktop/js/ace/ace.js') }"></script>
 <script src="${ static('desktop/js/ace/mode-impala.js') }"></script>
 <script src="${ static('desktop/js/ace/mode-impala.js') }"></script>

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

@@ -3064,8 +3064,6 @@ ${ dashboard.layout_skeleton(suffix='search') }
 %endif
 %endif
 <link rel="stylesheet" href="${ static('desktop/ext/css/hue-filetypes.css') }">
 <link rel="stylesheet" href="${ static('desktop/ext/css/hue-filetypes.css') }">
 <link rel="stylesheet" href="${ static('desktop/ext/css/hue-charts.css') }">
 <link rel="stylesheet" href="${ static('desktop/ext/css/hue-charts.css') }">
-<link rel="stylesheet" href="${ static('desktop/ext/chosen/chosen.min.css') }">
-<link rel="stylesheet" href="${ static('desktop/ext/select2/select2.css') }">
 <link rel="stylesheet" href="${ static('desktop/ext/css/jquery.gridster.min.css') }">
 <link rel="stylesheet" href="${ static('desktop/ext/css/jquery.gridster.min.css') }">
 
 
 ${ dashboard.import_layout(True) }
 ${ dashboard.import_layout(True) }
@@ -3075,12 +3073,9 @@ ${ dashboard.import_layout(True) }
 % endif
 % endif
 <script src="${ static('dashboard/js/search.utils.js') }" type="text/javascript" charset="utf-8"></script>
 <script src="${ static('dashboard/js/search.utils.js') }" type="text/javascript" charset="utf-8"></script>
 <script src="${ static('desktop/js/jquery.textsqueezer.js') }" type="text/javascript" charset="utf-8"></script>
 <script src="${ static('desktop/js/jquery.textsqueezer.js') }" type="text/javascript" charset="utf-8"></script>
-<script src="${ static('desktop/ext/js/bootstrap-editable.min.js') }" type="text/javascript" charset="utf-8"></script>
 <script src="${ static('desktop/ext/js/shortcut.js') }" type="text/javascript" charset="utf-8"></script>
 <script src="${ static('desktop/ext/js/shortcut.js') }" type="text/javascript" charset="utf-8"></script>
 <script src="${ static('desktop/ext/js/mustache.js') }" type="text/javascript" charset="utf-8"></script>
 <script src="${ static('desktop/ext/js/mustache.js') }" type="text/javascript" charset="utf-8"></script>
-<script src="${ static('desktop/ext/chosen/chosen.jquery.min.js') }" type="text/javascript" charset="utf-8"></script>
 <script src="${ static('desktop/ext/js/jquery/plugins/jquery.hotkeys.js') }"></script>
 <script src="${ static('desktop/ext/js/jquery/plugins/jquery.hotkeys.js') }"></script>
-<script src="${ static('desktop/ext/select2/select2.min.js') }" type="text/javascript" charset="utf-8"></script>
 <script src="${ static('dashboard/js/search.ko.js') }" type="text/javascript" charset="utf-8"></script>
 <script src="${ static('dashboard/js/search.ko.js') }" type="text/javascript" charset="utf-8"></script>
 
 
 <script src="${ static('desktop/ext/js/jquery/plugins/jquery.gridster.with-extras.min.js') }"></script>
 <script src="${ static('desktop/ext/js/jquery/plugins/jquery.gridster.with-extras.min.js') }"></script>

+ 0 - 2
desktop/libs/indexer/src/indexer/templates/collections.mako

@@ -26,7 +26,6 @@ ${ commonheader(_('Search Indexes'), "indexer", user, request, "90px") | n,unico
 %endif
 %endif
 
 
 <div id="indexesComponents">
 <div id="indexesComponents">
-<link rel="stylesheet" href="${ static('desktop/ext/chosen/chosen.min.css') }">
 <link rel="stylesheet" href="${ static('indexer/css/admin.css') }">
 <link rel="stylesheet" href="${ static('indexer/css/admin.css') }">
 
 
 <style type="text/css">
 <style type="text/css">
@@ -479,7 +478,6 @@ ${ commonheader(_('Search Indexes'), "indexer", user, request, "90px") | n,unico
 
 
 </div>
 </div>
 
 
-<script src="${ static('desktop/ext/chosen/chosen.jquery.min.js') }" type="text/javascript" charset="utf-8"></script>
 <script src="${ static('desktop/js/hue.routie.js') }" type="text/javascript" charset="utf-8"></script>
 <script src="${ static('desktop/js/hue.routie.js') }" type="text/javascript" charset="utf-8"></script>
 <script>
 <script>
   routie.setPathname('/indexer');
   routie.setPathname('/indexer');

+ 3 - 16
desktop/libs/notebook/src/notebook/templates/editor_components.mako

@@ -35,16 +35,11 @@ from webpack_loader.templatetags.webpack_loader import render_bundle
 % endif
 % endif
 <link rel="stylesheet" href="${ static('notebook/css/notebook.css') }">
 <link rel="stylesheet" href="${ static('notebook/css/notebook.css') }">
 <link rel="stylesheet" href="${ static('desktop/ext/css/bootstrap-editable.css') }">
 <link rel="stylesheet" href="${ static('desktop/ext/css/bootstrap-editable.css') }">
-<link rel="stylesheet" href="${ static('desktop/ext/chosen/chosen.min.css') }">
 
 
-<link rel="stylesheet" href="${ static('desktop/ext/select2/select2.css') }">
 <link rel="stylesheet" href="${ static('desktop/ext/css/medium-editor.min.css') }">
 <link rel="stylesheet" href="${ static('desktop/ext/css/medium-editor.min.css') }">
 <link rel="stylesheet" href="${ static('desktop/css/bootstrap-medium-editor.css') }">
 <link rel="stylesheet" href="${ static('desktop/css/bootstrap-medium-editor.css') }">
 <link rel="stylesheet" href="${ static('desktop/ext/css/bootstrap-datepicker.min.css') }">
 <link rel="stylesheet" href="${ static('desktop/ext/css/bootstrap-datepicker.min.css') }">
 
 
-${ render_bundle('vendors~notebook') | n,unicode }
-${ render_bundle('notebook') | n,unicode }
-
 % if not is_embeddable:
 % if not is_embeddable:
 <script src="${ static('desktop/js/share2.vm.js') }"></script>
 <script src="${ static('desktop/js/share2.vm.js') }"></script>
 % endif
 % endif
@@ -54,10 +49,7 @@ ${ render_bundle('notebook') | n,unicode }
 <script src="${ static('oozie/js/list-oozie-coordinator.ko.js') }"></script>
 <script src="${ static('oozie/js/list-oozie-coordinator.ko.js') }"></script>
 % endif
 % endif
 
 
-<script src="${ static('desktop/ext/js/markdown.min.js') }"></script>
-<script src="${ static('desktop/ext/js/jquery/plugins/jquery.hotkeys.js') }"></script>
-<script src="${ static('desktop/ext/js/jquery/plugins/jquery.mousewheel.min.js') }"></script>
-
+<script src="${ static('desktop/js/ko.common-dashboard.js') }" type="text/javascript" charset="utf-8"></script>
 
 
 %if ENABLE_QUERY_BUILDER.get():
 %if ENABLE_QUERY_BUILDER.get():
 <!-- For query builder -->
 <!-- For query builder -->
@@ -96,10 +88,8 @@ ${ render_bundle('notebook') | n,unicode }
 <!-- End query builder imports -->
 <!-- End query builder imports -->
 % endif
 % endif
 
 
-<script src="${ static('desktop/ext/js/bootstrap-editable.min.js') }" type="text/javascript" charset="utf-8"></script>
-<script src="${ static('desktop/ext/chosen/chosen.jquery.min.js') }" type="text/javascript" charset="utf-8"></script>
-
-<script src="${ static('desktop/ext/select2/select2.min.js') }" type="text/javascript" charset="utf-8"></script>
+${ render_bundle('vendors~notebook') | n,unicode }
+${ render_bundle('notebook') | n,unicode }
 
 
 <!--[if IE 9]>
 <!--[if IE 9]>
   <script src="${ static('desktop/ext/js/classList.min.js') }" type="text/javascript" charset="utf-8"></script>
   <script src="${ static('desktop/ext/js/classList.min.js') }" type="text/javascript" charset="utf-8"></script>
@@ -108,8 +98,6 @@ ${ render_bundle('notebook') | n,unicode }
 <%namespace name="dashboard" file="/common_dashboard.mako" />
 <%namespace name="dashboard" file="/common_dashboard.mako" />
 <%namespace name="sqlSyntaxDropdown" file="/sql_syntax_dropdown.mako" />
 <%namespace name="sqlSyntaxDropdown" file="/sql_syntax_dropdown.mako" />
 
 
-<script src="${ static('desktop/js/ko.common-dashboard.js') }" type="text/javascript" charset="utf-8"></script>
-
 </%def>
 </%def>
 
 
 <%def name="topBar(suffix='')">
 <%def name="topBar(suffix='')">
@@ -135,7 +123,6 @@ ${ render_bundle('notebook') | n,unicode }
 % endif
 % endif
 </style>
 </style>
 
 
-
 ${ sqlSyntaxDropdown.sqlSyntaxDropdown() }
 ${ sqlSyntaxDropdown.sqlSyntaxDropdown() }
 
 
 <div class="navbar hue-title-bar" data-bind="visible: ! $root.isPresentationMode() && ! $root.isResultFullScreenMode()">
 <div class="navbar hue-title-bar" data-bind="visible: ! $root.isPresentationMode() && ! $root.isResultFullScreenMode()">

+ 10 - 0
package-lock.json

@@ -6471,6 +6471,11 @@
         "jquery": ">=1.7.2"
         "jquery": ">=1.7.2"
       }
       }
     },
     },
+    "jquery-mousewheel": {
+      "version": "3.1.13",
+      "resolved": "https://registry.npmjs.org/jquery-mousewheel/-/jquery-mousewheel-3.1.13.tgz",
+      "integrity": "sha1-BvAzXxbjU6aV5yBr9QUDy1I6buU="
+    },
     "jquery-ui": {
     "jquery-ui": {
       "version": "1.12.1",
       "version": "1.12.1",
       "resolved": "https://registry.npmjs.org/jquery-ui/-/jquery-ui-1.12.1.tgz",
       "resolved": "https://registry.npmjs.org/jquery-ui/-/jquery-ui-1.12.1.tgz",
@@ -9420,6 +9425,11 @@
       "resolved": "https://registry.npmjs.org/select/-/select-1.1.2.tgz",
       "resolved": "https://registry.npmjs.org/select/-/select-1.1.2.tgz",
       "integrity": "sha1-DnNQrN7ICxEIUoeG7B1EGNEbOW0="
       "integrity": "sha1-DnNQrN7ICxEIUoeG7B1EGNEbOW0="
     },
     },
+    "select2": {
+      "version": "3.5.1",
+      "resolved": "https://registry.npmjs.org/select2/-/select2-3.5.1.tgz",
+      "integrity": "sha1-8oGUibvGX9bTKL5yu+K5XdfofP4="
+    },
     "selectize": {
     "selectize": {
       "version": "0.12.6",
       "version": "0.12.6",
       "resolved": "https://registry.npmjs.org/selectize/-/selectize-0.12.6.tgz",
       "resolved": "https://registry.npmjs.org/selectize/-/selectize-0.12.6.tgz",

+ 2 - 0
package.json

@@ -31,6 +31,7 @@
     "jquery-ui": "1.12.1",
     "jquery-ui": "1.12.1",
     "jquery.cookie": "1.4.1",
     "jquery.cookie": "1.4.1",
     "jquery-form": "4.2.2",
     "jquery-form": "4.2.2",
+    "jquery-mousewheel": "3.1.13",
     "knockout": "3.4.2",
     "knockout": "3.4.2",
     "knockout.mapping": "2.4.3",
     "knockout.mapping": "2.4.3",
     "knockout-sortable": "1.1.0",
     "knockout-sortable": "1.1.0",
@@ -42,6 +43,7 @@
     "medium-editor": "5.23.3",
     "medium-editor": "5.23.3",
     "minimist": "^1.2.0",
     "minimist": "^1.2.0",
     "page": "1.8.6",
     "page": "1.8.6",
+    "select2": "3.5.1",
     "selectize": "0.12.6",
     "selectize": "0.12.6",
     "selectize-plugin-clear": "0.0.3",
     "selectize-plugin-clear": "0.0.3",
     "sprintf-js": "1.1.2"
     "sprintf-js": "1.1.2"

+ 3 - 0
webpack.config.js

@@ -29,6 +29,9 @@ module.exports = {
     minimize: true,
     minimize: true,
     splitChunks: {
     splitChunks: {
       chunks: 'all'
       chunks: 'all'
+    },
+    runtimeChunk: {
+      name: 'hue'
     }
     }
   },
   },
   output: {
   output: {

Some files were not shown because too many files changed in this diff