#13704: change code after CR

Feature #13704

Arvados-DCO-1.1-Signed-off-by: Janicki Artur <artur.janicki@contractors.roche.com>

diff --git a/src/views-components/details-panel/details-panel.tsx b/src/views-components/details-panel/details-panel.tsx
index ac4b151faa1712206164a4fd30588c223db5f966..b63266a0e4d0237560e2223fc405b2ccac7af13c 100644 (file)
--- a/src/views-components/details-panel/details-panel.tsx
+++ b/src/views-components/details-panel/details-panel.tsx
@@ -10,19 +10,11 @@ import { StyleRulesCallback, WithStyles, withStyles, Theme } from "@material-ui/
 import Tabs from '@material-ui/core/Tabs';
 import Tab from '@material-ui/core/Tab';
 import Typography from '@material-ui/core/Typography';
-import * as classnames from "classnames";
 import Grid from '@material-ui/core/Grid';
-
-function TabContainer(props: any) {
-       return (
-               <Typography component="div" style={{ padding: 8 * 3 }}>
-                       {props.children}
-               </Typography>
-       );
-}
+import * as classnames from "classnames";
 
 export interface DetailsPanelProps {
-    toggleDrawer: (isOpened: boolean) => void;
+    closeDrawer: () => void;
     isOpened: boolean;
 }
 
@@ -34,23 +26,27 @@ class DetailsPanel extends React.Component<DetailsPanelProps & WithStyles<CssRul
        handleChange = (event: any, value: boolean) => {
                this.setState({ tabsValue: value });
        }
