Display archived message only to the owner

galaxyproject · May 27, 2024 · e41293d · e41293d
1 parent 3bcc171
commit e41293d
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 4 deletions.
diff --git a/client/src/components/History/CurrentHistory/HistoryMessages.vue b/client/src/components/History/CurrentHistory/HistoryMessages.vue
@@ -5,13 +5,14 @@ import { FontAwesomeIcon } from "@fortawesome/vue-fontawesome";
 import { BAlert } from "bootstrap-vue";
 import { computed, ref } from "vue";
 
-import type { HistorySummary } from "@/api";
+import { type GenericUser, type HistorySummary, userOwnsHistory } from "@/api";
 import localize from "@/utils/localization";
 
 library.add(faArchive, faBurn, faTrash);
 
 interface Props {
     history: HistorySummary;
+    currentUser: GenericUser | null;
 }
 
 const props = defineProps<Props>();
@@ -21,10 +22,14 @@ const userOverQuota = ref(false);
 const hasMessages = computed(() => {
     return userOverQuota.value || props.history.deleted || props.history.archived;
 });
+
+const currentUserOwnsHistory = computed(() => {
+    return userOwnsHistory(props.currentUser, props.history);
+});
 </script>
 
 <template>
-    <div v-if="hasMessages" class="mx-3 mt-2">
+    <div v-if="hasMessages" class="mx-3 mt-2" data-description="history messages">
         <BAlert v-if="history.purged" :show="history.purged" variant="warning">
             <FontAwesomeIcon :icon="faBurn" fixed-width />
             {{ localize("History has been purged") }}
@@ -34,7 +39,7 @@ const hasMessages = computed(() => {
             {{ localize("History has been deleted") }}
         </BAlert>
 
-        <BAlert :show="history.archived" variant="warning">
+        <BAlert :show="history.archived && currentUserOwnsHistory" variant="warning">
             <FontAwesomeIcon :icon="faArchive" fixed-width />
             {{ localize("History has been archived") }}
         </BAlert>

diff --git a/client/src/components/History/CurrentHistory/HistoryPanel.vue b/client/src/components/History/CurrentHistory/HistoryPanel.vue
@@ -542,7 +542,7 @@ function setItemDragstart(
                         :summarized="isMultiViewItem"
                         @update:history="historyStore.updateHistory($event)" />
 
-                    <HistoryMessages :history="history" />
+                    <HistoryMessages :history="history" :current-user="currentUser" />
 
                     <HistoryCounter
                         :history="history"