Nemcio/SCM-Manager
1
0
Fork 0
mirror of https://github.com/scm-manager/scm-manager.git synced 2025-11-10 07:25:44 +01:00
Code Issues Packages Projects Releases Activity

Show size for empty files, but not for directories

Browse Source
This commit is contained in:
René Pfeuffer
2018-10-17 15:34:22 +02:00
parent 46846673ae
commit 04432f6a50
3 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
scm-ui/src/repos/sources/components/FileSize.js
View File

@@ -6,9 +6,9 @@ type Props = {
}; };
class FileSize extends React.Component<Props> { class FileSize extends React.Component<Props> {
static format(bytes) { static format(bytes: number) {
if (!bytes) { if (!bytes) {
return ""; return "0 B";
} }
const units = ["B", "K", "M", "G", "T", "P", "E", "Z", "Y"]; const units = ["B", "K", "M", "G", "T", "P", "E", "Z", "Y"];

3
scm-ui/src/repos/sources/components/FileSize.test.js
View File

@@ -1,7 +1,8 @@
import FileSize from "./FileSize"; import FileSize from "./FileSize";
it("should format bytes", () => { it("should format bytes", () => {
expect(FileSize.format(160)).toBe("160.00 B"); expect(FileSize.format(0)).toBe("0 B");
expect(FileSize.format(160)).toBe("160 B");
expect(FileSize.format(6304)).toBe("6.16 K"); expect(FileSize.format(6304)).toBe("6.16 K");
expect(FileSize.format(28792588)).toBe("27.46 M"); expect(FileSize.format(28792588)).toBe("27.46 M");
expect(FileSize.format(1369510189)).toBe("1.28 G"); expect(FileSize.format(1369510189)).toBe("1.28 G");

6
scm-ui/src/repos/sources/components/FileTreeLeaf.js
View File

@@ -62,13 +62,13 @@ class FileTreeLeaf extends React.Component<Props> {
render() { render() {
const { file, classes } = this.props; const { file, classes } = this.props;
const fileSize = file.directory ? "" : <FileSize bytes={file.length} />;
return ( return (
<tr> <tr>
<td className={classes.iconColumn}>{this.createFileIcon(file)}</td> <td className={classes.iconColumn}>{this.createFileIcon(file)}</td>
<td>{this.createFileName(file)}</td> <td>{this.createFileName(file)}</td>
<td> <td>{fileSize}</td>
<FileSize bytes={file.length} />
</td>
<td> <td>
<DateFromNow date={file.lastModified} /> <DateFromNow date={file.lastModified} />
</td> </td>