From: Daniel Kutyła <daniel.kutyla@contractors.roche.com>
Date: Wed, 8 Dec 2021 22:01:38 +0000 (+0100)
Subject: Merge remote-tracking branch 'origin/main' into 17579-Clear-table-filter-when-changin... 
X-Git-Tag: 2.4.0~23^2~4
X-Git-Url: https://git.arvados.org/arvados-workbench2.git/commitdiff_plain/43551086cc04bb37a2b1dc6c8ec24af44f2acf8d

Merge remote-tracking branch 'origin/main' into 17579-Clear-table-filter-when-changing-the-project

Arvados-DCO-1.1-Signed-off-by: Daniel Kutyła <daniel.kutyla@contractors.roche.com>
---

43551086cc04bb37a2b1dc6c8ec24af44f2acf8d
diff --cc src/components/data-explorer/data-explorer.tsx
index 78aae350,d3d26708..05125f12
--- a/src/components/data-explorer/data-explorer.tsx
+++ b/src/components/data-explorer/data-explorer.tsx
@@@ -96,12 -104,13 +106,14 @@@ export const DataExplorer = withStyles(
                  rowsPerPage, rowsPerPageOptions, onColumnToggle, searchLabel, searchValue, onSearch,
                  items, itemsAvailable, onRowClick, onRowDoubleClick, classes,
                  dataTableDefaultView, hideColumnSelector, actions, paperProps, hideSearchInput,
-                 paperKey, fetchMode, currentItemUuid, title
+                 paperKey, fetchMode, currentItemUuid, title,
+                 doHidePanel, doMaximizePanel, panelName, panelMaximized
              } = this.props;
 +
              return <Paper className={classes.root} {...paperProps} key={paperKey}>
-                 {title && <div className={classes.title}>{title}</div>}
-                 {(!hideColumnSelector || !hideSearchInput) && <Toolbar className={title ? classes.toolbarUnderTitle : classes.toolbar}>
+                 <Grid container direction="column" wrap="nowrap" className={classes.container}>
+                 {title && <Grid item xs className={classes.title}>{title}</Grid>}
+                 {(!hideColumnSelector || !hideSearchInput) && <Grid item xs><Toolbar className={title ? classes.toolbarUnderTitle : classes.toolbar}>
                      <Grid container justify="space-between" wrap="nowrap" alignItems="center">
                          <div className={classes.searchBox}>
                              {!hideSearchInput && <SearchInput