From ee3c51037ab485eb0bf2c787b01828e717f26d5c Mon Sep 17 00:00:00 2001
From: John Chilton <jmchilton@gmail.com>
Date: Thu, 24 Aug 2023 11:15:56 -0400
Subject: [PATCH 01/20] Revise language around non-private object stores.

unrestricted caused some totally understandable panic for a user.
---
 .../components/ObjectStore/ObjectStoreRestrictionSpan.vue   | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/client/src/components/ObjectStore/ObjectStoreRestrictionSpan.vue b/client/src/components/ObjectStore/ObjectStoreRestrictionSpan.vue
index aed05893e82..4e4a0cbc751 100644
--- a/client/src/components/ObjectStore/ObjectStoreRestrictionSpan.vue
+++ b/client/src/components/ObjectStore/ObjectStoreRestrictionSpan.vue
@@ -8,12 +8,12 @@ const props = defineProps({
     isPrivate: Boolean,
 });
 
-const text = computed(() => (props.isPrivate ? "private" : "unrestricted"));
+const text = computed(() => (props.isPrivate ? "private" : "sharable"));
 const title = computed(() => {
     if (props.isPrivate) {
-        return "This dataset is stored on storage restricted to a single user. It can not be shared, published, or added to Galaxy data libraries.";
+        return "This dataset is stored on storage restricted to a single user. It cannot be shared, published, or added to Galaxy data libraries.";
     } else {
-        return "This dataset is stored on unrestricted storage. With sufficient Galaxy permissions, this dataset can be published, shared, or added to Galaxy data libraries.";
+        return "This dataset is stored on storage that allows standard Galaxy sharing features. If you have sufficient Galaxy permissions to this dataset - the dataset can be published, shared, or added to data libraries within Galaxy.";
     }
 });
 </script>

From 5ff83d81563ba841de705daf91503225eab9cb6b Mon Sep 17 00:00:00 2001
From: John Chilton <jmchilton@gmail.com>
Date: Mon, 28 Aug 2023 12:11:38 -0400
Subject: [PATCH 02/20] Update unit tests.

---
 .../components/ObjectStore/ObjectStoreRestrictionSpan.test.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/client/src/components/ObjectStore/ObjectStoreRestrictionSpan.test.js b/client/src/components/ObjectStore/ObjectStoreRestrictionSpan.test.js
index 0b5f9f41e90..111c9f98801 100644
--- a/client/src/components/ObjectStore/ObjectStoreRestrictionSpan.test.js
+++ b/client/src/components/ObjectStore/ObjectStoreRestrictionSpan.test.js
@@ -13,7 +13,7 @@ describe("ObjectStoreRestrictionSpan", () => {
             propsData: { isPrivate: true },
             localVue,
         });
-        expect(wrapper.find(".stored-how").text()).toBe("private");
+        expect(wrapper.find(".stored-how").text()).toMatch("restricted to a single user");
         expect(wrapper.find(".stored-how").attributes("title")).toBeTruthy();
     });
 
@@ -22,7 +22,7 @@ describe("ObjectStoreRestrictionSpan", () => {
             propsData: { isPrivate: false },
             localVue,
         });
-        expect(wrapper.find(".stored-how").text()).toBe("unrestricted");
+        expect(wrapper.find(".stored-how").text()).toMatch("allows standard Galaxy sharing features");
         expect(wrapper.find(".stored-how").attributes("title")).toBeTruthy();
     });
 });

From 089a5954a47fc8e7810be2ad73ef743d40bca6a4 Mon Sep 17 00:00:00 2001
From: Martin Cech <marten@bx.psu.edu>
Date: Fri, 15 Mar 2024 10:25:27 -0700
Subject: [PATCH 03/20] fix unit test

---
 .../components/ObjectStore/ObjectStoreRestrictionSpan.test.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/client/src/components/ObjectStore/ObjectStoreRestrictionSpan.test.js b/client/src/components/ObjectStore/ObjectStoreRestrictionSpan.test.js
index 111c9f98801..d32b70ec446 100644
--- a/client/src/components/ObjectStore/ObjectStoreRestrictionSpan.test.js
+++ b/client/src/components/ObjectStore/ObjectStoreRestrictionSpan.test.js
@@ -13,7 +13,7 @@ describe("ObjectStoreRestrictionSpan", () => {
             propsData: { isPrivate: true },
             localVue,
         });
-        expect(wrapper.find(".stored-how").text()).toMatch("restricted to a single user");
+        expect(wrapper.find(".stored-how").text()).toMatch("private");
         expect(wrapper.find(".stored-how").attributes("title")).toBeTruthy();
     });
 
@@ -22,7 +22,7 @@ describe("ObjectStoreRestrictionSpan", () => {
             propsData: { isPrivate: false },
             localVue,
         });
-        expect(wrapper.find(".stored-how").text()).toMatch("allows standard Galaxy sharing features");
+        expect(wrapper.find(".stored-how").text()).toMatch("sharable");
         expect(wrapper.find(".stored-how").attributes("title")).toBeTruthy();
     });
 });

From f8fa8d273820c3e1031dcae33364eaa64f75de22 Mon Sep 17 00:00:00 2001
From: Martin Cech <marten@bx.psu.edu>
Date: Mon, 9 Oct 2023 17:43:29 -0400
Subject: [PATCH 04/20] attempt to clarify the preferred object store language

fix a couple of typos

clarify language around switching storage
---
 .../components/ObjectStore/ConfigurationMarkdown.test.ts  | 2 +-
 client/src/components/ObjectStore/ObjectStoreBadge.vue    | 2 +-
 client/src/components/ObjectStore/SelectObjectStore.vue   | 8 +++-----
 3 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/client/src/components/ObjectStore/ConfigurationMarkdown.test.ts b/client/src/components/ObjectStore/ConfigurationMarkdown.test.ts
index b9218058233..926f96c871b 100644
--- a/client/src/components/ObjectStore/ConfigurationMarkdown.test.ts
+++ b/client/src/components/ObjectStore/ConfigurationMarkdown.test.ts
@@ -16,7 +16,7 @@ describe("ConfigurationMarkdown.vue", () => {
         expect(wrapper.html()).toContain("<em>content</em>");
     });
 
