瀏覽代碼

HUE-7444 [dashboard] Fix missing d3v3.tip declaration

Enrico Berti 8 年之前
父節點
當前提交
9a83fc1dfa

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

@@ -33,7 +33,6 @@ ${layout.metastore_menubar()}
 <script src="${ static('desktop/js/hue.routie.js') }" type="text/javascript" charset="utf-8"></script>
 <script src="${ static('desktop/ext/js/selectize.min.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>
 <script src="${ static('desktop/js/ko.editable.js') }"></script>
 

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

@@ -31,7 +31,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('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>
 <script src="${ static('desktop/js/ko.editable.js') }"></script>
 

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

@@ -31,7 +31,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('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>
 <script src="${ static('desktop/js/ko.editable.js') }"></script>
 

+ 0 - 1
apps/beeswax/src/beeswax/templates/import_wizard_choose_file.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('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>
 <script src="${ static('desktop/js/ko.editable.js') }"></script>
 

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

@@ -31,7 +31,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('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>
 <script src="${ static('desktop/js/ko.editable.js') }"></script>
 

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

@@ -54,7 +54,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/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/metastore.mako

@@ -44,7 +44,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/ko.charts.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/bootstrap-editable.min.js') }"></script>

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

@@ -32,7 +32,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('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>
 <script src="${ static('desktop/js/ko.selectize.js') }"></script>
 <script src="${ static('desktop/js/ko.editable.js') }"></script>

+ 4 - 1
desktop/core/src/desktop/static/desktop/js/ko.charts.js

@@ -1416,6 +1416,9 @@
       var node = d3v3.select(document.createElement("div"))
       node.style({
         position: "absolute",
+        background: HueColors.cuiD3Scale()[0],
+        padding: "4px",
+        color: HueColors.WHITE,
         opacity: 0,
         pointerEvents: "none",
         boxSizing: "border-box"
@@ -1485,7 +1488,7 @@
     return tip
   };
 
-  if (typeof d3 !== 'undefined') {
+  if (typeof d3v3 !== 'undefined') {
     d3v3.tip = tipBuilder;
   }
 

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

@@ -26,7 +26,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('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>
 <script src="${ static('desktop/js/ko.editable.js') }"></script>
 

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

@@ -180,6 +180,9 @@ if USE_NEW_EDITOR.get():
 
   <script src="${ static('metastore/js/metastore.model.js') }"></script>
 
+  <%namespace name="charting" file="/charting.mako" />
+  ${ charting.import_charts() }
+
   ${ koComponents.all() }
 
   ${ commonHeaderFooterComponents.header_pollers(user, is_s3_enabled, apps) }

+ 2 - 0
desktop/core/src/desktop/templates/common_header_m.mako

@@ -176,6 +176,8 @@ if USE_NEW_EDITOR.get():
     ace.config.set("basePath", "/static/desktop/js/ace");
   </script>
 
+  <%namespace name="charting" file="/charting.mako" />
+  ${ charting.import_charts() }
 
   <script type="text/javascript">
 

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

@@ -493,10 +493,12 @@ ${ commonshare() | n,unicode }
   var shareViewModel = initSharing("#documentShareModal");
 </script>
 
+<%namespace name="charting" file="/charting.mako" />
 <%namespace name="configKoComponents" file="/config_ko_components.mako" />
 <%namespace name="notebookKoComponents" file="/common_notebook_ko_components.mako" />
 <%namespace name="hueAceAutocompleter" file="/hue_ace_autocompleter.mako" />
 
+${ charting.import_charts() }
 ${ configKoComponents.config() }
 ${ notebookKoComponents.aceKeyboardShortcuts() }
 ${ notebookKoComponents.downloadSnippetResults() }

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

@@ -21,7 +21,6 @@ from desktop import conf
 from desktop.views import commonheader, commonfooter, _ko, commonshare
 %>
 
-<%namespace name="charting" file="/charting.mako" />
 <%namespace name="dashboard" file="common_dashboard.mako" />
 
 <%def name="page_structure(is_mobile=False, is_embeddable=False)">
@@ -2808,7 +2807,6 @@ ${ dashboard.import_layout(True) }
 <script src="${ static('desktop/ext/js/jquery/plugins/jquery.gridster.with-extras.min.js') }"></script>
 
 ${ dashboard.import_bindings() }
-${ charting.import_charts() }
 
 <style type="text/css">
 % if conf.CUSTOM.BANNER_TOP_HTML.get():

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

@@ -44,7 +44,6 @@ ${ commonheader(_("Importer"), "indexer", 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('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>
 <script src="${ static('desktop/js/ko.editable.js') }"></script>
 <script src="${ static('desktop/ext/js/selectize.min.js') }"></script>

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

@@ -30,7 +30,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('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>
 <script src="${ static('desktop/js/ko.editable.js') }"></script>
 

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

@@ -121,12 +121,9 @@ from notebook.conf import ENABLE_QUERY_BUILDER, ENABLE_QUERY_SCHEDULING, ENABLE_
 <![endif]-->
 <script src="${ static('desktop/ext/js/medium-editor.min.js') }" type="text/javascript" charset="utf-8"></script>
 
-<%namespace name="charting" file="/charting.mako" />
 <%namespace name="dashboard" file="/common_dashboard.mako" />
 <%namespace name="sqlSyntaxDropdown" file="/sql_syntax_dropdown.mako" />
 
-${ charting.import_charts() }
-
 <script src="${ static('desktop/js/ko.common-dashboard.js') }" type="text/javascript" charset="utf-8"></script>
 
 </%def>

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

@@ -163,7 +163,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/ko.charts.js') }"></script>
 <script src="${ static('desktop/js/ko.switch-case.js') }"></script>
 <script src="${ static('desktop/js/sqlFunctions.js') }"></script>
 <script src="${ static('desktop/js/autocomplete/sqlParseSupport.js') }"></script>