projects
/
arvados-workbench2.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
18169: Post review changes, Cypress tests added
[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..a7001a61ac614e83f5dd6c8eb2e570a9902f55a6 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';
@@
-489,7
+489,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>;
}
}
@@
-509,7
+517,12
@@
export const CollectionPanelFiles = withStyles(styles)(connect((state: RootState
<Button
className={classes.uploadButton}
data-cy='upload-button'
<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'>