[arvados] updated: 2.7.0-6049-g16d131de26

[git repository hosting]

Summary of changes:
 .../src/components/multiselect-toolbar/MultiselectToolbar.tsx       | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

       via  16d131de262bbe7f5f04c2e66f906e5720caa7ed (commit)
      from  da26b4e32fd2242c8898be9556b68fa6eddfbe31 (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 16d131de262bbe7f5f04c2e66f906e5720caa7ed
Author: Lisa Knox <lisaknox83 at gmail.com>
Date:   Fri Mar 15 11:40:51 2024 -0400

    21224: fixed trash location ref Arvados-DCO-1.1-Signed-off-by: Lisa Knox <lisa.knox at curii.com>

diff --git a/services/workbench2/src/components/multiselect-toolbar/MultiselectToolbar.tsx b/services/workbench2/src/components/multiselect-toolbar/MultiselectToolbar.tsx
index 6c14307d6f..82c6f1bdc4 100644
--- a/services/workbench2/src/components/multiselect-toolbar/MultiselectToolbar.tsx
+++ b/services/workbench2/src/components/multiselect-toolbar/MultiselectToolbar.tsx
@@ -81,6 +81,7 @@ export type MultiselectToolbarProps = {
     user: User | null
     disabledButtons: Set<string>
     auth: AuthState;
+    location: string;
     executeMulti: (action: ContextMenuAction | MultiSelectMenuAction, inputSelectedUuid: string | null, checkedList: TCheckedList, resources: ResourcesState) => void;
 };
 
@@ -95,10 +96,10 @@ export const MultiselectToolbar = connect(
     mapDispatchToProps
 )(
     withStyles(styles)((props: MultiselectToolbarProps & WithStyles<CssRules>) => {
-        const { classes, checkedList, iconProps, user, disabledButtons, selectedResource } = props;
+        const { classes, checkedList, iconProps, user, disabledButtons, selectedResource, location } = props;
         const singleResourceKind = selectedResource ? [resourceToMsResourceKind(selectedResource, iconProps.resources, user)] : null
         const currentResourceKinds = singleResourceKind ? singleResourceKind : Array.from(selectedToKindSet(checkedList));
-        const currentPathIsTrash = window.location.pathname === "/trash";
+        const currentPathIsTrash = location.includes("/trash");
         const [isTransitioning, setIsTransitioning] = useState(false);
         let transitionTimeout;
         
@@ -334,6 +335,7 @@ function mapStateToProps({auth, multiselect, resources, favorites, publicFavorit
         disabledButtons: new Set<string>(multiselect.disabledButtons),
         auth,
         selectedResource,
+        location: window.location.pathname,
         iconProps: {
             resources,
             favorites,

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


hooks/post-receive
--