Browse Source

HUE-7410 [core] Support opening mini job browser links directly on the correct section

Romain Rigaux 8 năm trước cách đây
mục cha
commit
2a8488ddb2

+ 1 - 1
desktop/core/src/desktop/templates/assist.mako

@@ -2556,7 +2556,7 @@ from notebook.conf import ENABLE_QUERY_BUILDER, ENABLE_QUERY_SCHEDULING, get_ord
             <a data-bind="click: showSubmitPopup" href="javascript: void(0);">${ _('Start') }</a>
             <!-- /ko -->
             <!-- ko if: schedulerViewModelIsLoaded() && viewSchedulerId()-->
-            <a data-bind="click: function() { huePubSub.publish('show.jobs.panel', viewSchedulerId()) }, clickBubble: false" href="javascript: void(0);">
+            <a data-bind="click: function() { huePubSub.publish('show.jobs.panel', {id: viewSchedulerId(), interface: 'schedules'}) }, clickBubble: false" href="javascript: void(0);">
               ${ _('View') }
             </a>
             <!-- ko if: isSchedulerJobRunning() -->

+ 4 - 4
desktop/core/src/desktop/templates/ko_components.mako

@@ -474,12 +474,12 @@ from desktop.views import _ko
           $('#jobsPanel').hide();
         });
 
-        huePubSub.subscribe('show.jobs.panel', function (id) {
+        huePubSub.subscribe('show.jobs.panel', function (section) {
           huePubSub.publish('hide.history.panel');
           $('#jobsPanel').show();
-          huePubSub.publish('mini.jb.navigate');
-          if (id) {
-            huePubSub.publish('mini.jb.open.job', id);
+          huePubSub.publish('mini.jb.navigate', section && section.interface ? section.interface : 'jobs');
+          if (section && section.id) {
+            huePubSub.publish('mini.jb.open.job', section.id);
           }
         });
 

+ 2 - 2
desktop/libs/notebook/src/notebook/templates/editor_components.mako

@@ -635,7 +635,7 @@ ${ sqlSyntaxDropdown.sqlSyntaxDropdown() }
       <ul data-bind="visible: jobs().length > 0, foreach: jobs" class="unstyled jobs-overlay">
         <li data-bind="attr: {'id': $data.name.substr(4)}">
           %if is_embeddable:
-            <a class="pointer" data-bind="text: $.trim($data.name), click: function() { huePubSub.publish('show.jobs.panel', $data.name); }, clickBubble: false"></a>
+            <a class="pointer" data-bind="text: $.trim($data.name), click: function() { huePubSub.publish('show.jobs.panel', {id: $data.name, interface: 'queries'}); }, clickBubble: false"></a>
           %else:
             <a data-bind="text: $.trim($data.name), hueLink: $data.url"></a>
           %endif
@@ -3605,7 +3605,7 @@ ${ sqlSyntaxDropdown.sqlSyntaxDropdown() }
       huePubSub.subscribe('submit.popup.return', function (data) {
         viewModel.selectedNotebook().viewSchedulerId(data.job_id);
         $('.submit-modal-editor').modal('hide');
-        huePubSub.publish('show.jobs.panel', data.job_id);
+        huePubSub.publish('show.jobs.panel', {id: data.job_id, interface: 'workflows'});
       }, HUE_PUB_SUB_EDITOR_ID);
 
       huePubSub.subscribe('jobbrowser.data', function (jobs) {