From 83e7cbb4620d7e7d61c56fb25efc2069955eb78a Mon Sep 17 00:00:00 2001
From: Stephen Smith <stephen@curii.com>
Date: Tue, 4 Jun 2024 16:07:31 -0400
Subject: [PATCH 1/1] 21225: Add styles to wrap mutually exclusive tabs and
 data explorer in same paper

Arvados-DCO-1.1-Signed-off-by: Stephen Smith <stephen@curii.com>
---
 .../data-explorer/data-explorer.tsx           |   4 +-
 .../multi-panel-view/multi-panel-view.tsx     | 105 ++++++++++++------
 .../data-explorer/data-explorer.tsx           |   2 +-
 .../project-panel/project-panel-data.tsx      |   7 +-
 .../views/project-panel/project-panel-run.tsx |   2 +
 .../src/views/project-panel/project-panel.tsx |   9 +-
 6 files changed, 92 insertions(+), 37 deletions(-)

diff --git a/services/workbench2/src/components/data-explorer/data-explorer.tsx b/services/workbench2/src/components/data-explorer/data-explorer.tsx
index 94deff0462..40ecfc5b38 100644
--- a/services/workbench2/src/components/data-explorer/data-explorer.tsx
+++ b/services/workbench2/src/components/data-explorer/data-explorer.tsx
@@ -126,6 +126,7 @@ interface DataExplorerDataProps<T> {
     checkedList: TCheckedList;
     isNotFound: boolean;
     searchBarValue: string;
+    paperClassName?: string;
 }
 
 interface DataExplorerActionProps<T> {
@@ -218,10 +219,11 @@ export const DataExplorer = withStyles(styles)(
                 setCheckedListOnStore,
                 checkedList,
                 working,
+                paperClassName,
             } = this.props;
             return (
                 <Paper
-                    className={classes.root}
+                    className={classNames(classes.root, paperClassName)}
                     {...paperProps}
                     key={paperKey}
                     data-cy={this.props["data-cy"]}
diff --git a/services/workbench2/src/components/multi-panel-view/multi-panel-view.tsx b/services/workbench2/src/components/multi-panel-view/multi-panel-view.tsx
index 69e2b7015e..10c671f05f 100644
--- a/services/workbench2/src/components/multi-panel-view/multi-panel-view.tsx
+++ b/services/workbench2/src/components/multi-panel-view/multi-panel-view.tsx
@@ -21,12 +21,32 @@ import { InfoIcon } from 'components/icon/icon';
 import { ReactNodeArray } from 'prop-types';
 import classNames from 'classnames';
 
-type CssRules = 'root' | 'button' | 'buttonIcon' | 'content' | 'tabsWrapper' | 'tabsRoot' | 'tabs';
+type CssRules =
+    | 'gridContainerRoot'
+    | 'exclusiveGridContainerRoot'
+    | 'gridItemRoot'
+    | 'paperRoot'
+    | 'button'
+    | 'buttonIcon'
+    | 'content'
+    | 'exclusiveContentPaper'
+    | 'tabs';
 
 const styles: StyleRulesCallback<CssRules> = theme => ({
-    root: {
+    gridContainerRoot: {
         marginTop: '10px',
     },
+    exclusiveGridContainerRoot: {
+        marginTop: 0,
+    },
+    gridItemRoot: {
+        paddingTop: '0 !important',
+    },
+    paperRoot: {
+        height: '100%',
+        display: 'flex',
+        flexDirection: 'column',
+    },
     button: {
         padding: '2px 5px',
         marginRight: '5px',
@@ -40,11 +60,8 @@ const styles: StyleRulesCallback<CssRules> = theme => ({
         overflow: 'auto',
         maxWidth: 'initial',
     },
-    tabsWrapper: {
-        width: '100%',
-    },
-    tabsRoot: {
-        flexGrow: 1,
+    exclusiveContentPaper: {
+        boxShadow: 'none',
     },
     tabs: {
         flexGrow: 1,
@@ -60,6 +77,7 @@ interface MPVHideablePanelDataProps {
     illuminated: boolean;
     children: ReactNode;
     panelRef?: MutableRefObject<any>;
+    paperClassName?: string;
 }
 
 interface MPVHideablePanelActionProps {
@@ -70,10 +88,19 @@ interface MPVHideablePanelActionProps {
 
 type MPVHideablePanelProps = MPVHideablePanelDataProps & MPVHideablePanelActionProps;
 
-const MPVHideablePanel = ({ doHidePanel, doMaximizePanel, doUnMaximizePanel, name, visible, maximized, illuminated, ...props }: MPVHideablePanelProps) =>
+const MPVHideablePanel = ({ doHidePanel, doMaximizePanel, doUnMaximizePanel, name, visible, maximized, illuminated, paperClassName, ...props }: MPVHideablePanelProps) =>
     visible
         ? <>
-            {React.cloneElement((props.children as ReactElement), { doHidePanel, doMaximizePanel, doUnMaximizePanel, panelName: name, panelMaximized: maximized, panelIlluminated: illuminated, panelRef: props.panelRef })}
+            {React.cloneElement((props.children as ReactElement), {
+                doHidePanel,
+                doMaximizePanel,
+                doUnMaximizePanel,
+                panelName: name,
+                panelMaximized: maximized,
+                panelIlluminated: illuminated,
+                panelRef: props.panelRef,
+                paperClassName,
+            })}
         </>
         : null;
 
@@ -85,6 +112,7 @@ interface MPVPanelDataProps {
     forwardProps?: boolean;
     maxHeight?: string;
     minHeight?: string;
+    paperClassName?: string;
 }
 
 interface MPVPanelActionProps {
@@ -100,7 +128,7 @@ type MPVPanelContentProps = { children: ReactElement } & MPVPanelProps & GridPro
 
 // Grid item compatible component for layout and MPV props passing
 export const MPVPanelContent = ({ doHidePanel, doMaximizePanel, doUnMaximizePanel, panelName,
-    panelMaximized, panelIlluminated, panelRef, forwardProps, maxHeight, minHeight,
+    panelMaximized, panelIlluminated, panelRef, forwardProps, maxHeight, minHeight, paperClassName,
     ...props }: MPVPanelContentProps) => {
     useEffect(() => {
         if (panelRef && panelRef.current) {
@@ -116,8 +144,8 @@ export const MPVPanelContent = ({ doHidePanel, doMaximizePanel, doUnMaximizePane
         <span ref={panelRef} /> {/* Element to scroll to when the panel is selected */}
         <Paper style={{ height: '100%' }} elevation={panelIlluminated ? 8 : 0}>
             {forwardProps
-                ? React.cloneElement(props.children, { doHidePanel, doMaximizePanel, doUnMaximizePanel, panelName, panelMaximized })
-                : props.children}
+                ? React.cloneElement(props.children, { doHidePanel, doMaximizePanel, doUnMaximizePanel, panelName, panelMaximized, paperClassName })
+                : React.cloneElement(props.children, { paperClassName })}
         </Paper>
     </Grid>;
 }
@@ -231,7 +259,11 @@ const MPVContainerComponent = ({ children, panelStates, classes, ...props }: MPV
             ];
 
             const aPanel =
-                <MPVHideablePanel key={idx} visible={panelVisibility[idx]} name={panelName}
+                <MPVHideablePanel
+                    key={idx}
+                    visible={panelVisibility[idx]}
+                    name={panelName}
+                    paperClassName={props.mutuallyExclusive ? classes.exclusiveContentPaper : undefined}
                     panelRef={(idx === selectedPanel) ? panelRef : undefined}
                     maximized={panelIsMaximized} illuminated={idx === highlightedPanel}
                     doHidePanel={hideFn(idx)} doMaximizePanel={maximizeFn(idx)} doUnMaximizePanel={panelIsMaximized ? unMaximizeFn(idx) : () => null}>
@@ -241,29 +273,38 @@ const MPVContainerComponent = ({ children, panelStates, classes, ...props }: MPV
         };
 
         buttonBar = props.mutuallyExclusive ?
-            <Paper className={classes.tabsWrapper}>
-                <Tabs className={classes.tabsRoot} value={currentSelectedPanel} onChange={(e, val) => showFn(val)()}>
-                    {tabs.map((tgl, idx) => <Tab className={classes.tabs} key={idx} label={tgl} />)}
-                </Tabs>
-            </Paper> :
-            <>
+            <Tabs value={currentSelectedPanel} onChange={(e, val) => showFn(val)()}>
+                {tabs.map((tgl, idx) => <Tab className={classes.tabs} key={idx} label={tgl} />)}
+            </Tabs> :
+            <Grid container item direction="row">
                 {buttons.map((tgl, idx) => <Grid item key={idx}>{tgl}</Grid>)}
-            </>;
+            </Grid>;
     };
 
-    return <Grid container {...props} className={classNames(classes.root, props.className)}>
-        <Grid container item direction="row">
-            {buttonBar}
-        </Grid>
-        <Grid container item {...props} xs className={classes.content}
-            onScroll={() => setSelectedPanel(-1)}>
-            {panelVisibility.includes(true)
-                ? panels
-                : <Grid container item alignItems='center' justify='center'>
-                    <DefaultView messages={["All panels are hidden.", "Click on the buttons above to show them."]} icon={InfoIcon} />
-                </Grid>}
-        </Grid>
+    const content = <Grid container item {...props} xs className={classes.content}
+        onScroll={() => setSelectedPanel(-1)}>
+        {panelVisibility.includes(true)
+            ? panels
+            : <Grid container item alignItems='center' justify='center'>
+                <DefaultView messages={["All panels are hidden.", "Click on the buttons above to show them."]} icon={InfoIcon} />
+            </Grid>}
     </Grid>;
+
+    if (props.mutuallyExclusive) {
+        return <Grid container {...props} className={classNames(classes.exclusiveGridContainerRoot, props.className)}>
+            <Grid item {...props} className={classes.gridItemRoot}>
+                <Paper className={classes.paperRoot}>
+                    {buttonBar}
+                    {content}
+                </Paper>
+            </Grid>
+        </Grid>;
+    } else {
+        return <Grid container {...props} className={classNames(classes.gridContainerRoot, props.className)}>
+            {buttonBar}
+            {content}
+        </Grid>;
+    }
 };
 
 export const MPVContainer = withStyles(styles)(MPVContainerComponent);
diff --git a/services/workbench2/src/views-components/data-explorer/data-explorer.tsx b/services/workbench2/src/views-components/data-explorer/data-explorer.tsx
index 0f4fc56358..bcf8683e89 100644
--- a/services/workbench2/src/views-components/data-explorer/data-explorer.tsx
+++ b/services/workbench2/src/views-components/data-explorer/data-explorer.tsx
@@ -86,7 +86,7 @@ const mapDispatchToProps = () => {
         setSelectedUuid: (uuid: string | null) => {
             dispatch<any>(setSelectedResourceUuid(uuid));
         },
-        
+
         onRowClick,
 
         onRowDoubleClick,
diff --git a/services/workbench2/src/views/project-panel/project-panel-data.tsx b/services/workbench2/src/views/project-panel/project-panel-data.tsx
index 59c6f22506..8526ebf083 100644
--- a/services/workbench2/src/views/project-panel/project-panel-data.tsx
+++ b/services/workbench2/src/views/project-panel/project-panel-data.tsx
@@ -150,7 +150,11 @@ export const projectPanelDataColumns: DataColumns<string, ProjectResource> = [
 
 const DEFAULT_VIEW_MESSAGES = ['No data found'];
 
-export const ProjectPanelData = class extends React.Component {
+interface ProjectPanelDataProps {
+    paperClassName?: string;
+};
+
+export const ProjectPanelData = class extends React.Component<ProjectPanelDataProps> {
     handleRowClick = () => {};
     handleRowDoubleClick = () => {};
     handleContextMenu = () => {};
@@ -164,6 +168,7 @@ export const ProjectPanelData = class extends React.Component {
             contextMenuColumn={true}
             defaultViewIcon={ProjectIcon}
             defaultViewMessages={DEFAULT_VIEW_MESSAGES}
+            paperClassName={this.props.paperClassName}
         />;
     }
 };
diff --git a/services/workbench2/src/views/project-panel/project-panel-run.tsx b/services/workbench2/src/views/project-panel/project-panel-run.tsx
index 0dcda89e8b..e89e761389 100644
--- a/services/workbench2/src/views/project-panel/project-panel-run.tsx
+++ b/services/workbench2/src/views/project-panel/project-panel-run.tsx
@@ -174,6 +174,7 @@ const DEFAULT_VIEW_MESSAGES = ['No workflow runs found'];
 
 interface ProjectPanelRunProps {
     project?: ProjectResource;
+    paperClassName?: string;
 }
 
 const mapStateToProps = (state: RootState): ProjectPanelRunProps => {
@@ -198,5 +199,6 @@ export const ProjectPanelRun = connect(mapStateToProps)((props: ProjectPanelRunP
         defaultViewIcon={ProjectIcon}
         defaultViewMessages={DEFAULT_VIEW_MESSAGES}
         progressBar={<SubprocessProgressBar parentResource={props.project} dataExplorerId={PROJECT_PANEL_RUN_ID} />}
+        paperClassName={props.paperClassName}
     />;
 });
diff --git a/services/workbench2/src/views/project-panel/project-panel.tsx b/services/workbench2/src/views/project-panel/project-panel.tsx
index fe01a9344f..f84d8e7090 100644
--- a/services/workbench2/src/views/project-panel/project-panel.tsx
+++ b/services/workbench2/src/views/project-panel/project-panel.tsx
@@ -39,6 +39,11 @@ const styles: StyleRulesCallback<CssRules> = (theme: ArvadosTheme) => ({
     },
     mpvRoot: {
         flexGrow: 1,
+        display: 'flex',
+        flexDirection: 'column',
+        '& > div': {
+            height: '100%',
+        },
     },
     dataExplorer: {
         height: "100%",
@@ -92,14 +97,14 @@ export const ProjectPanel = withStyles(styles)(
                         <MPVPanelContent
                             forwardProps
                             xs="auto"
-                            data-cy="process-details"
+                            data-cy="process-data"
                             className={classes.dataExplorer}>
                             <ProjectPanelData />
                         </MPVPanelContent>
                         <MPVPanelContent
                             forwardProps
                             xs="auto"
-                            data-cy="process-details"
+                            data-cy="process-run"
                             className={classes.dataExplorer}>
                             <ProjectPanelRun />
                         </MPVPanelContent>
-- 
2.30.2