projects
/
arvados-workbench2.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch '17579-Clear-table-filter-when-changing-the-project' into main
[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 adec50f651a9d307cdf3bd29d1d79cc79f76fd91..1ef6b5c94cdf117ea52a932c47a085957ce6c2d2 100644
(file)
--- a/
src/components/collection-panel-files/collection-panel-files.tsx
+++ b/
src/components/collection-panel-files/collection-panel-files.tsx
@@
-17,7
+17,7
@@
import { RootState } from 'store/store';
import { WebDAV, WebDAVRequestConfig } from 'common/webdav';
import { AuthState } from 'store/auth/auth-reducer';
import { extractFilesData } from 'services/collection-service/collection-service-files-response';
import { WebDAV, WebDAVRequestConfig } from 'common/webdav';
import { AuthState } from 'store/auth/auth-reducer';
import { extractFilesData } from 'services/collection-service/collection-service-files-response';
-import { DefaultIcon, DirectoryIcon, FileIcon, BackIcon } from 'components/icon/icon';
+import { DefaultIcon, DirectoryIcon, FileIcon, BackIcon
, SidePanelRightArrowIcon
} from 'components/icon/icon';
import { setCollectionFiles } from 'store/collection-panel/collection-panel-files/collection-panel-files-actions';
import { sortBy } from 'lodash';
import { formatFileSize } from 'common/formatters';
import { setCollectionFiles } from 'store/collection-panel/collection-panel-files/collection-panel-files-actions';
import { sortBy } from 'lodash';
import { formatFileSize } from 'common/formatters';
@@
-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}>
{
@@
-489,7
+488,15
@@
export const CollectionPanelFiles = withStyles(styles)(connect((state: RootState
data-type={type}
data-parent-path={name}
className={classNames(classes.row, getActiveClass(name))}
data-type={type}
data-parent-path={name}
className={classNames(classes.row, getActiveClass(name))}
- key={id}>{getItemIcon(type, getActiveClass(name))} <div className={classes.rowName}>{name}</div>
+ key={id}>
+ {getItemIcon(type, getActiveClass(name))}
+ <div className={classes.rowName}>
+ {name}
+ </div>
+ {
+ getActiveClass(name) ? <SidePanelRightArrowIcon
+ style={{ display: 'inline', marginTop: '5px', marginLeft: '5px' }} /> : null
+ }
</div>;
}
}
</div>;
}
}
@@
-502,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'>