21128: fixed trash panel to only show restore button Arvados-DCO-1.1-Signed-off-by...

diff --git a/src/components/multiselect-toolbar/MultiselectToolbar.tsx b/src/components/multiselect-toolbar/MultiselectToolbar.tsx
index 2d9f3c44840ab76ae39c1247b8dc471036ad1f0c..a3b4f725acc4c33d6bf8563928c1070de0ac018e 100644 (file)
--- a/src/components/multiselect-toolbar/MultiselectToolbar.tsx
+++ b/src/components/multiselect-toolbar/MultiselectToolbar.tsx
@@ -55,10 +55,13 @@ export const MultiselectToolbar = connect(
         const { classes, checkedList, resources, selectedUuid, favorites } = props;
         const currentResourceKinds = Array.from(selectedToKindSet(checkedList));
 
-        const buttons = selectedToKindSet(checkedList).size
-            ? selectActionsByKind(currentResourceKinds, multiselectActionsFilters) : []
+        const currentPathIsTrash = window.location.pathname === "/trash";
+
+        const buttons =
+            currentPathIsTrash && selectedToKindSet(checkedList).size 
+            ? [msToggleTrashAction] 
+            : selectActionsByKind(currentResourceKinds, multiselectActionsFilters);
 
-console.log(buttons)
         return (
             <React.Fragment>
                 <Toolbar

diff --git a/src/views-components/data-explorer/data-explorer.tsx b/src/views-components/data-explorer/data-explorer.tsx
index d5a9977a71b4caad93d464d43d580ca457399e6c..55a254aba7f9ab791a44ab749d9a1e5781257667 100644 (file)
--- a/src/views-components/data-explorer/data-explorer.tsx
+++ b/src/views-components/data-explorer/data-explorer.tsx
@@ -41,7 +41,7 @@ const mapStateToProps = (state: RootState, { id }: Props) => {
     };
 };
 
-const mapDispatchToProps = dispatchFn => {
+const mapDispatchToProps = () => {
     return (dispatch: Dispatch, { id, onRowClick, onRowDoubleClick, onContextMenu }: Props) => ({
         onSetColumns: (columns: DataColumns<any, any>) => {
             dispatch(dataExplorerActions.SET_COLUMNS({ id, columns }));

diff --git a/src/views-components/multiselect-toolbar/ms-project-action-set.ts b/src/views-components/multiselect-toolbar/ms-project-action-set.ts
index de328a7dcc7fafe04af04560a8ab489710d0f8e9..0a1b1c5dc3df69996c60c42519d3c52969f0ceab 100644 (file)
--- a/src/views-components/multiselect-toolbar/ms-project-action-set.ts
+++ b/src/views-components/multiselect-toolbar/ms-project-action-set.ts
@@ -12,7 +12,6 @@ import { favoritePanelActions } from "store/favorite-panel/favorite-panel-action
 import { AddFavoriteIcon, RemoveFavoriteIcon } from "components/icon/icon";
 import { RestoreFromTrashIcon, TrashIcon } from "components/icon/icon";
 import { getResource } from "store/resources/resources";
-import { ContextMenuResource } from "store/context-menu/context-menu-actions";
 import { checkFavorite } from "store/favorites/favorites-reducer";
 
 export const msToggleFavoriteAction = {