projects
/
arvados-workbench2.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch '18123-group-edit-page-rebase1' into main. Closes #18123
[arvados-workbench2.git]
/
src
/
components
/
data-explorer
/
data-explorer.tsx
diff --git
a/src/components/data-explorer/data-explorer.tsx
b/src/components/data-explorer/data-explorer.tsx
index 05125f12c7311b8a4fe700a7dd61923ce6e682c8..55840ae9fd52a752f8b90e73c1f3cc06370c19b9 100644
(file)
--- a/
src/components/data-explorer/data-explorer.tsx
+++ b/
src/components/data-explorer/data-explorer.tsx
@@
-110,18
+110,19
@@
export const DataExplorer = withStyles(styles)(
doHidePanel, doMaximizePanel, panelName, panelMaximized
} = this.props;
doHidePanel, doMaximizePanel, panelName, panelMaximized
} = this.props;
- return <Paper className={classes.root} {...paperProps} key={paperKey}>
+ const dataCy = this.props["data-cy"];
+ return <Paper className={classes.root} {...paperProps} key={paperKey} data-cy={dataCy}>
<Grid container direction="column" wrap="nowrap" className={classes.container}>
{title && <Grid item xs className={classes.title}>{title}</Grid>}
<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}>
+ {(!hideColumnSelector || !hideSearchInput
|| !!actions
) && <Grid item xs><Toolbar className={title ? classes.toolbarUnderTitle : classes.toolbar}>
<Grid container justify="space-between" wrap="nowrap" alignItems="center">
<Grid container justify="space-between" wrap="nowrap" alignItems="center">
- <div className={classes.searchBox}>
+
{!hideSearchInput &&
<div className={classes.searchBox}>
{!hideSearchInput && <SearchInput
label={searchLabel}
value={searchValue}
selfClearProp={currentItemUuid}
onSearch={onSearch} />}
{!hideSearchInput && <SearchInput
label={searchLabel}
value={searchValue}
selfClearProp={currentItemUuid}
onSearch={onSearch} />}
- </div>
+ </div>
}
{actions}
{!hideColumnSelector && <ColumnSelector
columns={columns}
{actions}
{!hideColumnSelector && <ColumnSelector
columns={columns}