X-Git-Url: https://git.arvados.org/arvados-workbench2.git/blobdiff_plain/dc63b1fd2a8cbf8c15c5521c27ff72bb5f94e9c7..c21c6582a12fe3968e3ef3a4786de5dfacce3b18:/src/views-components/details-panel/collection-details.tsx diff --git a/src/views-components/details-panel/collection-details.tsx b/src/views-components/details-panel/collection-details.tsx index 3905427b..5edfbc37 100644 --- a/src/views-components/details-panel/collection-details.tsx +++ b/src/views-components/details-panel/collection-details.tsx @@ -3,21 +3,27 @@ // SPDX-License-Identifier: AGPL-3.0 import React from 'react'; -import { CollectionIcon } from 'components/icon/icon'; +import { CollectionIcon, RenameIcon } from 'components/icon/icon'; import { CollectionResource } from 'models/collection'; import { DetailsData } from "./details-data"; import { CollectionDetailsAttributes } from 'views/collection-panel/collection-panel'; import { RootState } from 'store/store'; import { filterResources, getResource } from 'store/resources/resources'; import { connect } from 'react-redux'; -import { Grid, ListItem, StyleRulesCallback, Typography, withStyles, WithStyles } from '@material-ui/core'; +import { Button, Grid, ListItem, StyleRulesCallback, Typography, withStyles, WithStyles } from '@material-ui/core'; import { formatDate, formatFileSize } from 'common/formatters'; import { UserNameFromID } from '../data-explorer/renderers'; import { Dispatch } from 'redux'; import { navigateTo } from 'store/navigation/navigation-action'; import { openContextMenu, resourceUuidToContextMenuKind } from 'store/context-menu/context-menu-actions'; +import { openCollectionUpdateDialog } from 'store/collections/collection-update-actions'; -export type CssRules = 'versionBrowserHeader' | 'versionBrowserItem' | 'versionBrowserField'; +export type CssRules = 'versionBrowserHeader' + | 'versionBrowserItem' + | 'versionBrowserField' + | 'editButton' + | 'editIcon' + | 'tag'; const styles: StyleRulesCallback = theme => ({ versionBrowserHeader: { @@ -29,7 +35,20 @@ const styles: StyleRulesCallback = theme => ({ }, versionBrowserField: { textAlign: 'center', - } + }, + editIcon: { + paddingRight: theme.spacing.unit/2, + fontSize: '1.125rem', + }, + editButton: { + boxShadow: 'none', + padding: '2px 10px 2px 5px', + fontSize: '0.75rem' + }, + tag: { + marginRight: theme.spacing.unit / 2, + marginBottom: theme.spacing.unit / 2 + }, }); export class CollectionDetails extends DetailsData { @@ -42,8 +61,8 @@ export class CollectionDetails extends DetailsData { return ['Details', 'Versions']; } - getDetails(tabNumber: number) { - switch (tabNumber) { + getDetails({tabNr}) { + switch (tabNr) { case 0: return this.getCollectionInfo(); case 1: @@ -54,7 +73,7 @@ export class CollectionDetails extends DetailsData { } private getCollectionInfo() { - return ; + return ; } private getVersionBrowser() { @@ -62,6 +81,50 @@ export class CollectionDetails extends DetailsData { } } +interface CollectionInfoDataProps { + currentCollection: CollectionResource | undefined; +} + +interface CollectionInfoDispatchProps { + editCollection: (collection: CollectionResource | undefined) => void; +} + +const ciMapStateToProps = (state: RootState): CollectionInfoDataProps => { + return { + currentCollection: getResource(state.detailsPanel.resourceUuid)(state.resources), + }; +}; + +const ciMapDispatchToProps = (dispatch: Dispatch): CollectionInfoDispatchProps => ({ + editCollection: (collection: CollectionResource) => + dispatch(openCollectionUpdateDialog({ + uuid: collection.uuid, + name: collection.name, + description: collection.description, + properties: collection.properties, + storageClassesDesired: collection.storageClassesDesired, + })), +}); + +type CollectionInfoProps = CollectionInfoDataProps & CollectionInfoDispatchProps & WithStyles; + +const CollectionInfo = withStyles(styles)( + connect(ciMapStateToProps, ciMapDispatchToProps)( + ({ currentCollection, editCollection, classes }: CollectionInfoProps) => + currentCollection !== undefined + ?
+ + +
+ :
+ ) +); + interface CollectionVersionBrowserProps { currentCollection: CollectionResource | undefined; versions: CollectionResource[]; @@ -72,7 +135,7 @@ interface CollectionVersionBrowserDispatchProps { handleContextMenu: (event: React.MouseEvent, collection: CollectionResource) => void; } -const mapStateToProps = (state: RootState): CollectionVersionBrowserProps => { +const vbMapStateToProps = (state: RootState): CollectionVersionBrowserProps => { const currentCollection = getResource(state.detailsPanel.resourceUuid)(state.resources); const versions = (currentCollection && filterResources(rsc => @@ -82,7 +145,7 @@ const mapStateToProps = (state: RootState): CollectionVersionBrowserProps => { return { currentCollection, versions }; }; -const mapDispatchToProps = () => +const vbMapDispatchToProps = () => (dispatch: Dispatch): CollectionVersionBrowserDispatchProps => ({ showVersion: (collection) => dispatch(navigateTo(collection.uuid)), handleContextMenu: (event: React.MouseEvent, collection: CollectionResource) => { @@ -103,7 +166,7 @@ const mapDispatchToProps = () => }); const CollectionVersionBrowser = withStyles(styles)( - connect(mapStateToProps, mapDispatchToProps)( + connect(vbMapStateToProps, vbMapDispatchToProps)( ({ currentCollection, versions, showVersion, handleContextMenu, classes }: CollectionVersionBrowserProps & CollectionVersionBrowserDispatchProps & WithStyles) => { return