X-Git-Url: https://git.arvados.org/arvados-workbench2.git/blobdiff_plain/eb4491eea9ba873845f7a5796d139d19977f8112..cdc8a73914399a401642ca553e9d3d8b2d42db5c:/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 1b07642a..abf18392 100644 --- a/src/views-components/data-explorer/renderers.tsx +++ b/src/views-components/data-explorer/renderers.tsx @@ -9,9 +9,14 @@ import { ResourceKind } 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 { GroupContentsResource } from '~/services/groups-service/groups-service'; +import { ProcessResource } from '~/models/process'; -export const renderName = (item: {name: string; uuid: string, kind: string}) => +export const renderName = (item: { name: string; uuid: string, kind: string }) => {renderIcon(item)} @@ -28,8 +33,13 @@ 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; + return resource || { name: '', uuid: '', kind: '' }; + })(renderName); -export const renderIcon = (item: {kind: string}) => { +export const renderIcon = (item: { kind: string }) => { switch (item.kind) { case ResourceKind.PROJECT: return ; @@ -46,22 +56,52 @@ export const renderDate = (date: string) => { return {formatDate(date)}; }; +export const ResourceLastModifiedDate = connect( + (state: RootState, props: { uuid: string }) => { + const resource = getResource(props.uuid)(state.resources) as GroupContentsResource | undefined; + return { date: resource ? resource.modifiedAt : '' }; + })((props: { date: string }) => renderDate(props.date)); + export const renderFileSize = (fileSize?: number) => {formatFileSize(fileSize)} ; +export const ResourceFileSize = connect( + (state: RootState, props: { uuid: string }) => { + const resource = getResource(props.uuid)(state.resources) as GroupContentsResource | undefined; + return {}; + })((props: { fileSize?: number }) => renderFileSize(props.fileSize)); + export const renderOwner = (owner: string) => {owner} ; +export const ResourceOwner = connect( + (state: RootState, props: { uuid: string }) => { + const resource = getResource(props.uuid)(state.resources) as GroupContentsResource | undefined; + return { owner: resource ? resource.ownerUuid : '' }; + })((props: { owner: string }) => renderOwner(props.owner)); + export const renderType = (type: string) => {resourceLabel(type)} ; -export const renderStatus = (item: {status?: string}) => +export const ResourceType = connect( + (state: RootState, props: { uuid: string }) => { + const resource = getResource(props.uuid)(state.resources) as GroupContentsResource | undefined; + return { type: resource ? resource.kind : '' }; + })((props: { type: string }) => renderType(props.type)); + +export const renderStatus = (item: { status?: string }) => {item.status || "-"} ; + +export const ProcessStatus = connect( + (state: RootState, props: { uuid: string }) => { + const resource = getResource(props.uuid)(state.resources) as ProcessResource | undefined; + return { status: resource ? resource.state : '-' }; + })((props: { status: string }) => renderType(props.status));