From edb0ce16ee7ccef6cec38c9787ba0dadde5da697 Mon Sep 17 00:00:00 2001 From: Stephen Smith Date: Thu, 25 May 2023 15:04:38 -0400 Subject: [PATCH] 20031: Rename vertical more icon and add horizontal variant. Correct usage in collection files panel Arvados-DCO-1.1-Signed-off-by: Stephen Smith --- .../collection-panel-files/collection-panel-files.tsx | 6 +++--- src/components/data-explorer/data-explorer.tsx | 4 ++-- src/components/icon/icon.tsx | 4 +++- src/views/collection-panel/collection-panel.tsx | 4 ++-- src/views/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 +++--- src/views/user-profile-panel/user-profile-panel-root.tsx | 4 ++-- .../virtual-machine-panel/virtual-machine-admin-panel.tsx | 4 ++-- src/views/workflow-panel/registered-workflow-panel.tsx | 4 ++-- 11 files changed, 28 insertions(+), 26 deletions(-) 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); }}> - + @@ -577,7 +577,7 @@ export const CollectionPanelFiles = withStyles(styles)(connect((state: RootState - 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)( this.props.onContextMenu(event, item)}> - + 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) => ; export const MaximizeIcon: IconType = (props) => ; export const MemoryIcon: IconType = (props) => ; export const UnMaximizeIcon: IconType = (props) => ; -export const MoreOptionsIcon: IconType = (props) => ; +export const MoreVerticalIcon: IconType = (props) => ; +export const MoreHorizontalIcon: IconType = (props) => ; export const MoveToIcon: IconType = (props) => ; export const NewProjectIcon: IconType = (props) => ; export const NotificationIcon: IconType = (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}> - + } 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; export const KeepServicePanelRoot = withStyles(styles)( - ({ classes, hasKeepSerices, keepServices, openRowOptions }: KeepServicePanelRootProps) => + ({ classes, hasKeepSerices, keepServices, openRowOptions }: KeepServicePanelRootProps) => {hasKeepSerices && @@ -73,7 +73,7 @@ export const KeepServicePanelRoot = withStyles(styles)( openRowOptions(event, keepService)}> - + @@ -84,4 +84,4 @@ export const KeepServicePanelRoot = withStyles(styles)( } -); \ 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)( onContextMenu(event)}> - + {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( onOptionsMenuOpen(event, repository)} className={classes.moreOptionsButton}> - + @@ -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)( openRowOptions(event, sshKey)}> - + @@ -113,4 +113,4 @@ export const SshKeyPanelRoot = withStyles(styles)( - ); \ 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)}> - + 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) => props.onOptionsMenuOpen(event, machine)} className={props.classes.moreOptionsButton}> - + 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( this.handleContextMenu(event)}> - + } -- 2.30.2