[arvados-workbench2] updated: 2.7.0-200-ga3e21918

[git repository hosting]

Summary of changes:
 src/components/multiselect-toolbar/MultiselectToolbar.tsx        | 9 ++++++---
 src/views-components/data-explorer/data-explorer.tsx             | 2 +-
 .../multiselect-toolbar/ms-project-action-set.ts                 | 1 -
 3 files changed, 7 insertions(+), 5 deletions(-)

       via  a3e219187463e72f0023873cf86150117da779c7 (commit)
      from  64677607790ab4d196de3d848dbd411c731a2f7b (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 a3e219187463e72f0023873cf86150117da779c7
Author: Lisa Knox <lisaknox83 at gmail.com>
Date:   Wed Nov 15 09:16:32 2023 -0500

    21128: fixed trash panel to only show restore button Arvados-DCO-1.1-Signed-off-by: Lisa Knox <lisa.knox at curii.com>

diff --git a/src/components/multiselect-toolbar/MultiselectToolbar.tsx b/src/components/multiselect-toolbar/MultiselectToolbar.tsx
index 2d9f3c44..a3b4f725 100644
--- 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 d5a9977a..55a254ab 100644
--- 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 de328a7d..0a1b1c5d 100644
--- 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 = {

-----------------------------------------------------------------------


hooks/post-receive
--