HUE-8687 [frontend] Move reminding chart components into webpack bundles

cloudera · Mar 22, 2019 · fd63d83 · fd63d83
1 parent 5f9ba5d
commit fd63d83
Show file tree

Hide file tree

Showing 49 changed files with 8,739 additions and 9,155 deletions.
diff --git a/.eslintrc.js b/.eslintrc.js
@@ -10,7 +10,7 @@ const hueGlobals = [
   'USER_HOME_DIR', 'WorkerGlobalScope',
 
   // other misc
-  'ace', 'CodeMirror', 'HueGeo', 'impalaDagre', 'less', 'MediumEditor', 'moment', 'Plotly', 'Role', 'trackOnGA',
+  'ace', 'CodeMirror', 'impalaDagre', 'less', 'MediumEditor', 'moment', 'Role', 'trackOnGA',
 
   // jasmine
   'afterAll', 'afterEach', 'beforeAll', 'beforeEach', 'describe', 'expect', 'fail', 'fdescribe', 'fit', 'it', 'jasmine',

diff --git a/apps/beeswax/src/beeswax/templates/execute.mako b/apps/beeswax/src/beeswax/templates/execute.mako
@@ -24,7 +24,6 @@
 %>
 
 <%namespace name="assist" file="/assist.mako" />
-<%namespace name="charting" file="/charting.mako" />
 <%namespace name="comps" file="beeswax_components.mako" />
 <%namespace name="layout" file="layout.mako" />
 
@@ -1121,12 +1120,9 @@ ${ assist.assistPanel() }
 </style>
 
 <link rel="stylesheet" href="${ static('desktop/ext/css/hue-filetypes.css') }">
-<link rel="stylesheet" href="${ static('desktop/ext/css/hue-charts.css') }">
 
 <script src="${ static('desktop/ext/js/jquery/plugins/jquery-fieldselection.js') }" type="text/javascript"></script>
 
-${ charting.import_charts() }
-
 <script type="text/javascript">
 
 // avoid blinking of the panels

diff --git a/apps/beeswax/src/beeswax/templates/watch_results.mako b/apps/beeswax/src/beeswax/templates/watch_results.mako
@@ -71,8 +71,6 @@ ${layout.menubar(section='query')}
     height: 400px;
   }
 </style>
-<link href="${ static('desktop/ext/css/leaflet.css') }" rel="stylesheet">
-<link href="${ static('desktop/ext/css/leaflet.markercluster.css') }" rel="stylesheet">
 
 <div class="container-fluid">
   <div id="expand"><i class="fa fa-chevron-right" style="color: #FFFFFF"></i></div>

diff --git a/apps/oozie/src/oozie/templates/editor2/bundle_editor.mako b/apps/oozie/src/oozie/templates/editor2/bundle_editor.mako
@@ -258,7 +258,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-charts.css') }">
 <link rel="stylesheet" href="${ static('oozie/css/common-editor.css') }">
 <link rel="stylesheet" href="${ static('oozie/css/coordinator-editor.css') }">
 

diff --git a/apps/oozie/src/oozie/templates/editor2/coordinator_editor.mako b/apps/oozie/src/oozie/templates/editor2/coordinator_editor.mako
@@ -110,7 +110,6 @@ ${ scheduler.import_modals() }
 </div>
 
 <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('oozie/css/common-editor.css') }">
 <link rel="stylesheet" href="${ static('oozie/css/coordinator-editor.css') }">
 

diff --git a/apps/oozie/src/oozie/templates/editor2/workflow_editor.mako b/apps/oozie/src/oozie/templates/editor2/workflow_editor.mako
@@ -584,7 +584,6 @@ ${ workflow.render() }
 </div>
 
 <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('oozie/css/common-editor.css') }">
 <link rel="stylesheet" href="${ static('oozie/css/workflow-editor.css') }">
 

diff --git a/desktop/core/src/desktop/js/hue.js b/desktop/core/src/desktop/js/hue.js
@@ -25,7 +25,7 @@ import d3v3 from 'd3v3';
 import Dropzone from 'dropzone';
 import filesize from 'filesize';
 import localforage from 'localforage';
-import nv from 'ext/nv.d3.1.1.15b.custom';
+import nv from 'nvd3/nv.all';
 import page from 'page';
 import qq from 'ext/fileuploader.custom';
 import sprintf from 'sprintf-js';
@@ -43,6 +43,7 @@ import hueAnalytics from 'utils/hueAnalytics';
 import HueColors from 'utils/hueColors';
 import hueDebug from 'utils/hueDebug';
 import hueDrop from 'utils/hueDrop';
+import HueGeo from 'utils/hueGeo';
 import huePubSub from 'utils/huePubSub';
 import hueUtils from 'utils/hueUtils';
 import I18n from 'utils/i18n';
@@ -83,6 +84,7 @@ window.hueAnalytics = hueAnalytics;
 window.HueColors = HueColors;
 window.hueDebug = hueDebug;
 window.hueDrop = hueDrop;
+window.HueGeo = HueGeo;
 window.huePubSub = huePubSub;
 window.hueUtils = hueUtils;
 window.I18n = I18n;