Merge remote-tracking branch 'origin/main' into 18207-Workbench2-is-not-clearing...

[arvados-workbench2.git] / src / models / container-request.ts

diff --git a/src/models/container-request.ts b/src/models/container-request.ts
index 78891c7bdcd8fc23918ff369052548dd02b725db..99ec4cf086ad6acfd3102f5e3dfd77b6c7f14867 100644 (file)
--- a/src/models/container-request.ts
+++ b/src/models/container-request.ts
@@ -2,8 +2,8 @@
 //
 // SPDX-License-Identifier: AGPL-3.0
 
-import { Resource, ResourceKind } from "./resource";
-import { MountType } from "~/models/mount-types";
+import { Resource, ResourceKind, ResourceWithProperties } from "./resource";
+import { MountType } from "models/mount-types";
 import { RuntimeConstraints } from './runtime-constraints';
 import { SchedulingParameters } from './scheduling-parameters';
 
@@ -13,16 +13,15 @@ export enum ContainerRequestState {
     FINAL = "Final"
 }
 
-export interface ContainerRequestResource extends Resource {
+export interface ContainerRequestResource extends Resource, ResourceWithProperties {
     kind: ResourceKind.CONTAINER_REQUEST;
     name: string;
     description: string;
-    properties: any;
     state: ContainerRequestState;
     requestingContainerUuid: string | null;
     containerUuid: string | null;
     containerCountMax: number;
-    mounts: MountType[];
+    mounts: {[path: string]: MountType};
     runtimeConstraints: RuntimeConstraints;
     schedulingParameters: SchedulingParameters;
     containerImage: string;
@@ -38,4 +37,5 @@ export interface ContainerRequestResource extends Resource {
     logUuid: string | null;
     outputUuid: string | null;
     filters: string;
+    containerCount: number;
 }