From a53d01e6d73ca859a69f7c0e06c329476601c4fc Mon Sep 17 00:00:00 2001
From: Alireza Heidari <itisalirh@gmail.com>
Date: Wed, 18 Jan 2023 12:55:01 +0100
Subject: [PATCH 1/8] display time in the user's local time for pretty mode

---
 .../DatasetInformation/DatasetInformation.test.js         | 5 ++---
 client/src/components/UtcDate.vue                         | 8 +++-----
 2 files changed, 5 insertions(+), 8 deletions(-)

diff --git a/client/src/components/DatasetInformation/DatasetInformation.test.js b/client/src/components/DatasetInformation/DatasetInformation.test.js
index 84ef036a4786..897f79474ade 100644
--- a/client/src/components/DatasetInformation/DatasetInformation.test.js
+++ b/client/src/components/DatasetInformation/DatasetInformation.test.js
@@ -5,8 +5,7 @@ import { getLocalVue } from "tests/jest/helpers";
 import DatasetInformation from "./DatasetInformation";
 import datasetResponse from "./testData/datasetResponse";
 import flushPromises from "flush-promises";
-import { parseISO } from "date-fns";
-import { formatInTimeZone } from "date-fns-tz";
+import { format, parseISO } from "date-fns";
 
 const HDA_ID = "FOO_HDA_ID";
 
