[ARVADOS-WORKBENCH2] updated: 1.4.1-166-gf0a64666
Git user
git at public.arvados.org
Thu Dec 12 16:00:39 UTC 2019
Summary of changes:
.../file-upload-dialog/file-upload-dialog.tsx | 2 ++
src/components/file-upload/file-upload.tsx | 38 +++++++++++++++++++---
src/store/file-uploader/file-uploader-actions.ts | 5 +++
src/store/file-uploader/file-uploader-reducer.ts | 6 ++++
.../file-uploader/file-uploader.tsx | 5 +--
5 files changed, 50 insertions(+), 6 deletions(-)
via f0a64666816383d2641d5fa7ea22019441ac4464 (commit)
via e586962e68a264bc6a8cf2830475e4fb2c910046 (commit)
from 7c5a6b69831ffc8e679841192abc4ec054a09c74 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
commit f0a64666816383d2641d5fa7ea22019441ac4464
Merge: 7c5a6b69 e586962e
Author: Peter Amstutz <peter.amstutz at curii.com>
Date: Thu Dec 12 10:57:44 2019 -0500
Merge branch '15256-removing-files-during-upload'
refs #15256
Arvados-DCO-1.1-Signed-off-by: Peter Amstutz <peter.amstutz at curii.com>
commit e586962e68a264bc6a8cf2830475e4fb2c910046
Author: mateuszrojecki <mateusz.rojecki at contractors.roche.com>
Date: Mon Jun 24 01:52:17 2019 +0200
Added removing files during upload feature
Feature #15256
Arvados-DCO-1.1-Signed-off-by: mateuszrojecki <mateusz.rojecki at contractors.roche.com>
diff --git a/src/components/file-upload-dialog/file-upload-dialog.tsx b/src/components/file-upload-dialog/file-upload-dialog.tsx
index b178cdae..81558493 100644
--- a/src/components/file-upload-dialog/file-upload-dialog.tsx
+++ b/src/components/file-upload-dialog/file-upload-dialog.tsx
@@ -14,6 +14,7 @@ export interface FilesUploadDialogProps {
uploading: boolean;
onSubmit: () => void;
onChange: (files: File[]) => void;
+ onDelete: (files: File[]) => void;
}
export const FilesUploadDialog = (props: FilesUploadDialogProps & WithDialogProps<{}>) =>
@@ -28,6 +29,7 @@ export const FilesUploadDialog = (props: FilesUploadDialogProps & WithDialogProp
files={props.files}
disabled={props.uploading}
onDrop={props.onChange}
+ onDelete={props.onDelete}
/>
</DialogContent>
<DialogActions>
diff --git a/src/components/file-upload/file-upload.tsx b/src/components/file-upload/file-upload.tsx
index 64656e48..23afc0be 100644
--- a/src/components/file-upload/file-upload.tsx
+++ b/src/components/file-upload/file-upload.tsx
@@ -9,17 +9,18 @@ import {
StyleRulesCallback,
Table, TableBody, TableCell, TableHead, TableRow,
Typography,
- WithStyles
+ WithStyles,
+ IconButton
} from '@material-ui/core';
import { withStyles } from '@material-ui/core';
import Dropzone from 'react-dropzone';
-import { CloudUploadIcon } from "../icon/icon";
+import { CloudUploadIcon, RemoveIcon } from "../icon/icon";
import { formatFileSize, formatProgress, formatUploadSpeed } from "~/common/formatters";
import { UploadFile } from '~/store/file-uploader/file-uploader-actions';
type CssRules = "root" | "dropzone" | "dropzoneWrapper" | "container" | "uploadIcon"
| "dropzoneBorder" | "dropzoneBorderLeft" | "dropzoneBorderRight" | "dropzoneBorderTop" | "dropzoneBorderBottom"
- | "dropzoneBorderHorzActive" | "dropzoneBorderVertActive";
+ | "dropzoneBorderHorzActive" | "dropzoneBorderVertActive" | "deleteButton" | "deleteButtonDisabled" | "deleteIcon";
const styles: StyleRulesCallback<CssRules> = theme => ({
root: {
@@ -81,6 +82,15 @@ const styles: StyleRulesCallback<CssRules> = theme => ({
},
uploadIcon: {
verticalAlign: "middle"
+ },
+ deleteButton: {
+ cursor: "pointer"
+ },
+ deleteButtonDisabled: {
+ cursor: "not-allowed"
+ },
+ deleteIcon: {
+ marginLeft: "-6px"
}
});
@@ -88,6 +98,7 @@ interface FileUploadPropsData {
files: UploadFile[];
disabled: boolean;
onDrop: (files: File[]) => void;
+ onDelete: (files: File[]) => void;
}
interface FileUploadState {
@@ -104,6 +115,15 @@ export const FileUpload = withStyles(styles)(
focused: false
};
}
+ onDelete = (event: React.MouseEvent<HTMLTableCellElement>, file: any): void => {
+ const { onDelete, disabled } = this.props;
+
+ event.stopPropagation();
+
+ if (!disabled) {
+ onDelete([file]);
+ }
+ }
render() {
const { classes, onDrop, disabled, files } = this.props;
return <div className={"file-upload-dropzone " + classes.dropzoneWrapper}>
@@ -149,6 +169,7 @@ export const FileUpload = withStyles(styles)(
<TableCell>File size</TableCell>
<TableCell>Upload speed</TableCell>
<TableCell>Upload progress</TableCell>
+ <TableCell>Delete</TableCell>
</TableRow>
</TableHead>
<TableBody>
@@ -158,7 +179,16 @@ export const FileUpload = withStyles(styles)(
<TableCell>{formatFileSize(f.file.size)}</TableCell>
<TableCell>{formatUploadSpeed(f.prevLoaded, f.loaded, f.prevTime, f.currentTime)}</TableCell>
<TableCell>{formatProgress(f.loaded, f.total)}</TableCell>
- </TableRow>
+ <TableCell>
+ <IconButton
+ aria-label="Remove"
+ onClick={(event: React.MouseEvent<HTMLTableCellElement>) => this.onDelete(event, f)}
+ className={disabled ? classnames(classes.deleteButtonDisabled, classes.deleteIcon) : classnames(classes.deleteButton, classes.deleteIcon)}
+ >
+ <RemoveIcon />
+ </IconButton>
+ </TableCell>
+ </TableRow>
)}
</TableBody>
</Table>
diff --git a/src/store/file-uploader/file-uploader-actions.ts b/src/store/file-uploader/file-uploader-actions.ts
index f4a30a23..5a82958d 100644
--- a/src/store/file-uploader/file-uploader-actions.ts
+++ b/src/store/file-uploader/file-uploader-actions.ts
@@ -17,12 +17,17 @@ export interface UploadFile {
currentTime: number;
}
+export interface FileWithId extends File {
+ id: number;
+}
+
export const fileUploaderActions = unionize({
CLEAR_UPLOAD: ofType(),
SET_UPLOAD_FILES: ofType<File[]>(),
UPDATE_UPLOAD_FILES: ofType<File[]>(),
SET_UPLOAD_PROGRESS: ofType<{ fileId: number, loaded: number, total: number, currentTime: number }>(),
START_UPLOAD: ofType(),
+ DELETE_UPLOAD_FILE: ofType<FileWithId[]>(),
});
export type FileUploaderAction = UnionOf<typeof fileUploaderActions>;
diff --git a/src/store/file-uploader/file-uploader-reducer.ts b/src/store/file-uploader/file-uploader-reducer.ts
index 9ea63131..bf24505b 100644
--- a/src/store/file-uploader/file-uploader-reducer.ts
+++ b/src/store/file-uploader/file-uploader-reducer.ts
@@ -37,6 +37,12 @@ export const fileUploaderReducer = (state: UploaderState = initialState, action:
return uniqUpdatedState;
},
+ DELETE_UPLOAD_FILE: files => {
+ const idToDelete: number = files[0].id;
+ const updatedState = state.filter( file => file.id !== idToDelete);
+
+ return updatedState;
+ },
START_UPLOAD: () => {
const startTime = Date.now();
return state.map(f => ({ ...f, startTime, prevTime: startTime }));
diff --git a/src/views-components/file-uploader/file-uploader.tsx b/src/views-components/file-uploader/file-uploader.tsx
index 83808016..f14c54fe 100644
--- a/src/views-components/file-uploader/file-uploader.tsx
+++ b/src/views-components/file-uploader/file-uploader.tsx
@@ -8,7 +8,7 @@ import { connect } from 'react-redux';
import { RootState } from '~/store/store';
import { FileUploadProps } from '../../components/file-upload/file-upload';
import { Dispatch } from 'redux';
-import { fileUploaderActions, getFileUploaderState } from '~/store/file-uploader/file-uploader-actions';
+import { fileUploaderActions, getFileUploaderState, FileWithId } from '~/store/file-uploader/file-uploader-actions';
import { WrappedFieldProps } from 'redux-form';
import { Typography } from '@material-ui/core';
@@ -19,7 +19,7 @@ const mapStateToProps = (state: RootState, { disabled }: FileUploaderProps): Pic
files: state.fileUploader,
});
-const mapDispatchToProps = (dispatch: Dispatch, { onDrop }: FileUploaderProps): Pick<FileUploadProps, 'onDrop'> => ({
+const mapDispatchToProps = (dispatch: Dispatch, { onDrop }: FileUploaderProps): Pick<FileUploadProps, 'onDrop' | 'onDelete'> => ({
onDrop: files => {
const state = dispatch<any>(getFileUploaderState());
if (files.length > 0 && state.length === 0) {
@@ -30,6 +30,7 @@ const mapDispatchToProps = (dispatch: Dispatch, { onDrop }: FileUploaderProps):
onDrop(files);
}
},
+ onDelete: files => dispatch(fileUploaderActions.DELETE_UPLOAD_FILE(files as FileWithId[])),
});
export const FileUploader = connect(mapStateToProps, mapDispatchToProps)(FileUpload);
-----------------------------------------------------------------------
hooks/post-receive
--
More information about the arvados-commits
mailing list