X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/eb7235a7a2cf4c6b6f52b42ac8313de388235aa9..826435d2e41cae04847672a38619b1d7ebae1ba7:/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 6d95196d3e..0e3eefe231 100644 --- a/src/views-components/data-explorer/renderers.tsx +++ b/src/views-components/data-explorer/renderers.tsx @@ -5,8 +5,8 @@ import * as React from 'react'; import { Grid, Typography, withStyles, Tooltip, IconButton, Checkbox } from '@material-ui/core'; import { FavoriteStar, PublicFavoriteStar } from '../favorite-star/favorite-star'; -import { ResourceKind, TrashableResource } from '~/models/resource'; -import { ProjectIcon, CollectionIcon, ProcessIcon, DefaultIcon, ShareIcon, CollectionOldVersionIcon, WorkflowIcon } from '~/components/icon/icon'; +import { Resource, ResourceKind, TrashableResource } from '~/models/resource'; +import { ProjectIcon, FilterGroupIcon, CollectionIcon, ProcessIcon, DefaultIcon, ShareIcon, CollectionOldVersionIcon, WorkflowIcon } from '~/components/icon/icon'; import { formatDate, formatFileSize, formatTime } from '~/common/formatters'; import { resourceLabel } from '~/common/labels'; import { connect, DispatchProp } from 'react-redux'; @@ -20,13 +20,15 @@ import { WorkflowResource } from '~/models/workflow'; import { ResourceStatus as WorkflowStatus } from '~/views/workflow-panel/workflow-panel-view'; import { getUuidPrefix, openRunProcess } from '~/store/workflow-panel/workflow-panel-actions'; import { openSharingDialog } from '~/store/sharing-dialog/sharing-dialog-actions'; -import { UserResource } from '~/models/user'; +import { getUserFullname, User, UserResource } from '~/models/user'; import { toggleIsActive, toggleIsAdmin } from '~/store/users/users-actions'; import { LinkResource } from '~/models/link'; import { navigateTo } from '~/store/navigation/navigation-action'; import { withResourceData } from '~/views-components/data-explorer/with-resources'; import { CollectionResource } from '~/models/collection'; import { IllegalNamingWarning } from '~/components/warning/warning'; +import { loadResource } from '~/store/resources/resources-actions'; +import { GroupClass } from '~/models/group'; const renderName = (dispatch: Dispatch, item: GroupContentsResource) => @@ -58,6 +60,9 @@ export const ResourceName = connect( const renderIcon = (item: GroupContentsResource) => { switch (item.kind) { case ResourceKind.PROJECT: + if (item.groupClass === GroupClass.FILTER) { + return ; + } return ; case ResourceKind.COLLECTION: if (item.uuid === item.currentVersionUuid) { @@ -412,6 +417,11 @@ export const renderFileSize = (fileSize?: number) => export const ResourceFileSize = connect( (state: RootState, props: { uuid: string }) => { const resource = getResource(props.uuid)(state.resources); + + if (resource && resource.kind !== ResourceKind.COLLECTION) { + return { fileSize: '' }; + } + return { fileSize: resource ? resource.fileSizeTotal : 0 }; })((props: { fileSize?: number }) => renderFileSize(props.fileSize)); @@ -434,32 +444,117 @@ export const ResourceOwnerName = connect( return { owner: ownerName ? ownerName!.name : resource!.ownerUuid }; })((props: { owner: string }) => renderOwner(props.owner)); -const renderType = (type: string) => +export const ResourceOwnerWithName = + compose( + connect( + (state: RootState, props: { uuid: string }) => { + let ownerName = ''; + const resource = getResource(props.uuid)(state.resources); + + if (resource) { + ownerName = getUserFullname(resource as User) || (resource as GroupContentsResource).name; + } + + return { uuid: props.uuid, ownerName }; + }), + withStyles({}, { withTheme: true })) + ((props: { uuid: string, ownerName: string, dispatch: Dispatch, theme: ArvadosTheme }) => { + const { uuid, ownerName, dispatch, theme } = props; + + if (ownerName === '') { + dispatch(loadResource(uuid, false)); + return + {uuid} + ; + } + + return + {ownerName} ({uuid}) + ; + }); + +export const ResponsiblePerson = + compose( + connect( + (state: RootState, props: { uuid: string, parentRef: HTMLElement | null }) => { + let responsiblePersonName = null; + let responsiblePersonUUID = null; + let responsiblePersonProperty = null; + + if (state.auth.config.clusterConfig.Collections.ManagedProperties) { + let index = 0; + const keys = Object.keys(state.auth.config.clusterConfig.Collections.ManagedProperties); + + while (!responsiblePersonProperty && keys[index]) { + const key = keys[index]; + if (state.auth.config.clusterConfig.Collections.ManagedProperties[key].Function === 'original_owner') { + responsiblePersonProperty = key; + } + index++; + } + } + + let resource: Resource | undefined = getResource(props.uuid)(state.resources); + + while (resource && resource.kind !== ResourceKind.USER && responsiblePersonProperty) { + responsiblePersonUUID = (resource as CollectionResource).properties[responsiblePersonProperty]; + resource = getResource(responsiblePersonUUID)(state.resources); + } + + if (resource && resource.kind === ResourceKind.USER) { + responsiblePersonName = getUserFullname(resource as UserResource) || (resource as GroupContentsResource).name; + } + + return { uuid: responsiblePersonUUID, responsiblePersonName, parentRef: props.parentRef }; + }), + withStyles({}, { withTheme: true })) + ((props: { uuid: string | null, responsiblePersonName: string, parentRef: HTMLElement | null, theme: ArvadosTheme }) => { + const { uuid, responsiblePersonName, parentRef, theme } = props; + + if (!uuid && parentRef) { + parentRef.style.display = 'none'; + return null; + } else if (parentRef) { + parentRef.style.display = 'block'; + } + + if (!responsiblePersonName) { + return + {uuid} + ; + } + + return + {responsiblePersonName} ({uuid}) + ; + }); + +const renderType = (type: string, subtype: string) => - {resourceLabel(type)} + {resourceLabel(type, subtype)} ; export const ResourceType = connect( (state: RootState, props: { uuid: string }) => { const resource = getResource(props.uuid)(state.resources); - return { type: resource ? resource.kind : '' }; - })((props: { type: string }) => renderType(props.type)); + return { type: resource ? resource.kind : '', subtype: resource && resource.kind === ResourceKind.GROUP ? resource.groupClass : '' }; + })((props: { type: string, subtype: string }) => renderType(props.type, props.subtype)); export const ResourceStatus = connect((state: RootState, props: { uuid: string }) => { - return { resource: getResource(props.uuid)(state.resources) }; - })((props: { resource: GroupContentsResource }) => - (props.resource && props.resource.kind === ResourceKind.COLLECTION) + return { resource: getResource(props.uuid)(state.resources) }; +})((props: { resource: GroupContentsResource }) => + (props.resource && props.resource.kind === ResourceKind.COLLECTION) ? : - ); +); export const CollectionStatus = connect((state: RootState, props: { uuid: string }) => { - return { collection: getResource(props.uuid)(state.resources) }; - })((props: { collection: CollectionResource }) => - (props.collection.uuid !== props.collection.currentVersionUuid) + return { collection: getResource(props.uuid)(state.resources) }; +})((props: { collection: CollectionResource }) => + (props.collection.uuid !== props.collection.currentVersionUuid) ? version {props.collection.version} : head version - ); +); export const ProcessStatus = compose( connect((state: RootState, props: { uuid: string }) => { @@ -478,7 +573,7 @@ export const ProcessStatus = compose( export const ProcessStartDate = connect( (state: RootState, props: { uuid: string }) => { const process = getProcess(props.uuid)(state.resources); - return { date: ( process && process.container ) ? process.container.startedAt : '' }; + return { date: (process && process.container) ? process.container.startedAt : '' }; })((props: { date: string }) => renderDate(props.date)); export const renderRunTime = (time: number) =>