@@ -67,7 +66,7 @@ describe("DatasetInformation/DatasetInformation", () => {
     it("Date should be formatted", async () => {
         const date = datasetInfoTable.find(".utc-time").text();
         const parsedDate = parseISO(`${datasetResponse.create_time}Z`);
-        const formattedDate = `${formatInTimeZone(parsedDate, "Etc/Zulu", "eeee MMM do H:mm:ss yyyy")} UTC`;
+        const formattedDate = `${format(parsedDate, "eeee MMM do H:mm:ss yyyy zz")}`;
         expect(date).toBe(formattedDate);
     });
 
diff --git a/client/src/components/UtcDate.vue b/client/src/components/UtcDate.vue
index dbbc20baca61..097e08041696 100644
--- a/client/src/components/UtcDate.vue
+++ b/client/src/components/UtcDate.vue
@@ -1,7 +1,6 @@
 <script setup lang="ts">
-import { formatDistanceToNow, parseISO } from "date-fns";
-import { formatInTimeZone } from "date-fns-tz";
 import { computed } from "vue";
+import { format, formatDistanceToNow, parseISO } from "date-fns";
 
 interface UtcDateProps {
     date: string;
@@ -12,13 +11,12 @@ const props = withDefaults(defineProps<UtcDateProps>(), {
     mode: "date",
 });
 
-// Component assumes ISO format date, but note that in Galaxy this won't have
-// TZinfo -- it will always be Zulu
 const parsedDate = computed(() => parseISO(`${props.date}Z`));
 const elapsedTime = computed(() => formatDistanceToNow(parsedDate.value, { addSuffix: true }));
 const fullISO = computed(() => parsedDate.value.toISOString());
-const pretty = computed(() => `${formatInTimeZone(parsedDate.value, "Etc/Zulu", "eeee MMM do H:mm:ss yyyy")} UTC`);
+const pretty = computed(() => `${format(parsedDate.value, "eeee MMM do H:mm:ss yyyy zz")}`);
 </script>
+
 <template>
     <span v-if="mode == 'date'" class="utc-time" :title="elapsedTime">
         {{ fullISO }}

From 4cc45a73866ed0188fdb1afd401e6504c9c748fd Mon Sep 17 00:00:00 2001
From: Alireza Heidari <itisalirh@gmail.com>
Date: Wed, 18 Jan 2023 12:55:40 +0100
Subject: [PATCH 2/8] remove unused package `date-fns-tz`

---
 client/package.json | 1 -
 client/yarn.lock    | 5 -----
 2 files changed, 6 deletions(-)

diff --git a/client/package.json b/client/package.json
index 1bd049aa7467..0a76643162d3 100644
--- a/client/package.json
+++ b/client/package.json
@@ -53,7 +53,6 @@
     "d3-zoom": "^3.0.0",
     "d3v3": "npm:d3@3",
     "date-fns": "^2.28.0",
-    "date-fns-tz": "^1.3.3",
     "decode-uri-component": "^0.2.1",
     "dom-to-image": "^2.6.0",
     "dompurify": "^3.0.1",
diff --git a/client/yarn.lock b/client/yarn.lock
index e85e2503bc23..b219140f0031 100644
--- a/client/yarn.lock
+++ b/client/yarn.lock
@@ -4540,11 +4540,6 @@ data-urls@^3.0.2:
     whatwg-mimetype "^3.0.0"
     whatwg-url "^11.0.0"
 
-date-fns-tz@^1.3.3:
-  version "1.3.6"
-  resolved "https://registry.npmjs.org/date-fns-tz/-/date-fns-tz-1.3.6.tgz"
-  integrity sha512-C8q7mErvG4INw1ZwAFmPlGjEo5Sv4udjKVbTc03zpP9cu6cp5AemFzKhz0V68LGcWEtX5mJudzzg3G04emIxLA==
-
 date-fns@^2.28.0:
   version "2.29.1"
   resolved "https://registry.npmjs.org/date-fns/-/date-fns-2.29.1.tgz"

From abd7f9e3cf723947c6be5fbb2ff9a77878553c65 Mon Sep 17 00:00:00 2001
From: Alireza Heidari <itisalirh@gmail.com>
Date: Wed, 18 Jan 2023 14:35:16 +0100
Subject: [PATCH 3/8] fix UtcDate unit test

---
 client/src/components/UtcDate.test.js | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/client/src/components/UtcDate.test.js b/client/src/components/UtcDate.test.js
index c59d9c8ff31a..0d7d34ebdea2 100644
--- a/client/src/components/UtcDate.test.js
+++ b/client/src/components/UtcDate.test.js
@@ -1,6 +1,7 @@
 import { shallowMount } from "@vue/test-utils";
 import { getLocalVue } from "tests/jest/helpers";
 import UtcDate from "./UtcDate.vue";
+import { format, parseISO } from "date-fns";
 
 describe("UTCDate component", () => {
     const localVue = getLocalVue();
@@ -16,6 +17,6 @@ describe("UTCDate component", () => {
         expect(wrapper.text()).toContain("years ago");
 
         await wrapper.setProps({ mode: "pretty" });
-        expect(wrapper.text()).toBe("Wednesday Oct 21st 16:29:00 2015 UTC");
+        expect(wrapper.text()).toBe(format(parseISO("2015-10-21T16:29:00.000Z"), "eeee MMM do H:mm:ss yyyy zz"));
     });
 });

From e2bdabf874cd3882489adf1fba2ce66c84cfa2e6 Mon Sep 17 00:00:00 2001
From: Alireza Heidari <itisalirh@gmail.com>
Date: Tue, 27 Jun 2023 11:29:29 +0200
Subject: [PATCH 4/8] Update
 client/src/components/DatasetInformation/DatasetInformation.test.js

Co-authored-by: Laila Los <44241786+ElectronicBlueberry@users.noreply.github.com>
---
 .../components/DatasetInformation/DatasetInformation.test.js    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/client/src/components/DatasetInformation/DatasetInformation.test.js b/client/src/components/DatasetInformation/DatasetInformation.test.js
index 897f79474ade..78c179ae5a5c 100644
--- a/client/src/components/DatasetInformation/DatasetInformation.test.js
+++ b/client/src/components/DatasetInformation/DatasetInformation.test.js
@@ -66,7 +66,7 @@ describe("DatasetInformation/DatasetInformation", () => {
     it("Date should be formatted", async () => {
         const date = datasetInfoTable.find(".utc-time").text();
         const parsedDate = parseISO(`${datasetResponse.create_time}Z`);
-        const formattedDate = `${format(parsedDate, "eeee MMM do H:mm:ss yyyy zz")}`;
+        const formattedDate = format(parsedDate, "eeee MMM do H:mm:ss yyyy zz");
         expect(date).toBe(formattedDate);
     });
 

From 1019ea4b80ed5dec5ac95507123ba1bea25b81e1 Mon Sep 17 00:00:00 2001
From: Alireza Heidari <itisalirh@gmail.com>
Date: Tue, 27 Jun 2023 12:08:08 +0200
Subject: [PATCH 5/8] Update client/src/co mponents/UtcDate.vue

---
 client/src/components/UtcDate.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/client/src/components/UtcDate.vue b/client/src/components/UtcDate.vue
index 097e08041696..e6c6c70be81f 100644
--- a/client/src/components/UtcDate.vue
+++ b/client/src/components/UtcDate.vue
@@ -14,7 +14,7 @@ const props = withDefaults(defineProps<UtcDateProps>(), {
 const parsedDate = computed(() => parseISO(`${props.date}Z`));
 const elapsedTime = computed(() => formatDistanceToNow(parsedDate.value, { addSuffix: true }));
 const fullISO = computed(() => parsedDate.value.toISOString());
-const pretty = computed(() => `${format(parsedDate.value, "eeee MMM do H:mm:ss yyyy zz")}`);
+const pretty = computed(() => format(parsedDate.value, "eeee MMM do H:mm:ss yyyy zz"));
 </script>
 
 <template>

From 3e95ac25fd68c569ad63c67af1c6d93436d9f9ac Mon Sep 17 00:00:00 2001
From: mvdbeek <m.vandenbeek@gmail.com>
Date: Fri, 30 Jun 2023 20:51:06 +0200
Subject: [PATCH 6/8] Improve help text for conditional

---
 client/src/components/Workflow/Editor/Forms/FormConditional.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/client/src/components/Workflow/Editor/Forms/FormConditional.vue b/client/src/components/Workflow/Editor/Forms/FormConditional.vue
index 6b1eb2a67a49..516a2def0fd0 100644
--- a/client/src/components/Workflow/Editor/Forms/FormConditional.vue
+++ b/client/src/components/Workflow/Editor/Forms/FormConditional.vue
@@ -34,7 +34,7 @@ function onSkipBoolean(value: boolean) {
         id="__conditional"
         :value="conditionalDefined"
         title="Conditionally skip step?"
-        help="Set to true and connect a boolean parameter that determines whether step will be skipped"
+        help="Set to true and connect a boolean parameter that determines whether the step should run. The step runs if the parameter value is true and will be skipped if the parameter value is false"
         type="boolean"
         @input="onSkipBoolean"></FormElement>
     <!-- We don't seem to have a disabled text field

From fc33d6b7924174f37e5007a8e6b04798d95482ea Mon Sep 17 00:00:00 2001
From: Nate Coraor <nate@bx.psu.edu>
Date: Fri, 30 Jun 2023 18:55:08 -0400
Subject: [PATCH 7/8] Don't attempt to call a bool when using mem-self handler
 assignment.

---
 lib/galaxy/web_stack/handlers.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/galaxy/web_stack/handlers.py b/lib/galaxy/web_stack/handlers.py
index 14c6095cd28f..3fcf42e8a8e5 100644
--- a/lib/galaxy/web_stack/handlers.py
+++ b/lib/galaxy/web_stack/handlers.py
@@ -335,7 +335,7 @@ def _assign_mem_self_handler(self, obj, method, configured, queue_callback=None,
                 HANDLER_ASSIGNMENT_METHODS.MEM_SELF,
                 configured,
             )
-        if flush():
+        if flush:
             _timed_flush_obj(obj)
         queue_callback()
         return self.app.config.server_name

From c7a2af130fb53b97beefb64f43976766c002db04 Mon Sep 17 00:00:00 2001
From: mvdbeek <m.vandenbeek@gmail.com>
Date: Fri, 30 Jun 2023 21:03:01 +0200
Subject: [PATCH 8/8] Hide conditionally skipped outputs

I think that's a little less confusing and a bit cleaner.
---
 lib/galaxy/tools/actions/__init__.py | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/lib/galaxy/tools/actions/__init__.py b/lib/galaxy/tools/actions/__init__.py
index 8fc6c263c70f..404f623edf76 100644
--- a/lib/galaxy/tools/actions/__init__.py
+++ b/lib/galaxy/tools/actions/__init__.py
@@ -663,11 +663,15 @@ def handle_output(name, output, hidden=None):
             job.state = job.states.SKIPPED
             for output_collection in output_collections.out_collections.values():
                 output_collection.mark_as_populated()
+            for hdca in output_collections.out_collection_instances.values():
+                hdca.visible = False
             object_store_populator = ObjectStorePopulator(trans.app, trans.user)
             for data in out_data.values():
                 object_store_populator.set_object_store_id(data)
                 data.extension = "expression.json"
                 data.state = "ok"
+                data.blurb = "skipped"
+                data.visible = False
                 with open(data.dataset.file_name, "w") as out:
                     out.write(json.dumps(None))
         job.preferred_object_store_id = preferred_object_store_id