Sfoglia il codice sorgente

HUE-9041 [frontend] Don't show the jobs links in the top nav when the job browser is blacklisted

Johan Ahlen 6 anni fa
parent
commit
919f19e712

+ 2 - 0
desktop/core/src/desktop/js/ko/components/ko.jobBrowserLinks.js

@@ -30,6 +30,7 @@ const TEMPLATE = `
         <span>${I18n('Queries')}</span>
       </a>
     <!-- /ko -->
+    <!-- ko if: window.HAS_JOB_BROWSER -->
     <!-- ko ifnot: window.IS_K8S_ONLY -->
       <a class="btn btn-flat" style="padding-right: 4px" title="${I18n(
         'Job browser'
@@ -43,6 +44,7 @@ const TEMPLATE = `
       <span class="jobs-badge" data-bind="visible: jobCount() > 0, text: jobCount"></span>
       <i class="fa fa-tasks"></i>
     </button>
+    <!-- /ko -->
   </div>
 `;
 

+ 3 - 2
desktop/core/src/desktop/js/topNavViewModel.js

@@ -56,7 +56,7 @@ class TopNavViewModel {
     self.mainQuickCreateAction = ko.observable();
     self.quickCreateActions = ko.observableArray();
 
-    self.hasJobBrowser = ko.observable(true);
+    self.hasJobBrowser = ko.observable(window.HAS_JOB_BROWSER);
     self.clusters = ko.observableArray();
 
     huePubSub.subscribe('cluster.config.set.config', clusterConfig => {
@@ -127,7 +127,8 @@ class TopNavViewModel {
       }
 
       self.hasJobBrowser(
-        clusterConfig &&
+        window.HAS_JOB_BROWSER &&
+          clusterConfig &&
           clusterConfig['app_config'] &&
           clusterConfig['app_config']['browser'] &&
           (clusterConfig['app_config']['browser']['interpreter_names'].indexOf('yarn') != -1 ||

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

@@ -60,6 +60,7 @@
   window.DISPLAY_APP_SWITCHER = '${ DISPLAY_APP_SWITCHER.get() }' === 'True';
   window.CUSTOM_LOGO = '${ conf.CUSTOM.LOGO_SVG.get() }' !== '';
 
+  window.HAS_JOB_BROWSER = '${ 'jobbrowser' in apps }' === 'True';
   window.KNOX_BASE_PATH_HUE = '/KNOX_BASE_PATH_HUE';
   window._KNOX_BASE_PATH = '/KNOX_BASE_PATH_KNOX';
   window._KNOX_BASE_URL = '/KNOX_BASE_URL';