X-Git-Url: https://git.arvados.org/arvados-workbench2.git/blobdiff_plain/83cc752d85a910c19ffaf5c74433fbf7fa76e038..4530e2fcf4cac004af67cecddefc742a83c82b16:/src/views/collection-panel/collection-panel.tsx diff --git a/src/views/collection-panel/collection-panel.tsx b/src/views/collection-panel/collection-panel.tsx index b92557f9..27a68541 100644 --- a/src/views/collection-panel/collection-panel.tsx +++ b/src/views/collection-panel/collection-panel.tsx @@ -11,7 +11,7 @@ import { connect, DispatchProp } from "react-redux"; import { RouteComponentProps } from 'react-router'; import { ArvadosTheme } from '~/common/custom-theme'; import { RootState } from '~/store/store'; -import { MoreOptionsIcon, CollectionIcon } from '~/components/icon/icon'; +import { MoreOptionsIcon, CollectionIcon, ReadOnlyIcon } from '~/components/icon/icon'; import { DetailsAttribute } from '~/components/details-attribute/details-attribute'; import { CollectionResource } from '~/models/collection'; import { CollectionPanelFiles } from '~/views-components/collection-panel-files/collection-panel-files'; @@ -23,10 +23,15 @@ import { ContextMenuKind } from '~/views-components/context-menu/context-menu'; import { formatFileSize } from "~/common/formatters"; import { openDetailsPanel } from '~/store/details-panel/details-panel-action'; import { snackbarActions, SnackbarKind } from '~/store/snackbar/snackbar-actions'; -import { PropertyChipComponent } from '~/views-components/resource-properties-form/property-chip'; +import { getPropertyChip } from '~/views-components/resource-properties-form/property-chip'; import { IllegalNamingWarning } from '~/components/warning/warning'; +import { GroupResource } from '~/models/group'; +import { UserResource } from '~/models/user'; +import { getUserUuid } from '~/common/getuser'; +import { getProgressIndicator } from '~/store/progress-indicator/progress-indicator-reducer'; +import { COLLECTION_PANEL_LOAD_FILES } from '~/store/collection-panel/collection-panel-files/collection-panel-files-actions'; -type CssRules = 'card' | 'iconHeader' | 'tag' | 'label' | 'value' | 'link'; +type CssRules = 'card' | 'iconHeader' | 'tag' | 'label' | 'value' | 'link' | 'centeredLabel' | 'readOnlyIcon'; const styles: StyleRulesCallback = (theme: ArvadosTheme) => ({ card: { @@ -43,6 +48,10 @@ const styles: StyleRulesCallback = (theme: ArvadosTheme) => ({ label: { fontSize: '0.875rem' }, + centeredLabel: { + fontSize: '0.875rem', + textAlign: 'center' + }, value: { textTransform: 'none', fontSize: '0.875rem' @@ -53,11 +62,17 @@ const styles: StyleRulesCallback = (theme: ArvadosTheme) => ({ '&:hover': { cursor: 'pointer' } + }, + readOnlyIcon: { + marginLeft: theme.spacing.unit, + fontSize: 'small', } }); interface CollectionPanelDataProps { item: CollectionResource; + isWritable: boolean; + isLoadingFiles: boolean; } type CollectionPanelProps = CollectionPanelDataProps & DispatchProp @@ -65,16 +80,27 @@ type CollectionPanelProps = CollectionPanelDataProps & DispatchProp export const CollectionPanel = withStyles(styles)( connect((state: RootState, props: RouteComponentProps<{ id: string }>) => { - const item = getResource(props.match.params.id)(state.resources); - return { item }; + const currentUserUUID = getUserUuid(state); + const item = getResource(props.match.params.id)(state.resources); + let isWritable = false; + if (item && item.ownerUuid === currentUserUUID) { + isWritable = true; + } else if (item) { + const itemOwner = getResource(item.ownerUuid)(state.resources); + if (itemOwner) { + isWritable = itemOwner.writableBy.indexOf(currentUserUUID || '') >= 0; + } + } + const loadingFilesIndicator = getProgressIndicator(COLLECTION_PANEL_LOAD_FILES)(state.progressIndicator); + const isLoadingFiles = loadingFilesIndicator && loadingFilesIndicator!.working || false; + return { item, isWritable, isLoadingFiles }; })( class extends React.Component { - render() { - const { classes, item, dispatch } = this.props; + const { classes, item, dispatch, isWritable, isLoadingFiles } = this.props; return item ? <> - + @@ -84,31 +110,42 @@ export const CollectionPanel = withStyles(styles)( action={ } - title={item && {item.name}} + title={ + + + {item.name} + {isWritable || + + + + } + + } titleTypographyProps={this.titleProps} - subheader={item && item.description} + subheader={item.description} subheaderTypographyProps={this.titleProps} /> + linkToUuid={item.uuid} /> + linkToUuid={item.portableDataHash} /> + label='Number of files' value={item.fileCount} /> + label='Content size' value={formatFileSize(item.fileSizeTotal)} /> + label='Owner' linkToUuid={item.ownerUuid} /> {(item.properties.container_request || item.properties.containerRequest) && dispatch(navigateToProcess(item.properties.container_request || item.properties.containerRequest))}> @@ -119,26 +156,39 @@ export const CollectionPanel = withStyles(styles)( - + - + {isWritable && - + } - {Object.keys(item.properties).map(k => - - )} + { Object.keys(item.properties).length > 0 + ? Object.keys(item.properties).map(k => + Array.isArray(item.properties[k]) + ? item.properties[k].map((v: string) => + getPropertyChip( + k, v, + isWritable + ? this.handleDelete(k, item.properties[k]) + : undefined, + classes.tag)) + : getPropertyChip( + k, item.properties[k], + isWritable + ? this.handleDelete(k, item.properties[k]) + : undefined, + classes.tag) + ) + :
No properties set on this collection.
+ }
- +
: null; @@ -146,15 +196,18 @@ export const CollectionPanel = withStyles(styles)( handleContextMenu = (event: React.MouseEvent) => { const { uuid, ownerUuid, name, description, kind, isTrashed } = this.props.item; + const { isWritable } = this.props; const resource = { uuid, ownerUuid, name, description, kind, - menuKind: isTrashed - ? ContextMenuKind.TRASHED_COLLECTION - : ContextMenuKind.COLLECTION + menuKind: isWritable + ? isTrashed + ? ContextMenuKind.TRASHED_COLLECTION + : ContextMenuKind.COLLECTION + : ContextMenuKind.READONLY_COLLECTION }; this.props.dispatch(openContextMenu(event, resource)); } @@ -166,8 +219,8 @@ export const CollectionPanel = withStyles(styles)( kind: SnackbarKind.SUCCESS })) - handleDelete = (key: string) => () => { - this.props.dispatch(deleteCollectionTag(key)); + handleDelete = (key: string, value: string) => () => { + this.props.dispatch(deleteCollectionTag(key, value)); } openCollectionDetails = () => {