merge-conflicts

[arvados-workbench2.git] / src / models / resource.ts

diff --git a/src/models/resource.ts b/src/models/resource.ts
index 4c198fb8cac56548a5d2ba4357c0ef271af2fcad..6a76b070452146734b2a9f64a36bf3d4eac6ff4f 100644 (file)
--- a/src/models/resource.ts
+++ b/src/models/resource.ts
@@ -1,27 +1,24 @@
+// Copyright (C) The Arvados Authors. All rights reserved.
+//
+// SPDX-License-Identifier: AGPL-3.0
+
 export interface Resource {
-    name: string;
-    createdAt: string;
-    modifiedAt: string;
     uuid: string;
     ownerUuid: string;
+    createdAt: string;
+    modifiedByClientUuid: string;
+    modifiedByUserUuid: string;
+    modifiedAt: string;
     href: string;
     kind: string;
+    etag: string;
 }
 
 export enum ResourceKind {
-    PROJECT = "project",
-    COLLECTION = "collection",
-    PIPELINE = "pipeline",
-    LEVEL_UP = "levelup",
-    UNKNOWN = "unknown"
-}
-
-export function getResourceKind(itemKind: string) {
-    switch (itemKind) {
-        case "arvados#project": return ResourceKind.PROJECT;
-        case "arvados#collection": return ResourceKind.COLLECTION;
-        case "arvados#pipeline": return ResourceKind.PIPELINE;
-        default:
-            return ResourceKind.UNKNOWN;
-    }
+    COLLECTION = "arvados#collection",
+    CONTAINER_REQUEST = "arvados#containerRequest",
+    GROUP = "arvados#group",
+    PROCESS = "arvados#containerRequest",
+    PROJECT = "arvados#group",
+    WORKFLOW = "arvados#workflow"
 }