21329: Only flex-grow:0 the data explorer title if progress bar is present

Arvados-DCO-1.1-Signed-off-by: Stephen Smith <stephen@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 8f5661929bff5b1f95c27c4d650f6a8d9717c1f8..0e71fbcbd4e44191428e1b8d124a87a1ce64a914 100644 (file)
--- a/services/workbench2/src/components/data-explorer/data-explorer.tsx
+++ b/services/workbench2/src/components/data-explorer/data-explorer.tsx
@@ -16,8 +16,9 @@ import { DataTableFilters } from "components/data-table-filters/data-table-filte
 import { CloseIcon, IconType, MaximizeIcon, UnMaximizeIcon, MoreVerticalIcon } from "components/icon/icon";
 import { PaperProps } from "@material-ui/core/Paper";
 import { MPVPanelProps } from "components/multi-panel-view/multi-panel-view";
+import classNames from "classnames";
 
-type CssRules = "titleWrapper" | "searchBox" | "headerMenu" | "toolbar" | "footer" | "root" | "moreOptionsButton" | "title" | "dataTable" | "container";
+type CssRules = "titleWrapper" | "searchBox" | "headerMenu" | "toolbar" | "footer" | "root" | "moreOptionsButton" | "title" | "titleWithProgress" | "dataTable" | "container";
 
 const styles: StyleRulesCallback<CssRules> = (theme: ArvadosTheme) => ({
     titleWrapper: {
@@ -46,9 +47,11 @@ const styles: StyleRulesCallback<CssRules> = (theme: ArvadosTheme) => ({
         paddingLeft: theme.spacing.unit * 2,
         paddingTop: theme.spacing.unit * 2,
         fontSize: "18px",
-        flexGrow: 0,
         paddingRight: "10px",
     },
+    titleWithProgress: {
+        flexGrow: 0,
+    },
     dataTable: {
         height: "100%",
         overflow: "auto",
@@ -218,7 +221,7 @@ export const DataExplorer = withStyles(styles)(
                                 <Grid
                                     item
                                     xs
-                                    className={classes.title}
+                                    className={classNames(classes.title, !!progressBar && classes.titleWithProgress)}
                                 >
                                     {title}
                                 </Grid>