X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/ccc52fb9e9a880f8b8e9b15b09c2ebd513575bd4..44cbbc08d7a5b559a542bbf6491a05467de1c15c:/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 1e5fb5e8a6..0b264b6bab 100644 --- a/src/views/collection-panel/collection-panel.tsx +++ b/src/views/collection-panel/collection-panel.tsx @@ -3,186 +3,157 @@ // SPDX-License-Identifier: AGPL-3.0 import * as React from 'react'; -import { - StyleRulesCallback, WithStyles, withStyles, Card, CardHeader, IconButton, - CardContent, Grid, MenuItem, Menu, ListItemIcon, ListItemText, Typography +import { + StyleRulesCallback, WithStyles, withStyles, Card, + CardHeader, IconButton, CardContent, Grid, Chip, Tooltip } 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, ShareIcon, RenameIcon, AddFavoriteIcon, MoveToIcon, - CopyIcon, ProvenanceGraphIcon, DetailsIcon, AdvancedIcon, RemoveIcon -} from '../../components/icon/icon'; -import { DetailsAttribute } from '../../components/details-attribute/details-attribute'; -import { CollectionResource } from '../../models/collection'; - -type CssRules = 'card' | 'iconHeader'; +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 { CollectionTagForm } from './collection-tag-form'; +import { deleteCollectionTag } from '~/store/collection-panel/collection-panel-action'; +import { snackbarActions } from '~/store/snackbar/snackbar-actions'; +import { getResource } from '~/store/resources/resources'; +import { openContextMenu } from '~/store/context-menu/context-menu-actions'; +import { ContextMenuKind } from '~/views-components/context-menu/context-menu'; + +type CssRules = 'card' | 'iconHeader' | 'tag' | 'copyIcon' | 'label' | 'value'; const styles: StyleRulesCallback = (theme: ArvadosTheme) => ({ card: { - marginBottom: '20px' + marginBottom: theme.spacing.unit * 2 }, iconHeader: { fontSize: '1.875rem', color: theme.customs.colors.yellow700 - } -}); - -const MENU_OPTIONS = [ - { - title: 'Edit collection', - icon: RenameIcon - }, - { - title: 'Share', - icon: ShareIcon - }, - { - title: 'Move to', - icon: MoveToIcon }, - { - title: 'Add to favorites', - icon: AddFavoriteIcon + tag: { + marginRight: theme.spacing.unit, + marginBottom: theme.spacing.unit }, - { - title: 'Copy to project', - icon: CopyIcon + copyIcon: { + marginLeft: theme.spacing.unit, + fontSize: '1.125rem', + color: theme.palette.grey["500"], + cursor: 'pointer' }, - { - title: 'View details', - icon: DetailsIcon + label: { + fontSize: '0.875rem' }, - { - title: 'Provenance graph', - icon: ProvenanceGraphIcon - }, - { - title: 'Advanced', - icon: AdvancedIcon - }, - { - title: 'Remove', - icon: RemoveIcon + value: { + textTransform: 'none', + fontSize: '0.875rem' } -]; +}); interface CollectionPanelDataProps { item: CollectionResource; } -interface CollectionPanelActionProps { - onItemRouteChange: (collectionId: string) => void; -} +type CollectionPanelProps = CollectionPanelDataProps & DispatchProp + & WithStyles & RouteComponentProps<{ id: string }>; -type CollectionPanelProps = CollectionPanelDataProps & CollectionPanelActionProps - & WithStyles & RouteComponentProps<{ id: string }>; export const CollectionPanel = withStyles(styles)( - connect((state: RootState) => ({ item: state.collectionPanel.item }))( - class extends React.Component { - - state = { - anchorEl: undefined, - open: false - }; - - showMenu = (event: any) => { - this.setState({ anchorEl: event.currentTarget, open: true }); - } - - closeMenu = () => { - this.setState({ anchorEl: undefined, open: false }); - } - - displayMenuAction = () => { - return - - ; - } - + connect((state: RootState, props: RouteComponentProps<{ id: string }>) => { + const collection = getResource(props.match.params.id)(state.resources); + return { + item: collection + }; + })( + class extends React.Component { render() { - const { anchorEl, open } = this.state; const { classes, item } = this.props; return
- - } - action={ + + } + action={ + + onClick={this.handleContextMenu}> - - } - title={item && item.name } /> - - - {MENU_OPTIONS.map((option) => ( - - - - - - {option.title} - - }/> - - ))} - - - - - - - + + + } + title={item && item.name} + subheader={item && item.description} /> + + + + + + this.onCopy()}> + + + + + + + - - - - - - - - - Tags - + + + + + + + + + + + { + Object.keys(item.properties).map( key => { + return ; + }) + } - - + + + +
+ +
+
; + } - - - - - - Tags - - - - - ; + handleContextMenu = (event: React.MouseEvent) => { + const { uuid, ownerUuid, name, description, kind } = this.props.item; + const resource = { + uuid, + ownerUuid, + name, + description, + kind, + menuKind: ContextMenuKind.COLLECTION + }; + this.props.dispatch(openContextMenu(event, resource)); } - componentWillReceiveProps({ match, item, onItemRouteChange }: CollectionPanelProps) { - if (!item || match.params.id !== item.uuid) { - onItemRouteChange(match.params.id); - } + handleDelete = (key: string) => () => { + this.props.dispatch(deleteCollectionTag(key)); } + onCopy = () => { + this.props.dispatch(snackbarActions.OPEN_SNACKBAR({ + message: "Uuid has been copied", + hideDuration: 2000 + })); + } } ) -); \ No newline at end of file +);