Skip to content

Commit

Permalink
Cleanup invocation typing a bit.
Browse files Browse the repository at this point in the history
  • Loading branch information
jmchilton committed Mar 4, 2024
1 parent d8942a0 commit 5a5a857
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 8 deletions.
9 changes: 3 additions & 6 deletions client/src/api/invocations.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
Original file line number Diff line number Diff line change
@@ -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 {
Expand All @@ -21,7 +21,7 @@ function getUrl(path: string): string {
}
interface Props {
invocation?: WorkflowInvocationSummary;
invocation?: WorkflowInvocationElementView;
invocationAndJobTerminal: boolean;
invocationSchedulingTerminal: boolean;
jobStatesSummary: InvocationJobsSummary;
Expand Down

0 comments on commit 5a5a857

Please sign in to comment.