Merge branch 'master'

[arvados.git] / src / views / project-panel / project-panel-item.ts

diff --git a/src/views/project-panel/project-panel-item.ts b/src/views/project-panel/project-panel-item.ts
index cf77aaf14e2c84ba6be3f749c004eb83532ae24f..d0609d6df73139bbf55ebf5e404cafe7664632d5 100644 (file)
--- a/src/views/project-panel/project-panel-item.ts
+++ b/src/views/project-panel/project-panel-item.ts
@@ -2,10 +2,10 @@
 //
 // SPDX-License-Identifier: AGPL-3.0
 
-import { Resource } from "../../common/api/common-resource-service";
-import { DataItem } from "../../components/data-table/data-table";
+import { GroupContentsResource } from "../../services/groups-service/groups-service";
+import { ResourceKind } from "../../models/resource";
 
-export interface ProjectPanelItem extends DataItem {
+export interface ProjectPanelItem {
     uuid: string;
     name: string;
     kind: string;
@@ -16,15 +16,16 @@ export interface ProjectPanelItem extends DataItem {
     status?: string;
 }
 
-export function resourceToDataItem(r: Resource): ProjectPanelItem {
+
+export function resourceToDataItem(r: GroupContentsResource): ProjectPanelItem {
     return {
-        key: r.uuid,
         uuid: r.uuid,
-        name: r.uuid,
+        name: r.name,
         kind: r.kind,
         url: "",
         owner: r.ownerUuid,
-        lastModified: r.modifiedAt
+        lastModified: r.modifiedAt,
+        status:  r.kind === ResourceKind.PROCESS ? r.state : undefined
     };
 }