Bugfix and refactoring of TZ inclusion in reports, doing it this way …

…applies the timezone to child components which display (but do not re-process) this value.
dannon · Oct 11, 2023 · 2452a63 · 2452a63
1 parent 351ba37
commit 2452a63
Showing 1 changed file with 9 additions and 2 deletions.
diff --git a/client/src/components/Markdown/Markdown.vue b/client/src/components/Markdown/Markdown.vue
@@ -30,7 +30,7 @@
                 </span>
             </div>
             <b-badge variant="info" class="w-100 rounded mb-3 white-space-normal">
-                <div class="float-left m-1 text-break">Generated with Galaxy {{ version }} on {{ time }} UTC</div>
+                <div class="float-left m-1 text-break">Generated with Galaxy {{ version }} on {{ time }}</div>
                 <div class="float-right m-1">Identifier: {{ markdownConfig.id }}</div>
             </b-badge>
             <div>
@@ -138,15 +138,22 @@ export default {
             return this.enable_beta_markdown_export ? this.exportLink : null;
         },
         time() {
-            const generateTime = this.markdownConfig.generate_time;
+            let generateTime = this.markdownConfig.generate_time;
             if (generateTime) {
+                if (!(generateTime.endsWith("Z"))) {
+                    // We don't have proper tzinfo, but this will always be UTC
+                    // coming from Galaxy so append Z to assert UTC timezone
+                    generateTime += "Z";
+                }
                 const date = new Date(generateTime);
                 return date.toLocaleString("default", {
                     day: "numeric",
                     month: "long",
                     year: "numeric",
                     minute: "numeric",
                     hour: "numeric",
+                    timeZone: "UTC",
+                    timeZoneName: "short",
                 });
             }
             return "unavailable";