projects
/
arvados-workbench2.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge remote-tracking branch 'origin/main' into 17579-Clear-table-filter-when-changin...
[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 d3d26708dfe7124441752cebf5c12ee2f0b4dca8..05125f12c7311b8a4fe700a7dd61923ce6e682c8 100644
(file)
--- a/
src/components/data-explorer/data-explorer.tsx
+++ b/
src/components/data-explorer/data-explorer.tsx
@@
-93,11
+93,13
@@
type DataExplorerProps<T> = DataExplorerDataProps<T> &
export const DataExplorer = withStyles(styles)(
class DataExplorerGeneric<T> extends React.Component<DataExplorerProps<T>> {
export const DataExplorer = withStyles(styles)(
class DataExplorerGeneric<T> extends React.Component<DataExplorerProps<T>> {
+
componentDidMount() {
if (this.props.onSetColumns) {
this.props.onSetColumns(this.props.columns);
}
}
componentDidMount() {
if (this.props.onSetColumns) {
this.props.onSetColumns(this.props.columns);
}
}
+
render() {
const {
columns, onContextMenu, onFiltersChange, onSortToggle, working, extractKey,
render() {
const {
columns, onContextMenu, onFiltersChange, onSortToggle, working, extractKey,
@@
-107,6
+109,7
@@
export const DataExplorer = withStyles(styles)(
paperKey, fetchMode, currentItemUuid, title,
doHidePanel, doMaximizePanel, panelName, panelMaximized
} = this.props;
paperKey, fetchMode, currentItemUuid, title,
doHidePanel, doMaximizePanel, panelName, panelMaximized
} = this.props;
+
return <Paper className={classes.root} {...paperProps} key={paperKey}>
<Grid container direction="column" wrap="nowrap" className={classes.container}>
{title && <Grid item xs className={classes.title}>{title}</Grid>}
return <Paper className={classes.root} {...paperProps} key={paperKey}>
<Grid container direction="column" wrap="nowrap" className={classes.container}>
{title && <Grid item xs className={classes.title}>{title}</Grid>}
@@
-116,6
+119,7
@@
export const DataExplorer = withStyles(styles)(
{!hideSearchInput && <SearchInput
label={searchLabel}
value={searchValue}
{!hideSearchInput && <SearchInput
label={searchLabel}
value={searchValue}
+ selfClearProp={currentItemUuid}
onSearch={onSearch} />}
</div>
{actions}
onSearch={onSearch} />}
</div>
{actions}