[arvados-workbench2] updated: 2.6.0-29-g28cbbd7e
git repository hosting
git at public.arvados.org
Thu May 25 19:25:51 UTC 2023
Summary of changes:
.../collection-panel-files/collection-panel-files.tsx | 6 +++---
src/components/data-explorer/data-explorer.tsx | 4 ++--
src/components/icon/icon.tsx | 18 +++++++++++++++++-
.../collections/collection-partial-copy-actions.ts | 7 +++----
.../collections/collection-partial-move-actions.ts | 6 +++---
.../action-sets/collection-files-action-set.ts | 10 ++++++++++
.../collection-files-not-selected-action-set.ts | 4 +++-
.../partial-copy-to-new-collection-dialog.ts | 1 -
src/views/collection-panel/collection-panel.tsx | 4 ++--
.../keep-service-panel/keep-service-panel-root.tsx | 8 ++++----
src/views/process-panel/process-details-card.tsx | 4 ++--
src/views/repositories-panel/repositories-panel.tsx | 6 +++---
src/views/ssh-key-panel/ssh-key-panel-root.tsx | 6 +++---
.../user-profile-panel/user-profile-panel-root.tsx | 4 ++--
.../virtual-machine-admin-panel.tsx | 4 ++--
src/views/workflow-panel/registered-workflow-panel.tsx | 4 ++--
16 files changed, 61 insertions(+), 35 deletions(-)
via 28cbbd7ed4a4d051e1b920f5c397fd121123af5e (commit)
via 5786e88839dd7ef52885a03aedfc7642b19cd5a1 (commit)
via edb0ce16ee7ccef6cec38c9787ba0dadde5da697 (commit)
via 8b5ee21b5b8e1dca0613151e4b38df55381d0e6f (commit)
from 5e8d8fd1172273a14c9306f36eefc7aef8442dc6 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
commit 28cbbd7ed4a4d051e1b920f5c397fd121123af5e
Author: Stephen Smith <stephen at curii.com>
Date: Thu May 25 15:25:07 2023 -0400
20031: Move stop loading actions into finally block in collection batch operation actions
Arvados-DCO-1.1-Signed-off-by: Stephen Smith <stephen at curii.com>
diff --git a/src/store/collections/collection-partial-copy-actions.ts b/src/store/collections/collection-partial-copy-actions.ts
index 78db1896..4b3af2a2 100644
--- a/src/store/collections/collection-partial-copy-actions.ts
+++ b/src/store/collections/collection-partial-copy-actions.ts
@@ -99,7 +99,6 @@ export const copyCollectionPartialToNewCollection = (fileSelection: CollectionFi
hideDuration: 2000,
kind: SnackbarKind.SUCCESS
}));
- dispatch(progressIndicatorActions.STOP_WORKING(COLLECTION_PARTIAL_COPY_FORM_NAME));
} catch (e) {
const error = getCommonResourceServiceError(e);
if (error === CommonResourceServiceError.UNIQUE_NAME_VIOLATION) {
@@ -111,6 +110,7 @@ export const copyCollectionPartialToNewCollection = (fileSelection: CollectionFi
dispatch(dialogActions.CLOSE_DIALOG({ id: COLLECTION_PARTIAL_COPY_FORM_NAME }));
dispatch(snackbarActions.OPEN_SNACKBAR({ message: 'Collection has been copied but may contain incorrect files.', hideDuration: 2000, kind: SnackbarKind.ERROR }));
}
+ } finally {
dispatch(stopSubmit(COLLECTION_PARTIAL_COPY_FORM_NAME));
dispatch(progressIndicatorActions.STOP_WORKING(COLLECTION_PARTIAL_COPY_FORM_NAME));
}
@@ -165,13 +165,13 @@ export const copyCollectionPartialToExistingCollection = (fileSelection: Collect
hideDuration: 2000,
kind: SnackbarKind.SUCCESS
}));
- dispatch(progressIndicatorActions.STOP_WORKING(COLLECTION_PARTIAL_COPY_TO_SELECTED_COLLECTION));
} catch (e) {
const error = getCommonResourceServiceError(e);
if (error === CommonResourceServiceError.UNKNOWN) {
dispatch(dialogActions.CLOSE_DIALOG({ id: COLLECTION_PARTIAL_COPY_TO_SELECTED_COLLECTION }));
dispatch(snackbarActions.OPEN_SNACKBAR({ message: 'Could not copy this files to selected collection', hideDuration: 2000, kind: SnackbarKind.ERROR }));
}
+ } finally {
dispatch(stopSubmit(COLLECTION_PARTIAL_COPY_TO_SELECTED_COLLECTION));
dispatch(progressIndicatorActions.STOP_WORKING(COLLECTION_PARTIAL_COPY_TO_SELECTED_COLLECTION));
}
@@ -227,7 +227,6 @@ export const copyCollectionPartialToSeparateCollections = (fileSelection: Collec
hideDuration: 2000,
kind: SnackbarKind.SUCCESS
}));
- dispatch(progressIndicatorActions.STOP_WORKING(COLLECTION_PARTIAL_COPY_TO_SEPARATE_COLLECTIONS));
} catch (e) {
const error = getCommonResourceServiceError(e);
if (error === CommonResourceServiceError.UNIQUE_NAME_VIOLATION) {
@@ -239,6 +238,7 @@ export const copyCollectionPartialToSeparateCollections = (fileSelection: Collec
dispatch(dialogActions.CLOSE_DIALOG({ id: COLLECTION_PARTIAL_COPY_TO_SEPARATE_COLLECTIONS }));
dispatch(snackbarActions.OPEN_SNACKBAR({ message: 'Collection has been copied but may contain incorrect files.', hideDuration: 2000, kind: SnackbarKind.ERROR }));
}
+ } finally {
dispatch(stopSubmit(COLLECTION_PARTIAL_COPY_TO_SEPARATE_COLLECTIONS));
dispatch(progressIndicatorActions.STOP_WORKING(COLLECTION_PARTIAL_COPY_TO_SEPARATE_COLLECTIONS));
}
diff --git a/src/store/collections/collection-partial-move-actions.ts b/src/store/collections/collection-partial-move-actions.ts
index 1d979f31..92e20981 100644
--- a/src/store/collections/collection-partial-move-actions.ts
+++ b/src/store/collections/collection-partial-move-actions.ts
@@ -101,13 +101,13 @@ export const moveCollectionPartialToNewCollection = (fileSelection: CollectionFi
hideDuration: 2000,
kind: SnackbarKind.SUCCESS
}));
- dispatch(progressIndicatorActions.STOP_WORKING(COLLECTION_PARTIAL_MOVE_TO_NEW_COLLECTION));
} catch (e) {
const error = getCommonResourceServiceError(e);
if (error === CommonResourceServiceError.UNKNOWN) {
dispatch(dialogActions.CLOSE_DIALOG({ id: COLLECTION_PARTIAL_MOVE_TO_NEW_COLLECTION }));
dispatch(snackbarActions.OPEN_SNACKBAR({ message: 'Could not move files to selected collection', hideDuration: 2000, kind: SnackbarKind.ERROR }));
}
+ } finally {
dispatch(stopSubmit(COLLECTION_PARTIAL_MOVE_TO_NEW_COLLECTION));
dispatch(progressIndicatorActions.STOP_WORKING(COLLECTION_PARTIAL_MOVE_TO_NEW_COLLECTION));
}
@@ -168,7 +168,6 @@ export const moveCollectionPartialToExistingCollection = (fileSelection: Collect
hideDuration: 2000,
kind: SnackbarKind.SUCCESS
}));
- dispatch(progressIndicatorActions.STOP_WORKING(COLLECTION_PARTIAL_MOVE_TO_SELECTED_COLLECTION));
} catch (e) {
const error = getCommonResourceServiceError(e);
if (error === CommonResourceServiceError.SOURCE_DESTINATION_CANNOT_BE_SAME) {
@@ -177,6 +176,7 @@ export const moveCollectionPartialToExistingCollection = (fileSelection: Collect
dispatch(dialogActions.CLOSE_DIALOG({ id: COLLECTION_PARTIAL_MOVE_TO_SELECTED_COLLECTION }));
dispatch(snackbarActions.OPEN_SNACKBAR({ message: 'Could not copy this files to selected collection', hideDuration: 2000, kind: SnackbarKind.ERROR }));
}
+ } finally {
dispatch(stopSubmit(COLLECTION_PARTIAL_MOVE_TO_SELECTED_COLLECTION));
dispatch(progressIndicatorActions.STOP_WORKING(COLLECTION_PARTIAL_MOVE_TO_SELECTED_COLLECTION));
}
@@ -233,7 +233,6 @@ export const moveCollectionPartialToSeparateCollections = (fileSelection: Collec
hideDuration: 2000,
kind: SnackbarKind.SUCCESS
}));
- dispatch(progressIndicatorActions.STOP_WORKING(COLLECTION_PARTIAL_MOVE_TO_SEPARATE_COLLECTIONS));
} catch (e) {
const error = getCommonResourceServiceError(e);
if (error === CommonResourceServiceError.UNIQUE_NAME_VIOLATION) {
@@ -245,6 +244,7 @@ export const moveCollectionPartialToSeparateCollections = (fileSelection: Collec
dispatch(dialogActions.CLOSE_DIALOG({ id: COLLECTION_PARTIAL_MOVE_TO_SEPARATE_COLLECTIONS }));
dispatch(snackbarActions.OPEN_SNACKBAR({ message: 'Collection has been copied but may contain incorrect files.', hideDuration: 2000, kind: SnackbarKind.ERROR }));
}
+ } finally {
dispatch(stopSubmit(COLLECTION_PARTIAL_MOVE_TO_SEPARATE_COLLECTIONS));
dispatch(progressIndicatorActions.STOP_WORKING(COLLECTION_PARTIAL_MOVE_TO_SEPARATE_COLLECTIONS));
}
commit 5786e88839dd7ef52885a03aedfc7642b19cd5a1
Author: Stephen Smith <stephen at curii.com>
Date: Thu May 25 15:05:14 2023 -0400
20031: Remove console log
Arvados-DCO-1.1-Signed-off-by: Stephen Smith <stephen at curii.com>
diff --git a/src/store/collections/collection-partial-copy-actions.ts b/src/store/collections/collection-partial-copy-actions.ts
index 7897efc4..78db1896 100644
--- a/src/store/collections/collection-partial-copy-actions.ts
+++ b/src/store/collections/collection-partial-copy-actions.ts
@@ -230,7 +230,6 @@ export const copyCollectionPartialToSeparateCollections = (fileSelection: Collec
dispatch(progressIndicatorActions.STOP_WORKING(COLLECTION_PARTIAL_COPY_TO_SEPARATE_COLLECTIONS));
} catch (e) {
const error = getCommonResourceServiceError(e);
- console.log(e, error);
if (error === CommonResourceServiceError.UNIQUE_NAME_VIOLATION) {
dispatch(snackbarActions.OPEN_SNACKBAR({ message: 'Collection from one or more files already exists', hideDuration: 2000, kind: SnackbarKind.ERROR }));
} else if (error === CommonResourceServiceError.UNKNOWN) {
diff --git a/src/views-components/dialog-forms/partial-copy-to-new-collection-dialog.ts b/src/views-components/dialog-forms/partial-copy-to-new-collection-dialog.ts
index 65b65db4..3a321def 100644
--- a/src/views-components/dialog-forms/partial-copy-to-new-collection-dialog.ts
+++ b/src/views-components/dialog-forms/partial-copy-to-new-collection-dialog.ts
@@ -14,7 +14,6 @@ export const PartialCopyToNewCollectionDialog = compose(
reduxForm<CollectionPartialCopyToNewCollectionFormData>({
form: COLLECTION_PARTIAL_COPY_FORM_NAME,
onSubmit: (data, dispatch, dialog) => {
- console.log(dialog.data);
dispatch(copyCollectionPartialToNewCollection(dialog.data, data));
}
}),
commit edb0ce16ee7ccef6cec38c9787ba0dadde5da697
Author: Stephen Smith <stephen at curii.com>
Date: Thu May 25 15:04:38 2023 -0400
20031: Rename vertical more icon and add horizontal variant. Correct usage in collection files panel
Arvados-DCO-1.1-Signed-off-by: Stephen Smith <stephen at curii.com>
diff --git a/src/components/collection-panel-files/collection-panel-files.tsx b/src/components/collection-panel-files/collection-panel-files.tsx
index fb36ebce..84b37a70 100644
--- a/src/components/collection-panel-files/collection-panel-files.tsx
+++ b/src/components/collection-panel-files/collection-panel-files.tsx
@@ -8,7 +8,7 @@ import { connect } from 'react-redux';
import { FixedSizeList } from "react-window";
import AutoSizer from "react-virtualized-auto-sizer";
import servicesProvider from 'common/service-provider';
-import { CustomizeTableIcon, DownloadIcon, MoreOptionsIcon } from 'components/icon/icon';
+import { DownloadIcon, MoreHorizontalIcon, MoreVerticalIcon } from 'components/icon/icon';
import { SearchInput } from 'components/search-input/search-input';
import {
ListItemIcon,
@@ -495,7 +495,7 @@ export const CollectionPanelFiles = withStyles(styles)(connect((state: RootState
onClick={(ev) => {
onOptionsMenuOpen(ev, isWritable);
}}>
- <CustomizeTableIcon />
+ <MoreVerticalIcon />
</IconButton>
</Tooltip>
</div>
@@ -577,7 +577,7 @@ export const CollectionPanelFiles = withStyles(styles)(connect((state: RootState
<IconButton data-id='moreOptions'
data-cy='file-item-options-btn'
className={classes.moreOptionsButton}>
- <MoreOptionsIcon
+ <MoreHorizontalIcon
data-id='moreOptions'
className={classes.moreOptions} />
</IconButton>
diff --git a/src/components/data-explorer/data-explorer.tsx b/src/components/data-explorer/data-explorer.tsx
index fcee0c54..dc097c39 100644
--- a/src/components/data-explorer/data-explorer.tsx
+++ b/src/components/data-explorer/data-explorer.tsx
@@ -16,7 +16,7 @@ import {
IconType,
MaximizeIcon,
UnMaximizeIcon,
- MoreOptionsIcon
+ MoreVerticalIcon
} from 'components/icon/icon';
import { PaperProps } from '@material-ui/core/Paper';
import { MPVPanelProps } from 'components/multi-panel-view/multi-panel-view';
@@ -255,7 +255,7 @@ export const DataExplorer = withStyles(styles)(
<Grid container justify="center">
<Tooltip title="More options" disableFocusListener>
<IconButton className={this.props.classes.moreOptionsButton} onClick={event => this.props.onContextMenu(event, item)}>
- <MoreOptionsIcon />
+ <MoreVerticalIcon />
</IconButton>
</Tooltip>
</Grid>
diff --git a/src/components/icon/icon.tsx b/src/components/icon/icon.tsx
index b71dc5a4..65ef3b8b 100644
--- a/src/components/icon/icon.tsx
+++ b/src/components/icon/icon.tsx
@@ -44,6 +44,7 @@ import LibraryBooks from '@material-ui/icons/LibraryBooks';
import ListAlt from '@material-ui/icons/ListAlt';
import Menu from '@material-ui/icons/Menu';
import MoreVert from '@material-ui/icons/MoreVert';
+import MoreHoriz from '@material-ui/icons/MoreHoriz';
import Mail from '@material-ui/icons/Mail';
import Notifications from '@material-ui/icons/Notifications';
import OpenInNew from '@material-ui/icons/OpenInNew';
@@ -190,7 +191,8 @@ export const MailIcon: IconType = (props) => <Mail {...props} />;
export const MaximizeIcon: IconType = (props) => <FullscreenSharp {...props} />;
export const MemoryIcon: IconType = (props) => <Memory {...props} />;
export const UnMaximizeIcon: IconType = (props) => <FullscreenExitSharp {...props} />;
-export const MoreOptionsIcon: IconType = (props) => <MoreVert {...props} />;
+export const MoreVerticalIcon: IconType = (props) => <MoreVert {...props} />;
+export const MoreHorizontalIcon: IconType = (props) => <MoreHoriz {...props} />;
export const MoveToIcon: IconType = (props) => <Input {...props} />;
export const NewProjectIcon: IconType = (props) => <CreateNewFolder {...props} />;
export const NotificationIcon: IconType = (props) => <Notifications {...props} />;
diff --git a/src/views/collection-panel/collection-panel.tsx b/src/views/collection-panel/collection-panel.tsx
index 54b7134e..79cf07bf 100644
--- a/src/views/collection-panel/collection-panel.tsx
+++ b/src/views/collection-panel/collection-panel.tsx
@@ -17,7 +17,7 @@ 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, ReadOnlyIcon, CollectionOldVersionIcon } from 'components/icon/icon';
+import { MoreVerticalIcon, CollectionIcon, ReadOnlyIcon, CollectionOldVersionIcon } from 'components/icon/icon';
import { DetailsAttribute } from 'components/details-attribute/details-attribute';
import { CollectionResource, getCollectionUrl } from 'models/collection';
import { CollectionPanelFiles } from 'views-components/collection-panel-files/collection-panel-files';
@@ -200,7 +200,7 @@ export const CollectionPanel = withStyles(styles)(connect(
data-cy='collection-panel-options-btn'
aria-label="Actions"
onClick={this.handleContextMenu}>
- <MoreOptionsIcon />
+ <MoreVerticalIcon />
</IconButton>
</Tooltip>
}
diff --git a/src/views/keep-service-panel/keep-service-panel-root.tsx b/src/views/keep-service-panel/keep-service-panel-root.tsx
index dee6ee77..7cc77956 100644
--- a/src/views/keep-service-panel/keep-service-panel-root.tsx
+++ b/src/views/keep-service-panel/keep-service-panel-root.tsx
@@ -5,7 +5,7 @@
import React from 'react';
import { StyleRulesCallback, WithStyles, withStyles, Card, CardContent, Grid, Table, TableHead, TableRow, TableCell, TableBody, Tooltip, IconButton, Checkbox } from '@material-ui/core';
import { ArvadosTheme } from 'common/custom-theme';
-import { MoreOptionsIcon } from 'components/icon/icon';
+import { MoreVerticalIcon } from 'components/icon/icon';
import { KeepServiceResource } from 'models/keep-services';
type CssRules = 'root' | 'tableRow';
@@ -34,7 +34,7 @@ export interface KeepServicePanelRootDataProps {
type KeepServicePanelRootProps = KeepServicePanelRootActionProps & KeepServicePanelRootDataProps & WithStyles<CssRules>;
export const KeepServicePanelRoot = withStyles(styles)(
- ({ classes, hasKeepSerices, keepServices, openRowOptions }: KeepServicePanelRootProps) =>
+ ({ classes, hasKeepSerices, keepServices, openRowOptions }: KeepServicePanelRootProps) =>
<Card className={classes.root}>
<CardContent>
{hasKeepSerices && <Grid container direction="row">
@@ -73,7 +73,7 @@ export const KeepServicePanelRoot = withStyles(styles)(
<TableCell>
<Tooltip title="More options" disableFocusListener>
<IconButton onClick={event => openRowOptions(event, keepService)}>
- <MoreOptionsIcon />
+ <MoreVerticalIcon />
</IconButton>
</Tooltip>
</TableCell>
@@ -84,4 +84,4 @@ export const KeepServicePanelRoot = withStyles(styles)(
</Grid>}
</CardContent>
</Card>
-);
\ No newline at end of file
+);
diff --git a/src/views/process-panel/process-details-card.tsx b/src/views/process-panel/process-details-card.tsx
index abcbcdb4..37f01dd7 100644
--- a/src/views/process-panel/process-details-card.tsx
+++ b/src/views/process-panel/process-details-card.tsx
@@ -16,7 +16,7 @@ import {
Button,
} from '@material-ui/core';
import { ArvadosTheme } from 'common/custom-theme';
-import { CloseIcon, MoreOptionsIcon, ProcessIcon, StartIcon, StopIcon } from 'components/icon/icon';
+import { CloseIcon, MoreVerticalIcon, ProcessIcon, StartIcon, StopIcon } from 'components/icon/icon';
import { Process, isProcessRunnable, isProcessResumable, isProcessCancelable } from 'store/processes/process';
import { MPVPanelProps } from 'components/multi-panel-view/multi-panel-view';
import { ProcessDetailsAttributes } from './process-details-attributes';
@@ -139,7 +139,7 @@ export const ProcessDetailsCard = withStyles(styles)(
<IconButton
aria-label="More options"
onClick={event => onContextMenu(event)}>
- <MoreOptionsIcon />
+ <MoreVerticalIcon />
</IconButton>
</Tooltip>
{doHidePanel &&
diff --git a/src/views/repositories-panel/repositories-panel.tsx b/src/views/repositories-panel/repositories-panel.tsx
index 996c7bdf..3ec5c56c 100644
--- a/src/views/repositories-panel/repositories-panel.tsx
+++ b/src/views/repositories-panel/repositories-panel.tsx
@@ -10,7 +10,7 @@ import { ArvadosTheme } from 'common/custom-theme';
import { Link } from 'react-router-dom';
import { Dispatch, compose } from 'redux';
import { RootState } from 'store/store';
-import { HelpIcon, AddIcon, MoreOptionsIcon } from 'components/icon/icon';
+import { HelpIcon, AddIcon, MoreVerticalIcon } from 'components/icon/icon';
import { loadRepositoriesData, openRepositoriesSampleGitDialog, openRepositoryCreateDialog } from 'store/repositories/repositories-actions';
import { RepositoryResource } from 'models/repositories';
import { openRepositoryContextMenu } from 'store/context-menu/context-menu-actions';
@@ -138,7 +138,7 @@ export const RepositoriesPanel = compose(
<TableCell className={classes.moreOptions}>
<Tooltip title="More options" disableFocusListener>
<IconButton onClick={event => onOptionsMenuOpen(event, repository)} className={classes.moreOptionsButton}>
- <MoreOptionsIcon />
+ <MoreVerticalIcon />
</IconButton>
</Tooltip>
</TableCell>
@@ -151,4 +151,4 @@ export const RepositoriesPanel = compose(
);
}
}
- );
\ No newline at end of file
+ );
diff --git a/src/views/ssh-key-panel/ssh-key-panel-root.tsx b/src/views/ssh-key-panel/ssh-key-panel-root.tsx
index 99ad1bff..8a266d00 100644
--- a/src/views/ssh-key-panel/ssh-key-panel-root.tsx
+++ b/src/views/ssh-key-panel/ssh-key-panel-root.tsx
@@ -6,7 +6,7 @@ import React from 'react';
import { StyleRulesCallback, WithStyles, withStyles, Card, CardContent, Button, Typography, Grid, Table, TableHead, TableRow, TableCell, TableBody, Tooltip, IconButton } from '@material-ui/core';
import { ArvadosTheme } from 'common/custom-theme';
import { SshKeyResource } from 'models/ssh-key';
-import { AddIcon, MoreOptionsIcon, KeyIcon } from 'components/icon/icon';
+import { AddIcon, MoreVerticalIcon, KeyIcon } from 'components/icon/icon';
type CssRules = 'root' | 'link' | 'buttonContainer' | 'table' | 'tableRow' | 'keyIcon';
@@ -103,7 +103,7 @@ export const SshKeyPanelRoot = withStyles(styles)(
<TableCell>
<Tooltip title="More options" disableFocusListener>
<IconButton onClick={event => openRowOptions(event, sshKey)}>
- <MoreOptionsIcon />
+ <MoreVerticalIcon />
</IconButton>
</Tooltip>
</TableCell>
@@ -113,4 +113,4 @@ export const SshKeyPanelRoot = withStyles(styles)(
</Grid>
</CardContent>
</Card>
- );
\ No newline at end of file
+ );
diff --git a/src/views/user-profile-panel/user-profile-panel-root.tsx b/src/views/user-profile-panel/user-profile-panel-root.tsx
index 6a556516..85eaaf0c 100644
--- a/src/views/user-profile-panel/user-profile-panel-root.tsx
+++ b/src/views/user-profile-panel/user-profile-panel-root.tsx
@@ -27,7 +27,7 @@ import { ArvadosTheme } from 'common/custom-theme';
import { PROFILE_EMAIL_VALIDATION, PROFILE_URL_VALIDATION } from "validators/validators";
import { USER_PROFILE_PANEL_ID } from 'store/user-profile/user-profile-actions';
import { noop } from 'lodash';
-import { DetailsIcon, GroupsIcon, MoreOptionsIcon } from 'components/icon/icon';
+import { DetailsIcon, GroupsIcon, MoreVerticalIcon } from 'components/icon/icon';
import { DataColumns } from 'components/data-table/data-table';
import { ResourceLinkHeadUuid, ResourceLinkHeadPermissionLevel, ResourceLinkHead, ResourceLinkDelete, ResourceLinkTailIsVisible, UserResourceAccountStatus } from 'views-components/data-explorer/renderers';
import { createTree } from 'models/tree';
@@ -220,7 +220,7 @@ export const UserProfilePanelRoot = withStyles(styles)(
data-cy='user-profile-panel-options-btn'
aria-label="Actions"
onClick={(event) => this.handleContextMenu(event, this.props.userUuid)}>
- <MoreOptionsIcon />
+ <MoreVerticalIcon />
</IconButton>
</Tooltip>
</Grid>
diff --git a/src/views/virtual-machine-panel/virtual-machine-admin-panel.tsx b/src/views/virtual-machine-panel/virtual-machine-admin-panel.tsx
index 864218e4..20665f17 100644
--- a/src/views/virtual-machine-panel/virtual-machine-admin-panel.tsx
+++ b/src/views/virtual-machine-panel/virtual-machine-admin-panel.tsx
@@ -11,7 +11,7 @@ import { compose, Dispatch } from 'redux';
import { loadVirtualMachinesAdminData, openAddVirtualMachineLoginDialog, openRemoveVirtualMachineLoginDialog, openEditVirtualMachineLoginDialog } from 'store/virtual-machines/virtual-machines-actions';
import { RootState } from 'store/store';
import { ListResults } from 'services/common-service/common-service';
-import { MoreOptionsIcon, AddUserIcon } from 'components/icon/icon';
+import { MoreVerticalIcon, AddUserIcon } from 'components/icon/icon';
import { VirtualMachineLogins, VirtualMachinesResource } from 'models/virtual-machines';
import { openVirtualMachinesContextMenu } from 'store/context-menu/context-menu-actions';
import { ResourceUuid, VirtualMachineHostname, VirtualMachineLogin } from 'views-components/data-explorer/renderers';
@@ -139,7 +139,7 @@ const virtualMachinesTable = (props: VirtualMachineProps) =>
<TableCell className={props.classes.moreOptions}>
<Tooltip title="More options" disableFocusListener>
<IconButton onClick={event => props.onOptionsMenuOpen(event, machine)} className={props.classes.moreOptionsButton}>
- <MoreOptionsIcon />
+ <MoreVerticalIcon />
</IconButton>
</Tooltip>
</TableCell>
diff --git a/src/views/workflow-panel/registered-workflow-panel.tsx b/src/views/workflow-panel/registered-workflow-panel.tsx
index 0963de35..5973efed 100644
--- a/src/views/workflow-panel/registered-workflow-panel.tsx
+++ b/src/views/workflow-panel/registered-workflow-panel.tsx
@@ -18,7 +18,7 @@ import { connect, DispatchProp } from "react-redux";
import { RouteComponentProps } from 'react-router';
import { ArvadosTheme } from 'common/custom-theme';
import { RootState } from 'store/store';
-import { WorkflowIcon, MoreOptionsIcon } from 'components/icon/icon';
+import { WorkflowIcon, MoreVerticalIcon } from 'components/icon/icon';
import { WorkflowResource } from 'models/workflow';
import { ProcessOutputCollectionFiles } from 'views/process-panel/process-output-collection-files';
import { WorkflowDetailsAttributes, RegisteredWorkflowPanelDataProps, getRegisteredWorkflowPanelData } from 'views-components/details-panel/workflow-details';
@@ -167,7 +167,7 @@ export const RegisteredWorkflowPanel = withStyles(styles)(connect(
<IconButton
aria-label="More options"
onClick={event => this.handleContextMenu(event)}>
- <MoreOptionsIcon />
+ <MoreVerticalIcon />
</IconButton>
</Tooltip>}
commit 8b5ee21b5b8e1dca0613151e4b38df55381d0e6f
Author: Stephen Smith <stephen at curii.com>
Date: Thu May 25 14:40:02 2023 -0400
20031: Add icons to collection files action set
Arvados-DCO-1.1-Signed-off-by: Stephen Smith <stephen at curii.com>
diff --git a/src/components/icon/icon.tsx b/src/components/icon/icon.tsx
index 157fb44b..b71dc5a4 100644
--- a/src/components/icon/icon.tsx
+++ b/src/components/icon/icon.tsx
@@ -142,6 +142,18 @@ export const FileMoveIcon: IconType = (props: any) =>
<path d="M14,17H18V14L23,18.5L18,23V20H14V17M13,9H18.5L13,3.5V9M6,2H14L20,8V12.34C19.37,12.12 18.7,12 18,12A6,6 0 0,0 12,18C12,19.54 12.58,20.94 13.53,22H6C4.89,22 4,21.1 4,20V4A2,2 0 0,1 6,2Z" />
</SvgIcon>;
+// https://pictogrammers.com/library/mdi/icon/checkbox-multiple-outline/
+export const CheckboxMultipleOutline: IconType = (props: any) =>
+ <SvgIcon {...props}>
+ <path d="M20,2H8A2,2 0 0,0 6,4V16A2,2 0 0,0 8,18H20A2,2 0 0,0 22,16V4A2,2 0 0,0 20,2M20,16H8V4H20V16M16,20V22H4A2,2 0 0,1 2,20V7H4V20H16M18.53,8.06L17.47,7L12.59,11.88L10.47,9.76L9.41,10.82L12.59,14L18.53,8.06Z" />
+ </SvgIcon>;
+
+// https://pictogrammers.com/library/mdi/icon/checkbox-multiple-blank-outline/
+export const CheckboxMultipleBlankOutline: IconType = (props: any) =>
+ <SvgIcon {...props}>
+ <path d="M20,16V4H8V16H20M22,16A2,2 0 0,1 20,18H8C6.89,18 6,17.1 6,16V4C6,2.89 6.89,2 8,2H20A2,2 0 0,1 22,4V16M16,20V22H4A2,2 0 0,1 2,20V7H4V20H16Z" />
+ </SvgIcon>;
+
export type IconType = React.SFC<{ className?: string, style?: object }>;
// https://v4.mui.com/components/material-icons/
@@ -226,3 +238,5 @@ export const InactiveIcon: IconType = (props) => <NotInterested {...props} />;
export const ImageIcon: IconType = (props) => <Image {...props} />;
export const StartIcon: IconType = (props) => <PlayArrow {...props} />;
export const StopIcon: IconType = (props) => <Stop {...props} />;
+export const SelectAllIcon: IconType = (props) => <CheckboxMultipleOutline {...props} />;
+export const SelectNoneIcon: IconType = (props) => <CheckboxMultipleBlankOutline {...props} />;
diff --git a/src/views-components/context-menu/action-sets/collection-files-action-set.ts b/src/views-components/context-menu/action-sets/collection-files-action-set.ts
index 681ca5b3..80deb37c 100644
--- a/src/views-components/context-menu/action-sets/collection-files-action-set.ts
+++ b/src/views-components/context-menu/action-sets/collection-files-action-set.ts
@@ -10,16 +10,19 @@ import {
openCollectionPartialCopyToSeparateCollectionsDialog
} from 'store/collections/collection-partial-copy-actions';
import { openCollectionPartialMoveMultipleToExistingCollectionDialog, openCollectionPartialMoveMultipleToNewCollectionDialog, openCollectionPartialMoveToSeparateCollectionsDialog } from "store/collections/collection-partial-move-actions";
+import { FileCopyIcon, FileMoveIcon, RemoveIcon, SelectAllIcon, SelectNoneIcon } from "components/icon/icon";
const copyActions: ContextMenuAction[] = [
{
name: "Copy selected into new collection",
+ icon: FileCopyIcon,
execute: dispatch => {
dispatch<any>(openCollectionPartialCopyMultipleToNewCollectionDialog());
}
},
{
name: "Copy selected into existing collection",
+ icon: FileCopyIcon,
execute: dispatch => {
dispatch<any>(openCollectionPartialCopyMultipleToExistingCollectionDialog());
}
@@ -30,6 +33,7 @@ const copyActionsMultiple: ContextMenuAction[] = [
...copyActions,
{
name: "Copy selected into separate collections",
+ icon: FileCopyIcon,
execute: dispatch => {
dispatch<any>(openCollectionPartialCopyToSeparateCollectionsDialog());
}
@@ -39,12 +43,14 @@ const copyActionsMultiple: ContextMenuAction[] = [
const moveActions: ContextMenuAction[] = [
{
name: "Move selected into new collection",
+ icon: FileMoveIcon,
execute: dispatch => {
dispatch<any>(openCollectionPartialMoveMultipleToNewCollectionDialog());
}
},
{
name: "Move selected into existing collection",
+ icon: FileMoveIcon,
execute: dispatch => {
dispatch<any>(openCollectionPartialMoveMultipleToExistingCollectionDialog());
}
@@ -55,6 +61,7 @@ const moveActionsMultiple: ContextMenuAction[] = [
...moveActions,
{
name: "Move selected into separate collections",
+ icon: FileMoveIcon,
execute: dispatch => {
dispatch<any>(openCollectionPartialMoveToSeparateCollectionsDialog());
}
@@ -64,12 +71,14 @@ const moveActionsMultiple: ContextMenuAction[] = [
const selectActions: ContextMenuAction[] = [
{
name: "Select all",
+ icon: SelectAllIcon,
execute: dispatch => {
dispatch(collectionPanelFilesAction.SELECT_ALL_COLLECTION_FILES());
}
},
{
name: "Unselect all",
+ icon: SelectNoneIcon,
execute: dispatch => {
dispatch(collectionPanelFilesAction.UNSELECT_ALL_COLLECTION_FILES());
}
@@ -78,6 +87,7 @@ const selectActions: ContextMenuAction[] = [
const removeAction: ContextMenuAction = {
name: "Remove selected",
+ icon: RemoveIcon,
execute: dispatch => {
dispatch(openMultipleFilesRemoveDialog());
}
diff --git a/src/views-components/context-menu/action-sets/collection-files-not-selected-action-set.ts b/src/views-components/context-menu/action-sets/collection-files-not-selected-action-set.ts
index 1ad13e74..1e31d11c 100644
--- a/src/views-components/context-menu/action-sets/collection-files-not-selected-action-set.ts
+++ b/src/views-components/context-menu/action-sets/collection-files-not-selected-action-set.ts
@@ -4,10 +4,12 @@
import { ContextMenuActionSet } from "views-components/context-menu/context-menu-action-set";
import { collectionPanelFilesAction } from "store/collection-panel/collection-panel-files/collection-panel-files-actions";
+import { SelectAllIcon } from "components/icon/icon";
export const collectionFilesNotSelectedActionSet: ContextMenuActionSet = [[{
name: "Select all",
+ icon: SelectAllIcon,
execute: dispatch => {
dispatch(collectionPanelFilesAction.SELECT_ALL_COLLECTION_FILES());
}
-}]];
\ No newline at end of file
+}]];
-----------------------------------------------------------------------
hooks/post-receive
--
More information about the arvados-commits
mailing list