//
// SPDX-License-Identifier: AGPL-3.0
-import * as React from 'react';
-import { CollectionIcon } from 'components/icon/icon';
+import React from 'react';
+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';
+export type CssRules = 'versionBrowserHeader' | 'versionBrowserItem' | 'versionBrowserField' | 'editIcon';
const styles: StyleRulesCallback<CssRules> = theme => ({
versionBrowserHeader: {
fontWeight: 'bold',
},
versionBrowserItem: {
+ flexWrap: 'wrap',
+ },
+ versionBrowserField: {
textAlign: 'center',
- }
+ },
+ editIcon: {
+ paddingRight: theme.spacing.unit/2,
+ fontSize: '1.125rem',
+ },
});
export class CollectionDetails extends DetailsData<CollectionResource> {
return ['Details', 'Versions'];
}
- getDetails(tabNumber: number) {
- switch (tabNumber) {
+ getDetails({tabNr}) {
+ switch (tabNr) {
case 0:
return this.getCollectionInfo();
case 1:
}
private getCollectionInfo() {
- return <CollectionDetailsAttributes twoCol={false} item={this.item} />;
+ return <CollectionInfo />;
}
private getVersionBrowser() {
}
}
+interface CollectionInfoDataProps {
+ currentCollection: CollectionResource | undefined;
+}
+
+interface CollectionInfoDispatchProps {
+ editCollection: (collection: CollectionResource | undefined) => void;
+}
+
+const ciMapStateToProps = (state: RootState): CollectionInfoDataProps => {
+ return {
+ currentCollection: getResource<CollectionResource>(state.detailsPanel.resourceUuid)(state.resources),
+ };
+};
+
+const ciMapDispatchToProps = (dispatch: Dispatch): CollectionInfoDispatchProps => ({
+ editCollection: (collection: CollectionResource) =>
+ dispatch<any>(openCollectionUpdateDialog({
+ uuid: collection.uuid,
+ name: collection.name,
+ description: collection.description,
+ properties: collection.properties,
+ storageClassesDesired: collection.storageClassesDesired,
+ })),
+});
+
+type CollectionInfoProps = CollectionInfoDataProps & CollectionInfoDispatchProps & WithStyles<CssRules>;
+
+const CollectionInfo = withStyles(styles)(
+ connect(ciMapStateToProps, ciMapDispatchToProps)(
+ ({ currentCollection, editCollection, classes }: CollectionInfoProps) =>
+ currentCollection !== undefined
+ ? <div data-cy='details-panel-edit-btn'>
+ <Button onClick={() => editCollection(currentCollection)}>
+ <RenameIcon className={classes.editIcon} /> Edit
+ </Button>
+ <CollectionDetailsAttributes twoCol={false} item={currentCollection} />
+ </div>
+ : <div />
+ )
+);
+
interface CollectionVersionBrowserProps {
currentCollection: CollectionResource | undefined;
versions: CollectionResource[];
handleContextMenu: (event: React.MouseEvent<HTMLElement>, collection: CollectionResource) => void;
}
-const mapStateToProps = (state: RootState): CollectionVersionBrowserProps => {
+const vbMapStateToProps = (state: RootState): CollectionVersionBrowserProps => {
const currentCollection = getResource<CollectionResource>(state.detailsPanel.resourceUuid)(state.resources);
- const versions = currentCollection
+ const versions = (currentCollection
&& filterResources(rsc =>
(rsc as CollectionResource).currentVersionUuid === currentCollection.currentVersionUuid)(state.resources)
- .sort((a: CollectionResource, b: CollectionResource) => b.version - a.version) as CollectionResource[]
+ .sort((a: CollectionResource, b: CollectionResource) => b.version - a.version) as CollectionResource[])
|| [];
return { currentCollection, versions };
};
-const mapDispatchToProps = () =>
+const vbMapDispatchToProps = () =>
(dispatch: Dispatch): CollectionVersionBrowserDispatchProps => ({
showVersion: (collection) => dispatch<any>(navigateTo(collection.uuid)),
handleContextMenu: (event: React.MouseEvent<HTMLElement>, collection: CollectionResource) => {
dispatch<any>(openContextMenu(event, {
name: collection.name,
uuid: collection.uuid,
+ description: collection.description,
+ storageClassesDesired: collection.storageClassesDesired,
ownerUuid: collection.ownerUuid,
isTrashed: collection.isTrashed,
kind: collection.kind,
});
const CollectionVersionBrowser = withStyles(styles)(
- connect(mapStateToProps, mapDispatchToProps)(
+ connect(vbMapStateToProps, vbMapDispatchToProps)(
({ currentCollection, versions, showVersion, handleContextMenu, classes }: CollectionVersionBrowserProps & CollectionVersionBrowserDispatchProps & WithStyles<CssRules>) => {
return <div data-cy="collection-version-browser">
<Grid container>
key={item.version}
onClick={e => showVersion(item)}
onContextMenu={event => handleContextMenu(event, item)}
- selected={isSelectedVersion}>
+ selected={isSelectedVersion}
+ className={classes.versionBrowserItem}>
<Grid item xs={2}>
- <Typography variant="caption" className={classes.versionBrowserItem}>
+ <Typography variant="caption" className={classes.versionBrowserField}>
{item.version}
</Typography>
</Grid>
<Grid item xs={4}>
- <Typography variant="caption" className={classes.versionBrowserItem}>
+ <Typography variant="caption" className={classes.versionBrowserField}>
{formatFileSize(item.fileSizeTotal)}
</Typography>
</Grid>
<Grid item xs={6}>
- <Typography variant="caption" className={classes.versionBrowserItem}>
+ <Typography variant="caption" className={classes.versionBrowserField}>
{formatDate(item.modifiedAt)}
</Typography>
</Grid>
+ <Grid item xs={12}>
+ <Typography variant="caption" className={classes.versionBrowserField}>
+ Modified by: <UserNameFromID uuid={item.modifiedByUserUuid} />
+ </Typography>
+ </Grid>
</ListItem>
);
})}
</Grid>
</div>;
- }));
\ No newline at end of file
+ }));
projects / arvados-workbench2.git / blobdiff