X-Git-Url: https://git.arvados.org/arvados-workbench2.git/blobdiff_plain/3ee31ce16470660d90fb870e048c2de9fcde6e47..dd89200ad6fdbfa337fdbab5f54def8712c6746c:/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 b55e50c0..5baa6d18 100644 --- a/src/views/collection-panel/collection-panel.tsx +++ b/src/views/collection-panel/collection-panel.tsx @@ -3,32 +3,51 @@ // SPDX-License-Identifier: AGPL-3.0 import * as React from 'react'; -import { - StyleRulesCallback, WithStyles, withStyles, Card, - CardHeader, IconButton, CardContent, Grid +import { + StyleRulesCallback, WithStyles, withStyles, Card, + CardHeader, IconButton, CardContent, Grid, Chip } from '@material-ui/core'; -import { connect } from 'react-redux'; +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 { DetailsAttribute } from '../../components/details-attribute/details-attribute'; -import { CollectionResource } from '../../models/collection'; +import { ArvadosTheme } from '~/common/custom-theme'; +import { RootState } from '~/store/store'; +import { MoreOptionsIcon, CollectionIcon, CopyIcon } 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'; -type CssRules = 'card' | 'iconHeader'; +type CssRules = 'card' | 'iconHeader' | 'tag' | 'copyIcon' | 'value'; const styles: StyleRulesCallback = (theme: ArvadosTheme) => ({ card: { - marginBottom: '20px' + marginBottom: theme.spacing.unit * 2 }, iconHeader: { fontSize: '1.875rem', color: theme.customs.colors.yellow700 + }, + tag: { + marginRight: theme.spacing.unit, + marginBottom: theme.spacing.unit + }, + copyIcon: { + marginLeft: theme.spacing.unit, + fontSize: '1.125rem', + color: theme.palette.grey["500"], + cursor: 'pointer' + }, + value: { + textTransform: 'none' } }); interface CollectionPanelDataProps { item: CollectionResource; + tags: TagResource[]; } interface CollectionPanelActionProps { @@ -36,33 +55,45 @@ interface CollectionPanelActionProps { onContextMenu: (event: React.MouseEvent, item: CollectionResource) => void; } -type CollectionPanelProps = CollectionPanelDataProps & CollectionPanelActionProps +type CollectionPanelProps = CollectionPanelDataProps & CollectionPanelActionProps & DispatchProp & WithStyles & RouteComponentProps<{ id: string }>; + export const CollectionPanel = withStyles(styles)( - connect((state: RootState) => ({ item: state.collectionPanel.item }))( - class extends React.Component { + connect((state: RootState) => ({ + item: state.collectionPanel.item, + tags: state.collectionPanel.tags + }))( + class extends React.Component { render() { - const { classes, item, onContextMenu } = this.props; + const { classes, item, tags, onContextMenu } = this.props; return
- } - action={ + action={ onContextMenu(event, item)}> - + } - title={item && item.name } /> + title={item && item.name } + subheader={item && item.description} /> - - - + + + + + + + + @@ -72,26 +103,29 @@ export const CollectionPanel = withStyles(styles)( - - Tags - - - - - - - - - - - Tags + + + { + tags.map(tag => { + return ; + }) + } +
+ +
; } + handleDelete = (uuid: string) => () => { + this.props.dispatch(deleteCollectionTag(uuid)); + } + componentWillReceiveProps({ match, item, onItemRouteChange }: CollectionPanelProps) { if (!item || match.params.id !== item.uuid) { onItemRouteChange(match.params.id); @@ -100,4 +134,9 @@ export const CollectionPanel = withStyles(styles)( } ) -); \ No newline at end of file +); + +const renderTagLabel = (tag: TagResource) => { + const { properties } = tag; + return `${properties.key}: ${properties.value}`; +};