-    it("should allow HTML in configuration markdup explicitly set by the admin", () => {
+    it("should allow HTML in configuration markup explicitly set by the admin", () => {
         wrapper = shallowMount(ConfigurationMarkdown, {
             propsData: { markdown: "the <b>content</b>", admin: true },
             localVue,
diff --git a/client/src/components/ObjectStore/ObjectStoreBadge.vue b/client/src/components/ObjectStore/ObjectStoreBadge.vue
index 29f4db69293..d61d9e5f6b2 100644
--- a/client/src/components/ObjectStore/ObjectStoreBadge.vue
+++ b/client/src/components/ObjectStore/ObjectStoreBadge.vue
@@ -18,7 +18,7 @@ const MESSAGES = {
     no_quota: "No Galaxy quota is enabled for this object store.",
     faster: "This storage has been marked as a faster option by the Galaxy administrator.",
     slower: "This storage has been marked as a slower option by the Galaxy administrator.",
-    short_term: "This storage has been marked routinely purged by the Galaxy administrator.",
+    short_term: "This storage has been marked as routinely purged by the Galaxy administrator.",
     backed_up: "This storage has been marked as backed up by the Galaxy administrator.",
     not_backed_up: "This storage has been marked as not backed up by the Galaxy administrator.",
     more_secure:
diff --git a/client/src/components/ObjectStore/SelectObjectStore.vue b/client/src/components/ObjectStore/SelectObjectStore.vue
index 36638836208..0a5d3206f79 100644
--- a/client/src/components/ObjectStore/SelectObjectStore.vue
+++ b/client/src/components/ObjectStore/SelectObjectStore.vue
@@ -27,12 +27,10 @@ const { isLoading, loadErrorMessage, selectableObjectStores } = storeToRefs(stor
 
 const loadingObjectStoreInfoMessage = ref("Loading object store information");
 const whyIsSelectionPreferredText = ref(`
-Selecting this will reset Galaxy to default behaviors configured by your Galaxy administrator.
-Select a preferred object store for new datasets. This is should be thought of as a preferred
-object store because depending the job and workflow configuration execution configuration of
-this Galaxy instance - a different object store may be selected. After a dataset is created,
+Select a preferred object store for new datasets. Depending on the job and workflow execution configuration of
+this Galaxy a different object store may be ultimately used. After a dataset is created,
 click on the info icon in the history panel to view information about where it is stored. If it
-is not stored in the correct place, contact your Galaxy administrator for more information.
+is not stored in the place you want, contact Galaxy administrator for more information.
 `);
 
 function variant(objectStoreId: string) {

From 9519ffe8f4d44b4d65763ebb55b7195318bae688 Mon Sep 17 00:00:00 2001
From: Martin Cech <marten@bx.psu.edu>
Date: Fri, 15 Mar 2024 17:25:25 -0700
Subject: [PATCH 05/20] change user-facing language from "object store" to
 "storage location"

---
 .../History/CurrentHistory/HistoryCounter.vue          |  2 +-
 .../History/CurrentHistory/PreferredStorePopover.vue   | 10 +++++-----
 .../src/components/ObjectStore/DescribeObjectStore.vue |  8 ++++----
 client/src/components/ObjectStore/ObjectStoreBadge.vue |  4 ++--
 .../src/components/ObjectStore/SelectObjectStore.vue   |  6 +++---
 .../ObjectStore/ShowSelectedObjectStore.test.js        |  2 +-
 .../components/ObjectStore/ShowSelectedObjectStore.vue |  2 +-
 .../components/ObjectStore/showTargetPopoverMixin.js   |  2 +-
 client/src/components/Tool/ToolCard.vue                |  2 +-
 .../components/Tool/ToolSelectPreferredObjectStore.vue |  2 +-
 .../Tool/ToolTargetPreferredObjectStorePopover.vue     |  6 +++---
 .../DiskUsage/Quota/ProvidedQuotaSourceUsageBar.vue    |  2 +-
 .../components/User/UserPreferredObjectStore.test.js   |  2 +-
 .../src/components/User/UserPreferredObjectStore.vue   |  6 +++---
 .../components/Workflow/Run/WorkflowRunFormSimple.vue  |  2 +-
 .../Run/WorkflowSelectPreferredObjectStore.vue         |  4 ++--
 .../Workflow/Run/WorkflowStorageConfiguration.vue      |  4 ++--
 .../Run/WorkflowTargetPreferredObjectStorePopover.vue  |  6 ++----
 18 files changed, 35 insertions(+), 37 deletions(-)

diff --git a/client/src/components/History/CurrentHistory/HistoryCounter.vue b/client/src/components/History/CurrentHistory/HistoryCounter.vue
index c70ec3a91e6..df3f0a1d0e0 100644
--- a/client/src/components/History/CurrentHistory/HistoryCounter.vue
+++ b/client/src/components/History/CurrentHistory/HistoryCounter.vue
@@ -206,7 +206,7 @@ onMounted(() => {
 
             <BModal
                 v-model="showPreferredObjectStoreModal"
-                title="History Preferred Object Store"
+                title="History Preferred Storage Location"
                 modal-class="history-preferred-object-store-modal"
                 title-tag="h3"
                 size="sm"
diff --git a/client/src/components/History/CurrentHistory/PreferredStorePopover.vue b/client/src/components/History/CurrentHistory/PreferredStorePopover.vue
index ff28f962fba..b69b2c4008e 100644
--- a/client/src/components/History/CurrentHistory/PreferredStorePopover.vue
+++ b/client/src/components/History/CurrentHistory/PreferredStorePopover.vue
@@ -23,14 +23,14 @@ const preferredObjectStoreId = computed(() => {
 
 <template>
     <BPopover :target="`history-storage-${historyId}`" triggers="hover" placement="bottomleft" boundary="window">
-        <template v-slot:title>Preferred Target Object Store</template>
+        <template v-slot:title>Preferred Storage Location</template>
         <div class="popover-wide">
             <p v-if="historyPreferredObjectStoreId" class="history-preferred-object-store-inherited">
-                This target object store has been set at the history level.
+                This storage location has been set at the history level.
             </p>
             <p v-else class="history-preferred-object-store-not-inherited">
-                This target object store has been inherited from your user preferences (set in User -> Preferences ->
-                Preferred Object Store). If that option is updated, this history will target that new default.
+                This storage location has been inherited from your user preferences (set in User -> Preferences ->
+                Preferred Storage Location). If that option is updated, this history will target that new default.
             </p>
 
             <ShowSelectedObjectStore
@@ -39,7 +39,7 @@ const preferredObjectStoreId = computed(() => {
                 for-what="Galaxy will default to storing this history's datasets in " />
 
             <div v-localize>
-                Change this preference object store target by clicking on the storage button in the history panel.
+                Change preferred storage location by clicking on the storage button in the history panel.
             </div>
         </div>
     </BPopover>
diff --git a/client/src/components/ObjectStore/DescribeObjectStore.vue b/client/src/components/ObjectStore/DescribeObjectStore.vue
index caf9ddd9ae4..0676f09133f 100644
--- a/client/src/components/ObjectStore/DescribeObjectStore.vue
+++ b/client/src/components/ObjectStore/DescribeObjectStore.vue
@@ -46,15 +46,15 @@ export default {
         <div>
             <span v-localize>{{ what }}</span>
             <span v-if="storageInfo.name" class="display-os-by-name">
-                a Galaxy <ObjectStoreRestrictionSpan :is-private="isPrivate" /> object store named
+                a Galaxy <ObjectStoreRestrictionSpan :is-private="isPrivate" /> storage location named
                 <b>{{ storageInfo.name }}</b>
             </span>
             <span v-else-if="storageInfo.object_store_id" class="display-os-by-id">
-                a Galaxy <ObjectStoreRestrictionSpan :is-private="isPrivate" /> object store with id
+                a Galaxy <ObjectStoreRestrictionSpan :is-private="isPrivate" /> storage location with id
                 <b>{{ storageInfo.object_store_id }}</b>
             </span>
             <span v-else class="display-os-default">
-                the default configured Galaxy <ObjectStoreRestrictionSpan :is-private="isPrivate" /> object store </span
+                the default configured Galaxy <ObjectStoreRestrictionSpan :is-private="isPrivate" /> storage location </span
             >.
         </div>
         <ObjectStoreBadges :badges="badges"> </ObjectStoreBadges>
@@ -66,7 +66,7 @@ export default {
             <b-spinner v-if="isLoadingUsage" />
             <QuotaUsageBar v-else-if="quotaUsage" :quota-usage="quotaUsage" :embedded="true" />
         </QuotaSourceUsageProvider>
-        <div v-else>Galaxy has no quota configured for this object store.</div>
+        <div v-else>Galaxy has no quota configured for this storage location.</div>
         <ConfigurationMarkdown v-if="storageInfo.description" :markdown="storageInfo.description" :admin="true" />
     </div>
 </template>
diff --git a/client/src/components/ObjectStore/ObjectStoreBadge.vue b/client/src/components/ObjectStore/ObjectStoreBadge.vue
index d61d9e5f6b2..855147b33db 100644
--- a/client/src/components/ObjectStore/ObjectStoreBadge.vue
+++ b/client/src/components/ObjectStore/ObjectStoreBadge.vue
@@ -14,8 +14,8 @@ const MESSAGES = {
     restricted:
         "This dataset is stored on storage restricted to a single user. It can not be shared, published, or added to Galaxy data libraries.",
     user_defined: "This storage was user defined and is not managed by the Galaxy administrator.",
-    quota: "A Galaxy quota is enabled for this object store.",
-    no_quota: "No Galaxy quota is enabled for this object store.",
+    quota: "A Galaxy quota is enabled for this storage location.",
+    no_quota: "No Galaxy quota is enabled for this storage location.",
     faster: "This storage has been marked as a faster option by the Galaxy administrator.",
     slower: "This storage has been marked as a slower option by the Galaxy administrator.",
     short_term: "This storage has been marked as routinely purged by the Galaxy administrator.",
diff --git a/client/src/components/ObjectStore/SelectObjectStore.vue b/client/src/components/ObjectStore/SelectObjectStore.vue
index 0a5d3206f79..82fe46b53c1 100644
--- a/client/src/components/ObjectStore/SelectObjectStore.vue
+++ b/client/src/components/ObjectStore/SelectObjectStore.vue
@@ -25,10 +25,10 @@ const props = withDefaults(defineProps<SelectObjectStoreProps>(), {
 const store = useObjectStoreStore();
 const { isLoading, loadErrorMessage, selectableObjectStores } = storeToRefs(store);
 
-const loadingObjectStoreInfoMessage = ref("Loading object store information");
+const loadingObjectStoreInfoMessage = ref("Loading storage location information");
 const whyIsSelectionPreferredText = ref(`
-Select a preferred object store for new datasets. Depending on the job and workflow execution configuration of
-this Galaxy a different object store may be ultimately used. After a dataset is created,
+Select a preferred storage location for new datasets. Depending on the job and workflow execution configuration of
+this Galaxy a different storage location may be ultimately used. After a dataset is created,
 click on the info icon in the history panel to view information about where it is stored. If it
 is not stored in the place you want, contact Galaxy administrator for more information.
 `);
diff --git a/client/src/components/ObjectStore/ShowSelectedObjectStore.test.js b/client/src/components/ObjectStore/ShowSelectedObjectStore.test.js
index c20e3b86165..275fabe92dd 100644
--- a/client/src/components/ObjectStore/ShowSelectedObjectStore.test.js
+++ b/client/src/components/ObjectStore/ShowSelectedObjectStore.test.js
@@ -30,7 +30,7 @@ describe("ShowSelectedObjectStore", () => {
         });
         let loadingEl = wrapper.findComponent(LoadingSpan);
         expect(loadingEl.exists()).toBeTruthy();
-        expect(loadingEl.find(".loading-message").text()).toContainLocalizationOf("Loading object store details");
+        expect(loadingEl.find(".loading-message").text()).toContainLocalizationOf("Loading storage location details");
         await flushPromises();
         loadingEl = wrapper.findComponent(LoadingSpan);
         expect(loadingEl.exists()).toBeFalsy();
diff --git a/client/src/components/ObjectStore/ShowSelectedObjectStore.vue b/client/src/components/ObjectStore/ShowSelectedObjectStore.vue
index bbebc6442e1..3b1c4cdfd08 100644
--- a/client/src/components/ObjectStore/ShowSelectedObjectStore.vue
+++ b/client/src/components/ObjectStore/ShowSelectedObjectStore.vue
@@ -38,7 +38,7 @@ watch(
     }
 );
 fetch();
-const loadingMessage = "Loading object store details";
+const loadingMessage = "Loading storage location details";
 </script>
 
 <template>
diff --git a/client/src/components/ObjectStore/showTargetPopoverMixin.js b/client/src/components/ObjectStore/showTargetPopoverMixin.js
index 4fc88ce2486..66c68f4bfd5 100644
--- a/client/src/components/ObjectStore/showTargetPopoverMixin.js
+++ b/client/src/components/ObjectStore/showTargetPopoverMixin.js
@@ -12,7 +12,7 @@ export default {
     },
     computed: {
         title() {
-            return this.l(`Preferred Target Object Store ${this.titleSuffix || ""}`);
+            return this.l(`Preferred Target Storage Location ${this.titleSuffix || ""}`);
         },
     },
 };
diff --git a/client/src/components/Tool/ToolCard.vue b/client/src/components/Tool/ToolCard.vue
index 4f89eab6b7a..f1df26492a1 100644
--- a/client/src/components/Tool/ToolCard.vue
+++ b/client/src/components/Tool/ToolCard.vue
@@ -148,7 +148,7 @@ const showHelpForum = computed(() => isConfigLoaded.value && config.value.enable
                         </ToolTargetPreferredObjectStorePopover>
                         <b-modal
                             v-model="showPreferredObjectStoreModal"
-                            title="Tool Execution Preferred Object Store"
+                            title="Tool Execution Preferred Storage Location"
                             modal-class="tool-preferred-object-store-modal"
                             title-tag="h3"
                             size="sm"
diff --git a/client/src/components/Tool/ToolSelectPreferredObjectStore.vue b/client/src/components/Tool/ToolSelectPreferredObjectStore.vue
index ee39693fdac..bcbc5bc8b4e 100644
--- a/client/src/components/Tool/ToolSelectPreferredObjectStore.vue
+++ b/client/src/components/Tool/ToolSelectPreferredObjectStore.vue
@@ -12,7 +12,7 @@ const props = withDefaults(defineProps<ToolSelectProps>(), {
 });
 
 const selectedObjectStoreId = ref<String | null>(props.toolPreferredObjectStoreId);
-const newDatasetsDescription = "The default object store for the outputs of this tool";
+const newDatasetsDescription = "The default storage location for the outputs of this tool";
 const defaultOptionTitle = "Use Defaults";
 const defaultOptionDescription =
     "If the history has a default set, that will be used. If instead, you've set an option in your user preferences - that will be assumed to be your default selection. Finally, the Galaxy configuration will be used.";
diff --git a/client/src/components/Tool/ToolTargetPreferredObjectStorePopover.vue b/client/src/components/Tool/ToolTargetPreferredObjectStorePopover.vue
index bdf4264144e..a88e5214335 100644
--- a/client/src/components/Tool/ToolTargetPreferredObjectStorePopover.vue
+++ b/client/src/components/Tool/ToolTargetPreferredObjectStorePopover.vue
@@ -3,8 +3,8 @@
         <template v-slot:title>{{ title }}</template>
         <div class="popover-wide">
             <p v-if="toolPreferredObjectStoreId">
-                This target object store has been set at the tool level, by default history or user preferences will be
-                used and if those are not set Galaxy will pick an adminstrator configured default.
+                Preferred storage location has been set at the tool level, by default history or user preferences will
+                be used and if those are not set Galaxy will pick an administrator-configured default.
             </p>
             <ShowSelectedObjectStore
                 v-if="toolPreferredObjectStoreId"
@@ -15,7 +15,7 @@
                 No selection has been made for this tool execution. Defaults from history, user, or Galaxy will be used.
             </div>
             <div v-localize>
-                Change this preference object store target by clicking on the storage button in the tool header.
+                Change preferred storage location by clicking on the storage button in the tool header.
             </div>
         </div>
     </b-popover>
diff --git a/client/src/components/User/DiskUsage/Quota/ProvidedQuotaSourceUsageBar.vue b/client/src/components/User/DiskUsage/Quota/ProvidedQuotaSourceUsageBar.vue
index e53c86043ad..715d9e52a99 100644
--- a/client/src/components/User/DiskUsage/Quota/ProvidedQuotaSourceUsageBar.vue
+++ b/client/src/components/User/DiskUsage/Quota/ProvidedQuotaSourceUsageBar.vue
@@ -36,7 +36,7 @@ export default {
     },
     data() {
         return {
-            loadingMessage: "Loading object store information",
+            loadingMessage: "Loading storage location information",
         };
     },
 };
diff --git a/client/src/components/User/UserPreferredObjectStore.test.js b/client/src/components/User/UserPreferredObjectStore.test.js
index 379ff8b0ea0..a5c1ed74052 100644
--- a/client/src/components/User/UserPreferredObjectStore.test.js
+++ b/client/src/components/User/UserPreferredObjectStore.test.js
@@ -40,7 +40,7 @@ describe("UserPreferredObjectStore.vue", () => {
         const wrapper = mountComponent();
         expect(wrapper.vm.$refs["modal"].isHidden).toBeTruthy();
         const el = await wrapper.find(ROOT_COMPONENT.preferences.object_store.selector);
-        expect(el.text()).toBeLocalizationOf("Preferred Object Store");
+        expect(el.text()).toBeLocalizationOf("Preferred Storage Location");
         await el.trigger("click");
         expect(wrapper.vm.$refs["modal"].isHidden).toBeFalsy();
     });
diff --git a/client/src/components/User/UserPreferredObjectStore.vue b/client/src/components/User/UserPreferredObjectStore.vue
index 9372baf5465..e2c056ddae6 100644
--- a/client/src/components/User/UserPreferredObjectStore.vue
+++ b/client/src/components/User/UserPreferredObjectStore.vue
@@ -7,17 +7,17 @@
                 v-b-modal.modal-select-preferred-object-store
                 class="preferred-storage"
                 href="javascript:void(0)"
-                ><b v-localize>Preferred Object Store</b></a
+                ><b v-localize>Preferred Storage Location</b></a
             >
             <div v-localize class="form-text text-muted">
-                Select a preferred default object store for the outputs of new jobs to be created in.
+                Select a preferred storage location for the outputs of new jobs.
             </div>
             <BModal
                 id="modal-select-preferred-object-store"
                 ref="modal"
                 v-model="showModal"
                 centered
-                title="Preferred Object Store"
+                title="Preferred Storage Location"
                 :title-tag="titleTag"
                 hide-footer
                 static
diff --git a/client/src/components/Workflow/Run/WorkflowRunFormSimple.vue b/client/src/components/Workflow/Run/WorkflowRunFormSimple.vue
index 4a57542da9e..b74700c7abe 100644
--- a/client/src/components/Workflow/Run/WorkflowRunFormSimple.vue
+++ b/client/src/components/Workflow/Run/WorkflowRunFormSimple.vue
@@ -33,7 +33,7 @@
                     <b-form-checkbox
                         v-if="isConfigLoaded && config.object_store_allows_id_selection"
                         v-model="splitObjectStore">
-                        Send outputs and intermediate to different object stores?
+                        Send outputs and intermediate to different storage locations?
                     </b-form-checkbox>
                     <WorkflowStorageConfiguration
                         v-if="isConfigLoaded && config.object_store_allows_id_selection"
diff --git a/client/src/components/Workflow/Run/WorkflowSelectPreferredObjectStore.vue b/client/src/components/Workflow/Run/WorkflowSelectPreferredObjectStore.vue
index 8616180f693..ac859f48a84 100644
--- a/client/src/components/Workflow/Run/WorkflowSelectPreferredObjectStore.vue
+++ b/client/src/components/Workflow/Run/WorkflowSelectPreferredObjectStore.vue
@@ -16,10 +16,10 @@ const emit = defineEmits<{
 }>();
 
 const selectedObjectStoreId = ref<String | null>(props.invocationPreferredObjectStoreId);
-const newDatasetsDescription = "The default object store for the outputs of this workflow invocation";
+const newDatasetsDescription = "The default storage location for the outputs of this workflow invocation";
 const defaultOptionTitle = "Use Defaults";
 const defaultOptionDescription =
-    "If the history has a default set, that will be used. If instead, you've set an option in your user preferences - that will be assumed to be your default selection. Finally, the Galaxy configuration will be used.";
+    "If the history has a preference set, that will be used. If instead, you've set an option in your user preferences - that will be assumed to be your default selection. Finally, the Galaxy configuration will be used.";
 
 async function handleSubmit(preferredObjectStoreId: string | null) {
     selectedObjectStoreId.value = preferredObjectStoreId;
diff --git a/client/src/components/Workflow/Run/WorkflowStorageConfiguration.vue b/client/src/components/Workflow/Run/WorkflowStorageConfiguration.vue
index 3307a79da1d..d6d9b03ea55 100644
--- a/client/src/components/Workflow/Run/WorkflowStorageConfiguration.vue
+++ b/client/src/components/Workflow/Run/WorkflowStorageConfiguration.vue
@@ -14,7 +14,7 @@
         </WorkflowTargetPreferredObjectStorePopover>
         <b-modal
             v-model="showPreferredObjectStoreModal"
-            title="Invocation Preferred Object Store"
+            title="Invocation Preferred Storage Location"
             v-bind="modalProps"
             hide-footer>
             <WorkflowSelectPreferredObjectStore
@@ -37,7 +37,7 @@
         </WorkflowTargetPreferredObjectStorePopover>
         <b-modal
             v-model="showIntermediatePreferredObjectStoreModal"
-            title="Invocation Preferred Object Store (Intermediate Datasets)"
+            title="Invocation Preferred Storage Location (Intermediate Datasets)"
             v-bind="modalProps"
             hide-footer>
             <WorkflowSelectPreferredObjectStore
diff --git a/client/src/components/Workflow/Run/WorkflowTargetPreferredObjectStorePopover.vue b/client/src/components/Workflow/Run/WorkflowTargetPreferredObjectStorePopover.vue
index b78eb8db925..989689d55a9 100644
--- a/client/src/components/Workflow/Run/WorkflowTargetPreferredObjectStorePopover.vue
+++ b/client/src/components/Workflow/Run/WorkflowTargetPreferredObjectStorePopover.vue
@@ -2,9 +2,7 @@
     <b-popover :target="target" triggers="hover" placement="bottomleft" boundary="window">
         <template v-slot:title>{{ title }}</template>
         <div class="popover-wide">
-            <p v-if="invocationPreferredObjectStoreId">
-                This target object store has been set at the invocation level.
-            </p>
+            <p v-if="invocationPreferredObjectStoreId">Storage location has been set at the invocation level.</p>
             <ShowSelectedObjectStore
                 v-if="invocationPreferredObjectStoreId"
                 :preferred-object-store-id="invocationPreferredObjectStoreId"
@@ -15,7 +13,7 @@
                 used.
             </div>
             <div v-localize>
-                Change this preference object store target by clicking on the storage button in the worklfow run header.
+                Change preferred storage location by clicking on the storage button in the worklfow run header.
             </div>
         </div>
     </b-popover>

From 9e79c70ccecf1c60a4b6704daeb118b290cab6df Mon Sep 17 00:00:00 2001
From: Martin Cech <marten@bx.psu.edu>
Date: Fri, 15 Mar 2024 17:32:52 -0700
Subject: [PATCH 06/20] improve visibility of object store badge popovers

so it is not white on white bg
---
 client/src/components/ObjectStore/ObjectStoreBadge.vue | 1 +
 1 file changed, 1 insertion(+)

diff --git a/client/src/components/ObjectStore/ObjectStoreBadge.vue b/client/src/components/ObjectStore/ObjectStoreBadge.vue
index 855147b33db..03ef07e6c4d 100644
--- a/client/src/components/ObjectStore/ObjectStoreBadge.vue
+++ b/client/src/components/ObjectStore/ObjectStoreBadge.vue
@@ -136,6 +136,7 @@ const message = computed(() => {
             "
             triggers="hover"
             placement="bottom"
+            variant="secondary"
             class="object-store-badge-popover">
             <p v-localize>{{ stockMessage }}</p>
             <ConfigurationMarkdown v-if="message" :markdown="message" :admin="true" />

From 4e04012499f8c42be7605533fc77240d88daeb3a Mon Sep 17 00:00:00 2001
From: mvdbeek <m.vandenbeek@gmail.com>
Date: Mon, 18 Mar 2024 09:49:43 +0100
Subject: [PATCH 07/20] Fix parameter_input step type

---
 client/src/api/schema/schema.ts | 2 +-
 lib/galaxy/schema/schema.py     | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/client/src/api/schema/schema.ts b/client/src/api/schema/schema.ts
index 2f41a56da3b..6f7aac5f9e8 100644
--- a/client/src/api/schema/schema.ts
+++ b/client/src/api/schema/schema.ts
@@ -6938,7 +6938,7 @@ export interface components {
              * Type
              * @constant
              */
-            type: "parameter";
+            type: "parameter_input";
             /** When */
             when: string | null;
         };
diff --git a/lib/galaxy/schema/schema.py b/lib/galaxy/schema/schema.py
index ab2e22909ca..40e076fd778 100644
--- a/lib/galaxy/schema/schema.py
+++ b/lib/galaxy/schema/schema.py
@@ -2236,7 +2236,7 @@ class InputDataCollectionStep(WorkflowStepBase):
 
 
 class InputParameterStep(WorkflowStepBase):
-    type: Literal["parameter"]
+    type: Literal["parameter_input"]
 
 
 class PauseStep(WorkflowStepBase):

From f776c3ad891b55fa69f73a4342ffb44e34fe26cf Mon Sep 17 00:00:00 2001
From: mvdbeek <m.vandenbeek@gmail.com>
Date: Mon, 18 Mar 2024 10:15:00 +0100
Subject: [PATCH 08/20] Fix ``include_nested_invocations`` passing, drop unused
 provder method

Fixes https://github.com/galaxyproject/galaxy/issues/17760
---
 .../Workflow/InvocationsList.test.js          | 23 +++++++++++++++----
 .../components/Workflow/InvocationsList.vue   | 21 ++---------------
 2 files changed, 21 insertions(+), 23 deletions(-)

diff --git a/client/src/components/Workflow/InvocationsList.test.js b/client/src/components/Workflow/InvocationsList.test.js
index 0d394ac0bc2..6321039a1c5 100644
--- a/client/src/components/Workflow/InvocationsList.test.js
+++ b/client/src/components/Workflow/InvocationsList.test.js
@@ -70,7 +70,12 @@ describe("InvocationsList.vue", () => {
         beforeEach(async () => {
             axiosMock
                 .onGet("/api/invocations", {
-                    params: { limit: 50, offset: 0, include_terminal: false, workflow_id: "abcde145678" },
+                    params: {
+                        limit: 50,
+                        offset: 0,
+                        include_terminal: false,
+                        workflow_id: "abcde145678",
+                    },
                 })
                 .reply(200, [], { total_matches: "0" });
             const propsData = {
@@ -102,7 +107,13 @@ describe("InvocationsList.vue", () => {
         beforeEach(async () => {
             axiosMock
                 .onGet("/api/invocations", {
-                    params: { limit: 50, offset: 0, include_terminal: false, history_id: "abcde145678" },
+                    params: {
+                        limit: 50,
+                        offset: 0,
+                        include_terminal: false,
+                        history_id: "abcde145678",
+                        include_nested_invocations: false,
+                    },
                 })
                 .reply(200, [], { total_matches: "0" });
             const propsData = {
@@ -132,7 +143,9 @@ describe("InvocationsList.vue", () => {
     describe("with invocation", () => {
         beforeEach(async () => {
             axiosMock
-                .onGet("/api/invocations", { params: { limit: 50, offset: 0, include_terminal: false } })
+                .onGet("/api/invocations", {
+                    params: { limit: 50, offset: 0, include_terminal: false, include_nested_invocations: false },
+                })
                 .reply(200, [mockInvocationData], { total_matches: "1" });
             const propsData = {
                 ownerGrid: false,
@@ -202,7 +215,9 @@ describe("InvocationsList.vue", () => {
     describe("paginations", () => {
         beforeEach(async () => {
             axiosMock
-                .onGet("/api/invocations", { params: { limit: 1, offset: 0, include_terminal: false } })
+                .onGet("/api/invocations", {
+                    params: { limit: 1, offset: 0, include_terminal: false, include_nested_invocations: false },
+                })
                 .reply(200, [mockInvocationData], { total_matches: "3" });
             const propsData = {
                 ownerGrid: false,
diff --git a/client/src/components/Workflow/InvocationsList.vue b/client/src/components/Workflow/InvocationsList.vue
index d2350bf49d6..ce962d03638 100644
--- a/client/src/components/Workflow/InvocationsList.vue
+++ b/client/src/components/Workflow/InvocationsList.vue
@@ -168,6 +168,8 @@ export default {
             const extraParams = this.ownerGrid ? {} : { include_terminal: false };
             if (this.storedWorkflowId) {
                 extraParams["workflow_id"] = this.storedWorkflowId;
+            } else {
+                extraParams["include_nested_invocations"] = false;
             }
             if (this.historyId) {
                 extraParams["history_id"] = this.historyId;
@@ -195,25 +197,6 @@ export default {
     methods: {
         ...mapActions(useHistoryStore, ["loadHistoryById"]),
         ...mapActions(useWorkflowStore, ["fetchWorkflowForInstanceIdCached"]),
-        async provider(ctx) {
-            ctx.root = this.root;
-            const extraParams = this.ownerGrid ? {} : { include_terminal: false };
-            if (this.storedWorkflowId) {
-                extraParams["workflow_id"] = this.storedWorkflowId;
-            } else {
-                extraParams["include_nested_invocations"] = false;
-            }
-            if (this.historyId) {
-                extraParams["history_id"] = this.historyId;
-            }
-            if (this.userId) {
-                extraParams["user_id"] = this.userId;
-            }
-            const promise = invocationsProvider(ctx, this.setRows, extraParams).catch(this.onError);
-            const invocationItems = await promise;
-            this.invocationItems = invocationItems;
-            return invocationItems;
-        },
         swapRowDetails(row) {
             row.toggleDetails();
         },

From 3d2f89ad35e3b0f966604e445e2668a7205b21a3 Mon Sep 17 00:00:00 2001
From: mvdbeek <m.vandenbeek@gmail.com>
Date: Mon, 18 Mar 2024 13:01:32 +0100
Subject: [PATCH 09/20] Fix anon user values again

Fixes:
```
TypeError: float() argument must be a string or a real number, not 'NoneType'
  File "starlette/applications.py", line 123, in __call__
    await self.middleware_stack(scope, receive, send)
  File "starlette/middleware/errors.py", line 186, in __call__
    raise exc
  File "starlette/middleware/errors.py", line 164, in __call__
    await self.app(scope, receive, _send)
  File "starlette_context/middleware/raw_middleware.py", line 92, in __call__
    await self.app(scope, receive, send_wrapper)
  File "starlette/middleware/base.py", line 189, in __call__
    with collapse_excgroups():
  File "contextlib.py", line 155, in __exit__
    self.gen.throw(typ, value, traceback)
  File "starlette/_utils.py", line 93, in collapse_excgroups
    raise exc
  File "starlette/middleware/base.py", line 191, in __call__
    response = await self.dispatch_func(request, call_next)
  File "galaxy/webapps/galaxy/fast_app.py", line 108, in add_x_frame_options
    response = await call_next(request)
  File "starlette/middleware/base.py", line 165, in call_next
    raise app_exc
  File "starlette/middleware/base.py", line 151, in coro
    await self.app(scope, receive_or_disconnect, send_no_error)
  File "starlette/middleware/exceptions.py", line 62, in __call__
    await wrap_app_handling_exceptions(self.app, conn)(scope, receive, send)
  File "starlette/_exception_handler.py", line 64, in wrapped_app
    raise exc
  File "starlette/_exception_handler.py", line 53, in wrapped_app
    await app(scope, receive, sender)
  File "starlette/routing.py", line 758, in __call__
    await self.middleware_stack(scope, receive, send)
  File "starlette/routing.py", line 778, in app
    await route.handle(scope, receive, send)
  File "starlette/routing.py", line 299, in handle
    await self.app(scope, receive, send)
  File "starlette/routing.py", line 79, in app
    await wrap_app_handling_exceptions(app, request)(scope, receive, send)
  File "starlette/_exception_handler.py", line 64, in wrapped_app
    raise exc
  File "starlette/_exception_handler.py", line 53, in wrapped_app
    await app(scope, receive, sender)
  File "starlette/routing.py", line 74, in app
    response = await func(request)
  File "fastapi/routing.py", line 278, in app
    raw_response = await run_endpoint_function(
  File "fastapi/routing.py", line 193, in run_endpoint_function
    return await run_in_threadpool(dependant.call, **values)
  File "starlette/concurrency.py", line 42, in run_in_threadpool
    return await anyio.to_thread.run_sync(func, *args)
  File "anyio/to_thread.py", line 56, in run_sync
    return await get_async_backend().run_sync_in_worker_thread(
  File "anyio/_backends/_asyncio.py", line 2144, in run_sync_in_worker_thread
    return await future
  File "anyio/_backends/_asyncio.py", line 851, in run
    result = context.run(func, *args)
  File "galaxy/webapps/galaxy/api/users.py", line 652, in show
    return self.service.show_user(trans=trans, user_id=user_id, deleted=user_deleted)
  File "galaxy/webapps/galaxy/services/users.py", line 189, in show_user
    anon_response = self._anon_user_api_value(trans)
  File "galaxy/webapps/galaxy/services/users.py", line 128, in _anon_user_api_value
    percent = self.quota_agent.get_percent(trans=trans, usage=usage)
  File "galaxy/quota/__init__.py", line 352, in get_percent
    return min((int(float(usage) / quota * 100), 100))
```

which for whatever reason wasn't a problem locally.
---
 lib/galaxy/webapps/galaxy/services/users.py | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/lib/galaxy/webapps/galaxy/services/users.py b/lib/galaxy/webapps/galaxy/services/users.py
index fa820748c11..67f7ec0f033 100644
--- a/lib/galaxy/webapps/galaxy/services/users.py
+++ b/lib/galaxy/webapps/galaxy/services/users.py
@@ -122,10 +122,11 @@ class UsersService(ServiceBase):
     def _anon_user_api_value(self, trans: ProvidesHistoryContext):
         """Return data for an anonymous user, truncated to only usage and quota_percent"""
         if not trans.user and not trans.history:
-            usage = None
+            usage = 0
+            percent = 0.0
         else:
             usage = self.quota_agent.get_usage(trans, history=trans.history)
-        percent = self.quota_agent.get_percent(trans=trans, usage=usage)
+            percent = self.quota_agent.get_percent(trans=trans, usage=usage)
         usage = usage or 0
         return {
             "total_disk_usage": int(usage),

From 8bb655eda64cfb22a61fcb690951f30e9e5690bc Mon Sep 17 00:00:00 2001
From: mvdbeek <m.vandenbeek@gmail.com>
Date: Mon, 18 Mar 2024 14:37:08 +0100
Subject: [PATCH 10/20] Fix typing around usage and percent

---
 lib/galaxy/webapps/galaxy/services/users.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/galaxy/webapps/galaxy/services/users.py b/lib/galaxy/webapps/galaxy/services/users.py
index 67f7ec0f033..909a9898f19 100644
--- a/lib/galaxy/webapps/galaxy/services/users.py
+++ b/lib/galaxy/webapps/galaxy/services/users.py
@@ -122,8 +122,8 @@ class UsersService(ServiceBase):
     def _anon_user_api_value(self, trans: ProvidesHistoryContext):
         """Return data for an anonymous user, truncated to only usage and quota_percent"""
         if not trans.user and not trans.history:
-            usage = 0
-            percent = 0.0
+            usage: Optional[float] = 0.0
+            percent: Optional[int] = 0
         else:
             usage = self.quota_agent.get_usage(trans, history=trans.history)
             percent = self.quota_agent.get_percent(trans=trans, usage=usage)

From 2665b3e2ca9a5347b26ea8028d09e7ea1c3fe65d Mon Sep 17 00:00:00 2001
From: davelopez <46503462+davelopez@users.noreply.github.com>
Date: Mon, 18 Mar 2024 15:18:23 +0100
Subject: [PATCH 11/20] Add missing fields in histories listings

---
 client/src/components/Grid/configs/histories.ts          | 1 +
 client/src/components/Grid/configs/historiesPublished.ts | 1 +
 2 files changed, 2 insertions(+)

diff --git a/client/src/components/Grid/configs/histories.ts b/client/src/components/Grid/configs/histories.ts
index 08201f24be0..20cbbeef649 100644
--- a/client/src/components/Grid/configs/histories.ts
+++ b/client/src/components/Grid/configs/histories.ts
@@ -33,6 +33,7 @@ type SortKeyLiteral = "create_time" | "name" | "update_time" | undefined;
 async function getData(offset: number, limit: number, search: string, sort_by: string, sort_desc: boolean) {
     const { data, headers } = await historiesFetcher({
         view: "summary",
+        keys: "create_time",
         limit,
         offset,
         search,
diff --git a/client/src/components/Grid/configs/historiesPublished.ts b/client/src/components/Grid/configs/historiesPublished.ts
index 9a1fd770391..f7480c49445 100644
--- a/client/src/components/Grid/configs/historiesPublished.ts
+++ b/client/src/components/Grid/configs/historiesPublished.ts
@@ -21,6 +21,7 @@ type SortKeyLiteral = "name" | "update_time" | undefined;
 async function getData(offset: number, limit: number, search: string, sort_by: string, sort_desc: boolean) {
     const { data, headers } = await historiesFetcher({
         view: "summary",
+        keys: "username",
         limit,
         offset,
         search,

From b77de7e8f3b80dda037a59529acfff97dd48272d Mon Sep 17 00:00:00 2001
From: Ahmed Awan <qe66653@umbc.edu>
Date: Tue, 12 Mar 2024 17:13:53 -0500
Subject: [PATCH 12/20] do not perform query when invalid filters are present

Modified the `Filtering.getValidFilters` function to return an `invalidFilters` object as well, which can be used to tell the user which filters were invalid.
---
 client/src/components/Common/FilterMenu.vue   |  22 +-
 client/src/components/Grid/GridList.vue       |  72 +++--
 .../History/CurrentHistory/HistoryPanel.vue   |   4 +-
 .../components/Workflow/WorkflowFilters.js    | 268 +++++++++++-------
 .../Workflow/WorkflowIndicators.vue           |   3 +-
 .../src/components/Workflow/WorkflowList.vue  | 150 ++++------
 client/src/utils/filtering.ts                 |  32 ++-
 7 files changed, 297 insertions(+), 254 deletions(-)

diff --git a/client/src/components/Common/FilterMenu.vue b/client/src/components/Common/FilterMenu.vue
index 8dee4e4bd08..f3deb4ee989 100644
--- a/client/src/components/Common/FilterMenu.vue
+++ b/client/src/components/Common/FilterMenu.vue
@@ -4,7 +4,7 @@ import { faAngleDoubleUp, faQuestion, faRedo, faSearch } from "@fortawesome/free
 import { FontAwesomeIcon } from "@fortawesome/vue-fontawesome";
 import { BButton, BModal } from "bootstrap-vue";
 import { kebabCase } from "lodash";
-import { computed, ref, watch } from "vue";
+import { computed, ref } from "vue";
 
 import type Filtering from "@/utils/filtering";
 import { type Alias, getOperatorForAlias } from "@/utils/filtering";
@@ -68,7 +68,6 @@ const props = withDefaults(defineProps<Props>(), {
 
 const emit = defineEmits<{
     (e: "update:filter-text", filter: string): void;
-    (e: "on-backend-filter", filter: string): void;
     (e: "update:show-advanced", showAdvanced: boolean): void;
     (e: "on-search", filters: Record<string, string | boolean>, filterText?: string, backendFilter?: string): void;
 }>();
@@ -127,25 +126,6 @@ function onToggle() {
 function updateFilterText(newFilterText: string) {
     emit("update:filter-text", newFilterText);
 }
-
-// as the filterText changes, emit a backend-filter that can be used as a backend query
-watch(
-    () => props.filterText,
-    (newFilterText: string) => {
-        const defaultBackendFilter = props.filterClass.getFilterText(props.filterClass.defaultFilters, true);
-        const currentBackendFilter = props.filterClass.getFilterText(filters.value, true);
-
-        const backendFilter =
-            defaultBackendFilter === currentBackendFilter
-                ? `${
-                      defaultBackendFilter && !newFilterText.includes(defaultBackendFilter)
-                          ? defaultBackendFilter + " "
-                          : ""
-                  }` + newFilterText
-                : props.filterClass.getFilterText(filters.value, true);
-        emit("on-backend-filter", backendFilter);
-    }
-);
 </script>
 
 <template>
diff --git a/client/src/components/Grid/GridList.vue b/client/src/components/Grid/GridList.vue
index 39cc6985aee..e1a9269affb 100644
--- a/client/src/components/Grid/GridList.vue
+++ b/client/src/components/Grid/GridList.vue
@@ -76,8 +76,11 @@ const sortDesc = ref(props.gridConfig ? props.gridConfig.sortDesc : false);
 
 // filtering refs and handlers
 const filterText = ref("");
-const searchTerm = ref("");
 const showAdvanced = ref(false);
+const filterClass = props.gridConfig.filtering;
+const rawFilters = computed(() => Object.fromEntries(filterClass.getFiltersForText(filterText.value, true, false)));
+const validFilters = computed(() => filterClass.getValidFilters(rawFilters.value, true).validFilters);
+const invalidFilters = computed(() => filterClass.getValidFilters(rawFilters.value, true).invalidFilters);
 
 // hide message helper
 const hideMessage = useDebounceFn(() => {
@@ -111,12 +114,17 @@ function displayInitialMessage() {
 async function getGridData() {
     selected.value = new Set();
     if (props.gridConfig) {
+        if (Object.keys(invalidFilters.value).length > 0) {
+            // there are invalid filters, so we don't want to search
+            loading.value = false;
+            return;
+        }
         try {
             const offset = props.limit * (currentPage.value - 1);
             const [responseData, responseTotal] = await props.gridConfig.getData(
                 offset,
                 props.limit,
-                searchTerm.value,
+                validatedFilterText(),
                 sortBy.value,
                 sortDesc.value
             );
@@ -159,13 +167,6 @@ function onRouterPush(route: string) {
     router.push(route);
 }
 
-/**
- * Apply backend formatted filter and execute grid search
- */
-function onSearch(query: string) {
-    searchTerm.value = query;
-}
-
 /**
  * User changes sorting
  */
@@ -211,14 +212,24 @@ function onSelectAll(current: boolean): void {
     }
 }
 
+/**
+ * A valid filter/query for the backend
+ */
+function validatedFilterText() {
+    // there are no filters derived from the `filterText`; return the `filterText` as is
+    if (Object.keys(rawFilters.value).length === 0) {
+        return filterText.value;
+    }
+    // there are valid filters derived from the `filterText`
+    return filterClass.getFilterText(validFilters.value, false);
+}
+
 /**
  * Initialize grid data
  */
 onMounted(() => {
     if (props.usernameSearch) {
-        const search_query = `user:${props.usernameSearch}`.trim();
-        filterText.value = search_query;
-        onSearch(search_query);
+        filterText.value = filterClass.setFilterValue(filterText.value, "user", props.usernameSearch);
     }
     getGridData();
     eventBus.on(onRouterPush);
@@ -232,7 +243,7 @@ onUnmounted(() => {
 /**
  * Load current page
  */
-watch([currentPage, searchTerm, sortDesc, sortBy], () => getGridData());
+watch([currentPage, filterText, sortDesc, sortBy], () => getGridData());
 
 /**
  * Operation message timeout handler
@@ -269,21 +280,34 @@ watch(operationMessage, () => {
                 :class="{ 'py-2': !embedded }"
                 :name="gridConfig.plural"
                 :placeholder="`search ${gridConfig.plural.toLowerCase()}`"
-                :filter-class="gridConfig.filtering"
+                :filter-class="filterClass"
                 :filter-text.sync="filterText"
                 :loading="loading"
-                :show-advanced.sync="showAdvanced"
-                @on-backend-filter="onSearch" />
+                :show-advanced.sync="showAdvanced" />
             <hr v-if="showAdvanced" />
         </div>
         <LoadingSpan v-if="loading" />
-        <BAlert v-else-if="!isAvailable" variant="info" show>
-            <span v-if="searchTerm">
-                <span v-localize>Nothing found with:</span>
-                <b>{{ searchTerm }}</b>
-            </span>
-            <span v-else v-localize> No entries found. </span>
-        </BAlert>
+        <span v-else-if="!isAvailable || Object.keys(invalidFilters).length > 0" variant="info" show>
+            <BAlert v-if="Object.keys(invalidFilters).length === 0" variant="info" show>
+                <span v-if="filterText">
+                    <span v-localize>Nothing found with:</span>
+                    <b>{{ filterText }}</b>
+                </span>
+                <span v-else v-localize> No entries found. </span>
+            </BAlert>
+            <BAlert v-else variant="danger" show>
+                <Heading h4 inline size="sm" class="flex-grow-1 mb-2">Invalid filters in query:</Heading>
+                <ul>
+                    <li v-for="[invalidKey, value] in Object.entries(invalidFilters)" :key="invalidKey">
+                        <b>{{ invalidKey }}</b
+                        >: {{ value }}
+                    </li>
+                </ul>
+                <a href="javascript:void(0)" class="ui-link" @click="filterText = validatedFilterText()">
+                    Remove invalid filters from query
+                </a>
+            </BAlert>
+        </span>
         <table v-else class="grid-table">
             <thead>
                 <th v-if="!!gridConfig.batch">
@@ -354,7 +378,7 @@ watch(operationMessage, () => {
                             :value="rowData[fieldEntry.key]"
                             :disabled="fieldEntry.disabled"
                             @input="onTagInput(rowData, $event, fieldEntry.handler)"
-                            @tag-click="applyFilter('tag', $event, true)" />
+                            @tag-click="applyFilter('tag', $event)" />
                         <span v-else v-localize> Not available. </span>
                     </div>
                     <FontAwesomeIcon v-else icon="fa-shield-alt" />
diff --git a/client/src/components/History/CurrentHistory/HistoryPanel.vue b/client/src/components/History/CurrentHistory/HistoryPanel.vue
index ab8bc7d6358..227b6f25ee7 100644
--- a/client/src/components/History/CurrentHistory/HistoryPanel.vue
+++ b/client/src/components/History/CurrentHistory/HistoryPanel.vue
@@ -412,9 +412,9 @@ async function onDrop() {
     }
 }
 
-function updateFilterValue(newFilterText: string, newValue: any) {
+function updateFilterValue(filterKey: string, newValue: any) {
     const currentFilterText = filterText.value;
-    filterText.value = filterClass.setFilterValue(currentFilterText, newFilterText, newValue);
+    filterText.value = filterClass.setFilterValue(currentFilterText, filterKey, newValue);
 }
 
 function getItemKey(item: HistoryItem) {
diff --git a/client/src/components/Workflow/WorkflowFilters.js b/client/src/components/Workflow/WorkflowFilters.js
index d91c8ca14ff..509e9f4cfc9 100644
--- a/client/src/components/Workflow/WorkflowFilters.js
+++ b/client/src/components/Workflow/WorkflowFilters.js
@@ -1,115 +1,167 @@
 import Filtering, { contains, equals, expandNameTag, toBool } from "utils/filtering";
 
-export const helpHtml = `<div>
-<p>This input can be used to filter the workflows displayed.</p>
+export function helpHtml(activeList = "my") {
+    let extra = "";
+    if (activeList === "my") {
+        extra = `<dt><code>is:published</code></dt>
+        <dd>
+            Shows published workflows.
+        </dd>
+        <dt><code>is:importable</code></dt>
+        <dd>
+            Shows importable workflows (this also means they are URL generated).
+        </dd>
+        <dt><code>is:shared_with_me</code></dt>
+        <dd>
+            Shows workflows shared by another user directly with you.
+        </dd>
+        <dt><code>is:deleted</code></dt>
+        <dd>Shows deleted workflows.</dd>`;
+    } else if (activeList === "shared_with_me") {
+        extra = `<dt><code>user:____</code></dt>
+        <dd>
+            Shows workflows owned by the given user.
+        </dd>
+        <dt><code>is:published</code></dt>
+        <dd>
+            Shows published workflows.
+        </dd>`;
+    } else {
+        extra = `<dt><code>user:____</code></dt>
+        <dd>
+            Shows workflows owned by the given user.
+        </dd>
+        <dt><code>is:shared_with_me</code></dt>
+        <dd>
+            Shows workflows shared by another user directly with you.
+        </dd>`;
+    }
 
-<p>
-    Text entered here will be searched against workflow names and workflow
-    tags. Additionally, advanced filtering tags can be used to refine the
-    search more precisely. Filtering tags are of the form
-    <code>&lt;tag_name&gt;:&lt;tag_value&gt;</code> or
-    <code>&lt;tag_name&gt;:'&lt;tag_value&gt;'</code>. For instance to
-    search just for RNAseq in the workflow name,
-    <code>name:rnsseq</code> can be used. Notice by default the search is
-    not case-sensitive. If the quoted version of tag is used, the search is
-    case sensitive and only full matches will be returned. So
-    <code>name:'RNAseq'</code> would show only workflows named exactly
-    <code>RNAseq</code>.
-</p>
+    const conditionalHelpHtml = `<div>
+        <p>This menu can be used to filter the workflows displayed.</p>
 
-<p>The available filtering tags are:</p>
-<dl>
-    <dt><code>name</code></dt>
-    <dd>
-        Shows workflows with the given sequence of characters in their names.
-    </dd>
-    <dt><code>tag</code></dt>
-    <dd>
-        Shows workflows with the given workflow tag. You may also click
-        on a tag to filter on that tag directly.
-    </dd>
-    <dt><code>is:published</code></dt>
-    <dd>
-        Shows published workflows.
-    </dd>
-    <dt><code>is:importable</code></dt>
-    <dd>
-        Shows importable workflows (this also means they are URL generated).
-    </dd>
-    <dt><code>is:shared_with_me</code></dt>
-    <dd>
-        Shows workflows shared by another user directly with you.
-    </dd>
-    <dt><code>is:deleted</code></dt>
-    <dd>Shows deleted workflows.</dd>
-</dl>
-</div>`;
+        <p>
+            Text entered here will be searched against workflow names and workflow
+            tags. Additionally, advanced filtering tags can be used to refine the
+            search more precisely. Filtering tags are of the form
+            <code>&lt;tag_name&gt;:&lt;tag_value&gt;</code> or
+            <code>&lt;tag_name&gt;:'&lt;tag_value&gt;'</code>. For instance to
+            search just for RNAseq in the workflow name,
+            <code>name:rnsseq</code> can be used. Notice by default the search is
+            not case-sensitive. If the quoted version of tag is used, the search is
+            case sensitive and only full matches will be returned. So
+            <code>name:'RNAseq'</code> would show only workflows named exactly
+            <code>RNAseq</code>.
+        </p>
 
-const validFilters = {
-    name: { placeholder: "name", type: String, handler: contains("name"), menuItem: true },
-    user: {
-        placeholder: "owner",
-        type: String,
-        handler: contains("user"),
-        menuItem: false,
-    },
-    tag: {
-        placeholder: "tag(s)",
-        type: "MultiTags",
-        handler: contains("tag", "tag", expandNameTag),
-        menuItem: true,
-    },
-    published: {
-        placeholder: "Filter on published workflows",
-        type: Boolean,
-        boolType: "is",
-        handler: equals("published", "published", toBool),
-        menuItem: true,
-    },
-    importable: {
-        placeholder: "Filter on importable workflows",
-        type: Boolean,
-        boolType: "is",
-        handler: equals("importable", "importable", toBool),
-        menuItem: true,
-    },
-    shared_with_me: {
-        placeholder: "Filter on workflows shared with me",
-        type: Boolean,
-        boolType: "is",
-        handler: equals("shared_with_me", "shared_with_me", toBool),
-        menuItem: true,
-    },
-    deleted: {
-        placeholder: "Filter on deleted workflows",
-        type: Boolean,
-        boolType: "is",
-        handler: equals("deleted", "deleted", toBool),
-        menuItem: true,
-    },
-};
+        <p>The available filtering tags are:</p>
+        <dl>
+            <dt><code>name:____</code></dt>
+            <dd>
+                Shows workflows with the given sequence of characters in their names.
+            </dd>
+            <dt><code>tag:____</code></dt>
+            <dd>
+                Shows workflows with the given workflow tag. You may also click
+                on a tag to filter on that tag directly.
+            </dd>
+            ${extra}
+        </dl>
+    </div>`;
+    return conditionalHelpHtml;
+}
 
-export const WorkflowFilters = new Filtering(validFilters, undefined, false, false);
+export function WorkflowFilters(activeList = "my") {
+    const commonFilters = {
+        name: { placeholder: "name", type: String, handler: contains("name"), menuItem: true },
+        tag: {
+            placeholder: "tag(s)",
+            type: "MultiTags",
+            handler: contains("tag", "tag", expandNameTag),
+            menuItem: true,
+        },
+    };
 
-const validPublishedFilters = {
-    ...validFilters,
-    user: {
-        ...validFilters.user,
-        menuItem: true,
-    },
-    published: {
-        ...validFilters.published,
-        default: true,
-        menuItem: false,
-    },
-    shared_with_me: {
-        ...validFilters.shared_with_me,
-        menuItem: false,
-    },
-    importable: {
-        ...validFilters.importable,
-        menuItem: false,
-    },
-};
-
-export const PublishedWorkflowFilters = new Filtering(validPublishedFilters, undefined, false, false);
+    if (activeList === "my") {
+        return new Filtering(
+            {
+                ...commonFilters,
+                published: {
+                    placeholder: "Filter on published workflows",
+                    type: Boolean,
+                    boolType: "is",
+                    handler: equals("published", "published", toBool),
+                    menuItem: true,
+                },
+                importable: {
+                    placeholder: "Filter on importable workflows",
+                    type: Boolean,
+                    boolType: "is",
+                    handler: equals("importable", "importable", toBool),
+                    menuItem: true,
+                },
+                shared_with_me: {
+                    placeholder: "Filter on workflows shared with me",
+                    type: Boolean,
+                    boolType: "is",
+                    handler: equals("shared_with_me", "shared_with_me", toBool),
+                    menuItem: true,
+                },
+                deleted: {
+                    placeholder: "Filter on deleted workflows",
+                    type: Boolean,
+                    boolType: "is",
+                    handler: equals("deleted", "deleted", toBool),
+                    menuItem: true,
+                },
+            },
+            undefined,
+            false,
+            false
+        );
+    } else if (activeList === "shared_with_me") {
+        return new Filtering(
+            {
+                ...commonFilters,
+                user: {
+                    placeholder: "owner",
+                    type: String,
+                    handler: contains("user"),
+                    menuItem: true,
+                },
+                published: {
+                    placeholder: "Filter on published workflows",
+                    type: Boolean,
+                    boolType: "is",
+                    handler: equals("published", "published", toBool),
+                    menuItem: true,
+                },
+            },
+            undefined,
+            false,
+            false
+        );
+    } else {
+        return new Filtering(
+            {
+                ...commonFilters,
+                user: {
+                    placeholder: "owner",
+                    type: String,
+                    handler: contains("user"),
+                    menuItem: true,
+                },
+                shared_with_me: {
+                    placeholder: "Filter on workflows shared with me",
+                    type: Boolean,
+                    boolType: "is",
+                    handler: equals("shared_with_me", "shared_with_me", toBool),
+                    menuItem: true,
+                },
+            },
+            undefined,
+            false,
+            false
+        );
+    }
+}
diff --git a/client/src/components/Workflow/WorkflowIndicators.vue b/client/src/components/Workflow/WorkflowIndicators.vue
index 90bec28520d..340361143de 100644
--- a/client/src/components/Workflow/WorkflowIndicators.vue
+++ b/client/src/components/Workflow/WorkflowIndicators.vue
@@ -79,7 +79,7 @@ function onViewUserPublished() {
 <template>
     <div>
         <BButton
-            v-if="workflow.published"
+            v-if="workflow.published && !publishedView"
             v-b-tooltip.noninteractive
             size="sm"
             class="workflow-published-icon inline-icon-button"
@@ -87,6 +87,7 @@ function onViewUserPublished() {
             title="Published workflow. Click to view all published workflows">
             <FontAwesomeIcon :icon="faGlobe" fixed-width />
         </BButton>
+        <FontAwesomeIcon v-else-if="workflow.published" :icon="faGlobe" fixed-width size="sm" />
 
         <BButton
             v-if="sourceType.includes('trs')"
diff --git a/client/src/components/Workflow/WorkflowList.vue b/client/src/components/Workflow/WorkflowList.vue
index af780b8545a..865515ca4e8 100644
--- a/client/src/components/Workflow/WorkflowList.vue
+++ b/client/src/components/Workflow/WorkflowList.vue
@@ -4,13 +4,14 @@ import { faStar, faTrash } from "@fortawesome/free-solid-svg-icons";
 import { FontAwesomeIcon } from "@fortawesome/vue-fontawesome";
 import { BAlert, BButton, BNav, BNavItem, BOverlay, BPagination } from "bootstrap-vue";
 import { filter } from "underscore";
-import { computed, type ComputedRef, onMounted, ref, watch } from "vue";
+import { computed, onMounted, ref, watch } from "vue";
 import { useRouter } from "vue-router/composables";
 
 import { loadWorkflows } from "@/components/Workflow/workflows.services";
 import { Toast } from "@/composables/toast";
 import { useUserStore } from "@/stores/userStore";
-import Filtering, { contains, equals, expandNameTag, toBool, type ValidFilter } from "@/utils/filtering";
+
+import { helpHtml, WorkflowFilters } from "./WorkflowFilters";
 
 import FilterMenu from "@/components/Common/FilterMenu.vue";
 import Heading from "@/components/Common/Heading.vue";
@@ -22,37 +23,6 @@ import WorkflowListActions from "@/components/Workflow/WorkflowListActions.vue";
 
 library.add(faStar, faTrash);
 
-const helpHtml = `<div>
-<p>This input can be used to filter the workflows displayed.</p>
-
-<p>
-    Text entered here will be searched against workflow names and workflow
-    tags. Additionally, advanced filtering tags can be used to refine the
-    search more precisely. Filtering tags are of the form
-    <code>&lt;tag_name&gt;:&lt;tag_value&gt;</code> or
-    <code>&lt;tag_name&gt;:'&lt;tag_value&gt;'</code>. For instance to
-    search just for RNAseq in the workflow name,
-    <code>name:rnsseq</code> can be used. Notice by default the search is
-    not case-sensitive. If the quoted version of tag is used, the search is
-    case sensitive and only full matches will be returned. So
-    <code>name:'RNAseq'</code> would show only workflows named exactly
-    <code>RNAseq</code>.
-</p>
-
-<p>The available filtering tags are:</p>
-<dl>
-    <dt><code>name</code></dt>
-    <dd>
-        Shows workflows with the given sequence of characters in their names.
-    </dd>
-    <dt><code>tag</code></dt>
-    <dd>
-        Shows workflows with the given workflow tag. You may also click
-        on a tag to filter on that tag directly.
-    </dd>
-</dl>
-</div>`;
-
 type ListView = "grid" | "list";
 type WorkflowsList = Record<string, never>[];
 
@@ -76,29 +46,8 @@ const totalWorkflows = ref(0);
 const showAdvanced = ref(false);
 const showBookmarked = ref(false);
 const listHeader = ref<any>(null);
-const advancedFiltering = ref<any>(null);
 const workflowsLoaded = ref<WorkflowsList>([]);
 
-const validFilters: ComputedRef<Record<string, ValidFilter<string | boolean | undefined>>> = computed(() => {
-    return {
-        name: { placeholder: "name", type: String, handler: contains("name"), menuItem: true },
-        tag: {
-            placeholder: "tag",
-            type: "MultiTags",
-            handler: contains("tags", "tag", expandNameTag),
-            menuItem: true,
-        },
-        deleted: {
-            placeholder: "Filter on deleted workflows",
-            type: Boolean,
-            handler: equals("deleted", "deleted", toBool),
-            menuItem: false,
-        },
-    };
-});
-
-const WorkflowFilters = new Filtering(validFilters.value);
-
 const searchPlaceHolder = computed(() => {
     let placeHolder = "Search my workflows";
 
@@ -123,24 +72,16 @@ const sortBy = computed(() => (listHeader.value && listHeader.value.sortBy) || "
 const noItems = computed(() => !loading.value && workflowsLoaded.value.length === 0 && !filterText.value);
 const noResults = computed(() => !loading.value && workflowsLoaded.value.length === 0 && filterText.value);
 
-function updateFilter(newVal: string) {
-    advancedFiltering.value.updateFilter(newVal.trim());
-}
+const workflowFilters = computed(() => WorkflowFilters(props.activeList));
+const rawFilters = computed(() =>
+    Object.fromEntries(workflowFilters.value.getFiltersForText(filterText.value, true, false))
+);
+const validFilters = computed(() => workflowFilters.value.getValidFilters(rawFilters.value, true).validFilters);
+const invalidFilters = computed(() => workflowFilters.value.getValidFilters(rawFilters.value, true).invalidFilters);
 
-function onTagClick(tag: string) {
-    if (filterText.value.includes(tag)) {
-        filterText.value = filterText.value.replace(`tag:'${tag}'`, "").trim();
-    } else {
-        filterText.value = WorkflowFilters.setFilterValue(filterText.value, "tag", `'${tag}'`);
-    }
-}
-
-function onToggleDeleted() {
-    if (!showDeleted.value) {
-        filterText.value = `${filterText.value} is:deleted`.trim();
-    } else {
-        filterText.value = filterText.value.replace("is:deleted", "").trim();
-    }
+function updateFilterValue(filterKey: string, newValue: any) {
+    const currentFilterText = filterText.value;
+    filterText.value = workflowFilters.value.setFilterValue(currentFilterText, filterKey, newValue);
 }
 
 function onToggleBookmarked() {
@@ -155,15 +96,22 @@ async function load(overlayLoading = false, silent = false) {
             loading.value = true;
         }
     }
+    let search;
+    if (Object.keys(invalidFilters.value).length === 0) {
+        search = validatedFilterText();
 
-    let search = filterText.value;
-
-    if (published.value) {
-        search += " is:published";
-    }
-
-    if (sharedWithMe.value) {
-        search += " is:shared_with_me";
+        // append default backend query filters for provided `props.activeList`
+        if (published.value && !workflowFilters.value.getFilterValue(search, "published")) {
+            search += " is:published";
+        }
+        if (sharedWithMe.value && !workflowFilters.value.getFilterValue(search, "shared_with_me")) {
+            search += " is:shared_with_me";
+        }
+    } else {
+        // there are invalid filters, so we don't want to search
+        overlay.value = false;
+        loading.value = false;
+        return;
     }
 
     try {
@@ -205,6 +153,15 @@ async function onPageChange(page: number) {
     await load(true);
 }
 
+function validatedFilterText() {
+    // there are no filters derived from the `filterText`
+    if (Object.keys(rawFilters.value).length === 0) {
+        return filterText.value;
+    }
+    // there are valid filters derived from the `filterText`
+    return workflowFilters.value.getFilterText(validFilters.value, true);
+}
+
 watch([filterText, sortBy, sortDesc, showBookmarked], async () => {
     offset.value = 0;
     await load(true);
@@ -212,7 +169,7 @@ watch([filterText, sortBy, sortDesc, showBookmarked], async () => {
 
 onMounted(() => {
     if (router.currentRoute.query.owner) {
-        filterText.value = `${filterText.value} user:${router.currentRoute.query.owner}`.trim();
+        updateFilterValue("user", router.currentRoute.query.owner);
     }
     load();
 });
@@ -251,15 +208,14 @@ onMounted(() => {
                 id="workflow-list-filter"
                 name="workflows"
                 class="mb-2"
-                :filter-class="WorkflowFilters"
+                :filter-class="workflowFilters"
                 :filter-text.sync="filterText"
                 :loading="loading || overlay"
                 has-help
                 :placeholder="searchPlaceHolder"
-                :show-advanced.sync="showAdvanced"
-                @updateFilter="updateFilter">
+                :show-advanced.sync="showAdvanced">
                 <template v-slot:menu-help-text>
-                    <div v-html="helpHtml"></div>
+                    <div v-html="helpHtml(activeList)"></div>
                 </template>
             </FilterMenu>
 
@@ -274,7 +230,7 @@ onMounted(() => {
                             :title="!showDeleted ? 'Show deleted workflows' : 'Hide deleted workflows'"
                             :pressed="showDeleted"
                             variant="outline-primary"
-                            @click="onToggleDeleted">
+                            @click="updateFilterValue('deleted', true)">
                             <FontAwesomeIcon :icon="faTrash" fixed-width />
                             Show deleted
                         </BButton>
@@ -303,9 +259,25 @@ onMounted(() => {
             No workflows found. You may create or import new workflows using the buttons above.
         </BAlert>
 
-        <BAlert v-else-if="!loading && !overlay && noResults" id="no-workflow-found" variant="info" show>
-            No workflows found matching: <span class="font-weight-bold">{{ filterText }}</span>
-        </BAlert>
+        <!-- There are either `noResults` or `invalidFilters` -->
+        <span v-else-if="!loading && !overlay && (noResults || Object.keys(invalidFilters).length > 0)">
+            <BAlert v-if="Object.keys(invalidFilters).length === 0" id="no-workflow-found" variant="info" show>
+                No workflows found matching: <span class="font-weight-bold">{{ filterText }}</span>
+            </BAlert>
+
+            <BAlert v-else id="no-workflow-found-invalid" variant="danger" show>
+                <Heading h4 inline size="sm" class="flex-grow-1 mb-2">Invalid filters in query:</Heading>
+                <ul>
+                    <li v-for="[invalidKey, value] in Object.entries(invalidFilters)" :key="invalidKey">
+                        <b>{{ invalidKey }}</b
+                        >: {{ value }}
+                    </li>
+                </ul>
+                <a href="javascript:void(0)" class="ui-link" @click="filterText = validatedFilterText()"
+                    >Remove invalid filters from query</a
+                >
+            </BAlert>
+        </span>
 
         <BOverlay
             v-else
@@ -322,7 +294,7 @@ onMounted(() => {
                 :grid-view="view === 'grid'"
                 :class="view === 'grid' ? 'grid-view' : 'list-view'"
                 @refreshList="load"
-                @tagClick="onTagClick" />
+                @tagClick="(tag) => updateFilterValue('tag', tag)" />
 
             <BPagination
                 v-if="!loading && totalWorkflows > limit"
diff --git a/client/src/utils/filtering.ts b/client/src/utils/filtering.ts
index 60127464ee5..dd5f7247dc0 100644
--- a/client/src/utils/filtering.ts
+++ b/client/src/utils/filtering.ts
@@ -341,7 +341,7 @@ export default class Filtering<T> {
      * @returns Parsed filter text string
      * */
     getFilterText(filters: Record<string, T>, backendFormatted = false): string {
-        filters = this.getValidFilters(filters, backendFormatted);
+        filters = this.getValidFilters(filters, backendFormatted).validFilters;
         const hasDefaults = this.containsDefaults(filters);
 
         let newFilterText = "";
@@ -385,10 +385,10 @@ export default class Filtering<T> {
 
     /** Parses single text input into a dict of field->value pairs.
      * @param filterText Raw filter text string
-     * @param removeAny default: `true` Whether to remove default filters if the are set to `any`
+     * @param removeAny default: `true` Whether to remove default filters if they are set to `any`
      * @returns Filters as 2D array of of [field, value] pairs
      * */
-    getFiltersForText(filterText: string, removeAny = true): [string, T][] {
+    getFiltersForText(filterText: string, removeAny = true, validate = true): [string, T][] {
         const pairSplitRE = this.quoteStrings
             ? /[^\s'"]+(?:['"][^'"]*['"][^\s'"]*)*|(?:['"][^'"]*['"][^\s'"]*)+/g
             : /(\S+):(.*?)(?=\s+\S+:|$)/g;
@@ -414,8 +414,8 @@ export default class Filtering<T> {
                     const normalizedField = field?.split("-").join("_");
                     if (
                         normalizedField &&
-                        this.validFilters[normalizedField] &&
-                        this.validFilters[normalizedField]?.boolType !== "is"
+                        this.validFilters[normalizedField]?.boolType !== "is" &&
+                        ((!validate && normalizedField !== "is") || this.validFilters[normalizedField])
                     ) {
                         // removes quotation and applies lower-case to filter value
                         const newVal = this.quoteStrings ? (toLowerNoQuotes(value) as T) : (value as T);
@@ -430,7 +430,12 @@ export default class Filtering<T> {
                             result[normalizedField] = newVal;
                         }
                         hasMatches = true;
-                    } else if (value && field === "is" && elg === ":" && this.validFilters[value]?.boolType === "is") {
+                    } else if (
+                        value &&
+                        field === "is" &&
+                        elg === ":" &&
+                        (!validate || this.validFilters[value]?.boolType === "is")
+                    ) {
                         // handle `is:filter` syntax
                         result[value] = true as T;
                         hasMatches = true;
@@ -471,7 +476,7 @@ export default class Filtering<T> {
      * @returns Parsed `filterText` string with added/removed filter(s)
      */
     applyFiltersToText(filters: Record<string, T>, existingText: string, remove = false) {
-        let validFilters = this.getValidFilters(filters);
+        let { validFilters } = this.getValidFilters(filters);
         const existingFilters = Object.fromEntries(this.getFiltersForText(existingText, false));
         if (remove) {
             validFilters = omit(existingFilters, Object.keys(validFilters));
@@ -485,10 +490,11 @@ export default class Filtering<T> {
      *
      * @param filters A filters object (e.g.: {hid: "3", name: "test", invalid: "x"}})
      * @param backendFormatted default: `false` Whether to convert the values to backend format
-     * @returns valid filters object (e.g.: {hid: "3", name: "test"}})
+     * @returns a _valid_ filters object (e.g.: {hid: "3", name: "test"}}) and one with invalid filters
      */
     getValidFilters(filters: Record<string, T>, backendFormatted = false) {
         const validFilters: Record<string, T> = {};
+        const invalidFilters: Record<string, T> = {};
         Object.entries(filters).forEach(([key, value]) => {
             if (this.validFilters[key]?.type === "MultiTags" && Array.isArray(value)) {
                 const validValues = value
@@ -497,14 +503,22 @@ export default class Filtering<T> {
                 if (validValues.length > 0) {
                     validFilters[key] = validValues as T;
                 }
+                const invalidValues = value.filter(
+                    (v) => !validValues.includes(this.getConvertedValue(key, v, backendFormatted))
+                );
+                if (invalidValues.length > 0) {
+                    invalidFilters[key] = invalidValues as T;
+                }
             } else {
                 const validValue = this.getConvertedValue(key, value, backendFormatted);
                 if (validValue !== undefined) {
                     validFilters[key] = validValue;
+                } else {
+                    invalidFilters[key] = value;
                 }
             }
         });
-        return validFilters;
+        return { validFilters, invalidFilters };
     }
 
     /** Convert a valid filter key (`filter`/`filter-gt`) to alias filter key (`filter:`/`filter>`)

From 51572b10f6d3e6d7e5638b66702ff6a8771dcf71 Mon Sep 17 00:00:00 2001
From: Ahmed Awan <qe66653@umbc.edu>
Date: Thu, 14 Mar 2024 13:30:21 -0500
Subject: [PATCH 13/20] fix name tag filtering functionality

Quoted tags should match exact results. Name tags are unquoted _when sent to the backend_.
---
 client/src/components/Grid/GridList.vue             |  2 +-
 client/src/components/Workflow/WorkflowCard.vue     |  3 ++-
 .../src/components/Workflow/WorkflowIndicators.vue  |  6 ++++++
 client/src/components/Workflow/WorkflowList.vue     | 11 ++++++-----
 client/src/utils/filtering.ts                       | 13 +++++++------
 5 files changed, 22 insertions(+), 13 deletions(-)

diff --git a/client/src/components/Grid/GridList.vue b/client/src/components/Grid/GridList.vue
index e1a9269affb..eac89a1dae3 100644
--- a/client/src/components/Grid/GridList.vue
+++ b/client/src/components/Grid/GridList.vue
@@ -378,7 +378,7 @@ watch(operationMessage, () => {
                             :value="rowData[fieldEntry.key]"
                             :disabled="fieldEntry.disabled"
                             @input="onTagInput(rowData, $event, fieldEntry.handler)"
-                            @tag-click="applyFilter('tag', $event)" />
+                            @tag-click="applyFilter('tag', $event, true)" />
                         <span v-else v-localize> Not available. </span>
                     </div>
                     <FontAwesomeIcon v-else icon="fa-shield-alt" />
diff --git a/client/src/components/Workflow/WorkflowCard.vue b/client/src/components/Workflow/WorkflowCard.vue
index 5734a6ae9ac..b7fda777e07 100644
--- a/client/src/components/Workflow/WorkflowCard.vue
+++ b/client/src/components/Workflow/WorkflowCard.vue
@@ -37,6 +37,7 @@ const props = withDefaults(defineProps<Props>(), {
 const emit = defineEmits<{
     (e: "tagClick", tag: string): void;
     (e: "refreshList", overlayLoading?: boolean, b?: boolean): void;
+    (e: "update-filter", key: string, value: any): void;
 }>();
 
 const userStore = useUserStore();
@@ -124,7 +125,7 @@ async function onTagClick(tag: string) {
                 'workflow-shared': workflow.published,
             }">
             <div class="workflow-card-header">
-                <WorkflowIndicators :workflow="workflow" :published-view="publishedView" />
+                <WorkflowIndicators :workflow="workflow" :published-view="publishedView" @update-filter="(k, v) => emit('update-filter', k, v)" />
 
                 <div class="workflow-count-actions">
                     <WorkflowInvocationsCount v-if="!isAnonymous && !shared" class="mx-1" :workflow="workflow" />
diff --git a/client/src/components/Workflow/WorkflowIndicators.vue b/client/src/components/Workflow/WorkflowIndicators.vue
index 340361143de..225295b9139 100644
--- a/client/src/components/Workflow/WorkflowIndicators.vue
+++ b/client/src/components/Workflow/WorkflowIndicators.vue
@@ -21,6 +21,10 @@ interface Props {
 
 const props = defineProps<Props>();
 
+const emit = defineEmits<{
+    (e: "update-filter", key: string, value: any): void;
+}>();
+
 const router = useRouter();
 const userStore = useUserStore();
 
@@ -69,10 +73,12 @@ function onCopyLink() {
 
 function onViewMySharedByUser() {
     router.push(`/workflows/list_shared_with_me?owner=${props.workflow.owner}`);
+    emit("update-filter", "user", `'${props.workflow.owner}'`);
 }
 
 function onViewUserPublished() {
     router.push(`/workflows/list_published?owner=${props.workflow.owner}`);
+    emit("update-filter", "user", `'${props.workflow.owner}'`);
 }
 </script>
 
diff --git a/client/src/components/Workflow/WorkflowList.vue b/client/src/components/Workflow/WorkflowList.vue
index 865515ca4e8..9d8abcc2f7e 100644
--- a/client/src/components/Workflow/WorkflowList.vue
+++ b/client/src/components/Workflow/WorkflowList.vue
@@ -169,7 +169,7 @@ watch([filterText, sortBy, sortDesc, showBookmarked], async () => {
 
 onMounted(() => {
     if (router.currentRoute.query.owner) {
-        updateFilterValue("user", router.currentRoute.query.owner);
+        updateFilterValue("user", `'${router.currentRoute.query.owner}'`);
     }
     load();
 });
@@ -273,9 +273,9 @@ onMounted(() => {
                         >: {{ value }}
                     </li>
                 </ul>
-                <a href="javascript:void(0)" class="ui-link" @click="filterText = validatedFilterText()"
-                    >Remove invalid filters from query</a
-                >
+                <a href="javascript:void(0)" class="ui-link" @click="filterText = validatedFilterText()">
+                    Remove invalid filters from query
+                </a>
             </BAlert>
         </span>
 
@@ -294,7 +294,8 @@ onMounted(() => {
                 :grid-view="view === 'grid'"
                 :class="view === 'grid' ? 'grid-view' : 'list-view'"
                 @refreshList="load"
-                @tagClick="(tag) => updateFilterValue('tag', tag)" />
+                @tagClick="(tag) => updateFilterValue('tag', `'${tag}'`)"
+                @update-filter="updateFilterValue" />
 
             <BPagination
                 v-if="!loading && totalWorkflows > limit"
diff --git a/client/src/utils/filtering.ts b/client/src/utils/filtering.ts
index dd5f7247dc0..fa4d859978e 100644
--- a/client/src/utils/filtering.ts
+++ b/client/src/utils/filtering.ts
@@ -104,7 +104,7 @@ export function toLowerNoQuotes<T>(value: T): string {
 
 /** Converts name tags starting with '#' to 'name:'
  * @param value
- * @returns Lowercase value with 'name:' replaced with '#'
+ * @returns String value with 'name:' replaced with '#'
  * */
 export function expandNameTag<T>(value: T): string {
     if (value && typeof value === "string") {
@@ -114,7 +114,7 @@ export function expandNameTag<T>(value: T): string {
             value = value.replace(/^#/, "name:") as T;
         }
     }
-    return toLower(value);
+    return value as string;
 }
 
 /** Converts string alias to string operator, e.g.: 'gt' to '>'
@@ -233,7 +233,9 @@ export function compare<T>(attribute: string, variant: string, converter?: Conve
  * @param validAliases: Array of valid aliases for filters
  * @param quoteStrings: Whether to auto quote filter strings in the query
  * @param nameMatching: Whether to apply name filter for unspecified filterText
- *                      (e.g. filterText = 'foo' -> 'name:foo')
+ *                      (e.g. filterText = 'foo' -> 'name:foo').
+ *                      Typically, when this is false, we index every field in
+ *                      the backend for unspecified filterText.
  * @returns Filtering object
  * */
 export default class Filtering<T> {
@@ -588,11 +590,10 @@ export default class Filtering<T> {
             if (converter) {
                 if (
                     (converter == toBool && filterValue == "any") ||
-                    (!backendFormatted && /^(['"]).*\1$/.test(filterValue as string))
+                    (!backendFormatted && /^(['"]).*\1$/.test(filterValue as string)) ||
+                    (!backendFormatted && ([expandNameTag, toDate] as Converter<T>[]).includes(converter))
                 ) {
                     return filterValue;
-                } else if (!backendFormatted && ([expandNameTag, toDate] as Converter<T>[]).includes(converter)) {
-                    return toLower(filterValue) as T;
                 }
                 return converter(filterValue);
             } else {

From df16ff06eb5d319ff3133ff59807c7213e241cd8 Mon Sep 17 00:00:00 2001
From: Ahmed Awan <qe66653@umbc.edu>
Date: Thu, 14 Mar 2024 14:07:03 -0500
Subject: [PATCH 14/20] fix filtering jests

---
 client/src/utils/filterConversion.test.js | 57 ++++++++++++-----------
 client/src/utils/filtering.test.js        | 11 ++++-
 2 files changed, 39 insertions(+), 29 deletions(-)

diff --git a/client/src/utils/filterConversion.test.js b/client/src/utils/filterConversion.test.js
index 6437d64802a..cf3230e4d13 100644
--- a/client/src/utils/filterConversion.test.js
+++ b/client/src/utils/filterConversion.test.js
@@ -1,7 +1,9 @@
 import { HistoryFilters } from "components/History/HistoryFilters";
-import { PublishedWorkflowFilters } from "components/Workflow/WorkflowFilters";
+import { WorkflowFilters } from "components/Workflow/WorkflowFilters";
 
 describe("test filtering helpers to convert filters to filter text", () => {
+    const MyWorkflowFilters = WorkflowFilters("my");
+    const PublishedWorkflowFilters = WorkflowFilters("published");
     it("conversion from filters to new filter text", async () => {
         const normalized = HistoryFilters.defaultFilters;
         expect(Object.keys(normalized).length).toBe(2);
@@ -10,7 +12,7 @@ describe("test filtering helpers to convert filters to filter text", () => {
     });
 
     it("verify the existence of defaults", async () => {
-        let filters = {};
+        const filters = {};
         Object.entries(HistoryFilters.defaultFilters).forEach(([key, value]) => {
             filters[key] = value;
         });
@@ -22,13 +24,6 @@ describe("test filtering helpers to convert filters to filter text", () => {
         expect(HistoryFilters.containsDefaults(filters)).toBe(false);
         filters["visible"] = String(HistoryFilters.defaultFilters.visible).toUpperCase();
         expect(HistoryFilters.containsDefaults(filters)).toBe(true);
-        filters = {};
-        Object.entries(PublishedWorkflowFilters.defaultFilters).forEach(([key, value]) => {
-            filters[key] = value;
-        });
-        expect(PublishedWorkflowFilters.containsDefaults(filters)).toBe(true);
-        filters["published"] = !PublishedWorkflowFilters.defaultFilters.published;
-        expect(PublishedWorkflowFilters.containsDefaults(filters)).toBe(false);
     });
 
     it("verify correct conversion of filters", async () => {
@@ -37,14 +32,16 @@ describe("test filtering helpers to convert filters to filter text", () => {
             visible: HistoryFilters.defaultFilters.visible,
             name: "name",
             other: "other",
-            tag: ["tag1", "tag2"],
+            tag: ["tag1", "'tag2'", "'#tag3'"],
             genome_build: "",
-            published: PublishedWorkflowFilters.defaultFilters.published,
+            published: true,
         };
-        const validHistFilters = HistoryFilters.getValidFilters(filters);
+        const validHistFilters = HistoryFilters.getValidFilters(filters).validFilters;
         expect(Object.keys(validHistFilters)).toEqual(["deleted", "visible", "name"]);
-        const validWfFilters = PublishedWorkflowFilters.getValidFilters(filters);
-        expect(Object.keys(validWfFilters)).toEqual(["deleted", "name", "tag", "published"]);
+        const validMyWfFilters = MyWorkflowFilters.getValidFilters(filters).validFilters;
+        expect(Object.keys(validMyWfFilters)).toEqual(["deleted", "name", "tag", "published"]);
+        const validPubWfFilters = PublishedWorkflowFilters.getValidFilters(filters).validFilters;
+        expect(Object.keys(validPubWfFilters)).toEqual(["name", "tag"]);
 
         expect(HistoryFilters.getFilterText(filters)).toBe("name:name");
         filters["visible"] = !HistoryFilters.defaultFilters.visible;
@@ -52,15 +49,27 @@ describe("test filtering helpers to convert filters to filter text", () => {
         filters["visible"] = HistoryFilters.defaultFilters.visible;
         expect(HistoryFilters.getFilterText(filters)).toBe("name:name");
 
-        expect(PublishedWorkflowFilters.getFilterText(filters, true)).toBe("name:name tag:tag1 tag:tag2 is:published");
+        // non-backend filter text keeps filters as is
+        expect(MyWorkflowFilters.getFilterText(filters)).toBe("name:name tag:tag1 tag:'tag2' tag:'#tag3' is:published");
+
+        // backend filter text adjusts name tag by replacing `#` with `name:`
+        expect(MyWorkflowFilters.getFilterText(filters, true)).toBe(
+            "name:name tag:tag1 tag:'tag2' tag:'name:tag3' is:published"
+        );
+
+        expect(PublishedWorkflowFilters.getFilterText(filters, true)).toBe(
+            "name:name tag:tag1 tag:'tag2' tag:'name:tag3'"
+        );
         delete filters["published"];
-        expect(PublishedWorkflowFilters.getFilterText(filters, true)).toBe("name:name tag:tag1 tag:tag2");
+        expect(MyWorkflowFilters.getFilterText(filters, true)).toBe("name:name tag:tag1 tag:'tag2' tag:'name:tag3'");
     });
 });
 
 describe("test filtering helpers to convert filter text to filters", () => {
+    const PublishedWorkflowFilters = WorkflowFilters("published");
     function getFilters(filteringClass, filterText) {
-        return filteringClass.getValidFilters(Object.fromEntries(filteringClass.getFiltersForText(filterText)));
+        return filteringClass.getValidFilters(Object.fromEntries(filteringClass.getFiltersForText(filterText)))
+            .validFilters;
     }
 
     it("verify the existence of defaults", async () => {
@@ -74,11 +83,6 @@ describe("test filtering helpers to convert filter text to filters", () => {
         expect(HistoryFilters.containsDefaults(getFilters(HistoryFilters, filterText))).toBe(false);
         filterText = "deleted:false visible:true";
         expect(HistoryFilters.containsDefaults(getFilters(HistoryFilters, filterText))).toBe(true);
-
-        filterText = "";
-        expect(PublishedWorkflowFilters.containsDefaults(getFilters(PublishedWorkflowFilters, filterText))).toBe(true);
-        filterText = "is:published is:deleted";
-        expect(PublishedWorkflowFilters.containsDefaults(getFilters(PublishedWorkflowFilters, filterText))).toBe(true);
     });
 
     it("verify correct conversion of filterText (HistoryFilters)", async () => {
@@ -104,17 +108,14 @@ describe("test filtering helpers to convert filter text to filters", () => {
 
     it("verify correct conversion of filterText (PublishedWorkflowFilters)", async () => {
         const filters = {
-            published: PublishedWorkflowFilters.defaultFilters.published,
             name: "name",
         };
-        let filterText = "name:name";
+        let filterText = "name:name is:published";
         expect(getFilters(PublishedWorkflowFilters, filterText)).toEqual(filters);
         filterText = "published:false name:name";
-        // filters["visible"] = !PublishedWorkflowFilters.defaultFilters.visible;
-        // delete filters["deleted"];
         expect(getFilters(PublishedWorkflowFilters, filterText)).toEqual(filters);
-        filterText = "name:name invalid:invalid is:deleted";
-        filters["deleted"] = true;
+        filterText = "name:name invalid:invalid user:testUser";
+        filters["user"] = "testUser";
         expect(getFilters(PublishedWorkflowFilters, filterText)).toEqual(filters);
     });
 });
diff --git a/client/src/utils/filtering.test.js b/client/src/utils/filtering.test.js
index e941eb08e0c..585bb72e334 100644
--- a/client/src/utils/filtering.test.js
+++ b/client/src/utils/filtering.test.js
@@ -14,6 +14,10 @@ const sampleFilters = [
         validFilters: {
             deleted: true,
         },
+        invalidFilters: {
+            invalid: "value",
+            visible: null,
+        },
         validText: "deleted:true visible:any",
     },
     {
@@ -28,6 +32,9 @@ const sampleFilters = [
             related: 10,
             hid_gt: 5,
         },
+        invalidFilters: {
+            hid_less_than: 20,
+        },
         validText: "deleted:any related:10 hid>5 visible:any",
     },
 ];
@@ -90,7 +97,9 @@ describe("filtering", () => {
     });
     test("parse get valid filters and settings", () => {
         sampleFilters.forEach((sample) => {
-            expect(HistoryFilters.getValidFilters(sample.filters)).toEqual(sample.validFilters);
+            const { validFilters, invalidFilters } = HistoryFilters.getValidFilters(sample.filters);
+            expect(validFilters).toEqual(sample.validFilters);
+            expect(invalidFilters).toEqual(sample.invalidFilters);
             expect(HistoryFilters.getFilterText(sample.filters)).toEqual(sample.validText);
         });
     });

From cdbe0c1dec79f1821e54233bbfbcb23602b3a4ca Mon Sep 17 00:00:00 2001
From: Ahmed Awan <qe66653@umbc.edu>
Date: Thu, 14 Mar 2024 16:15:09 -0500
Subject: [PATCH 15/20] add overlay as loading indicator on `GridList`s

Fixes https://github.com/galaxyproject/galaxy/issues/17666
---
 client/src/components/Grid/GridList.vue | 190 +++++++++++++-----------
 1 file changed, 102 insertions(+), 88 deletions(-)

diff --git a/client/src/components/Grid/GridList.vue b/client/src/components/Grid/GridList.vue
index eac89a1dae3..d0b3bae9f05 100644
--- a/client/src/components/Grid/GridList.vue
+++ b/client/src/components/Grid/GridList.vue
@@ -3,7 +3,7 @@ import { library } from "@fortawesome/fontawesome-svg-core";
 import { faCaretDown, faCaretUp, faShieldAlt } from "@fortawesome/free-solid-svg-icons";
 import { FontAwesomeIcon } from "@fortawesome/vue-fontawesome";
 import { useDebounceFn, useEventBus } from "@vueuse/core";
-import { BAlert, BButton, BFormCheckbox, BPagination } from "bootstrap-vue";
+import { BAlert, BButton, BFormCheckbox, BOverlay, BPagination } from "bootstrap-vue";
 import { computed, onMounted, onUnmounted, ref, watch } from "vue";
 import { useRouter } from "vue-router/composables";
 
@@ -64,11 +64,12 @@ const selectedIndeterminate = computed(() => ![0, gridData.value.length].include
 const currentPage = ref(1);
 const totalRows = ref(0);
 
-// loading indicator
-const loading = ref(true);
+// loading indicators
+const initDataLoading = ref(true);
+const resultsLoading = ref(false);
 
-// check if loading has completed and data rows are available
-const isAvailable = computed(() => !loading.value && totalRows.value > 0);
+// check if `initDataLoading` has completed and data rows are available
+const isAvailable = computed(() => !initDataLoading.value && totalRows.value > 0);
 
 // sort references
 const sortBy = ref(props.gridConfig ? props.gridConfig.sortBy : "");
@@ -112,11 +113,13 @@ function displayInitialMessage() {
  * Request grid data
  */
 async function getGridData() {
+    resultsLoading.value = true;
     selected.value = new Set();
     if (props.gridConfig) {
         if (Object.keys(invalidFilters.value).length > 0) {
             // there are invalid filters, so we don't want to search
-            loading.value = false;
+            initDataLoading.value = false;
+            resultsLoading.value = false;
             return;
         }
         try {
@@ -131,10 +134,11 @@ async function getGridData() {
             gridData.value = responseData;
             totalRows.value = responseTotal;
             errorMessage.value = "";
-            loading.value = false;
         } catch (e) {
             errorMessage.value = `Failed to obtain grid data: ${e}`;
-            loading.value = false;
+        } finally {
+            initDataLoading.value = false;
+            resultsLoading.value = false;
         }
     }
 }
@@ -229,7 +233,7 @@ function validatedFilterText() {
  */
 onMounted(() => {
     if (props.usernameSearch) {
-        filterText.value = filterClass.setFilterValue(filterText.value, "user", props.usernameSearch);
+        filterText.value = filterClass.setFilterValue(filterText.value, "user", `'${props.usernameSearch}'`);
     }
     getGridData();
     eventBus.on(onRouterPush);
@@ -282,11 +286,11 @@ watch(operationMessage, () => {
                 :placeholder="`search ${gridConfig.plural.toLowerCase()}`"
                 :filter-class="filterClass"
                 :filter-text.sync="filterText"
-                :loading="loading"
+                :loading="initDataLoading || resultsLoading"
                 :show-advanced.sync="showAdvanced" />
             <hr v-if="showAdvanced" />
         </div>
-        <LoadingSpan v-if="loading" />
+        <LoadingSpan v-if="initDataLoading" />
         <span v-else-if="!isAvailable || Object.keys(invalidFilters).length > 0" variant="info" show>
             <BAlert v-if="Object.keys(invalidFilters).length === 0" variant="info" show>
                 <span v-if="filterText">
@@ -308,83 +312,93 @@ watch(operationMessage, () => {
                 </a>
             </BAlert>
         </span>
-        <table v-else class="grid-table">
-            <thead>
-                <th v-if="!!gridConfig.batch">
-                    <BFormCheckbox
-                        class="m-2"
-                        :checked="selectedAll"
-                        :indeterminate="selectedIndeterminate"
-                        @change="onSelectAll" />
-                </th>
-                <th
-                    v-for="(fieldEntry, fieldIndex) in gridConfig.fields"
-                    :key="fieldIndex"
-                    class="text-nowrap px-2"
-                    :data-description="`grid header ${fieldIndex}`">
-                    <span v-if="gridConfig.sortKeys.includes(fieldEntry.key)">
-                        <BButton
-                            variant="link"
-                            class="text-nowrap font-weight-bold"
-                            :data-description="`grid sort key ${fieldEntry.key}`"
-                            @click="onSort(fieldEntry.key)">
-                            <span>{{ fieldEntry.title || fieldEntry.key }}</span>
-                            <span v-if="sortBy === fieldEntry.key">
-                                <FontAwesomeIcon v-if="sortDesc" icon="caret-down" data-description="grid sort desc" />
-                                <FontAwesomeIcon v-else icon="caret-up" data-description="grid sort asc" />
-                            </span>
-                        </BButton>
-                    </span>
-                    <span v-else>{{ fieldEntry.title || fieldEntry.key }}</span>
-                </th>
-            </thead>
-            <tr v-for="(rowData, rowIndex) in gridData" :key="rowIndex" :class="{ 'grid-dark-row': rowIndex % 2 }">
-                <td v-if="!!gridConfig.batch">
-                    <BFormCheckbox
-                        :checked="selected.has(rowData)"
-                        class="m-2 cursor-pointer"
-                        data-description="grid selected"
-                        @change="onSelect(rowData)" />
-                </td>
-                <td
-                    v-for="(fieldEntry, fieldIndex) in gridConfig.fields"
-                    :key="fieldIndex"
-                    class="px-2 py-3"
-                    :style="{ width: `${fieldEntry.width}%` }">
-                    <div
-                        v-if="!fieldEntry.condition || fieldEntry.condition(rowData)"
-                        :data-description="`grid cell ${rowIndex}-${fieldIndex}`">
-                        <GridOperations
-                            v-if="fieldEntry.type == 'operations' && fieldEntry.operations"
-                            :operations="fieldEntry.operations"
-                            :row-data="rowData"
-                            :title="rowData[fieldEntry.key]"
-                            @execute="onOperation($event, rowData)" />
-                        <GridBoolean v-else-if="fieldEntry.type == 'boolean'" :value="rowData[fieldEntry.key]" />
-                        <GridDatasets v-else-if="fieldEntry.type == 'datasets'" :history-id="rowData[fieldEntry.key]" />
-                        <GridText v-else-if="fieldEntry.type == 'text'" :text="rowData[fieldEntry.key]" />
-                        <GridLink
-                            v-else-if="fieldEntry.type == 'link'"
-                            :text="rowData[fieldEntry.key]"
-                            @click="fieldEntry.handler && fieldEntry.handler(rowData)" />
-                        <SharingIndicators
-                            v-else-if="fieldEntry.type == 'sharing'"
-                            :object="rowData"
-                            @filter="onFilter($event)" />
-                        <UtcDate v-else-if="fieldEntry.type == 'date'" :date="rowData[fieldEntry.key]" mode="elapsed" />
-                        <StatelessTags
-                            v-else-if="fieldEntry.type == 'tags'"
-                            clickable
-                            :value="rowData[fieldEntry.key]"
-                            :disabled="fieldEntry.disabled"
-                            @input="onTagInput(rowData, $event, fieldEntry.handler)"
-                            @tag-click="applyFilter('tag', $event, true)" />
-                        <span v-else v-localize> Not available. </span>
-                    </div>
-                    <FontAwesomeIcon v-else icon="fa-shield-alt" />
-                </td>
-            </tr>
-        </table>
+        <BOverlay v-else :show="resultsLoading" rounded="sm">
+            <table class="grid-table">
+                <thead>
+                    <th v-if="!!gridConfig.batch">
+                        <BFormCheckbox
+                            class="m-2"
+                            :checked="selectedAll"
+                            :indeterminate="selectedIndeterminate"
+                            @change="onSelectAll" />
+                    </th>
+                    <th
+                        v-for="(fieldEntry, fieldIndex) in gridConfig.fields"
+                        :key="fieldIndex"
+                        class="text-nowrap px-2"
+                        :data-description="`grid header ${fieldIndex}`">
+                        <span v-if="gridConfig.sortKeys.includes(fieldEntry.key)">
+                            <BButton
+                                variant="link"
+                                class="text-nowrap font-weight-bold"
+                                :data-description="`grid sort key ${fieldEntry.key}`"
+                                @click="onSort(fieldEntry.key)">
+                                <span>{{ fieldEntry.title || fieldEntry.key }}</span>
+                                <span v-if="sortBy === fieldEntry.key">
+                                    <FontAwesomeIcon
+                                        v-if="sortDesc"
+                                        icon="caret-down"
+                                        data-description="grid sort desc" />
+                                    <FontAwesomeIcon v-else icon="caret-up" data-description="grid sort asc" />
+                                </span>
+                            </BButton>
+                        </span>
+                        <span v-else>{{ fieldEntry.title || fieldEntry.key }}</span>
+                    </th>
+                </thead>
+                <tr v-for="(rowData, rowIndex) in gridData" :key="rowIndex" :class="{ 'grid-dark-row': rowIndex % 2 }">
+                    <td v-if="!!gridConfig.batch">
+                        <BFormCheckbox
+                            :checked="selected.has(rowData)"
+                            class="m-2 cursor-pointer"
+                            data-description="grid selected"
+                            @change="onSelect(rowData)" />
+                    </td>
+                    <td
+                        v-for="(fieldEntry, fieldIndex) in gridConfig.fields"
+                        :key="fieldIndex"
+                        class="px-2 py-3"
+                        :style="{ width: `${fieldEntry.width}%` }">
+                        <div
+                            v-if="!fieldEntry.condition || fieldEntry.condition(rowData)"
+                            :data-description="`grid cell ${rowIndex}-${fieldIndex}`">
+                            <GridOperations
+                                v-if="fieldEntry.type == 'operations' && fieldEntry.operations"
+                                :operations="fieldEntry.operations"
+                                :row-data="rowData"
+                                :title="rowData[fieldEntry.key]"
+                                @execute="onOperation($event, rowData)" />
+                            <GridBoolean v-else-if="fieldEntry.type == 'boolean'" :value="rowData[fieldEntry.key]" />
+                            <GridDatasets
+                                v-else-if="fieldEntry.type == 'datasets'"
+                                :history-id="rowData[fieldEntry.key]" />
+                            <GridText v-else-if="fieldEntry.type == 'text'" :text="rowData[fieldEntry.key]" />
+                            <GridLink
+                                v-else-if="fieldEntry.type == 'link'"
+                                :text="rowData[fieldEntry.key]"
+                                @click="fieldEntry.handler && fieldEntry.handler(rowData)" />
+                            <SharingIndicators
+                                v-else-if="fieldEntry.type == 'sharing'"
+                                :object="rowData"
+                                @filter="onFilter($event)" />
+                            <UtcDate
+                                v-else-if="fieldEntry.type == 'date'"
+                                :date="rowData[fieldEntry.key]"
+                                mode="elapsed" />
+                            <StatelessTags
+                                v-else-if="fieldEntry.type == 'tags'"
+                                clickable
+                                :value="rowData[fieldEntry.key]"
+                                :disabled="fieldEntry.disabled"
+                                @input="onTagInput(rowData, $event, fieldEntry.handler)"
+                                @tag-click="applyFilter('tag', $event, true)" />
+                            <span v-else v-localize> Not available. </span>
+                        </div>
+                        <FontAwesomeIcon v-else icon="fa-shield-alt" />
+                    </td>
+                </tr>
+            </table>
+        </BOverlay>
         <div class="flex-grow-1 h-100" />
         <div class="grid-footer">
             <div v-if="isAvailable" class="d-flex justify-content-between pt-3">

From d4e11206f39d74d71f83d5b4956b51ce5ee7193e Mon Sep 17 00:00:00 2001
From: Ahmed Awan <qe66653@umbc.edu>
Date: Fri, 15 Mar 2024 15:23:05 -0500
Subject: [PATCH 16/20] add alias `WorkflowFilters` like 'u`: `username`, `n`:
 `name` etc.

---
 client/src/components/Grid/GridList.vue           | 7 ++++---
 client/src/components/Workflow/WorkflowCard.vue   | 5 ++++-
 client/src/components/Workflow/WorkflowFilters.js | 4 ++++
 client/src/components/Workflow/WorkflowList.vue   | 7 ++++---
 4 files changed, 16 insertions(+), 7 deletions(-)

diff --git a/client/src/components/Grid/GridList.vue b/client/src/components/Grid/GridList.vue
index d0b3bae9f05..42ce5ca1e9c 100644
--- a/client/src/components/Grid/GridList.vue
+++ b/client/src/components/Grid/GridList.vue
@@ -82,6 +82,7 @@ const filterClass = props.gridConfig.filtering;
 const rawFilters = computed(() => Object.fromEntries(filterClass.getFiltersForText(filterText.value, true, false)));
 const validFilters = computed(() => filterClass.getValidFilters(rawFilters.value, true).validFilters);
 const invalidFilters = computed(() => filterClass.getValidFilters(rawFilters.value, true).invalidFilters);
+const hasInvalidFilters = computed(() => Object.keys(invalidFilters.value).length > 0);
 
 // hide message helper
 const hideMessage = useDebounceFn(() => {
@@ -116,7 +117,7 @@ async function getGridData() {
     resultsLoading.value = true;
     selected.value = new Set();
     if (props.gridConfig) {
-        if (Object.keys(invalidFilters.value).length > 0) {
+        if (hasInvalidFilters.value) {
             // there are invalid filters, so we don't want to search
             initDataLoading.value = false;
             resultsLoading.value = false;
@@ -291,8 +292,8 @@ watch(operationMessage, () => {
             <hr v-if="showAdvanced" />
         </div>
         <LoadingSpan v-if="initDataLoading" />
-        <span v-else-if="!isAvailable || Object.keys(invalidFilters).length > 0" variant="info" show>
-            <BAlert v-if="Object.keys(invalidFilters).length === 0" variant="info" show>
+        <span v-else-if="!isAvailable || hasInvalidFilters" variant="info" show>
+            <BAlert v-if="!hasInvalidFilters" variant="info" show>
                 <span v-if="filterText">
                     <span v-localize>Nothing found with:</span>
                     <b>{{ filterText }}</b>
diff --git a/client/src/components/Workflow/WorkflowCard.vue b/client/src/components/Workflow/WorkflowCard.vue
index b7fda777e07..818fb184451 100644
--- a/client/src/components/Workflow/WorkflowCard.vue
+++ b/client/src/components/Workflow/WorkflowCard.vue
@@ -125,7 +125,10 @@ async function onTagClick(tag: string) {
                 'workflow-shared': workflow.published,
             }">
             <div class="workflow-card-header">
-                <WorkflowIndicators :workflow="workflow" :published-view="publishedView" @update-filter="(k, v) => emit('update-filter', k, v)" />
+                <WorkflowIndicators
+                    :workflow="workflow"
+                    :published-view="publishedView"
+                    @update-filter="(k, v) => emit('update-filter', k, v)" />
 
                 <div class="workflow-count-actions">
                     <WorkflowInvocationsCount v-if="!isAnonymous && !shared" class="mx-1" :workflow="workflow" />
diff --git a/client/src/components/Workflow/WorkflowFilters.js b/client/src/components/Workflow/WorkflowFilters.js
index 509e9f4cfc9..1c184ff0d4c 100644
--- a/client/src/components/Workflow/WorkflowFilters.js
+++ b/client/src/components/Workflow/WorkflowFilters.js
@@ -74,12 +74,14 @@ export function helpHtml(activeList = "my") {
 export function WorkflowFilters(activeList = "my") {
     const commonFilters = {
         name: { placeholder: "name", type: String, handler: contains("name"), menuItem: true },
+        n: { handler: contains("n"), menuItem: false },
         tag: {
             placeholder: "tag(s)",
             type: "MultiTags",
             handler: contains("tag", "tag", expandNameTag),
             menuItem: true,
         },
+        t: { type: "MultiTags", handler: contains("t", "t", expandNameTag), menuItem: false },
     };
 
     if (activeList === "my") {
@@ -129,6 +131,7 @@ export function WorkflowFilters(activeList = "my") {
                     handler: contains("user"),
                     menuItem: true,
                 },
+                u: { handler: contains("u"), menuItem: false },
                 published: {
                     placeholder: "Filter on published workflows",
                     type: Boolean,
@@ -151,6 +154,7 @@ export function WorkflowFilters(activeList = "my") {
                     handler: contains("user"),
                     menuItem: true,
                 },
+                u: { handler: contains("u"), menuItem: false },
                 shared_with_me: {
                     placeholder: "Filter on workflows shared with me",
                     type: Boolean,
diff --git a/client/src/components/Workflow/WorkflowList.vue b/client/src/components/Workflow/WorkflowList.vue
index 9d8abcc2f7e..85b93caeb86 100644
--- a/client/src/components/Workflow/WorkflowList.vue
+++ b/client/src/components/Workflow/WorkflowList.vue
@@ -78,6 +78,7 @@ const rawFilters = computed(() =>
 );
 const validFilters = computed(() => workflowFilters.value.getValidFilters(rawFilters.value, true).validFilters);
 const invalidFilters = computed(() => workflowFilters.value.getValidFilters(rawFilters.value, true).invalidFilters);
+const hasInvalidFilters = computed(() => Object.keys(invalidFilters.value).length > 0);
 
 function updateFilterValue(filterKey: string, newValue: any) {
     const currentFilterText = filterText.value;
@@ -97,7 +98,7 @@ async function load(overlayLoading = false, silent = false) {
         }
     }
     let search;
-    if (Object.keys(invalidFilters.value).length === 0) {
+    if (!hasInvalidFilters.value) {
         search = validatedFilterText();
 
         // append default backend query filters for provided `props.activeList`
@@ -260,8 +261,8 @@ onMounted(() => {
         </BAlert>
 
         <!-- There are either `noResults` or `invalidFilters` -->
-        <span v-else-if="!loading && !overlay && (noResults || Object.keys(invalidFilters).length > 0)">
-            <BAlert v-if="Object.keys(invalidFilters).length === 0" id="no-workflow-found" variant="info" show>
+        <span v-else-if="!loading && !overlay && (noResults || hasInvalidFilters)">
+            <BAlert v-if="!hasInvalidFilters" id="no-workflow-found" variant="info" show>
                 No workflows found matching: <span class="font-weight-bold">{{ filterText }}</span>
             </BAlert>
 

From b58d195386ecddd5bbfbb432d9347ac6a764de9c Mon Sep 17 00:00:00 2001
From: Ahmed Awan <qe66653@umbc.edu>
Date: Fri, 15 Mar 2024 16:11:02 -0500
Subject: [PATCH 17/20] change published button to filter toggle instead of
 link to published

---
 .../src/components/Workflow/WorkflowIndicators.vue | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/client/src/components/Workflow/WorkflowIndicators.vue b/client/src/components/Workflow/WorkflowIndicators.vue
index 225295b9139..aa80aa132aa 100644
--- a/client/src/components/Workflow/WorkflowIndicators.vue
+++ b/client/src/components/Workflow/WorkflowIndicators.vue
@@ -86,18 +86,18 @@ function onViewUserPublished() {
     <div>
         <BButton
             v-if="workflow.published && !publishedView"
-            v-b-tooltip.noninteractive
+            v-b-tooltip.noninteractive.hover
             size="sm"
             class="workflow-published-icon inline-icon-button"
-            to="/workflows/list_published"
-            title="Published workflow. Click to view all published workflows">
+            title="Published workflow. Click to filter published workflows"
+            @click="emit('update-filter', 'published', true)">
             <FontAwesomeIcon :icon="faGlobe" fixed-width />
         </BButton>
         <FontAwesomeIcon v-else-if="workflow.published" :icon="faGlobe" fixed-width size="sm" />
 
         <BButton
             v-if="sourceType.includes('trs')"
-            v-b-tooltip.noninteractive
+            v-b-tooltip.noninteractive.hover
             size="sm"
             class="workflow-trs-icon inline-icon-button"
             :title="sourceTitle">
@@ -106,7 +106,7 @@ function onViewUserPublished() {
 
         <BButton
             v-if="sourceType == 'url'"
-            v-b-tooltip.noninteractive
+            v-b-tooltip.noninteractive.hover
             size="sm"
             class="workflow-external-link inline-icon-button"
             :title="sourceTitle">
@@ -122,7 +122,7 @@ function onViewUserPublished() {
 
         <BBadge
             v-if="shared && !publishedView"
-            v-b-tooltip.noninteractive
+            v-b-tooltip.noninteractive.hover
             class="outline-badge cursor-pointer mx-1"
             :title="`'${workflow.owner}' shared this workflow with you. Click to view all workflows shared with you by '${workflow.owner}'`"
             @click="onViewMySharedByUser">
@@ -132,7 +132,7 @@ function onViewUserPublished() {
 
         <BBadge
             v-if="publishedView"
-            v-b-tooltip.noninteractive
+            v-b-tooltip.noninteractive.hover
             class="outline-badge cursor-pointer mx-1"
             :title="publishedTitle"
             @click="onViewUserPublished">

From 8df4a5f28e47110098190e4d3bc5378c181353c9 Mon Sep 17 00:00:00 2001
From: Ahmed Awan <qe66653@umbc.edu>
Date: Fri, 15 Mar 2024 16:23:48 -0500
Subject: [PATCH 18/20] remove underline from `PanelViewMenu` advanced section

Not related to changes in this PR.
---
 client/src/components/Panels/Menus/PanelViewMenu.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/client/src/components/Panels/Menus/PanelViewMenu.vue b/client/src/components/Panels/Menus/PanelViewMenu.vue
index 135abdde4e9..c6f7ba224b1 100644
--- a/client/src/components/Panels/Menus/PanelViewMenu.vue
+++ b/client/src/components/Panels/Menus/PanelViewMenu.vue
@@ -2,7 +2,7 @@
     <b-button
         v-if="showAdvanced"
         variant="link"
-        class="w-100"
+        class="w-100 text-decoration-none"
         size="sm"
         @click="$emit('update:show-advanced', !showAdvanced)">
         <slot name="panel-view-selector"></slot><span class="sr-only">Close advanced tool search menu</span>

From 7eb3cc90591d82a1b3ee071c0c2bcbf798da5cff Mon Sep 17 00:00:00 2001
From: Ahmed Awan <qe66653@umbc.edu>
Date: Mon, 18 Mar 2024 14:44:02 -0500
Subject: [PATCH 19/20] allow exact query search (surrounded by quotes) in
 grids

Users can bypass the client filtering by surrounding their raw search query by quotes and sending the unprocessed filter to the backend.
---
 client/src/components/Grid/GridList.vue       | 19 +++++++++++++---
 .../src/components/Workflow/WorkflowList.vue  | 22 +++++++++++++++----
 test/integration_selenium/test_trs_import.py  |  3 ++-
 3 files changed, 36 insertions(+), 8 deletions(-)

diff --git a/client/src/components/Grid/GridList.vue b/client/src/components/Grid/GridList.vue
index 42ce5ca1e9c..8c73ba0e5d4 100644
--- a/client/src/components/Grid/GridList.vue
+++ b/client/src/components/Grid/GridList.vue
@@ -82,7 +82,8 @@ const filterClass = props.gridConfig.filtering;
 const rawFilters = computed(() => Object.fromEntries(filterClass.getFiltersForText(filterText.value, true, false)));
 const validFilters = computed(() => filterClass.getValidFilters(rawFilters.value, true).validFilters);
 const invalidFilters = computed(() => filterClass.getValidFilters(rawFilters.value, true).invalidFilters);
-const hasInvalidFilters = computed(() => Object.keys(invalidFilters.value).length > 0);
+const isSurroundedByQuotes = computed(() => /^["'].*["']$/.test(filterText.value));
+const hasInvalidFilters = computed(() => !isSurroundedByQuotes.value && Object.keys(invalidFilters.value).length > 0);
 
 // hide message helper
 const hideMessage = useDebounceFn(() => {
@@ -221,8 +222,11 @@ function onSelectAll(current: boolean): void {
  * A valid filter/query for the backend
  */
 function validatedFilterText() {
-    // there are no filters derived from the `filterText`; return the `filterText` as is
-    if (Object.keys(rawFilters.value).length === 0) {
+    if (isSurroundedByQuotes.value) {
+        // the filterText is surrounded by quotes, remove them
+        return filterText.value.slice(1, -1);
+    } else if (Object.keys(rawFilters.value).length === 0) {
+        // there are no filters derived from the `filterText`
         return filterText.value;
     }
     // there are valid filters derived from the `filterText`
@@ -311,6 +315,15 @@ watch(operationMessage, () => {
                 <a href="javascript:void(0)" class="ui-link" @click="filterText = validatedFilterText()">
                     Remove invalid filters from query
                 </a>
+                or
+                <a
+                    v-b-tooltip.noninteractive.hover
+                    title="Note that this might produce inaccurate results"
+                    href="javascript:void(0)"
+                    class="ui-link"
+                    @click="filterText = `'${filterText}'`">
+                    Match the exact query provided
+                </a>
             </BAlert>
         </span>
         <BOverlay v-else :show="resultsLoading" rounded="sm">
diff --git a/client/src/components/Workflow/WorkflowList.vue b/client/src/components/Workflow/WorkflowList.vue
index 85b93caeb86..45a1b9dee14 100644
--- a/client/src/components/Workflow/WorkflowList.vue
+++ b/client/src/components/Workflow/WorkflowList.vue
@@ -57,7 +57,7 @@ const searchPlaceHolder = computed(() => {
         placeHolder = "Search workflows shared with me";
     }
 
-    placeHolder += " by name or use the advanced filtering options";
+    placeHolder += " by query or use the advanced filtering options";
 
     return placeHolder;
 });
@@ -72,13 +72,15 @@ const sortBy = computed(() => (listHeader.value && listHeader.value.sortBy) || "
 const noItems = computed(() => !loading.value && workflowsLoaded.value.length === 0 && !filterText.value);
 const noResults = computed(() => !loading.value && workflowsLoaded.value.length === 0 && filterText.value);
 
+// Filtering computed refs
 const workflowFilters = computed(() => WorkflowFilters(props.activeList));
 const rawFilters = computed(() =>
     Object.fromEntries(workflowFilters.value.getFiltersForText(filterText.value, true, false))
 );
 const validFilters = computed(() => workflowFilters.value.getValidFilters(rawFilters.value, true).validFilters);
 const invalidFilters = computed(() => workflowFilters.value.getValidFilters(rawFilters.value, true).invalidFilters);
-const hasInvalidFilters = computed(() => Object.keys(invalidFilters.value).length > 0);
+const isSurroundedByQuotes = computed(() => /^["'].*["']$/.test(filterText.value));
+const hasInvalidFilters = computed(() => !isSurroundedByQuotes.value && Object.keys(invalidFilters.value).length > 0);
 
 function updateFilterValue(filterKey: string, newValue: any) {
     const currentFilterText = filterText.value;
@@ -155,8 +157,11 @@ async function onPageChange(page: number) {
 }
 
 function validatedFilterText() {
-    // there are no filters derived from the `filterText`
-    if (Object.keys(rawFilters.value).length === 0) {
+    if (isSurroundedByQuotes.value) {
+        // the `filterText` is surrounded by quotes, remove them
+        return filterText.value.slice(1, -1);
+    } else if (Object.keys(rawFilters.value).length === 0) {
+        // there are no filters derived from the `filterText`
         return filterText.value;
     }
     // there are valid filters derived from the `filterText`
@@ -277,6 +282,15 @@ onMounted(() => {
                 <a href="javascript:void(0)" class="ui-link" @click="filterText = validatedFilterText()">
                     Remove invalid filters from query
                 </a>
+                or
+                <a
+                    v-b-tooltip.noninteractive.hover
+                    title="Note that this might produce inaccurate results"
+                    href="javascript:void(0)"
+                    class="ui-link"
+                    @click="filterText = `'${filterText}'`">
+                    Match the exact query provided
+                </a>
             </BAlert>
         </span>
 
diff --git a/test/integration_selenium/test_trs_import.py b/test/integration_selenium/test_trs_import.py
index 7d6f4395227..d6031a80537 100644
--- a/test/integration_selenium/test_trs_import.py
+++ b/test/integration_selenium/test_trs_import.py
@@ -49,7 +49,8 @@ class TestTrsImport(SeleniumIntegrationTestCase):
         return cls.temp_config_dir("trs")
 
     def assert_workflow_imported(self, name):
-        self.workflow_index_search_for(name)
+        # surround name with quotes to consider case where name contains colons
+        self.workflow_index_search_for(f'"{name}"')
         assert len(self.workflow_card_elements()) == 1, f"workflow ${name} not imported"
 
     def test_import_workflow_by_url_dockstore(self):

From be59728585fd12bfd46eba6b2d165a15eec91fca Mon Sep 17 00:00:00 2001
From: Ahmed Awan <qe66653@umbc.edu>
Date: Mon, 18 Mar 2024 14:52:27 -0500
Subject: [PATCH 20/20] add tooltip text to published icons in published
 Workflow grid

---
 client/src/components/Workflow/WorkflowIndicators.vue | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/client/src/components/Workflow/WorkflowIndicators.vue b/client/src/components/Workflow/WorkflowIndicators.vue
index aa80aa132aa..17689296b10 100644
--- a/client/src/components/Workflow/WorkflowIndicators.vue
+++ b/client/src/components/Workflow/WorkflowIndicators.vue
@@ -93,7 +93,13 @@ function onViewUserPublished() {
             @click="emit('update-filter', 'published', true)">
             <FontAwesomeIcon :icon="faGlobe" fixed-width />
         </BButton>
-        <FontAwesomeIcon v-else-if="workflow.published" :icon="faGlobe" fixed-width size="sm" />
+        <FontAwesomeIcon
+            v-else-if="workflow.published"
+            v-b-tooltip.noninteractive.hover
+            title="Published workflow"
+            :icon="faGlobe"
+            fixed-width
+            size="sm" />
 
         <BButton
             v-if="sourceType.includes('trs')"