X-Git-Url: https://git.arvados.org/arvados-workbench2.git/blobdiff_plain/cdc8a73914399a401642ca553e9d3d8b2d42db5c..2ef3823ee2205b76af73f3fa4440395bdb3aac5d:/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 348b548b..77d91558 100644 --- a/src/views/collection-panel/collection-panel.tsx +++ b/src/views/collection-panel/collection-panel.tsx @@ -11,20 +11,23 @@ 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, CopyIcon } from '~/components/icon/icon'; +import { MoreOptionsIcon, CollectionIcon } 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'; -import * as CopyToClipboard from 'react-copy-to-clipboard'; -import { TagResource } from '~/models/tag'; import { CollectionTagForm } from './collection-tag-form'; -import { deleteCollectionTag } from '~/store/collection-panel/collection-panel-action'; -import { snackbarActions } from '~/store/snackbar/snackbar-actions'; +import { deleteCollectionTag, navigateToProcess } from '~/store/collection-panel/collection-panel-action'; import { getResource } from '~/store/resources/resources'; -import { contextMenuActions, openContextMenu } from '~/store/context-menu/context-menu-actions'; +import { openContextMenu } from '~/store/context-menu/context-menu-actions'; import { ContextMenuKind } from '~/views-components/context-menu/context-menu'; +import { formatFileSize } from "~/common/formatters"; +import { getResourceData } from "~/store/resources-data/resources-data"; +import { ResourceData } from "~/store/resources-data/resources-data-reducer"; +import { openDetailsPanel } from '~/store/details-panel/details-panel-action'; +import * as CopyToClipboard from 'react-copy-to-clipboard'; +import { snackbarActions, SnackbarKind } from '~/store/snackbar/snackbar-actions'; -type CssRules = 'card' | 'iconHeader' | 'tag' | 'copyIcon' | 'label' | 'value'; +type CssRules = 'card' | 'iconHeader' | 'tag' | 'label' | 'value' | 'link'; const styles: StyleRulesCallback = (theme: ArvadosTheme) => ({ card: { @@ -38,128 +41,153 @@ const styles: StyleRulesCallback = (theme: ArvadosTheme) => ({ marginRight: theme.spacing.unit, marginBottom: theme.spacing.unit }, - copyIcon: { - marginLeft: theme.spacing.unit, - fontSize: '1.125rem', - color: theme.palette.grey["500"], - cursor: 'pointer' - }, label: { fontSize: '0.875rem' }, value: { textTransform: 'none', fontSize: '0.875rem' + }, + link: { + fontSize: '0.875rem', + color: theme.palette.primary.main, + '&:hover': { + cursor: 'pointer' + } } }); interface CollectionPanelDataProps { item: CollectionResource; - tags: TagResource[]; + data: ResourceData; } type CollectionPanelProps = CollectionPanelDataProps & DispatchProp & WithStyles & RouteComponentProps<{ id: string }>; - export const CollectionPanel = withStyles(styles)( connect((state: RootState, props: RouteComponentProps<{ id: string }>) => { - const collection = getResource(props.match.params.id)(state.resources); - return { - item: collection, - tags: state.collectionPanel.tags - }; + const item = getResource(props.match.params.id)(state.resources); + const data = getResourceData(props.match.params.id)(state.resourcesData); + return { item, data }; })( class extends React.Component { render() { - const { classes, item, tags } = this.props; - return
- - } - action={ - - - - } - title={item && item.name} - subheader={item && item.description} /> - - - - - - this.onCopy()}> - - - - - - - + const { classes, item, data, dispatch } = this.props; + return item + ? <> + + + + + } + action={ + + + + + + } + title={item && item.name} + titleTypographyProps={this.titleProps} + subheader={item && item.description} + subheaderTypographyProps={this.titleProps} /> + + + + + + + + + {(item.properties.container_request || item.properties.containerRequest) && + dispatch(navigateToProcess(item.properties.container_request || item.properties.containerRequest))}> + + + } + - - - + + - - - - - - - { - tags.map(tag => { - return ; - }) - } + + + + + + + + + { + Object.keys(item.properties).map(k => { + const label = `${k}: ${item.properties[k]}`; + return this.onCopy("Copied")}> + + ; + }) + } + - - - -
- -
-
; + + +
+ +
+ + : null; } handleContextMenu = (event: React.MouseEvent) => { - const { uuid, name, description } = this.props.item; + const { uuid, ownerUuid, name, description, kind, isTrashed } = this.props.item; const resource = { uuid, + ownerUuid, name, description, - kind: ContextMenuKind.COLLECTION + kind, + menuKind: isTrashed + ? ContextMenuKind.TRASHED_COLLECTION + : ContextMenuKind.COLLECTION }; this.props.dispatch(openContextMenu(event, resource)); } - handleDelete = (uuid: string) => () => { - this.props.dispatch(deleteCollectionTag(uuid)); + onCopy = (message: string) => + this.props.dispatch(snackbarActions.OPEN_SNACKBAR({ + message, + hideDuration: 2000, + kind: SnackbarKind.SUCCESS + })) + + handleDelete = (key: string) => () => { + this.props.dispatch(deleteCollectionTag(key)); } - onCopy = () => { - this.props.dispatch(snackbarActions.OPEN_SNACKBAR({ - message: "Uuid has been copied", - hideDuration: 2000 - })); + openCollectionDetails = () => { + const { item } = this.props; + if (item) { + this.props.dispatch(openDetailsPanel(item.uuid)); + } } + titleProps = { + onClick: this.openCollectionDetails + }; + } ) ); - -const renderTagLabel = (tag: TagResource) => { - const { properties } = tag; - return `${properties.key}: ${properties.value}`; -};