Add generic trash action

[arvados-workbench2.git] / src / views-components / data-explorer / renderers.tsx

diff --git a/src/views-components/data-explorer/renderers.tsx b/src/views-components/data-explorer/renderers.tsx
index 390e601f9dbd8bac5e74967f316db3211c35163f..c96813df95bb25f8b4f773804ed6eda5df7255b2 100644 (file)
--- a/src/views-components/data-explorer/renderers.tsx
+++ b/src/views-components/data-explorer/renderers.tsx
@@ -5,13 +5,13 @@
 import * as React from 'react';
 import { Grid, Typography } from '@material-ui/core';
 import { FavoriteStar } from '../favorite-star/favorite-star';
-import { ResourceKind } from '~/models/resource';
+import { ResourceKind, TrashableResource } from '~/models/resource';
 import { ProjectIcon, CollectionIcon, ProcessIcon, DefaultIcon } from '~/components/icon/icon';
 import { formatDate, formatFileSize } from '~/common/formatters';
 import { resourceLabel } from '~/common/labels';
 import { connect } from 'react-redux';
 import { RootState } from '~/store/store';
-import { getResource } from '../../store/resources/resources';
+import { getResource } from '~/store/resources/resources';
 import { GroupContentsResource } from '~/services/groups-service/groups-service';
 import { ProcessResource } from '~/models/process';
 
@@ -35,7 +35,7 @@ export const renderName = (item: { name: string; uuid: string, kind: string }) =
 
 export const ResourceName = connect(
     (state: RootState, props: { uuid: string }) => {
-        const resource = getResource(props.uuid)(state.resources) as GroupContentsResource | undefined;
+        const resource = getResource<GroupContentsResource>(props.uuid)(state.resources);
         return resource || { name: '', uuid: '', kind: '' };
     })(renderName);
 
@@ -58,10 +58,22 @@ export const renderDate = (date?: string) => {
 
 export const ResourceLastModifiedDate = connect(
     (state: RootState, props: { uuid: string }) => {
-        const resource = getResource(props.uuid)(state.resources) as GroupContentsResource | undefined;
+        const resource = getResource<GroupContentsResource>(props.uuid)(state.resources);
         return { date: resource ? resource.modifiedAt : '' };
     })((props: { date: string }) => renderDate(props.date));
 
+export const ResourceTrashDate = connect(
+    (state: RootState, props: { uuid: string }) => {
+        const resource = getResource<TrashableResource>(props.uuid)(state.resources);
+        return { date: resource ? resource.trashAt : '' };
+    })((props: { date: string }) => renderDate(props.date));
+
+export const ResourceDeleteDate = connect(
+    (state: RootState, props: { uuid: string }) => {
+        const resource = getResource<TrashableResource>(props.uuid)(state.resources);
+        return { date: resource ? resource.deleteAt : '' };
+    })((props: { date: string }) => renderDate(props.date));
+
 export const renderFileSize = (fileSize?: number) =>
     <Typography noWrap>
         {formatFileSize(fileSize)}
@@ -69,7 +81,7 @@ export const renderFileSize = (fileSize?: number) =>
 
 export const ResourceFileSize = connect(
     (state: RootState, props: { uuid: string }) => {
-        const resource = getResource(props.uuid)(state.resources) as GroupContentsResource | undefined;
+        const resource = getResource<GroupContentsResource>(props.uuid)(state.resources);
         return {};
     })((props: { fileSize?: number }) => renderFileSize(props.fileSize));
 
@@ -80,7 +92,7 @@ export const renderOwner = (owner: string) =>
 
 export const ResourceOwner = connect(
     (state: RootState, props: { uuid: string }) => {
-        const resource = getResource(props.uuid)(state.resources) as GroupContentsResource | undefined;
+        const resource = getResource<GroupContentsResource>(props.uuid)(state.resources);
         return { owner: resource ? resource.ownerUuid : '' };
     })((props: { owner: string }) => renderOwner(props.owner));
 
@@ -91,7 +103,7 @@ export const renderType = (type: string) =>
 
 export const ResourceType = connect(
     (state: RootState, props: { uuid: string }) => {
-        const resource = getResource(props.uuid)(state.resources) as GroupContentsResource | undefined;
+        const resource = getResource<GroupContentsResource>(props.uuid)(state.resources);
         return { type: resource ? resource.kind : '' };
     })((props: { type: string }) => renderType(props.type));
 
@@ -102,6 +114,6 @@ export const renderStatus = (item: { status?: string }) =>
 
 export const ProcessStatus = connect(
     (state: RootState, props: { uuid: string }) => {
-        const resource = getResource(props.uuid)(state.resources) as ProcessResource | undefined;
+        const resource = getResource<ProcessResource>(props.uuid)(state.resources);
         return { status: resource ? resource.state : '-' };
     })((props: { status: string }) => renderType(props.status));