From 02f08637b2f9a92ca6267fefc9ed4581b47ec254 Mon Sep 17 00:00:00 2001
From: John Chilton <jmchilton@gmail.com>
Date: Fri, 21 Feb 2025 11:14:08 -0500
Subject: [PATCH 01/28] More vue type error suppression.

---
 client/src/components/FilesDialog/FilesDialog.test.ts           | 2 +-
 .../History/Archiving/HistoryArchiveExportSelector.test.ts      | 2 +-
 .../components/History/Archiving/HistoryArchiveWizard.test.ts   | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/client/src/components/FilesDialog/FilesDialog.test.ts b/client/src/components/FilesDialog/FilesDialog.test.ts
index 8a04439e7f47..73c6c42908d6 100644
--- a/client/src/components/FilesDialog/FilesDialog.test.ts
+++ b/client/src/components/FilesDialog/FilesDialog.test.ts
@@ -107,7 +107,7 @@ const initComponent = async (props: { multiple: boolean; mode?: string }) => {
     );
 
     const testingPinia = createTestingPinia({ stubActions: false });
-    const wrapper = mount(FilesDialog, {
+    const wrapper = mount(FilesDialog as object, {
         localVue,
         propsData: { ...props, modalStatic: true },
         pinia: testingPinia,
diff --git a/client/src/components/History/Archiving/HistoryArchiveExportSelector.test.ts b/client/src/components/History/Archiving/HistoryArchiveExportSelector.test.ts
index 0ad5de646db3..6043683f3726 100644
--- a/client/src/components/History/Archiving/HistoryArchiveExportSelector.test.ts
+++ b/client/src/components/History/Archiving/HistoryArchiveExportSelector.test.ts
@@ -29,7 +29,7 @@ const ARCHIVE_HISTORY_BTN = "#archive-history-btn";
 const CONFIRM_DELETE_CHECKBOX = "[type='checkbox']";
 
 async function mountComponentWithHistory(history: HistorySummary) {
-    const wrapper = shallowMount(HistoryArchiveExportSelector, {
+    const wrapper = shallowMount(HistoryArchiveExportSelector as object, {
         propsData: { history },
         localVue,
         stubs: {
diff --git a/client/src/components/History/Archiving/HistoryArchiveWizard.test.ts b/client/src/components/History/Archiving/HistoryArchiveWizard.test.ts
index 2d1d05adc527..cf4c0c120fa0 100644
--- a/client/src/components/History/Archiving/HistoryArchiveWizard.test.ts
+++ b/client/src/components/History/Archiving/HistoryArchiveWizard.test.ts
@@ -45,7 +45,7 @@ async function mountComponentWithHistory(history?: HistorySummary) {
     // this is a work-around
     jest.spyOn(historyStore, "getHistoryById").mockImplementation((_history_id: string) => history as HistorySummary);
 
-    const wrapper = shallowMount(HistoryArchiveWizard, {
+    const wrapper = shallowMount(HistoryArchiveWizard as object, {
         propsData: { historyId: TEST_HISTORY_ID },
         localVue,
         pinia,

From 376c0e9cc6ce47b9279ad84d4870eb79eb52f337 Mon Sep 17 00:00:00 2001
From: John Chilton <jmchilton@gmail.com>
Date: Fri, 21 Feb 2025 11:21:46 -0500
Subject: [PATCH 02/28] Prod typing to believe in itself in GenericElement.

---
 .../components/History/Content/GenericElement.vue  | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

diff --git a/client/src/components/History/Content/GenericElement.vue b/client/src/components/History/Content/GenericElement.vue
index 8643be275e0e..eba50da36acf 100644
--- a/client/src/components/History/Content/GenericElement.vue
+++ b/client/src/components/History/Content/GenericElement.vue
@@ -1,23 +1,27 @@
 <script setup lang="ts">
 import { type PropType, ref, set } from "vue";
 
-import { type components } from "@/api/schema";
+import { type DCESummary, type DCObject } from "@/api";
 
 import ContentItem from "./ContentItem.vue";
 
 defineProps({
     dsc: {
-        type: Object as PropType<components["schemas"]["DCObject"]>,
+        type: Object as PropType<DCObject>,
         required: true,
     },
 });
 
-const expandCollections = ref({});
-const expandDatasets = ref({});
+const expandCollections = ref<Record<string, boolean>>({});
+const expandDatasets = ref<Record<string, boolean>>({});
 
 function toggle(expansionMap: Record<string, boolean>, itemId: string) {
     set(expansionMap, itemId, !expansionMap[itemId]);
 }
+
+function childObject(item: DCESummary): DCObject {
+    return item.object as DCObject;
+}
 </script>
 
 <template>
@@ -33,7 +37,7 @@ function toggle(expansionMap: Record<string, boolean>, itemId: string) {
                 @update:expand-dataset="toggle(expandDatasets, item.id)"
                 @view-collection="toggle(expandCollections, item.id)" />
             <div v-if="!!expandCollections[item.id]" class="mx-3">
-                <GenericElement :dsc="item.object" />
+                <GenericElement :dsc="childObject(item)" />
             </div>
         </div>
     </div>

From 6d0a7385223fb76510c95d4634bfa98680e00476 Mon Sep 17 00:00:00 2001
From: John Chilton <jmchilton@gmail.com>
Date: Fri, 21 Feb 2025 11:23:07 -0500
Subject: [PATCH 03/28] Minor type fixes in CollectionDetails.vue.

---
 .../History/CurrentCollection/CollectionDetails.vue           | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/client/src/components/History/CurrentCollection/CollectionDetails.vue b/client/src/components/History/CurrentCollection/CollectionDetails.vue
index 42f8f5182594..5cfc026b2d98 100644
--- a/client/src/components/History/CurrentCollection/CollectionDetails.vue
+++ b/client/src/components/History/CurrentCollection/CollectionDetails.vue
@@ -21,7 +21,7 @@ const jobState = computed(() => {
 
 <template>
     <DetailsLayout
-        :name="dsc.name"
+        :name="dsc.name ?? ''"
         :tags="dsc.tags"
         :writeable="writeable"
         :show-annotation="false"
@@ -33,7 +33,7 @@ const jobState = computed(() => {
             <CollectionDescription
                 :job-state-summary="jobState"
                 :collection-type="dsc.collection_type"
-                :element-count="dsc.element_count"
+                :element-count="dsc.element_count ?? undefined"
                 :elements-datatypes="dsc.elements_datatypes" />
         </template>
     </DetailsLayout>

From c1b9fc84d6cd138171d06f7d238bb923cacae8c0 Mon Sep 17 00:00:00 2001
From: John Chilton <jmchilton@gmail.com>
Date: Fri, 21 Feb 2025 11:51:19 -0500
Subject: [PATCH 04/28] More percise typing in collection components that only
 require a summary.

Fixes some vue-tsc errors.
---
 .../CurrentCollection/CollectionDetails.vue      |  4 ++--
 .../CurrentCollection/CollectionOperations.vue   |  4 ++--
 .../CurrentCollection/CollectionPanel.vue        | 16 +++++++++++-----
 3 files changed, 15 insertions(+), 9 deletions(-)

diff --git a/client/src/components/History/CurrentCollection/CollectionDetails.vue b/client/src/components/History/CurrentCollection/CollectionDetails.vue
index 5cfc026b2d98..7f7d7fe5d234 100644
--- a/client/src/components/History/CurrentCollection/CollectionDetails.vue
+++ b/client/src/components/History/CurrentCollection/CollectionDetails.vue
@@ -1,14 +1,14 @@
 <script setup lang="ts">
 import { computed } from "vue";
 
-import { type HDCADetailed } from "@/api";
+import { type HDCASummary } from "@/api";
 import { JobStateSummary } from "@/components/History/Content/Collection/JobStateSummary.js";
 
 import CollectionDescription from "@/components/History/Content/Collection/CollectionDescription.vue";
 import DetailsLayout from "@/components/History/Layout/DetailsLayout.vue";
 
 interface Props {
-    dsc: HDCADetailed;
+    dsc: HDCASummary;
     writeable: boolean;
 }
 
diff --git a/client/src/components/History/CurrentCollection/CollectionOperations.vue b/client/src/components/History/CurrentCollection/CollectionOperations.vue
index 144c35e468e1..5e8fceda8a7c 100644
--- a/client/src/components/History/CurrentCollection/CollectionOperations.vue
+++ b/client/src/components/History/CurrentCollection/CollectionOperations.vue
@@ -2,13 +2,13 @@
 import { computed } from "vue";
 import { useRouter } from "vue-router/composables";
 
-import { type HDCADetailed } from "@/api";
+import { type HDCASummary } from "@/api";
 import { getAppRoot } from "@/onload/loadConfig";
 
 const router = useRouter();
 
 const props = defineProps<{
-    dsc: HDCADetailed;
+    dsc: HDCASummary; // typescript recognizes HDCADetailed IS_A HDCASummary
 }>();
 
 const downloadUrl = computed(() => `${getAppRoot()}api/dataset_collections/${props.dsc.id}/download`);
diff --git a/client/src/components/History/CurrentCollection/CollectionPanel.vue b/client/src/components/History/CurrentCollection/CollectionPanel.vue
index 70d13794a002..6ba9afd93e55 100644
--- a/client/src/components/History/CurrentCollection/CollectionPanel.vue
+++ b/client/src/components/History/CurrentCollection/CollectionPanel.vue
@@ -3,8 +3,16 @@
 <script setup lang="ts">
 import { computed, ref, watch } from "vue";
 
-import type { CollectionEntry, DCESummary, HistorySummary, SubCollection } from "@/api";
-import { canMutateHistory, isCollectionElement, isHDCA } from "@/api";
+import {
+    canMutateHistory,
+    type CollectionEntry,
+    type DCESummary,
+    type HDCASummary,
+    type HistorySummary,
+    isCollectionElement,
+    isHDCA,
+    type SubCollection,
+} from "@/api";
 import ExpandedItems from "@/components/History/Content/ExpandedItems";
 import { updateContentFields } from "@/components/History/model/queries";
 import { useCollectionElementsStore } from "@/stores/collectionElementsStore";
@@ -44,9 +52,8 @@ const dsc = computed(() => {
     if (currentCollection === undefined) {
         throw new Error("No collection selected");
     }
-    return currentCollection;
+    return currentCollection as HDCASummary;
 });
-
 watch(
     () => [dsc.value, offset.value],
     () => {
@@ -71,7 +78,6 @@ const rootCollection = computed(() => {
 });
 const isRoot = computed(() => dsc.value == rootCollection.value);
 const canEdit = computed(() => isRoot.value && canMutateHistory(props.history));
-
 async function updateDsc(collection: CollectionEntry, fields: Object | undefined) {
     if (!isHDCA(collection)) {
         return;

From 1a5777b5944303bcd6dd77dc14889920792024ff Mon Sep 17 00:00:00 2001
From: John Chilton <jmchilton@gmail.com>
Date: Fri, 21 Feb 2025 12:01:25 -0500
Subject: [PATCH 05/28] Fix type errors around History preferred object store.

Looks serious - maybe should be backported.
---
 .../History/CurrentHistory/HistoryCounter.vue    | 16 ++++++++++++----
 .../CurrentHistory/PreferredStorePopover.vue     |  4 ++--
 2 files changed, 14 insertions(+), 6 deletions(-)

diff --git a/client/src/components/History/CurrentHistory/HistoryCounter.vue b/client/src/components/History/CurrentHistory/HistoryCounter.vue
index d317c94e7adf..898502ecf975 100644
--- a/client/src/components/History/CurrentHistory/HistoryCounter.vue
+++ b/client/src/components/History/CurrentHistory/HistoryCounter.vue
@@ -10,7 +10,7 @@ import prettyBytes from "pretty-bytes";
 import { computed, onMounted, ref, toRef } from "vue";
 import { useRouter } from "vue-router/composables";
 
-import { type HistorySummaryExtended, userOwnsHistory } from "@/api";
+import { type HistorySummaryExtended, type RegisteredUser, userOwnsHistory } from "@/api";
 import { HistoryFilters } from "@/components/History/HistoryFilters.js";
 import { useConfig } from "@/composables/config";
 import { useHistoryContentStats } from "@/composables/historyContentStats";
@@ -131,6 +131,13 @@ function onUpdatePreferredObjectStoreId(preferredObjectStoreId: string | null) {
     historyPreferredObjectStoreId.value = preferredObjectStoreId;
 }
 
+const registeredUser = computed<RegisteredUser>(() => {
+    if (isAnonymous.value) {
+        throw new Error("Invalid anonymous user object encountered");
+    }
+    return currentUser.value as RegisteredUser;
+});
+
 onMounted(() => {
     updateTime();
     // update every second
@@ -168,8 +175,8 @@ onMounted(() => {
             <PreferredStorePopover
                 v-if="config && config.object_store_allows_id_selection && !isAnonymous"
                 :history-id="history.id"
-                :history-preferred-object-store-id="historyPreferredObjectStoreId"
-                :user="currentUser">
+                :history-preferred-object-store-id="historyPreferredObjectStoreId ?? undefined"
+                :user="registeredUser">
             </PreferredStorePopover>
 
             <BButtonGroup>
@@ -233,7 +240,8 @@ onMounted(() => {
                 size="sm"
                 hide-footer>
                 <SelectPreferredStore
-                    :user-preferred-object-store-id="currentUser.preferred_object_store_id"
+                    v-if="!isAnonymous"
+                    :user-preferred-object-store-id="registeredUser.preferred_object_store_id ?? undefined"
                     :history="history"
                     @updated="onUpdatePreferredObjectStoreId" />
             </BModal>
diff --git a/client/src/components/History/CurrentHistory/PreferredStorePopover.vue b/client/src/components/History/CurrentHistory/PreferredStorePopover.vue
index 5dba88d7b62c..296ed4f6ddca 100644
--- a/client/src/components/History/CurrentHistory/PreferredStorePopover.vue
+++ b/client/src/components/History/CurrentHistory/PreferredStorePopover.vue
@@ -11,7 +11,7 @@ const { isOnlyPreference } = useStorageLocationConfiguration();
 interface Props {
     historyId: string;
     historyPreferredObjectStoreId?: string;
-    user: { preferred_object_store_id: string };
+    user: { preferred_object_store_id?: string | null };
 }
 
 const props = defineProps<Props>();
@@ -19,7 +19,7 @@ const props = defineProps<Props>();
 const preferredObjectStoreId = computed(() => {
     let id = props.historyPreferredObjectStoreId;
     if (!id) {
-        id = props.user.preferred_object_store_id;
+        id = props.user.preferred_object_store_id ?? undefined;
     }
     return id;
 });

From 54a66a067b10a7fba4c669824ce3b25f686b6d57 Mon Sep 17 00:00:00 2001
From: John Chilton <jmchilton@gmail.com>
Date: Fri, 21 Feb 2025 12:03:02 -0500
Subject: [PATCH 06/28] Allow username to be null in PublishedItem.vue...

... this is so a HistoryDetailed IS_A Item. This fixes a Vue TSC error.
---
 client/src/components/Common/PublishedItem.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/client/src/components/Common/PublishedItem.vue b/client/src/components/Common/PublishedItem.vue
index adea9ea102a2..6fe66459027c 100644
--- a/client/src/components/Common/PublishedItem.vue
+++ b/client/src/components/Common/PublishedItem.vue
@@ -10,7 +10,7 @@ interface Item {
     name: string;
     model_class?: string;
     owner?: string;
-    username?: string;
+    username?: string | null;
     email_hash?: string;
     author_deleted?: boolean;
     tags?: string[];

From a0e4cb90a7612293ff550b1f1b0fd73a5034748a Mon Sep 17 00:00:00 2001
From: John Chilton <jmchilton@gmail.com>
Date: Fri, 21 Feb 2025 12:08:59 -0500
Subject: [PATCH 07/28] Vue TSC error fix for JobDestinationParams.

---
 .../components/JobDestinationParams/JobDestinationParams.vue   | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/client/src/components/JobDestinationParams/JobDestinationParams.vue b/client/src/components/JobDestinationParams/JobDestinationParams.vue
index 1f2653bc7aa8..dcd0fa97ebf9 100644
--- a/client/src/components/JobDestinationParams/JobDestinationParams.vue
+++ b/client/src/components/JobDestinationParams/JobDestinationParams.vue
@@ -2,6 +2,7 @@
 import { storeToRefs } from "pinia";
 import { computed } from "vue";
 
+import { isAdminUser } from "@/api";
 import { useJobDestinationParametersStore } from "@/stores/jobDestinationParametersStore";
 import { useUserStore } from "@/stores/userStore";
 
@@ -20,7 +21,7 @@ const jobDestinationParams = computed(() => {
 </script>
 
 <template>
-    <div v-if="currentUser?.is_admin">
+    <div v-if="isAdminUser(currentUser)">
         <h2 class="h-md">Destination Parameters</h2>
         <table id="destination_parameters" class="tabletip info_data_table">
             <tbody>

From d275fe9338c9e72d754800e28a00a4e3ef25dffc Mon Sep 17 00:00:00 2001
From: John Chilton <jmchilton@gmail.com>
Date: Fri, 21 Feb 2025 12:09:38 -0500
Subject: [PATCH 08/28] Type error suppression for JobParameters.test.ts.

---
 client/src/components/JobParameters/JobParameters.test.ts | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/client/src/components/JobParameters/JobParameters.test.ts b/client/src/components/JobParameters/JobParameters.test.ts
index 72256723c463..fc8da0bc6b4c 100644
--- a/client/src/components/JobParameters/JobParameters.test.ts
+++ b/client/src/components/JobParameters/JobParameters.test.ts
@@ -42,7 +42,7 @@ describe("JobParameters/JobParameters.vue", () => {
             jobId: JOB_ID,
         };
 
-        const wrapper = mount(JobParameters, {
+        const wrapper = mount(JobParameters as object, {
             propsData,
             stubs: {
                 DatasetProvider: DatasetProvider,
@@ -92,7 +92,7 @@ describe("JobParameters/JobParameters.vue", () => {
         };
 
         const getSingleParam = async (propsData: { jobId: string; param: string }) => {
-            const wrapper = mount(JobParameters, {
+            const wrapper = mount(JobParameters as object, {
                 propsData,
                 stubs: {
                     DatasetProvider: DatasetProvider,

From 5c1cb5a5c318eebac37f711f0de0add7b79f70a0 Mon Sep 17 00:00:00 2001
From: John Chilton <jmchilton@gmail.com>
Date: Mon, 24 Feb 2025 11:02:46 -0500
Subject: [PATCH 09/28] Minor type fix for WorkflowLanding.vue.

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

diff --git a/client/src/components/Landing/WorkflowLanding.vue b/client/src/components/Landing/WorkflowLanding.vue
index 5b4d1b90b4c7..ddc99ad23e73 100644
--- a/client/src/components/Landing/WorkflowLanding.vue
+++ b/client/src/components/Landing/WorkflowLanding.vue
@@ -45,7 +45,7 @@ claimWorkflow(props.uuid, props.public, props.secret).then(() => {
             <WorkflowRun
                 :workflow-id="claimState.workflowId"
                 :prefer-simple-form="true"
-                :request-state="claimState.requestState"
+                :request-state="claimState.requestState ?? undefined"
                 :instance="claimState.instance" />
         </div>
     </div>

From 2097bd04b113978711520c3a593b010eb6d545cd Mon Sep 17 00:00:00 2001
From: John Chilton <jmchilton@gmail.com>
Date: Fri, 21 Feb 2025 12:11:06 -0500
Subject: [PATCH 10/28] Fix null handling in markdown components.

---
 client/src/components/Markdown/Elements/InstanceUrl.vue       | 4 ++--
 client/src/components/Markdown/Elements/ToolStd.vue           | 4 ++--
 .../components/Markdown/Elements/Workflow/WorkflowDisplay.vue | 2 +-
 .../components/Markdown/Elements/Workflow/WorkflowImage.vue   | 2 +-
 .../components/Markdown/Elements/Workflow/WorkflowLicense.vue | 2 +-
 5 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/client/src/components/Markdown/Elements/InstanceUrl.vue b/client/src/components/Markdown/Elements/InstanceUrl.vue
index a7f52d957354..d7acdece3dfa 100644
--- a/client/src/components/Markdown/Elements/InstanceUrl.vue
+++ b/client/src/components/Markdown/Elements/InstanceUrl.vue
@@ -11,8 +11,8 @@ interface InstanceUrlProps {
 }
 
 const props = withDefaults(defineProps<InstanceUrlProps>(), {
-    href: null,
-    title: null,
+    href: undefined,
+    title: undefined,
 });
 
 const effectiveTitle = computed(() => {
diff --git a/client/src/components/Markdown/Elements/ToolStd.vue b/client/src/components/Markdown/Elements/ToolStd.vue
index dc266416f53d..606186e8fcc7 100644
--- a/client/src/components/Markdown/Elements/ToolStd.vue
+++ b/client/src/components/Markdown/Elements/ToolStd.vue
@@ -14,8 +14,8 @@ interface ToolStdProps {
 }
 
 const props = withDefaults(defineProps<ToolStdProps>(), {
-    jobId: null,
-    implicitCollectionJobsId: null,
+    jobId: undefined,
+    implicitCollectionJobsId: undefined,
 });
 
 const jobStore = useJobStore();
diff --git a/client/src/components/Markdown/Elements/Workflow/WorkflowDisplay.vue b/client/src/components/Markdown/Elements/Workflow/WorkflowDisplay.vue
index 9a6db0d60771..e61fba44f71f 100644
--- a/client/src/components/Markdown/Elements/Workflow/WorkflowDisplay.vue
+++ b/client/src/components/Markdown/Elements/Workflow/WorkflowDisplay.vue
@@ -19,7 +19,7 @@ interface WorkflowDisplayProps {
 }
 
 const props = withDefaults(defineProps<WorkflowDisplayProps>(), {
-    workflowVersion: null,
+    workflowVersion: undefined,
     embedded: false,
     expanded: false,
 });
diff --git a/client/src/components/Markdown/Elements/Workflow/WorkflowImage.vue b/client/src/components/Markdown/Elements/Workflow/WorkflowImage.vue
index 6c8886cf8c4c..b379d320b6a1 100644
--- a/client/src/components/Markdown/Elements/Workflow/WorkflowImage.vue
+++ b/client/src/components/Markdown/Elements/Workflow/WorkflowImage.vue
@@ -11,7 +11,7 @@ interface WorkflowImageProps {
 
 const props = withDefaults(defineProps<WorkflowImageProps>(), {
     size: "lg",
-    workflowVersion: null,
+    workflowVersion: undefined,
 });
 
 const src = computed(() => {
diff --git a/client/src/components/Markdown/Elements/Workflow/WorkflowLicense.vue b/client/src/components/Markdown/Elements/Workflow/WorkflowLicense.vue
index a4b0f3dd46d0..796de30c9605 100644
--- a/client/src/components/Markdown/Elements/Workflow/WorkflowLicense.vue
+++ b/client/src/components/Markdown/Elements/Workflow/WorkflowLicense.vue
@@ -6,7 +6,7 @@ interface WorkflowLicenseProps {
 }
 
 const props = withDefaults(defineProps<WorkflowLicenseProps>(), {
-    licenseId: null,
+    licenseId: undefined,
 });
 </script>
 

From 1bff67b78a80d1b254a4be4813f710f7662bf60b Mon Sep 17 00:00:00 2001
From: John Chilton <jmchilton@gmail.com>
Date: Fri, 21 Feb 2025 12:19:26 -0500
Subject: [PATCH 11/28] Minor type fix for MarkdownSelector.

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

diff --git a/client/src/components/Markdown/MarkdownSelector.vue b/client/src/components/Markdown/MarkdownSelector.vue
index ffa9b35e3b1c..6897962d3e19 100644
--- a/client/src/components/Markdown/MarkdownSelector.vue
+++ b/client/src/components/Markdown/MarkdownSelector.vue
@@ -44,7 +44,7 @@ function onCancel() {
                 v-model="selectedValue"
                 class="ml-2"
                 :has-labels="hasLabels"
-                :label-title="labelTitle"
+                :label-title="labelTitle ?? ''"
                 :labels="labels" />
         </BModal>
     </span>

From f6f932744b67b8268a5cbbff292274f08343286f Mon Sep 17 00:00:00 2001
From: John Chilton <jmchilton@gmail.com>
Date: Fri, 21 Feb 2025 12:19:39 -0500
Subject: [PATCH 12/28] More type error suppression in various jest tests.

---
 .../components/Notifications/NotificationsList.test.ts    | 2 +-
 .../components/ObjectStore/ConfigurationMarkdown.test.ts  | 6 +++---
 .../components/ObjectStore/Instances/CreateForm.test.ts   | 6 +++---
 .../components/ObjectStore/Instances/UpgradeForm.test.ts  | 8 ++++----
 4 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/client/src/components/Notifications/NotificationsList.test.ts b/client/src/components/Notifications/NotificationsList.test.ts
index 7c8d54a91ecb..52779927cd3f 100644
--- a/client/src/components/Notifications/NotificationsList.test.ts
+++ b/client/src/components/Notifications/NotificationsList.test.ts
@@ -22,7 +22,7 @@ async function mountNotificationsList() {
     const notificationsStore = useNotificationsStore(pinia);
     notificationsStore.notifications = mergeObjectListsById(FAKE_NOTIFICATIONS, []);
 
-    const wrapper = mount(NotificationsList, {
+    const wrapper = mount(NotificationsList as object, {
         localVue,
         pinia,
         stubs: {
diff --git a/client/src/components/ObjectStore/ConfigurationMarkdown.test.ts b/client/src/components/ObjectStore/ConfigurationMarkdown.test.ts
index 926f96c871b9..d66817346dab 100644
--- a/client/src/components/ObjectStore/ConfigurationMarkdown.test.ts
+++ b/client/src/components/ObjectStore/ConfigurationMarkdown.test.ts
@@ -9,7 +9,7 @@ describe("ConfigurationMarkdown.vue", () => {
     let wrapper;
 
     it("should convert supplied configuration markup to markdown and display", () => {
-        wrapper = shallowMount(ConfigurationMarkdown, {
+        wrapper = shallowMount(ConfigurationMarkdown as object, {
             propsData: { markdown: "the *content*", admin: true },
             localVue,
         });
@@ -17,7 +17,7 @@ describe("ConfigurationMarkdown.vue", () => {
     });
 
     it("should allow HTML in configuration markup explicitly set by the admin", () => {
-        wrapper = shallowMount(ConfigurationMarkdown, {
+        wrapper = shallowMount(ConfigurationMarkdown as object, {
             propsData: { markdown: "the <b>content</b>", admin: true },
             localVue,
         });
@@ -25,7 +25,7 @@ describe("ConfigurationMarkdown.vue", () => {
     });
 
     it("should escape supplied HTML for non-admin sourced content", () => {
-        wrapper = shallowMount(ConfigurationMarkdown, {
+        wrapper = shallowMount(ConfigurationMarkdown as object, {
             propsData: { markdown: "the <b>content</b>", admin: false },
             localVue,
         });
diff --git a/client/src/components/ObjectStore/Instances/CreateForm.test.ts b/client/src/components/ObjectStore/Instances/CreateForm.test.ts
index 5fc871116ecb..fd7a46796c9f 100644
--- a/client/src/components/ObjectStore/Instances/CreateForm.test.ts
+++ b/client/src/components/ObjectStore/Instances/CreateForm.test.ts
@@ -84,7 +84,7 @@ const { server, http } = useServerMock();
 
 describe("CreateForm", () => {
     it("should render a form with admin markdown converted to HTML in help", async () => {
-        const wrapper = mount(CreateForm, {
+        const wrapper = mount(CreateForm as object, {
             propsData: {
                 template: STANDARD_TEMPLATE,
             },
@@ -102,7 +102,7 @@ describe("CreateForm", () => {
     });
 
     it("should post to create a new object store on submit", async () => {
-        const wrapper = mount(CreateForm, {
+        const wrapper = mount(CreateForm as object, {
             propsData: {
                 template: SIMPLE_TEMPLATE,
             },
@@ -129,7 +129,7 @@ describe("CreateForm", () => {
     });
 
     it("should indicate an error on failure", async () => {
-        const wrapper = mount(CreateForm, {
+        const wrapper = mount(CreateForm as object, {
             propsData: {
                 template: SIMPLE_TEMPLATE,
             },
diff --git a/client/src/components/ObjectStore/Instances/UpgradeForm.test.ts b/client/src/components/ObjectStore/Instances/UpgradeForm.test.ts
index eed6cf3bdf06..5ac96bf96142 100644
--- a/client/src/components/ObjectStore/Instances/UpgradeForm.test.ts
+++ b/client/src/components/ObjectStore/Instances/UpgradeForm.test.ts
@@ -71,7 +71,7 @@ const INSTANCE: UserConcreteObjectStore = {
 
 describe("UpgradeForm", () => {
     it("should render with old variable values re-filled in", async () => {
-        const wrapper = mount(UpgradeForm, {
+        const wrapper = mount(UpgradeForm as object, {
             propsData: {
                 latestTemplate: STANDARD_TEMPLATE,
                 instance: INSTANCE,
@@ -88,7 +88,7 @@ describe("UpgradeForm", () => {
     });
 
     it("should render with new variable values with empty values", async () => {
-        const wrapper = mount(UpgradeForm, {
+        const wrapper = mount(UpgradeForm as object, {
             propsData: {
                 latestTemplate: STANDARD_TEMPLATE,
                 instance: INSTANCE,
@@ -105,7 +105,7 @@ describe("UpgradeForm", () => {
     });
 
     it("should put to update on submit and return to index", async () => {
-        const wrapper = mount(UpgradeForm, {
+        const wrapper = mount(UpgradeForm as object, {
             propsData: {
                 latestTemplate: STANDARD_TEMPLATE,
                 instance: INSTANCE,
@@ -132,7 +132,7 @@ describe("UpgradeForm", () => {
     });
 
     it("should indicate an error on failure", async () => {
-        const wrapper = mount(UpgradeForm, {
+        const wrapper = mount(UpgradeForm as object, {
             propsData: {
                 latestTemplate: STANDARD_TEMPLATE,
                 instance: INSTANCE,

From 597b86e0008ca616d7f54cec3c7430720eb27310 Mon Sep 17 00:00:00 2001
From: John Chilton <jmchilton@gmail.com>
Date: Fri, 21 Feb 2025 15:20:10 -0500
Subject: [PATCH 13/28] Fix vue-tsc error in ToolBox.vue.

Build an client-side object closer to what is generated in Python so the types align.
---
 client/src/components/Panels/ToolBox.vue | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/client/src/components/Panels/ToolBox.vue b/client/src/components/Panels/ToolBox.vue
index d34f8ee6f501..f9b926126948 100644
--- a/client/src/components/Panels/ToolBox.vue
+++ b/client/src/components/Panels/ToolBox.vue
@@ -74,10 +74,13 @@ const queryFinished = computed(() => query.value && queryPending.value != true);
 
 const hasDataManagerSection = computed(() => props.workflow && props.dataManagers && props.dataManagers.length > 0);
 const dataManagerSection = computed(() => {
-    return {
+    const dynamicSection: ToolSectionType = {
+        model_class: "ToolSection",
+        id: "__data_managers",
         name: localize("Data Managers"),
-        elems: props.dataManagers,
+        elems: props.dataManagers as Tool[],
     };
+    return dynamicSection;
 });
 
 /** `toolsById` from `toolStore`, except it only has valid tools for `props.workflow` value */

From ae4ac0c9e48cc5d1e1554647aa5ed2208efacdd9 Mon Sep 17 00:00:00 2001
From: John Chilton <jmchilton@gmail.com>
Date: Fri, 21 Feb 2025 15:21:03 -0500
Subject: [PATCH 14/28] More type error suppression in various jest tests.

---
 .../Management/Cleanup/CleanupOperationSummary.test.ts          | 2 +-
 .../DiskUsage/Management/Cleanup/CleanupResultDialog.test.ts    | 2 +-
 .../DiskUsage/Management/Cleanup/ReviewCleanupDialog.test.ts    | 2 +-
 .../User/DiskUsage/Visualizations/Charts/BarChart.test.ts       | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/client/src/components/User/DiskUsage/Management/Cleanup/CleanupOperationSummary.test.ts b/client/src/components/User/DiskUsage/Management/Cleanup/CleanupOperationSummary.test.ts
index ba52b4f3cf5b..8d9cbc8d9e2c 100644
--- a/client/src/components/User/DiskUsage/Management/Cleanup/CleanupOperationSummary.test.ts
+++ b/client/src/components/User/DiskUsage/Management/Cleanup/CleanupOperationSummary.test.ts
@@ -72,7 +72,7 @@ async function mountCleanupOperationSummaryWith(
     refreshOperationId = null,
     refreshDelay = 0
 ) {
-    const wrapper = mount(CleanupOperationSummary, {
+    const wrapper = mount(CleanupOperationSummary as object, {
         propsData: { operation, refreshOperationId, refreshDelay },
         localVue,
     });
diff --git a/client/src/components/User/DiskUsage/Management/Cleanup/CleanupResultDialog.test.ts b/client/src/components/User/DiskUsage/Management/Cleanup/CleanupResultDialog.test.ts
index 5aafecc6327a..e2c235da63ba 100644
--- a/client/src/components/User/DiskUsage/Management/Cleanup/CleanupResultDialog.test.ts
+++ b/client/src/components/User/DiskUsage/Management/Cleanup/CleanupResultDialog.test.ts
@@ -53,7 +53,7 @@ const SUCCESS_RESULT = () => {
     );
 };
 async function mountCleanupResultDialogWith(result?: CleanupResult) {
-    const wrapper = mount(CleanupResultDialog, { propsData: { result, show: true }, localVue });
+    const wrapper = mount(CleanupResultDialog as object, { propsData: { result, show: true }, localVue });
     await flushPromises();
     return wrapper;
 }
diff --git a/client/src/components/User/DiskUsage/Management/Cleanup/ReviewCleanupDialog.test.ts b/client/src/components/User/DiskUsage/Management/Cleanup/ReviewCleanupDialog.test.ts
index bd7d47371f0e..97455717daf2 100644
--- a/client/src/components/User/DiskUsage/Management/Cleanup/ReviewCleanupDialog.test.ts
+++ b/client/src/components/User/DiskUsage/Management/Cleanup/ReviewCleanupDialog.test.ts
@@ -42,7 +42,7 @@ const FAKE_OPERATION: CleanupOperation = {
 };
 
 async function mountReviewCleanupDialogWith(operation: CleanupOperation, totalItems = EXPECTED_TOTAL_ITEMS) {
-    const wrapper = mount(ReviewCleanupDialog, {
+    const wrapper = mount(ReviewCleanupDialog as object, {
         propsData: { operation, totalItems, show: true, modalStatic: true },
         localVue,
     });
diff --git a/client/src/components/User/DiskUsage/Visualizations/Charts/BarChart.test.ts b/client/src/components/User/DiskUsage/Visualizations/Charts/BarChart.test.ts
index 8dd4d51e99bd..b2d289bb546a 100644
--- a/client/src/components/User/DiskUsage/Visualizations/Charts/BarChart.test.ts
+++ b/client/src/components/User/DiskUsage/Visualizations/Charts/BarChart.test.ts
@@ -22,7 +22,7 @@ const TEST_DATA = [
 ];
 
 function mountBarChartWrapper(props: BarChartProps) {
-    return mount(BarChart, {
+    return mount(BarChart as object, {
         propsData: props,
     });
 }

From e0c9da898d0786380c03d9ba059421fd35ed2c5d Mon Sep 17 00:00:00 2001
From: John Chilton <jmchilton@gmail.com>
Date: Fri, 21 Feb 2025 15:23:46 -0500
Subject: [PATCH 15/28] Fix vue typing error in StatelessTags.vue.

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

diff --git a/client/src/components/TagsMultiselect/StatelessTags.vue b/client/src/components/TagsMultiselect/StatelessTags.vue
index 1bca9868a8f9..a15e5c718b8e 100644
--- a/client/src/components/TagsMultiselect/StatelessTags.vue
+++ b/client/src/components/TagsMultiselect/StatelessTags.vue
@@ -111,7 +111,7 @@ function onTagClicked(tag: string) {
                 :options="userTagsStore.userTags"
                 :selected="props.value"
                 :placeholder="props.placeholder"
-                :validator="isValid"
+                :validator="(x) => !!isValid(x)"
                 @addOption="onAddTag"
                 @input="onInput"
                 @selected="(tag) => userTagsStore.onTagUsed(tag)" />

From 74e6f715490de3ca4dc58e245cdd3f0eae0f360a Mon Sep 17 00:00:00 2001
From: John Chilton <jmchilton@gmail.com>
Date: Fri, 21 Feb 2025 15:24:07 -0500
Subject: [PATCH 16/28] Another jest typing error suppression.

---
 client/src/components/User/UserDeletion.test.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/client/src/components/User/UserDeletion.test.ts b/client/src/components/User/UserDeletion.test.ts
index 1e2429faa05a..a26ed5033865 100644
--- a/client/src/components/User/UserDeletion.test.ts
+++ b/client/src/components/User/UserDeletion.test.ts
@@ -12,7 +12,7 @@ const TEST_EMAIL = `${TEST_USER_ID}@test.com`;
 const TEST_ROOT = "/";
 
 function mountComponent() {
-    const wrapper = mount(UserDeletion, {
+    const wrapper = mount(UserDeletion as object, {
         propsData: { userId: TEST_USER_ID, root: TEST_ROOT, email: TEST_EMAIL },
         localVue,
     });

From 61c9e51e98ede21f9b311322a9cb70856dd28482 Mon Sep 17 00:00:00 2001
From: John Chilton <jmchilton@gmail.com>
Date: Fri, 21 Feb 2025 15:24:22 -0500
Subject: [PATCH 17/28] Fix another undefined/null typing error in
 FormDatatype.vue.

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

diff --git a/client/src/components/Workflow/Editor/Forms/FormDatatype.vue b/client/src/components/Workflow/Editor/Forms/FormDatatype.vue
index 466a9fca75e3..8507f91c0b71 100644
--- a/client/src/components/Workflow/Editor/Forms/FormDatatype.vue
+++ b/client/src/components/Workflow/Editor/Forms/FormDatatype.vue
@@ -14,7 +14,7 @@ const props = withDefaults(
         datatypes: DatatypesMapperModel["datatypes"];
     }>(),
     {
-        value: null,
+        value: undefined,
     }
 );
 

From 3cf84e82fbb7b28d32d3e41a312f344f59ed0089 Mon Sep 17 00:00:00 2001
From: John Chilton <jmchilton@gmail.com>
Date: Fri, 21 Feb 2025 15:25:15 -0500
Subject: [PATCH 18/28] Fix null vs undefined error in FormDefault.vue.

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

diff --git a/client/src/components/Workflow/Editor/Forms/FormDefault.vue b/client/src/components/Workflow/Editor/Forms/FormDefault.vue
index 3a0f82c0a9d6..ca834dfb8856 100644
--- a/client/src/components/Workflow/Editor/Forms/FormDefault.vue
+++ b/client/src/components/Workflow/Editor/Forms/FormDefault.vue
@@ -30,7 +30,7 @@
                 :value="label"
                 title="Label"
                 help="Add a step label."
-                :error="uniqueErrorLabel"
+                :error="uniqueErrorLabel ?? undefined"
                 @input="onLabel" />
             <FormElement
                 id="__annotation"

From 85b5483cdbe572549126e95eaadb4d14c66acd0e Mon Sep 17 00:00:00 2001
From: John Chilton <jmchilton@gmail.com>
Date: Fri, 21 Feb 2025 15:52:21 -0500
Subject: [PATCH 19/28] Another jest type error suppression.

---
 client/src/components/Workflow/Editor/Index.test.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/client/src/components/Workflow/Editor/Index.test.ts b/client/src/components/Workflow/Editor/Index.test.ts
index 7262d2d72956..6ce2803eb64f 100644
--- a/client/src/components/Workflow/Editor/Index.test.ts
+++ b/client/src/components/Workflow/Editor/Index.test.ts
@@ -45,7 +45,7 @@ describe("Index", () => {
             value: null,
             writable: true,
         });
-        wrapper = shallowMount(Index, {
+        wrapper = shallowMount(Index as object, {
             propsData: {
                 workflowId: "workflow_id",
                 initialVersion: 1,

From 354e8b7a53a0b2d952cb2ae47b64a3a20ba01ac0 Mon Sep 17 00:00:00 2001
From: John Chilton <jmchilton@gmail.com>
Date: Fri, 21 Feb 2025 15:52:46 -0500
Subject: [PATCH 20/28] Properish typing of invalid workflow editor nodes.

Cleans up Vue TSC errors in Node.vue.
---
 .../src/components/Workflow/Editor/Node.vue   | 25 +++++++++++++++----
 client/src/stores/workflowStepStore.ts        |  1 +
 2 files changed, 21 insertions(+), 5 deletions(-)

diff --git a/client/src/components/Workflow/Editor/Node.vue b/client/src/components/Workflow/Editor/Node.vue
index 5d7aaf00166b..d8f1e112806d 100644
--- a/client/src/components/Workflow/Editor/Node.vue
+++ b/client/src/components/Workflow/Editor/Node.vue
@@ -4,7 +4,7 @@
         ref="el"
         class="workflow-node card"
         :scale="scale"
-        :root-offset="rootOffset"
+        :root-offset="reactive(rootOffset)"
         :position="position"
         :name="name"
         :node-label="title"
@@ -118,7 +118,7 @@
                 :root-offset="rootOffset"
                 :scroll="scroll"
                 :scale="scale"
-                :parent-node="elHtml"
+                :parent-node="elHtml ?? undefined"
                 :readonly="readonly"
                 @onChange="onChange" />
             <div v-if="!isInvocation && showRule" class="rule" />
@@ -164,7 +164,7 @@ import type { GraphStep } from "@/composables/useInvocationGraph";
 import { useWorkflowStores } from "@/composables/workflowStores";
 import type { TerminalPosition, XYPosition } from "@/stores/workflowEditorStateStore";
 import { useWorkflowNodeInspectorStore } from "@/stores/workflowNodeInspectorStore";
-import type { Step } from "@/stores/workflowStepStore";
+import type { InputTerminalSource, OutputTerminalSource, Step } from "@/stores/workflowStepStore";
 import { composedPartialPath, isClickable } from "@/utils/dom";
 
 import { ToggleStepSelectedAction } from "./Actions/stepActions";
@@ -281,7 +281,16 @@ const inputs = computed(() => {
     });
     const invalidInputNames = [...new Set(unknownInputs)];
     const invalidInputTerminalSource = invalidInputNames.map((name) => {
-        return { name, optional: false, extensions: [], valid: false, input_type: "dataset" };
+        const invalidInput: InputTerminalSource = {
+            name,
+            label: name,
+            multiple: false,
+            optional: false,
+            extensions: [],
+            valid: false,
+            input_type: "dataset",
+        };
+        return invalidInput;
     });
     return [...stepInputs, ...invalidInputTerminalSource];
 });
@@ -295,7 +304,13 @@ const invalidOutputs = computed(() => {
     );
     const invalidOutputNames = [...new Set(invalidConnections.map((connection) => connection.output.name))];
     return invalidOutputNames.map((name) => {
-        return { name, optional: false, datatypes: [], valid: false };
+        const invalidOutput: OutputTerminalSource = {
+            name,
+            optional: false,
+            valid: false,
+            extensions: [],
+        };
+        return invalidOutput;
     });
 });
 
diff --git a/client/src/stores/workflowStepStore.ts b/client/src/stores/workflowStepStore.ts
index dcb0547c9d7b..a3456945a887 100644
--- a/client/src/stores/workflowStepStore.ts
+++ b/client/src/stores/workflowStepStore.ts
@@ -35,6 +35,7 @@ export interface PostJobActions {
 }
 
 export interface DataOutput {
+    valid?: boolean;
     extensions: string[];
     name: string;
     optional: boolean;

From 1b092a4ceece9838f59a79341dad23b3105bd47f Mon Sep 17 00:00:00 2001
From: John Chilton <jmchilton@gmail.com>
Date: Sat, 22 Feb 2025 10:44:17 -0500
Subject: [PATCH 21/28] Another pass at improving typing of object store
 selection stuff.

---
 client/src/api/index.ts                           |  4 ++++
 .../src/components/Common/ObjectStoreSelect.vue   |  4 ++--
 .../Dataset/DatasetStorage/RelocateDialog.vue     | 15 ++++-----------
 .../Dataset/DatasetStorage/RelocateLink.vue       | 10 +++++-----
 .../ObjectStore/ObjectStoreSelectButton.vue       |  4 ++--
 .../ObjectStoreSelectButtonDescribePopover.vue    |  2 +-
 .../components/ObjectStore/SelectObjectStore.vue  | 11 ++++-------
 .../ObjectStore/ShowSelectedObjectStore.vue       |  2 +-
 8 files changed, 23 insertions(+), 29 deletions(-)

diff --git a/client/src/api/index.ts b/client/src/api/index.ts
index 6f9ce9d0213d..2ea3d8f65a14 100644
--- a/client/src/api/index.ts
+++ b/client/src/api/index.ts
@@ -172,6 +172,10 @@ export type DatasetCollectionAttributes = components["schemas"]["DatasetCollecti
 
 export type ConcreteObjectStoreModel = components["schemas"]["ConcreteObjectStoreModel"];
 
+export interface SelectableObjectStore extends ConcreteObjectStoreModel {
+    object_store_id: string;
+}
+
 /**
  * A SubCollection is a DatasetCollectionElement of type `dataset_collection`
  * with additional information to simplify its handling.
diff --git a/client/src/components/Common/ObjectStoreSelect.vue b/client/src/components/Common/ObjectStoreSelect.vue
index e941f8b4155b..16a4151b4ace 100644
--- a/client/src/components/Common/ObjectStoreSelect.vue
+++ b/client/src/components/Common/ObjectStoreSelect.vue
@@ -11,7 +11,7 @@ interface RelocateProps {
 defineProps<RelocateProps>();
 
 const emit = defineEmits<{
-    (e: "select", value: string | undefined | null): void;
+    (e: "select", value: string | null): void;
 }>();
 
 const toWhat = "Datasets will be filtered to those stored in";
@@ -28,7 +28,7 @@ const toWhat = "Datasets will be filtered to those stored in";
                 class="filter-target-object-store-select-button"
                 variant="outline-primary"
                 :object-store="objectStore"
-                @click="emit('select', objectStore.object_store_id)" />
+                @click="emit('select', objectStore.object_store_id ?? null)" />
         </b-button-group>
         <ObjectStoreSelectButtonDescribePopover
             v-for="objectStore in objectStores"
diff --git a/client/src/components/Dataset/DatasetStorage/RelocateDialog.vue b/client/src/components/Dataset/DatasetStorage/RelocateDialog.vue
index cd6fe66eb3e4..9283bcb7c778 100644
--- a/client/src/components/Dataset/DatasetStorage/RelocateDialog.vue
+++ b/client/src/components/Dataset/DatasetStorage/RelocateDialog.vue
@@ -1,12 +1,12 @@
 <script setup lang="ts">
-import { type ConcreteObjectStoreModel } from "@/api";
+import { type ConcreteObjectStoreModel, type SelectableObjectStore } from "@/api";
 
 import ObjectStoreSelectButton from "@/components/ObjectStore/ObjectStoreSelectButton.vue";
 import ObjectStoreSelectButtonDescribePopover from "@/components/ObjectStore/ObjectStoreSelectButtonDescribePopover.vue";
 
 interface RelocateProps {
     fromObjectStore: ConcreteObjectStoreModel;
-    targetObjectStores: ConcreteObjectStoreModel[];
+    targetObjectStores: SelectableObjectStore[];
 }
 
 defineProps<RelocateProps>();
@@ -16,15 +16,8 @@ const emit = defineEmits<{
     (e: "closeModal"): void;
 }>();
 
-function relocate(objectStoreId: string | undefined | null) {
-    if (objectStoreId) {
-        // all the target object stores will have an object store id - they were
-        // generated thusly. But the type system doesn't know this. So this function
-        // wraps the emit.
-        emit("relocate", objectStoreId);
-    } else {
-        console.error("Serious logic problem, this branch should be unreachable.");
-    }
+function relocate(objectStoreId: string) {
+    emit("relocate", objectStoreId);
 }
 
 const fromWhat = "This dataset location is";
diff --git a/client/src/components/Dataset/DatasetStorage/RelocateLink.vue b/client/src/components/Dataset/DatasetStorage/RelocateLink.vue
index 3a67feaec830..d3d83266debf 100644
--- a/client/src/components/Dataset/DatasetStorage/RelocateLink.vue
+++ b/client/src/components/Dataset/DatasetStorage/RelocateLink.vue
@@ -3,7 +3,7 @@ import { BButton } from "bootstrap-vue";
 import { storeToRefs } from "pinia";
 import { computed, ref } from "vue";
 
-import { type ConcreteObjectStoreModel, type DatasetStorageDetails } from "@/api";
+import { type ConcreteObjectStoreModel, type DatasetStorageDetails, type SelectableObjectStore } from "@/api";
 import { updateObjectStore } from "@/api/objectStores";
 import { useObjectStoreStore } from "@/stores/objectStoreStore";
 
@@ -39,7 +39,7 @@ const currentObjectStore = computed<ConcreteObjectStoreModel | null>(() => {
     return filtered && filtered.length > 0 ? (filtered[0] as ConcreteObjectStoreModel) : null;
 });
 
-const validTargets = computed<ConcreteObjectStoreModel[]>(() => {
+const validTargets = computed<SelectableObjectStore[]>(() => {
     const isLoadedVal = isLoaded.value;
     const objectStores = selectableObjectStores.value;
     const currentObjectStoreId = props.datasetStorageDetails.object_store_id;
@@ -57,13 +57,13 @@ const validTargets = computed<ConcreteObjectStoreModel[]>(() => {
     if (!currentDevice) {
         return [];
     }
-    const validTargets: ConcreteObjectStoreModel[] = objectStores.filter(
+    const validTargets = objectStores.filter(
         (objectStore) =>
             objectStore.device == currentDevice &&
             objectStore.object_store_id &&
             objectStore.object_store_id != currentObjectStoreId
-    );
-    return validTargets as ConcreteObjectStoreModel[];
+    ) as SelectableObjectStore[];
+    return validTargets;
 });
 
 const relocatable = computed(() => {
diff --git a/client/src/components/ObjectStore/ObjectStoreSelectButton.vue b/client/src/components/ObjectStore/ObjectStoreSelectButton.vue
index d86661b707e5..051f6fa6bbe7 100644
--- a/client/src/components/ObjectStore/ObjectStoreSelectButton.vue
+++ b/client/src/components/ObjectStore/ObjectStoreSelectButton.vue
@@ -15,7 +15,7 @@ interface ObjectStoreSelectButtonProps {
 defineProps<ObjectStoreSelectButtonProps>();
 
 const emit = defineEmits<{
-    (e: "click", value: string): void;
+    (e: "click", value: string | null): void;
 }>();
 </script>
 
@@ -24,7 +24,7 @@ const emit = defineEmits<{
         :id="`${idPrefix}-object-store-button-${objectStore.object_store_id}`"
         :variant="variant"
         :data-object-store-id="objectStore.object_store_id"
-        @click="emit('click', objectStore.object_store_id)"
+        @click="emit('click', objectStore.object_store_id ?? null)"
         >{{ objectStore.name }}
         <ObjectStoreBadges :badges="objectStore.badges" size="lg" :more-on-hover="false" />
         <ProvidedQuotaSourceUsageBar :object-store="objectStore" :compact="true"> </ProvidedQuotaSourceUsageBar>
diff --git a/client/src/components/ObjectStore/ObjectStoreSelectButtonDescribePopover.vue b/client/src/components/ObjectStore/ObjectStoreSelectButtonDescribePopover.vue
index e6d730ef6691..770d95aaf9ec 100644
--- a/client/src/components/ObjectStore/ObjectStoreSelectButtonDescribePopover.vue
+++ b/client/src/components/ObjectStore/ObjectStoreSelectButtonDescribePopover.vue
@@ -23,7 +23,7 @@ const title = computed(() => {
 </script>
 
 <template>
-    <ObjectStoreSelectButtonPopover :target="target" :title="title">
+    <ObjectStoreSelectButtonPopover :target="target" :title="title ?? ''">
         <DescribeObjectStore :what="what" :storage-info="objectStore"> </DescribeObjectStore>
     </ObjectStoreSelectButtonPopover>
 </template>
diff --git a/client/src/components/ObjectStore/SelectObjectStore.vue b/client/src/components/ObjectStore/SelectObjectStore.vue
index e1a21d18eb77..e5be0952627b 100644
--- a/client/src/components/ObjectStore/SelectObjectStore.vue
+++ b/client/src/components/ObjectStore/SelectObjectStore.vue
@@ -19,10 +19,7 @@ interface SelectObjectStoreProps {
     parentError?: String | null;
 }
 
-const props = withDefaults(defineProps<SelectObjectStoreProps>(), {
-    selectedObjectStoreId: null,
-    parentError: null,
-});
+const props = defineProps<SelectObjectStoreProps>();
 
 const store = useObjectStoreStore();
 const { isLoading, loadErrorMessage, selectableObjectStores } = storeToRefs(store);
@@ -47,7 +44,7 @@ click on the info icon in the history panel to view information about where it i
 is not stored in the place you want, contact Galaxy administrator for more information.
 `);
 
-function variant(objectStoreId: string) {
+function variant(objectStoreId: string | null) {
     if (props.selectedObjectStoreId == objectStoreId) {
         return "outline-primary";
     } else {
@@ -86,14 +83,14 @@ async function handleSubmit(preferredObjectStore: ConcreteObjectStoreModel | nul
                             class="preferred-object-store-select-button"
                             data-object-store-id="__null__"
                             @click="handleSubmit(null)"
-                            ><i>{{ defaultOptionTitle | localize }}</i></b-button
+                            ><i v-localize>{{ defaultOptionTitle }}</i></b-button
                         >
                         <ObjectStoreSelectButton
                             v-for="objectStore in selectableAndVisibleObjectStores"
                             :key="objectStore.object_store_id"
                             id-prefix="preferred"
                             :object-store="objectStore"
-                            :variant="variant(objectStore.object_store_id)"
+                            :variant="variant(objectStore.object_store_id ?? null)"
                             class="preferred-object-store-select-button"
                             @click="handleSubmit(objectStore)" />
                     </b-button-group>
diff --git a/client/src/components/ObjectStore/ShowSelectedObjectStore.vue b/client/src/components/ObjectStore/ShowSelectedObjectStore.vue
index 3b1c4cdfd087..1db50ab3f486 100644
--- a/client/src/components/ObjectStore/ShowSelectedObjectStore.vue
+++ b/client/src/components/ObjectStore/ShowSelectedObjectStore.vue
@@ -43,7 +43,7 @@ const loadingMessage = "Loading storage location details";
 
 <template>
     <div>
-        <LoadingSpan v-if="loading" :message="loadingMessage | localize" />
+        <LoadingSpan v-if="loading" :message="loadingMessage" />
         <DescribeObjectStore v-else-if="objectStore != null" :what="forWhat" :storage-info="objectStore">
         </DescribeObjectStore>
         <b-alert v-else-if="error" show variant="danger">{{ error }}</b-alert>

From 613f957da8464dda84a8a775db0487ac26cdc5b6 Mon Sep 17 00:00:00 2001
From: John Chilton <jmchilton@gmail.com>
Date: Sat, 22 Feb 2025 10:45:02 -0500
Subject: [PATCH 22/28] Type fix for unneeded implicit any in SharingIndicator.

---
 client/src/components/PageEditor/SharingIndicator.vue | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/client/src/components/PageEditor/SharingIndicator.vue b/client/src/components/PageEditor/SharingIndicator.vue
index a0d7fff7477f..56fe2ac5771e 100644
--- a/client/src/components/PageEditor/SharingIndicator.vue
+++ b/client/src/components/PageEditor/SharingIndicator.vue
@@ -40,8 +40,8 @@ watch(props, () => {
             class="make-page-object-accessible"
             :disabled="accessible"
             @change="
-                (event) => {
-                    makeAccessible(event);
+                () => {
+                    makeAccessible();
                 }
             ">
         </BFormCheckbox>

From 8f85e4f818289acf6c97200ec7ea469fde1f7109 Mon Sep 17 00:00:00 2001
From: John Chilton <jmchilton@gmail.com>
Date: Sat, 22 Feb 2025 10:45:10 -0500
Subject: [PATCH 23/28] Typing fix for InvocationGraph.vue.

---
 .../Workflow/Invocation/Graph/InvocationGraph.vue          | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/client/src/components/Workflow/Invocation/Graph/InvocationGraph.vue b/client/src/components/Workflow/Invocation/Graph/InvocationGraph.vue
index 2281a1e5c6c2..2c4550a12b2c 100644
--- a/client/src/components/Workflow/Invocation/Graph/InvocationGraph.vue
+++ b/client/src/components/Workflow/Invocation/Graph/InvocationGraph.vue
@@ -18,6 +18,7 @@ import type { WorkflowInvocationElementView } from "@/api/invocations";
 import { useDatatypesMapper } from "@/composables/datatypesMapper";
 import { useInvocationGraph } from "@/composables/useInvocationGraph";
 import { useWorkflowStateStore } from "@/stores/workflowEditorStateStore";
+import type { Step } from "@/stores/workflowStepStore";
 import type { Workflow } from "@/stores/workflowStore";
 
 import Heading from "@/components/Common/Heading.vue";
@@ -118,6 +119,10 @@ const initialPosition = computed(() => ({
     y: -props.initialY * props.zoom,
 }));
 
+function activeStepFor(activeNodeId: number): Step {
+    return props.workflow.steps[activeNodeId] as Step;
+}
+
 /** Updates and loads the invocation graph */
 async function loadGraph() {
     loadingGraph.value = true;
@@ -203,7 +208,7 @@ function stepClicked(nodeId: number | null) {
                         <WorkflowInvocationStepHeader
                             v-if="activeNodeId !== null"
                             class="w-100"
-                            :workflow-step="props.workflow.steps[activeNodeId]"
+                            :workflow-step="activeStepFor(activeNodeId)"
                             :graph-step="steps[activeNodeId]"
                             :invocation-step="props.invocation.steps[activeNodeId]" />
                         <span v-else>No Step Selected</span>

From b513aaafc3fd80c8cdfcb28c8a135fe669f145a0 Mon Sep 17 00:00:00 2001
From: John Chilton <jmchilton@gmail.com>
Date: Sat, 22 Feb 2025 12:36:42 -0500
Subject: [PATCH 24/28] Fix two String / string type errors in
 SelectObjectStore.vue.

---
 client/src/components/ObjectStore/SelectObjectStore.vue | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/client/src/components/ObjectStore/SelectObjectStore.vue b/client/src/components/ObjectStore/SelectObjectStore.vue
index e5be0952627b..7638e7c5dcb7 100644
--- a/client/src/components/ObjectStore/SelectObjectStore.vue
+++ b/client/src/components/ObjectStore/SelectObjectStore.vue
@@ -13,9 +13,9 @@ import LoadingSpan from "@/components/LoadingSpan.vue";
 
 interface SelectObjectStoreProps {
     selectedObjectStoreId?: String | null;
-    defaultOptionTitle: String;
+    defaultOptionTitle: string;
     defaultOptionDescription: String;
-    forWhat: String;
+    forWhat: string;
     parentError?: String | null;
 }
 

From dc959eb7858e286aa24c9f639037c2bdb1de1762 Mon Sep 17 00:00:00 2001
From: John Chilton <jmchilton@gmail.com>
Date: Sat, 22 Feb 2025 12:37:44 -0500
Subject: [PATCH 25/28] Another test suppression for jest tests.

---
 .../ObjectStore/Templates/TemplateSummaryPopover.test.ts        | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/client/src/components/ObjectStore/Templates/TemplateSummaryPopover.test.ts b/client/src/components/ObjectStore/Templates/TemplateSummaryPopover.test.ts
index 42dc20584874..d6617c77ca36 100644
--- a/client/src/components/ObjectStore/Templates/TemplateSummaryPopover.test.ts
+++ b/client/src/components/ObjectStore/Templates/TemplateSummaryPopover.test.ts
@@ -9,7 +9,7 @@ const localVue = getLocalVue(true);
 
 describe("TemplateSummaryPopover", () => {
     it("should render a popover", async () => {
-        const wrapper = shallowMount(TemplateSummaryPopover, {
+        const wrapper = shallowMount(TemplateSummaryPopover as object, {
             propsData: {
                 target: "test-target-1",
                 template: STANDARD_OBJECT_STORE_TEMPLATE,

From c38053f7f53664e4a3fa2e3e15c7267bb6c7b1d2 Mon Sep 17 00:00:00 2001
From: John Chilton <jmchilton@gmail.com>
Date: Sat, 22 Feb 2025 12:38:55 -0500
Subject: [PATCH 26/28] Fix @jmchilton typo and type error in ToolSearch.vue.

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

diff --git a/client/src/components/Panels/Common/ToolSearch.vue b/client/src/components/Panels/Common/ToolSearch.vue
index 2679111a10da..60e43d385592 100644
--- a/client/src/components/Panels/Common/ToolSearch.vue
+++ b/client/src/components/Panels/Common/ToolSearch.vue
@@ -278,7 +278,7 @@ function onAdvancedSearch(filters: any) {
 </script>
 
 <template>
-    <div v-if="searchWorker || !props.userWorker">
+    <div v-if="searchWorker || !props.useWorker">
         <FilterMenu
             v-if="props.enableAdvanced"
             :class="!propShowAdvanced && 'mb-3'"

From aa1a4d609d7ab22f3a032f3fa5c0ba514be5b336 Mon Sep 17 00:00:00 2001
From: John Chilton <jmchilton@gmail.com>
Date: Mon, 24 Feb 2025 11:01:33 -0500
Subject: [PATCH 27/28] Add comment pointing at
 https://github.com/galaxyproject/galaxy/issues/19687

---
 client/src/components/History/Content/GenericItem.vue | 1 +
 1 file changed, 1 insertion(+)

diff --git a/client/src/components/History/Content/GenericItem.vue b/client/src/components/History/Content/GenericItem.vue
index 4a899b495416..7ddc1bb5fc1a 100644
--- a/client/src/components/History/Content/GenericItem.vue
+++ b/client/src/components/History/Content/GenericItem.vue
@@ -72,6 +72,7 @@ export default {
                 case "dce":
                     return "DatasetCollectionElementProvider";
                 default:
+                    // Failed on LDDAs https://github.com/galaxyproject/galaxy/issues/19687
                     throw Error(`Unknown element src ${this.itemSrc}`);
             }
         },

From 79e97c300ae919070269d9c92c4519bd0bc5aa02 Mon Sep 17 00:00:00 2001
From: John Chilton <jmchilton@gmail.com>
Date: Mon, 24 Feb 2025 17:12:21 -0500
Subject: [PATCH 28/28] Fix unit test and localization of
 ShowSelectedObjectStore.

---
 .../components/ObjectStore/ShowSelectedObjectStore.test.js    | 4 ++--
 client/src/components/ObjectStore/ShowSelectedObjectStore.vue | 3 ++-
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/client/src/components/ObjectStore/ShowSelectedObjectStore.test.js b/client/src/components/ObjectStore/ShowSelectedObjectStore.test.js
index 2ad292b5a3f1..02de68eb5bbf 100644
--- a/client/src/components/ObjectStore/ShowSelectedObjectStore.test.js
+++ b/client/src/components/ObjectStore/ShowSelectedObjectStore.test.js
@@ -58,7 +58,7 @@ describe("ShowSelectedObjectStore", () => {
         });
         let loadingEl = wrapper.findComponent(LoadingSpan);
         expect(loadingEl.exists()).toBeTruthy();
-        expect(loadingEl.find(".loading-message").text()).toContainLocalizationOf("Loading storage location details");
+        expect(loadingEl.find(".loading-message").text()).toContain("Loading storage location details");
         await flushPromises();
         loadingEl = wrapper.findComponent(LoadingSpan);
         expect(loadingEl.exists()).toBeFalsy();
@@ -78,7 +78,7 @@ describe("ShowSelectedObjectStore", () => {
         });
         let loadingEl = wrapper.findComponent(LoadingSpan);
         expect(loadingEl.exists()).toBeTruthy();
-        expect(loadingEl.find(".loading-message").text()).toContainLocalizationOf("Loading storage location details");
+        expect(loadingEl.find(".loading-message").text()).toContain("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 1db50ab3f486..f9fa3d7054a5 100644
--- a/client/src/components/ObjectStore/ShowSelectedObjectStore.vue
+++ b/client/src/components/ObjectStore/ShowSelectedObjectStore.vue
@@ -2,6 +2,7 @@
 import { ref, watch } from "vue";
 
 import { getObjectStoreDetails } from "@/api/objectStores";
+import localize from "@/utils/localization";
 import { errorMessageAsString } from "@/utils/simple-error";
 
 import type { ConcreteObjectStoreModel } from "./types";
@@ -38,7 +39,7 @@ watch(
     }
 );
 fetch();
-const loadingMessage = "Loading storage location details";
+const loadingMessage = localize("Loading storage location details");
 </script>
 
 <template>