From 5a5a857a636e7425159bd917a62c465ed1e0310b Mon Sep 17 00:00:00 2001
From: John Chilton <jmchilton@gmail.com>
Date: Mon, 4 Mar 2024 18:20:03 -0500
Subject: [PATCH] Cleanup invocation typing a bit.

---
 client/src/api/invocations.ts                            | 9 +++------
 .../WorkflowInvocationSummary.vue                        | 4 ++--
 2 files changed, 5 insertions(+), 8 deletions(-)

diff --git a/client/src/api/invocations.ts b/client/src/api/invocations.ts
index 2a10cf62d20e..88c34695fb8c 100644
--- a/client/src/api/invocations.ts
+++ b/client/src/api/invocations.ts
@@ -4,17 +4,14 @@ import { getAppRoot } from "@/onload";
 
 import { ApiResponse, components, fetcher } from "./schema";
 
-// TODO: rename...
-export type WorkflowInvocationSummary = components["schemas"]["WorkflowInvocationElementView"];
+export type WorkflowInvocationElementView = components["schemas"]["WorkflowInvocationElementView"];
+export type WorkflowInvocationCollectionView = components["schemas"]["WorkflowInvocationCollectionView"];
 export type InvocationJobsSummary = components["schemas"]["InvocationJobsResponse"];
 export type InvocationStep = components["schemas"]["InvocationStep"];
 
 export const invocationsFetcher = fetcher.path("/api/invocations").method("get").create();
 
-// TODO: Replace these interfaces with real schema models after https://github.com/galaxyproject/galaxy/pull/16707 is merged
-export interface WorkflowInvocation {
-    id: string;
-}
+export type WorkflowInvocation = WorkflowInvocationElementView | WorkflowInvocationCollectionView;
 
 export interface WorkflowInvocationJobsSummary {
     id: string;
diff --git a/client/src/components/WorkflowInvocationState/WorkflowInvocationSummary.vue b/client/src/components/WorkflowInvocationState/WorkflowInvocationSummary.vue
index ccc0c001d780..28ddeaa0eae1 100644
--- a/client/src/components/WorkflowInvocationState/WorkflowInvocationSummary.vue
+++ b/client/src/components/WorkflowInvocationState/WorkflowInvocationSummary.vue
@@ -1,7 +1,7 @@
 <script setup lang="ts">
 import { computed } from "vue";
 
-import { InvocationJobsSummary, InvocationStep, WorkflowInvocationSummary } from "@/api/invocations";
+import { InvocationJobsSummary, InvocationStep, WorkflowInvocationElementView } from "@/api/invocations";
 import { getRootFromIndexLink } from "@/onload";
 
 import {
@@ -21,7 +21,7 @@ function getUrl(path: string): string {
 }
 
 interface Props {
-    invocation?: WorkflowInvocationSummary;
+    invocation?: WorkflowInvocationElementView;
     invocationAndJobTerminal: boolean;
     invocationSchedulingTerminal: boolean;
     jobStatesSummary: InvocationJobsSummary;