21225: Add mutually exclusive tabs to multi panel view, use for project tabs

Arvados-DCO-1.1-Signed-off-by: Stephen Smith <stephen@curii.com>

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 7e0ca8fd1ffaff3feeb6841c451c969c40a1d28e..72903d7ef5f6c09b99066ea02b6eda74299d234f 100644 (file)
--- a/services/workbench2/src/components/multi-panel-view/multi-panel-view.tsx
+++ b/services/workbench2/src/components/multi-panel-view/multi-panel-view.tsx
@@ -8,6 +8,8 @@ import {
     Grid,
     Paper,
     StyleRulesCallback,
     Grid,
     Paper,
     StyleRulesCallback,

+    Tab,
+    Tabs,

     Tooltip,
     withStyles,
     WithStyles
     Tooltip,
     withStyles,
     WithStyles


@@ -19,7 +21,7 @@ import { InfoIcon } from 'components/icon/icon';
 import { ReactNodeArray } from 'prop-types';
 import classNames from 'classnames';
 
 import { ReactNodeArray } from 'prop-types';
 import classNames from 'classnames';
 

-type CssRules = 'root' | 'button' | 'buttonIcon' | 'content';
+type CssRules = 'root' | 'button' | 'buttonIcon' | 'content' | 'tabsWrapper' | 'tabsRoot' | 'tabs';

 
 const styles: StyleRulesCallback<CssRules> = theme => ({
     root: {
 
 const styles: StyleRulesCallback<CssRules> = theme => ({
     root: {


@@ -37,6 +39,17 @@ const styles: StyleRulesCallback<CssRules> = theme => ({
     content: {
         overflow: 'auto',
     },
     content: {
         overflow: 'auto',
     },

+    tabsWrapper: {
+        width: '100%',
+    },
+    tabsRoot: {
+        flexGrow: 1,
+    },
+    tabs: {
+        flexGrow: 1,
+        flexShrink: 1,
+        maxWidth: 'initial',
+    },

 });
 
 interface MPVHideablePanelDataProps {
 });
 
 interface MPVHideablePanelDataProps {


@@ -114,6 +127,7 @@ export interface MPVPanelState {
 }
 interface MPVContainerDataProps {
     panelStates?: MPVPanelState[];
 }
 interface MPVContainerDataProps {
     panelStates?: MPVPanelState[];

+    mutuallyExclusive?: boolean;

 }
 type MPVContainerProps = MPVContainerDataProps & GridProps;
 
 }
 type MPVContainerProps = MPVContainerDataProps & GridProps;
 


@@ -131,44 +145,56 @@ const MPVContainerComponent = ({ children, panelStates, classes, ...props }: MPV
     const [panelVisibility, setPanelVisibility] = useState<boolean[]>(initialVisibility);
     const [previousPanelVisibility, setPreviousPanelVisibility] = useState<boolean[]>(initialVisibility);
     const [highlightedPanel, setHighlightedPanel] = useState<number>(-1);
     const [panelVisibility, setPanelVisibility] = useState<boolean[]>(initialVisibility);
     const [previousPanelVisibility, setPreviousPanelVisibility] = useState<boolean[]>(initialVisibility);
     const [highlightedPanel, setHighlightedPanel] = useState<number>(-1);

+    const currentSelectedPanel = panelVisibility.findIndex(Boolean);

     const [selectedPanel, setSelectedPanel] = useState<number>(-1);
     const panelRef = useRef<any>(null);
 
     let panels: JSX.Element[] = [];
     let buttons: JSX.Element[] = [];
     const [selectedPanel, setSelectedPanel] = useState<number>(-1);
     const panelRef = useRef<any>(null);
 
     let panels: JSX.Element[] = [];
     let buttons: JSX.Element[] = [];

+    let tabs: JSX.Element[] = [];
+    let buttonBar: JSX.Element = <></>;

 
     if (isArray(children)) {
 
     if (isArray(children)) {

-        for (let idx = 0; idx < children.length; idx++) {
-            const showFn = (idx: number) => () => {
-                setPreviousPanelVisibility(initialVisibility);
+        const showFn = (idx: number) => () => {
+            setPreviousPanelVisibility(initialVisibility);
+            if (props.mutuallyExclusive) {
+                // Hide all other panels

                 setPanelVisibility([
                 setPanelVisibility([

-                    ...panelVisibility.slice(0, idx),
+                    ...(new Array(idx).fill(false)),

                     true,
                     true,

-                    ...panelVisibility.slice(idx + 1)
+                    ...(new Array(panelVisibility.length-(idx+1)).fill(false)),

                 ]);
                 ]);

-                setSelectedPanel(idx);
-            };
-            const hideFn = (idx: number) => () => {
-                setPreviousPanelVisibility(initialVisibility);
+            } else {

                 setPanelVisibility([
                     ...panelVisibility.slice(0, idx),
                 setPanelVisibility([
                     ...panelVisibility.slice(0, idx),

-                    false,
-                    ...panelVisibility.slice(idx + 1)
-                ])
-            };
-            const maximizeFn = (idx: number) => () => {
-                setPreviousPanelVisibility(panelVisibility);
-                // Maximize X == hide all but X
-                setPanelVisibility([
-                    ...panelVisibility.slice(0, idx).map(() => false),

                     true,
                     true,

-                    ...panelVisibility.slice(idx + 1).map(() => false),
+                    ...panelVisibility.slice(idx + 1)

                 ]);
                 ]);

-            };
-            const unMaximizeFn = (idx: number) => () => {
-                setPanelVisibility(previousPanelVisibility);
-                setSelectedPanel(idx);

             }
             }

+            setSelectedPanel(idx);
+        };
+        const hideFn = (idx: number) => () => {
+            setPreviousPanelVisibility(initialVisibility);
+            setPanelVisibility([
+                ...panelVisibility.slice(0, idx),
+                false,
+                ...panelVisibility.slice(idx+1)
+            ])
+        };
+        const maximizeFn = (idx: number) => () => {
+            setPreviousPanelVisibility(panelVisibility);
+            // Maximize X == hide all but X
+            setPanelVisibility([
+                ...panelVisibility.slice(0, idx).map(() => false),
+                true,
+                ...panelVisibility.slice(idx+1).map(() => false),
+            ]);
+        };
+        const unMaximizeFn = (idx: number) => () => {
+            setPanelVisibility(previousPanelVisibility);
+            setSelectedPanel(idx);
+        }
+        for (let idx = 0; idx < children.length; idx++) {

             const panelName = panelStates === undefined
                 ? `Panel ${idx + 1}`
                 : (panelStates[idx] && panelStates[idx].name) || `Panel ${idx + 1}`;
             const panelName = panelStates === undefined
                 ? `Panel ${idx + 1}`
                 : (panelStates[idx] && panelStates[idx].name) || `Panel ${idx + 1}`;


@@ -198,6 +224,11 @@ const MPVContainerComponent = ({ children, panelStates, classes, ...props }: MPV
                 </Tooltip>
             ];
 
                 </Tooltip>
             ];
 

+            tabs = [
+                ...tabs,
+                <>{panelName}</>
+            ];
+

             const aPanel =
                 <MPVHideablePanel key={idx} visible={panelVisibility[idx]} name={panelName}
                     panelRef={(idx === selectedPanel) ? panelRef : undefined}
             const aPanel =
                 <MPVHideablePanel key={idx} visible={panelVisibility[idx]} name={panelName}
                     panelRef={(idx === selectedPanel) ? panelRef : undefined}


@@ -207,11 +238,21 @@ const MPVContainerComponent = ({ children, panelStates, classes, ...props }: MPV
                 </MPVHideablePanel>;
             panels = [...panels, aPanel];
         };
                 </MPVHideablePanel>;
             panels = [...panels, aPanel];
         };

+
+        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> :
+            <>
+                {buttons.map((tgl, idx) => <Grid item key={idx}>{tgl}</Grid>)}
+            </>;

     };
 
     };
 

-    return <Grid container {...props} className={classes.root}>
+    return <Grid container {...props} className={classNames(classes.root, props.className)}>

         <Grid container item direction="row">
         <Grid container item direction="row">

-            {buttons.map((tgl, idx) => <Grid item key={idx}>{tgl}</Grid>)}
+            {buttonBar}

         </Grid>
         <Grid container item {...props} xs className={classes.content}
             onScroll={() => setSelectedPanel(-1)}>
         </Grid>
         <Grid container item {...props} xs className={classes.content}
             onScroll={() => setSelectedPanel(-1)}>

diff --git a/services/workbench2/src/views/project-panel/project-panel.tsx b/services/workbench2/src/views/project-panel/project-panel.tsx
index 5e10d022cd689c6549397c3f4e48d2eb3681b6ac..3d64f6517abdcd2e64faa389e987bab1e193a643 100644 (file)
--- a/services/workbench2/src/views/project-panel/project-panel.tsx
+++ b/services/workbench2/src/views/project-panel/project-panel.tsx
@@ -53,9 +53,10 @@ import { resourceIsFrozen } from 'common/frozen-resources';
 import { ProjectResource } from 'models/project';
 import { deselectAllOthers, toggleOne } from 'store/multiselect/multiselect-actions';
 import { DetailsCardRoot } from 'views-components/details-card/details-card-root';
 import { ProjectResource } from 'models/project';
 import { deselectAllOthers, toggleOne } from 'store/multiselect/multiselect-actions';
 import { DetailsCardRoot } from 'views-components/details-card/details-card-root';

+import { MPVContainer, MPVPanelContent, MPVPanelState } from 'components/multi-panel-view/multi-panel-view';

 import { PROJECT_PANEL_ID } from 'store/project-panel/project-panel-action-bind';
 
 import { PROJECT_PANEL_ID } from 'store/project-panel/project-panel-action-bind';
 

-type CssRules = 'root' | 'button' ;
+type CssRules = 'root' | 'button' | 'mpvRoot' | 'dataExplorer';

 
 const styles: StyleRulesCallback<CssRules> = (theme: ArvadosTheme) => ({
     root: {
 
 const styles: StyleRulesCallback<CssRules> = (theme: ArvadosTheme) => ({
     root: {


@@ -66,6 +67,12 @@ const styles: StyleRulesCallback<CssRules> = (theme: ArvadosTheme) => ({
     button: {
         marginLeft: theme.spacing.unit,
     },
     button: {
         marginLeft: theme.spacing.unit,
     },

+    mpvRoot: {
+        flexGrow: 1,
+    },
+    dataExplorer: {
+        height: "100%",
+    },

 });
 
 export enum ProjectPanelColumnNames {
 });
 
 export enum ProjectPanelColumnNames {


@@ -238,6 +245,10 @@ export const projectPanelColumns: DataColumns<string, ProjectResource> = [
 
 const DEFAULT_VIEW_MESSAGES = ['Your project is empty.', 'Please create a project or create a collection and upload a data.'];
 
 
 const DEFAULT_VIEW_MESSAGES = ['Your project is empty.', 'Please create a project or create a collection and upload a data.'];
 

+const panelsData: MPVPanelState[] = [
+    { name: "Subprojects", visible: true },
+];
+

 interface ProjectPanelDataProps {
     currentItemId: string;
     resources: ResourcesState;
 interface ProjectPanelDataProps {
     currentItemId: string;
     resources: ResourcesState;


@@ -269,15 +280,30 @@ export const ProjectPanel = withStyles(styles)(
                 const { classes } = this.props;
                 return <div data-cy='project-panel' className={classes.root}>
                     <DetailsCardRoot />
                 const { classes } = this.props;
                 return <div data-cy='project-panel' className={classes.root}>
                     <DetailsCardRoot />

-                    <DataExplorer
-                        id={PROJECT_PANEL_ID}
-                        onRowClick={this.handleRowClick}
-                        onRowDoubleClick={this.handleRowDoubleClick}
-                        onContextMenu={this.handleContextMenu}
-                        contextMenuColumn={true}
-                        defaultViewIcon={ProjectIcon}
-                        defaultViewMessages={DEFAULT_VIEW_MESSAGES}
-                    />
+                    <MPVContainer
+                        className={classes.mpvRoot}
+                        spacing={8}
+                        panelStates={panelsData}
+                        mutuallyExclusive
+                        justify-content="flex-start"
+                        direction="column"
+                        wrap="nowrap">
+                        <MPVPanelContent
+                            forwardProps
+                            xs="auto"
+                            data-cy="process-details"
+                            className={classes.dataExplorer}>
+                            <DataExplorer
+                                id={PROJECT_PANEL_ID}
+                                onRowClick={this.handleRowClick}
+                                onRowDoubleClick={this.handleRowDoubleClick}
+                                onContextMenu={this.handleContextMenu}
+                                contextMenuColumn={true}
+                                defaultViewIcon={ProjectIcon}
+                                defaultViewMessages={DEFAULT_VIEW_MESSAGES}
+                            />
+                        </MPVPanelContent>
+                    </MPVContainer>

                 </div>
             }
 
                 </div>
             }