Merge pull request galaxyproject#21305 from mvdbeek/merge_25_1_dev_17_11

Merge 25.1 into dev

Author: mvdbeek

.github/workflows/publish_artifacts.yaml

@@ -53,5 +53,3 @@ jobs:
         if: "!github.event.release.prerelease"
         run: npm publish --provenance --access public
         working-directory: 'client'
-        env:
-          NODE_AUTH_TOKEN: ${{ secrets.NPM_TOKEN }}

client/src/components/History/CurrentHistory/HistoryPanel.vue

@@ -13,7 +13,6 @@ import { useHistoryStore } from "@/stores/historyStore";
 import { useUserStore } from "@/stores/userStore";
 import { type Alias, getOperatorForAlias } from "@/utils/filtering";
 import { setItemDragstart } from "@/utils/setDrag";
-import { startWatchingHistory } from "@/watch/watchHistoryProvided";
 
 import { useHistoryDragDrop } from "../../../composables/historyDragDrop";
 
@@ -329,7 +328,7 @@ function updateContentStats() {
 }
 
 function reloadContents() {
-    startWatchingHistory();
+    historyStore.startWatchingHistory();
 }
 
 function setInvisible(item: HistoryItemSummary) {

client/src/components/RuleCollectionBuilder.vue

@@ -608,6 +608,7 @@
 import HotTable from "@handsontable/vue";
 import axios from "axios";
 import BootstrapVue from "bootstrap-vue";
+import { mapActions } from "pinia";
 import _ from "underscore";
 import Vue from "vue";
 
@@ -619,7 +620,6 @@ import { getAppRoot } from "@/onload/loadConfig";
 import { useHistoryStore } from "@/stores/historyStore";
 import _l from "@/utils/localization";
 import { errorMessageAsString } from "@/utils/simple-error";
-import { startWatchingHistory } from "@/watch/watchHistoryProvided";
 
 import GButton from "./BaseComponents/GButton.vue";
 import ColumnSelector from "@/components/RuleBuilder/ColumnSelector.vue";
@@ -1327,6 +1327,7 @@ export default {
         }
     },
     methods: {
+        ...mapActions(useHistoryStore, ["startWatchingHistory"]),
         restoreRules(event) {
             const json = JSON.parse(event);
             this.rules = json.rules;
@@ -1445,7 +1446,7 @@ export default {
             this.mapping.splice(index, 1);
         },
         refreshAndWait(response) {
-            startWatchingHistory();
+            this.startWatchingHistory();
             this.waitOnJob(response);
         },
         waitOnJob(response) {
@@ -1461,7 +1462,7 @@ export default {
                         "Unknown error encountered while running your upload job, this could be a server issue or a problem with the upload definition.";
                     this.doFullJobCheck(jobId);
                 } else {
-                    startWatchingHistory();
+                    this.startWatchingHistory();
                     this.$emit("onCreate", jobResponse.data);
                     if (this.oncreate) {
                         // legacy non-event handling

client/src/components/Tool/ToolForm.vue

@@ -121,7 +121,6 @@ import { useJobStore } from "@/stores/jobStore";
 import { useTourStore } from "@/stores/tourStore";
 import { useUserStore } from "@/stores/userStore";
 import { useUserToolsServiceCredentialsStore } from "@/stores/userToolsServiceCredentialsStore";
-import { startWatchingHistory } from "@/watch/watchHistoryProvided";
 
 import { getToolFormData, submitJob, updateToolFormData } from "./services";
 
@@ -309,6 +308,7 @@ export default {
     methods: {
         ...mapActions(useJobStore, ["saveLatestResponse"]),
         ...mapActions(useTourStore, ["setTour"]),
+        ...mapActions(useHistoryStore, ["startWatchingHistory"]),
         emailAllowed(config, user) {
             return config.server_mail_configured && !user.isAnonymous;
         },
@@ -426,7 +426,7 @@ export default {
                     this.submissionRequestFailed = false;
                     this.showExecuting = false;
                     let changeRoute = false;
-                    startWatchingHistory();
+                    this.startWatchingHistory();
                     if (jobResponse.produces_entry_points) {
                         this.showEntryPoints = true;
                         this.entryPoints = jobResponse.jobs;

client/src/components/Workflow/Invocation/InvocationScrollList.vue

@@ -123,7 +123,7 @@ function getInvocationBadges(invocation: WorkflowInvocation) {
                 :title-icon="{ icon: faSitemap }"
                 :title-n-lines="2"
                 title-size="text"
-                :update-time="invocation.create_time"
+                :update-time="invocation.update_time"
                 @title-click="workflowName(invocation.workflow_id)"
                 @click="() => cardClicked(invocation)">
                 <template v-slot:description>

client/src/components/Workflow/Run/WorkflowRunSuccess.vue

@@ -2,7 +2,7 @@
 import { computed, onMounted } from "vue";
 
 import type { WorkflowInvocation } from "@/api/invocations";
-import { startWatchingHistory } from "@/watch/watchHistoryProvided";
+import { useHistoryStore } from "@/stores/historyStore";
 
 import Webhook from "@/components/Common/Webhook.vue";
 import GridInvocation from "@/components/Grid/GridInvocation.vue";
@@ -13,8 +13,10 @@ const props = defineProps<{
     invocations: WorkflowInvocation[];
 }>();
 
+const historyStore = useHistoryStore();
+
 onMounted(() => {
-    startWatchingHistory();
+    historyStore.startWatchingHistory();
 });
 
 const targetHistories = computed(() =>

client/src/components/Workflow/WorkflowAnnotation.test.ts

@@ -165,7 +165,7 @@ describe("WorkflowAnnotation renders", () => {
         const { wrapper } = await mountWorkflowAnnotation("invocation");
 
         const timeInfo = wrapper.find(SELECTORS.TIME_INFO);
-        expect(timeInfo.text()).toContain("invoked");
+        expect(timeInfo.text()).toContain("updated");
         expect(timeInfo.find(SELECTORS.DATE).attributes("title")).toBe(INVOCATION_TIME);
     });
 });

client/src/components/Workflow/WorkflowAnnotation.vue

@@ -49,7 +49,7 @@ const workflowTags = computed(() => {
                 <i v-if="timeElapsed" data-description="workflow annotation time info">
                     <FontAwesomeIcon :icon="faClock" class="mr-1" />
                     <span v-localize>
-                        {{ props.invocationUpdateTime ? "invoked" : "edited" }}
+                        {{ props.invocationUpdateTime ? "updated" : "edited" }}
                     </span>
                     <UtcDate :date="timeElapsed" mode="elapsed" data-description="workflow annotation date" />
                 </i>

client/src/composables/keyedCache.test.ts

@@ -57,6 +57,25 @@ describe("useKeyedCache", () => {
         expect(fetchItem).not.toHaveBeenCalled();
     });
 
+    it("should not fetch if the stored item is 0 (or any falsy value)", async () => {
+        const id = "1";
+        const item = 0;
+
+        fetchItem.mockResolvedValue(item);
+
+        const { storedItems, getItemById, isLoadingItem } = useKeyedCache<number>(fetchItem);
+
+        storedItems.value[id] = item;
+
+        expect(isLoadingItem.value(id)).toBeFalsy();
+
+        getItemById.value(id);
+
+        expect(isLoadingItem.value(id)).toBeFalsy();
+        expect(storedItems.value[id]).toEqual(item);
+        expect(fetchItem).not.toHaveBeenCalled();
+    });
+
     it("should fetch the item regardless of whether it is already stored if shouldFetch returns true", async () => {
         const id = "1";
         const item = { id: id, name: "Item 1" };

client/src/composables/keyedCache.ts

@@ -27,7 +27,7 @@ type ShouldFetchHandler<T> = (item?: T) => boolean;
  * Returns true if the item is not defined.
  * @param item The item to check.
  */
-const fetchIfAbsent = <T>(item?: T) => !item;
+const fetchIfAbsent = <T>(item?: T) => item === undefined;
 
 /**
  * A composable that provides a simple key-value cache for items fetched from the server.