-       
+    
+    renderTabContainer = (children: React.ReactElement<any>) => {
+        return (
+            <Typography className={this.props.classes.tabContainer} component="div">
+                {children}
+            </Typography>
+        );
+    }
+
        render() {
-               const { classes, toggleDrawer, isOpened } = this.props;
+        const { classes, closeDrawer, isOpened } = this.props;
                const { tabsValue } = this.state;
         return (
             <div className={classnames([classes.container, { [classes.opened]: isOpened }])}>
-                               <Drawer variant="persistent" anchor="right" open={isOpened} onClose={() => toggleDrawer(false)}
-                    classes={{
-                        paper: classes.drawerPaper
-                    }}>
-                                       {/* className={classnames([classes.root, { [classes.active]: isActive }])} */}
+                <Drawer variant="permanent" anchor="right" classes={{ paper: classes.drawerPaper }}>
                                        <Typography component="div" className={classes.headerContainer}>
                                                <Grid container alignItems='center' justify='space-around'>
                                                        <Typography variant="title">
                                                                Tutorial pipeline
                                                        </Typography>
-                                                       <IconButton color="inherit" onClick={() => toggleDrawer(false)}>
+                            <IconButton color="inherit" onClick={closeDrawer}>
                                                                <CloseIcon />
                                                        </IconButton>
                                                </Grid>
@@ -66,7 +62,7 @@ class DetailsPanel extends React.Component<DetailsPanelProps & WithStyles<CssRul
                                                        classes={{ root: classes.tabRoot, selected: classes.tabSelected }}
                                                        label="Activity" />
                                        </Tabs>
-                                       {tabsValue === 0 && <TabContainer>
+                    {tabsValue === 0 && this.renderTabContainer(
                                                <Grid container>
                                                        <Grid item xs={6} sm={4} className={classes.gridLabel}>
                                                                <p>Type</p>
@@ -81,8 +77,8 @@ class DetailsPanel extends React.Component<DetailsPanelProps & WithStyles<CssRul
                                                                <p>me</p>
                                                        </Grid>
                                                </Grid>
-                                       </TabContainer>}
-                                       {tabsValue === 1 && <TabContainer>
+                                       )}
+                    {tabsValue === 1 && this.renderTabContainer(
                                                <Grid container>
                                                        <Grid item xs={6} sm={4} className={classes.gridLabel}>
                                                                <p>Type</p>
@@ -97,7 +93,7 @@ class DetailsPanel extends React.Component<DetailsPanelProps & WithStyles<CssRul
                                                                <p>me</p>
                                                        </Grid>
                                                </Grid>
-                                       </TabContainer>}
+                                       )}
                 </Drawer>
             </div>
         );
@@ -109,7 +105,11 @@ type CssRules = 'drawerPaper' | 'container' | 'opened' | 'headerContainer'
        | 'tabsIndicator' | 'tabRoot' | 'tabContainer' | 'tabSelected' | 'gridLabel';
 
 const drawerWidth = 320;
-const purple = '#692498';
+const colorPurple = '#692498';
+const colorLightGray = '#A1A1A1';
+const colorVeryLightGray = '#999999';
+const colorGray = '#333';
+
 const styles: StyleRulesCallback<CssRules> = (theme: Theme) => ({
        container: {
         width: 0,
@@ -126,17 +126,17 @@ const styles: StyleRulesCallback<CssRules> = (theme: Theme) => ({
         width: drawerWidth
        },
        headerContainer: {
-               color: '#A1A1A1',
+        color: colorLightGray,
                margin: `${theme.spacing.unit}px 0`
        },
        tabsIndicator: {
-               backgroundColor: purple
+        backgroundColor: colorPurple
        },
        tabRoot: {
-               color: '#333333',
+        color: colorGray,
                '&$tabSelected': {
                        fontWeight: 700,
-                       color: purple
+            color: colorPurple
                }
        },
        tabContainer: {
@@ -144,7 +144,7 @@ const styles: StyleRulesCallback<CssRules> = (theme: Theme) => ({
        },
        tabSelected: {},
        gridLabel: {
-               color: '#999999',
+        color: colorVeryLightGray,
        }
 });
 

diff --git a/src/views-components/main-app-bar/main-app-bar.tsx b/src/views-components/main-app-bar/main-app-bar.tsx
index b03dccd9184dde1043f1bec637a712665cf5e69a..135e1219d0bf7b3803df83b7acb0819b4b84ed1d 100644 (file)
--- a/src/views-components/main-app-bar/main-app-bar.tsx
+++ b/src/views-components/main-app-bar/main-app-bar.tsx
@@ -35,7 +35,7 @@ export interface MainAppBarActionProps {
     onSearch: (searchText: string) => void;
     onBreadcrumbClick: (breadcrumb: Breadcrumb) => void;
     onMenuItemClick: (menuItem: MainAppBarMenuItem) => void;
-    onDetailsPanelClick: (isOpened: boolean) => void;
+    onDetailsPanelToggle: () => void;
 }
 
 type MainAppBarProps = MainAppBarDataProps & MainAppBarActionProps & WithStyles<CssRules>;
@@ -75,7 +75,7 @@ export const MainAppBar: React.SFC<MainAppBarProps> = (props) => {
             {
                 props.user && <Breadcrumbs items={props.breadcrumbs} onClick={props.onBreadcrumbClick} />
             }
-            <IconButton color="inherit" onClick={() => props.onDetailsPanelClick(true)}>
+            <IconButton color="inherit" onClick={props.onDetailsPanelToggle}>
                 <InfoIcon />
             </IconButton>
         </Toolbar>

diff --git a/src/views/workbench/workbench.tsx b/src/views/workbench/workbench.tsx
index d8c24abe2c4c0411c303b984b6a10df94bc93070..2cca921c6c58d3cbefbc47838942280bac9cafb2 100644 (file)
--- a/src/views/workbench/workbench.tsx
+++ b/src/views/workbench/workbench.tsx
@@ -144,8 +144,8 @@ class Workbench extends React.Component<WorkbenchProps, WorkbenchState> {
             this.props.dispatch(push(`/search?q=${searchText}`));
         },
         onMenuItemClick: (menuItem: NavMenuItem) => menuItem.action(),
-        onDetailsPanelClick: (isOpened: boolean) => {
-            this.setState({ isDetailsPanelOpened: isOpened });
+        onDetailsPanelToggle: () => {
+            this.setState(prev => ({ isDetailsPanelOpened: !prev.isDetailsPanelOpened }));
         }
     };
 
@@ -204,7 +204,7 @@ class Workbench extends React.Component<WorkbenchProps, WorkbenchState> {
                     </div>
                     <DetailsPanel 
                         isOpened={this.state.isDetailsPanelOpened} 
-                        toggleDrawer={this.mainAppBarActions.onDetailsPanelClick} />
+                        closeDrawer={this.mainAppBarActions.onDetailsPanelToggle} />
                 </main>
             </div>
         );