Merge branch '20031-collection-files-batch-operations' into main. Closes #20031

[arvados-workbench2.git] / src / components / collection-panel-files / collection-panel-files.tsx

diff --git a/src/components/collection-panel-files/collection-panel-files.tsx b/src/components/collection-panel-files/collection-panel-files.tsx
index b75f3018e4894fa02bb8adedafe2b7b2130f126a..c9d5b65711cfe8f965731f588934fa980e062b8d 100644 (file)
--- 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,
@@ -39,7 +39,7 @@ import { setCollectionFiles } from 'store/collection-panel/collection-panel-file
 import { sortBy } from 'lodash';
 import { formatFileSize } from 'common/formatters';
 import { getInlineFileUrl, sanitizeToken } from 'views-components/context-menu/actions/helpers';
-import { extractUuidObjectType, ResourceObjectType } from 'models/resource';
+import { extractUuidKind, ResourceKind } from 'models/resource';
 
 export interface CollectionPanelFilesProps {
     isWritable: boolean;
@@ -261,7 +261,7 @@ export const CollectionPanelFiles = withStyles(styles)(connect((state: RootState
     const rightData = pathData[rightKey];
 
     React.useEffect(() => {
-        if (props.currentItemUuid && extractUuidObjectType(props.currentItemUuid) == ResourceObjectType.COLLECTION) {
+        if (props.currentItemUuid && extractUuidKind(props.currentItemUuid) === ResourceKind.COLLECTION) {
             setPathData({});
             setPath([props.currentItemUuid]);
         }
@@ -496,7 +496,7 @@ export const CollectionPanelFiles = withStyles(styles)(connect((state: RootState
                     onClick={(ev) => {
                         onOptionsMenuOpen(ev, isWritable);
                     }}>
-                    <CustomizeTableIcon />
+                    <MoreVerticalIcon />
                 </IconButton>
             </Tooltip>
         </div>
@@ -579,7 +579,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>