projects
/
arvados-workbench2.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
18315: Adds test exposing bug in file browser.
[arvados-workbench2.git]
/
src
/
components
/
collection-panel-files
/
collection-panel-files.tsx
diff --git
a/src/components/collection-panel-files/collection-panel-files.tsx
b/src/components/collection-panel-files/collection-panel-files.tsx
index 97cbc8ce6bc924a2def5e0b88f1261a2e8e8e331..459d9d2082349f79c78ef592861395e34baf337a 100644
(file)
--- a/
src/components/collection-panel-files/collection-panel-files.tsx
+++ b/
src/components/collection-panel-files/collection-panel-files.tsx
@@
-48,7
+48,6
@@
const styles: StyleRulesCallback<CssRules> = (theme: Theme) => ({
wrapper: {
display: 'flex',
minHeight: '600px',
wrapper: {
display: 'flex',
minHeight: '600px',
- marginBottom: '1rem',
color: 'rgba(0, 0, 0, 0.87)',
fontSize: '0.875rem',
fontFamily: '"Roboto", "Helvetica", "Arial", sans-serif',
color: 'rgba(0, 0, 0, 0.87)',
fontSize: '0.875rem',
fontFamily: '"Roboto", "Helvetica", "Arial", sans-serif',
@@
-463,7
+462,7
@@
export const CollectionPanelFiles = withStyles(styles)(connect((state: RootState
</IconButton>
</Tooltip>
<div className={path.length > 1 ? classes.searchWrapper : classes.searchWrapperHidden}>
</IconButton>
</Tooltip>
<div className={path.length > 1 ? classes.searchWrapper : classes.searchWrapperHidden}>
- <SearchInput label="Search" value={leftSearch} onSearch={setLeftSearch} />
+ <SearchInput
selfClearProp={leftKey}
label="Search" value={leftSearch} onSearch={setLeftSearch} />
</div>
<div className={classes.dataWrapper}>
{
</div>
<div className={classes.dataWrapper}>
{
@@
-490,7
+489,7
@@
export const CollectionPanelFiles = withStyles(styles)(connect((state: RootState
data-parent-path={name}
className={classNames(classes.row, getActiveClass(name))}
key={id}>
data-parent-path={name}
className={classNames(classes.row, getActiveClass(name))}
key={id}>
- {getItemIcon(type, getActiveClass(name))}
+ {getItemIcon(type, getActiveClass(name))}
<div className={classes.rowName}>
{name}
</div>
<div className={classes.rowName}>
{name}
</div>
@@
-510,14
+509,19
@@
export const CollectionPanelFiles = withStyles(styles)(connect((state: RootState
</div>
<div className={classes.rightPanel}>
<div className={classes.searchWrapper}>
</div>
<div className={classes.rightPanel}>
<div className={classes.searchWrapper}>
- <SearchInput label="Search" value={rightSearch} onSearch={setRightSearch} />
+ <SearchInput
selfClearProp={rightKey}
label="Search" value={rightSearch} onSearch={setRightSearch} />
</div>
{
isWritable &&
<Button
className={classes.uploadButton}
data-cy='upload-button'
</div>
{
isWritable &&
<Button
className={classes.uploadButton}
data-cy='upload-button'
- onClick={onUploadDataClick}
+ onClick={() => {
+ if (!collectionAutofetchEnabled) {
+ setCollectionAutofetchEnabled(true);
+ }
+ onUploadDataClick();
+ }}
variant='contained'
color='primary'
size='small'>
variant='contained'
color='primary'
size='small'>
@@
-563,7
+567,7
@@
export const CollectionPanelFiles = withStyles(styles)(connect((state: RootState
</div>
}
}
</div>
}
}
- </FixedSizeList> : <div className={classes.rowEmpty}>
No data available
</div>
+ </FixedSizeList> : <div className={classes.rowEmpty}>
This collection is empty
</div>
}}
</AutoSizer> : <div className={classes.row}><CircularProgress className={classes.loader} size={30} /></div>
}
}}
</AutoSizer> : <div className={classes.row}><CircularProgress className={classes.loader} size={30} /></div>
}