projects
/
arvados-workbench2.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch '19865-search-clearing-fix'. Closes #19865.
[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 06b3c507dba2ba3a49ad998dc59e8277756121b2..2ba29d44801435ccc258ebfd0fea533186567bd7 100644
(file)
--- a/
src/components/collection-panel-files/collection-panel-files.tsx
+++ b/
src/components/collection-panel-files/collection-panel-files.tsx
@@
-85,7
+85,7
@@
const styles: StyleRulesCallback<CssRules> = (theme: Theme) => ({
wrapper: {
display: 'flex',
minHeight: '600px',
wrapper: {
display: 'flex',
minHeight: '600px',
- color: 'rgba(0,
0, 0,
0.87)',
+ color: 'rgba(0,
0,0,
0.87)',
fontSize: '0.875rem',
fontFamily: '"Roboto", "Helvetica", "Arial", sans-serif',
fontWeight: 400,
fontSize: '0.875rem',
fontFamily: '"Roboto", "Helvetica", "Arial", sans-serif',
fontWeight: 400,
@@
-154,8
+154,8
@@
const styles: StyleRulesCallback<CssRules> = (theme: Theme) => ({
marginTop: '-15px',
},
pathPanel: {
marginTop: '-15px',
},
pathPanel: {
- padding: '
1
rem',
- marginBottom: '
1
rem',
+ padding: '
0.5
rem',
+ marginBottom: '
0.5
rem',
backgroundColor: '#fff',
boxShadow: '0px 1px 3px 0px rgb(0 0 0 / 20%), 0px 1px 1px 0px rgb(0 0 0 / 14%), 0px 2px 1px -1px rgb(0 0 0 / 12%)',
},
backgroundColor: '#fff',
boxShadow: '0px 1px 3px 0px rgb(0 0 0 / 20%), 0px 1px 1px 0px rgb(0 0 0 / 14%), 0px 2px 1px -1px rgb(0 0 0 / 12%)',
},
@@
-164,7
+164,7
@@
const styles: StyleRulesCallback<CssRules> = (theme: Theme) => ({
},
leftPanel: {
flex: 0,
},
leftPanel: {
flex: 0,
- padding: '1rem',
+ padding: '
0 1rem
1rem',
marginRight: '1rem',
whiteSpace: 'nowrap',
position: 'relative',
marginRight: '1rem',
whiteSpace: 'nowrap',
position: 'relative',
@@
-195,8
+195,8
@@
const styles: StyleRulesCallback<CssRules> = (theme: Theme) => ({
rightPanel: {
flex: '50%',
padding: '1rem',
rightPanel: {
flex: '50%',
padding: '1rem',
- paddingTop: '
2
rem',
- marginTop: '-
1
rem',
+ paddingTop: '
0.5
rem',
+ marginTop: '-
0.5
rem',
position: 'relative',
backgroundColor: '#fff',
boxShadow: '0px 3px 3px 0px rgb(0 0 0 / 20%), 0px 3px 1px 0px rgb(0 0 0 / 14%), 0px 3px 1px -1px rgb(0 0 0 / 12%)',
position: 'relative',
backgroundColor: '#fff',
boxShadow: '0px 3px 3px 0px rgb(0 0 0 / 20%), 0px 3px 1px 0px rgb(0 0 0 / 14%), 0px 3px 1px -1px rgb(0 0 0 / 12%)',
@@
-328,12
+328,7
@@
export const CollectionPanelFiles = withStyles(styles)(connect((state: RootState
const currentPDH = (collectionPanel.item || {}).portableDataHash;
React.useEffect(() => {
if (currentPDH) {
const currentPDH = (collectionPanel.item || {}).portableDataHash;
React.useEffect(() => {
if (currentPDH) {
- // Avoid fetching the same content level twice
- if (leftKey !== rightKey) {
- fetchData([leftKey, rightKey], true);
- } else {
- fetchData(rightKey, true);
- }
+ fetchData([leftKey, rightKey], true);
}
}, [currentPDH]); // eslint-disable-line react-hooks/exhaustive-deps
}
}, [currentPDH]); // eslint-disable-line react-hooks/exhaustive-deps
@@
-539,7
+534,7
@@
export const CollectionPanelFiles = withStyles(styles)(connect((state: RootState
: <div className={classes.rowEmpty}>No directories available</div>
}}
</AutoSizer>
: <div className={classes.rowEmpty}>No directories available</div>
}}
</AutoSizer>
- : <div className={classes.row}><CircularProgress className={classes.loader} size={30} /></div> }
+ : <div
data-cy="collection-loader"
className={classes.row}><CircularProgress className={classes.loader} size={30} /></div> }
</div>
</div>
<div className={classes.rightPanel} data-cy="collection-files-right-panel">
</div>
</div>
<div className={classes.rightPanel} data-cy="collection-files-right-panel">