Fixes inconsistent timezone display (#236)

Fixes https://issues.jenkins.io/browse/JENKINS-35656
jenkinsci · Aug 25, 2022 · 3992948 · 3992948
1 parent 3b56814
commit 3992948
Show file tree

Hide file tree

Showing 5 changed files with 24 additions and 4 deletions.
diff --git a/ui/package-lock.json b/ui/package-lock.json
diff --git a/ui/package.json b/ui/package.json
@@ -5,7 +5,7 @@
     "@jenkins-cd/js-modules": "^0.0.10",
     "jenkins-js-extp": "0.0.2",
     "jquery": "^3.5.1",
-    "moment": "~2.29.4",
+    "moment-timezone": "0.5.34",
     "window-handle": "^1.0.0"
   },
   "scripts": {

diff --git a/ui/src/main/java/com/cloudbees/workflow/ui/view/WorkflowStageViewAction.java b/ui/src/main/java/com/cloudbees/workflow/ui/view/WorkflowStageViewAction.java
@@ -54,4 +54,8 @@ public Collection<? extends Action> createFor(WorkflowJob target) {
             return Collections.singleton(new WorkflowStageViewAction(target));
         }
     }
+
+    public String getTimeZone() {
+        return System.getProperty("user.timezone");
+    }
 }
diff --git a/ui/src/main/js/view/templates/index.js b/ui/src/main/js/view/templates/index.js
@@ -26,7 +26,7 @@ var mvc = require('../../mvc');
 var handlebars = require('handlebars');
 var jqProxy = require('../../jQuery');
 var formatters = require('../../util/formatters');
-var moment = require('moment');
+var moment = require('moment-timezone');
 
 /**
  * Templating support.
@@ -87,11 +87,18 @@ registerHBSHelper('formatDate', function (date, toFormat) {
         return date;
     }
 
+    let momentDate
+    if (timeZone) {
+        momentDate = moment(date).tz(timeZone)
+    } else {
+        momentDate = moment(date)
+    }
+
     var aliasFormat = formatAliases[toFormat];
     if (aliasFormat) {
-        return moment(date).format(aliasFormat);
+        return momentDate.format(aliasFormat);
     } else {
-        return moment(date).format(toFormat);
+        return momentDate.format(toFormat);
     }
 });
 

diff --git a/ui/src/main/resources/com/cloudbees/workflow/controller.jelly b/ui/src/main/resources/com/cloudbees/workflow/controller.jelly
@@ -9,6 +9,7 @@
             Optional fragment caption, passed through to the controller.
         </st:attribute>
     </st:documentation>
+    <script>var timeZone = '${it.timeZone}';</script>
     <div class="cbwf-stage-view">
         <div cbwf-controller="${name}" objectUrl="${rootURL}/${it.target.url}" fragCaption="${fragCaption}" />
         <st:adjunct includes="org.jenkinsci.pipeline.stageview_adjunct"/>