Эх сурвалжийг харах

HUE-8548 [jb] Fix invalid date in workflow task

jdesjean 7 жил өмнө
parent
commit
63cc1a4

+ 3 - 3
apps/jobbrowser/src/jobbrowser/templates/job_browser.mako

@@ -2271,13 +2271,13 @@ ${ commonheader("Job Browser", "jobbrowser", user, request) | n,unicode }
         huePubSub.publish('graph.refresh.view');
         if (vm.job() == self && self.apiStatus() == 'RUNNING') {
           lastFetchJobRequest = self._fetchJob(function (data) {
-            if (vm.job().type() == 'schedule') {
+            if (['schedule', 'workflow'].indexOf(vm.job().type()) >= 0) {
               window.hueUtils.deleteAllEmptyStringKey(data.app); // It's preferable for our backend to return empty strings for various values in order to initialize them, but they shouldn't overwrite any values that are currently set.
-              vm.job = ko.mapping.fromJS(data.app, {}, vm.job)
+              vm.job = ko.mapping.fromJS(data.app, {}, vm.job);
             } else {
               vm.job().fetchStatus();
-              vm.job().fetchLogs(vm.job().logActive());
             }
+            vm.job().fetchLogs(vm.job().logActive());
             var profile = $("div[data-jobType] .tab-content .active").data("profile")
             if (profile) {
               vm.job().fetchProfile(profile);

+ 12 - 5
desktop/core/src/desktop/static/desktop/js/ko.hue-bindings.js

@@ -6875,12 +6875,19 @@
       var value = typeof options.data === 'function' ? options.data() : options.data;
 
       function render() {
-        if (options.format) {
-          $element.text(moment(value).format(options.format));
-        }
-        else {
-          $element.text(moment(value));
+        var fMoment = moment(value);
+        var text;
+        if (!fMoment.isValid()) {
+          text = value;
+        } else {
+          if (options.format) {
+            text = fMoment.format(options.format);
+          }
+          else {
+            text = fMoment.format();
+          }
         }
+        $element.text(text);
       }
       render();
     }