projects
/
arvados-workbench2.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
17782: Fixes almost all tests (4 left) mostly by fixing namespace-type imports.
[arvados-workbench2.git]
/
src
/
components
/
file-tree
/
file-tree-item.tsx
diff --git
a/src/components/file-tree/file-tree-item.tsx
b/src/components/file-tree/file-tree-item.tsx
index 0e8c92e2da6c2343f589696fa999d7e7f9fce49a..b522637de0b261c2edf8eb3ce8d49d4fd634b92f 100644
(file)
--- a/
src/components/file-tree/file-tree-item.tsx
+++ b/
src/components/file-tree/file-tree-item.tsx
@@
-2,14
+2,13
@@
//
// SPDX-License-Identifier: AGPL-3.0
//
// SPDX-License-Identifier: AGPL-3.0
-import
* as
React from "react";
+import React from "react";
import { TreeItem } from "../tree/tree";
import { TreeItem } from "../tree/tree";
-import {
ProjectIcon, MoreOptionsIcon, DefaultIcon, Collection
Icon } from "../icon/icon";
+import {
DirectoryIcon, MoreOptionsIcon, DefaultIcon, File
Icon } from "../icon/icon";
import { Typography, IconButton, StyleRulesCallback, withStyles, WithStyles, Tooltip } from '@material-ui/core';
import { Typography, IconButton, StyleRulesCallback, withStyles, WithStyles, Tooltip } from '@material-ui/core';
-import { formatFileSize } from "
~/
common/formatters";
+import { formatFileSize } from "common/formatters";
import { ListItemTextIcon } from "../list-item-text-icon/list-item-text-icon";
import { FileTreeData } from "./file-tree-data";
import { ListItemTextIcon } from "../list-item-text-icon/list-item-text-icon";
import { FileTreeData } from "./file-tree-data";
-import { FileThumbnail } from '~/components/file-tree/file-thumbnail';
type CssRules = "root" | "spacer" | "sizeInfo" | "button" | "moreOptions";
type CssRules = "root" | "spacer" | "sizeInfo" | "button" | "moreOptions";
@@
-46,7
+45,7
@@
export const FileTreeItem = withStyles(fileTreeItemStyle)(
return <>
<div className={classes.root}>
<ListItemTextIcon
return <>
<div className={classes.root}>
<ListItemTextIcon
- icon={getIcon(item)}
+ icon={getIcon(item
.data.type
)}
name={item.data.name} />
<div className={classes.spacer} />
<Typography
name={item.data.name} />
<div className={classes.spacer} />
<Typography
@@
-54,13
+53,13
@@
export const FileTreeItem = withStyles(fileTreeItemStyle)(
variant="caption">{formatFileSize(item.data.size)}</Typography>
<Tooltip title="More options" disableFocusListener>
<IconButton
variant="caption">{formatFileSize(item.data.size)}</Typography>
<Tooltip title="More options" disableFocusListener>
<IconButton
+ data-cy='file-item-options-btn'
className={classes.button}
onClick={this.handleClick}>
<MoreOptionsIcon className={classes.moreOptions} />
</IconButton>
</Tooltip>
</div >
className={classes.button}
onClick={this.handleClick}>
<MoreOptionsIcon className={classes.moreOptions} />
</IconButton>
</Tooltip>
</div >
- <FileThumbnail file={item.data} />
</>;
}
</>;
}
@@
-69,12
+68,12
@@
export const FileTreeItem = withStyles(fileTreeItemStyle)(
}
});
}
});
-
const getIcon = (item: TreeItem<FileTreeData>
) => {
- switch (
item.data.
type) {
+
export const getIcon = (type: string
) => {
+ switch (type) {
case 'directory':
case 'directory':
- return
Project
Icon;
+ return
Directory
Icon;
case 'file':
case 'file':
- return
Collection
Icon;
+ return
File
Icon;
default:
return DefaultIcon;
}
default:
return DefaultIcon;
}