[arvados] updated: 2.7.0-6055-g6c7a1c2663

[git repository hosting]

Summary of changes:
 services/workbench2/src/components/data-explorer/data-explorer.tsx   | 2 +-
 .../src/components/multiselect-toolbar/MultiselectToolbar.tsx        | 5 +++--
 2 files changed, 4 insertions(+), 3 deletions(-)

       via  6c7a1c2663ace34a00c6f7e6955a660aa45963b8 (commit)
      from  ae1702814a5d0b6b505d1d225ba47fd4afd32cb6 (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 6c7a1c2663ace34a00c6f7e6955a660aa45963b8
Author: Lisa Knox <lisaknox83 at gmail.com>
Date:   Wed Mar 20 15:06:11 2024 -0400

    21224: fixed conditional render in subpanel Arvados-DCO-1.1-Signed-off-by: Lisa Knox <lisa.knox at curii.com>

diff --git a/services/workbench2/src/components/data-explorer/data-explorer.tsx b/services/workbench2/src/components/data-explorer/data-explorer.tsx
index c2d8214fe9..e3e55b25d4 100644
--- a/services/workbench2/src/components/data-explorer/data-explorer.tsx
+++ b/services/workbench2/src/components/data-explorer/data-explorer.tsx
@@ -308,7 +308,7 @@ export const DataExplorer = withStyles(styles)(
                                 </Grid>
                             )}
                         </div>
-                        {!this.multiSelectToolbarInTitle && <MultiselectToolbar />}
+                        {!this.multiSelectToolbarInTitle && <MultiselectToolbar isSubPanel={true}/>}
                         <Grid
                             item
                             xs="auto"
diff --git a/services/workbench2/src/components/multiselect-toolbar/MultiselectToolbar.tsx b/services/workbench2/src/components/multiselect-toolbar/MultiselectToolbar.tsx
index 2a4f3f09e3..81eaaa8638 100644
--- a/services/workbench2/src/components/multiselect-toolbar/MultiselectToolbar.tsx
+++ b/services/workbench2/src/components/multiselect-toolbar/MultiselectToolbar.tsx
@@ -82,6 +82,7 @@ export type MultiselectToolbarProps = {
     disabledButtons: Set<string>
     auth: AuthState;
     location: string;
+    isSubPanel?: boolean;
     executeMulti: (action: ContextMenuAction | MultiSelectMenuAction, inputSelectedUuid: string | null, checkedList: TCheckedList, resources: ResourcesState) => void;
 };
 
@@ -96,8 +97,8 @@ export const MultiselectToolbar = connect(
     mapDispatchToProps
 )(
     withStyles(styles)((props: MultiselectToolbarProps & WithStyles<CssRules>) => {
-        const { classes, checkedList, iconProps, user, disabledButtons, selectedResourceUuid, location } = props;
-        const singleResourceKind = selectedResourceUuid ? [resourceToMsResourceKind(selectedResourceUuid, iconProps.resources, user)] : null
+        const { classes, checkedList, iconProps, user, disabledButtons, selectedResourceUuid, location, isSubPanel } = props;
+        const singleResourceKind = selectedResourceUuid && !isSubPanel ? [resourceToMsResourceKind(selectedResourceUuid, iconProps.resources, user)] : null
         const currentResourceKinds = singleResourceKind ? singleResourceKind : Array.from(selectedToKindSet(checkedList));
         const currentPathIsTrash = location.includes("/trash");
         const [isTransitioning, setIsTransitioning] = useState(false);

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


hooks/post-receive
--