From ee3c51037ab485eb0bf2c787b01828e717f26d5c Mon Sep 17 00:00:00 2001 From: John Chilton Date: Thu, 24 Aug 2023 11:15:56 -0400 Subject: [PATCH 1/3] 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 aed05893e829..4e4a0cbc7515 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."; } }); From 5ff83d81563ba841de705daf91503225eab9cb6b Mon Sep 17 00:00:00 2001 From: John Chilton Date: Mon, 28 Aug 2023 12:11:38 -0400 Subject: [PATCH 2/3] 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 0b5f9f41e902..111c9f98801c 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 Date: Fri, 15 Mar 2024 10:25:27 -0700 Subject: [PATCH 3/3] 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 111c9f98801c..d32b70ec4469 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(); }); });