projects
/
arvados-workbench2.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch '15027-object-update-fix'
[arvados-workbench2.git]
/
src
/
store
/
collection-panel
/
collection-panel-files
/
collection-panel-files-actions.ts
diff --git
a/src/store/collection-panel/collection-panel-files/collection-panel-files-actions.ts
b/src/store/collection-panel/collection-panel-files/collection-panel-files-actions.ts
index 3f82d29e921e670fdf4f3b453290c9ec32de5c01..c661d9f8b2d9c2ee8c95e90ca04953f8629e4f3e 100644
(file)
--- a/
src/store/collection-panel/collection-panel-files/collection-panel-files-actions.ts
+++ b/
src/store/collection-panel/collection-panel-files/collection-panel-files-actions.ts
@@
-11,7
+11,7
@@
import { snackbarActions, SnackbarKind } from "../../snackbar/snackbar-actions";
import { dialogActions } from '../../dialog/dialog-actions';
import { getNodeValue } from "~/models/tree";
import { filterCollectionFilesBySelection } from './collection-panel-files-state';
import { dialogActions } from '../../dialog/dialog-actions';
import { getNodeValue } from "~/models/tree";
import { filterCollectionFilesBySelection } from './collection-panel-files-state';
-import { startSubmit, stopSubmit,
reset, initialize
} from 'redux-form';
+import { startSubmit, stopSubmit,
initialize, FormErrors
} from 'redux-form';
import { getDialog } from "~/store/dialog/dialog-reducer";
import { getFileFullPath } from "~/services/collection-service/collection-service-files-response";
import { resourcesDataActions } from "~/store/resources-data/resources-data-actions";
import { getDialog } from "~/store/dialog/dialog-reducer";
import { getFileFullPath } from "~/services/collection-service/collection-service-files-response";
import { resourcesDataActions } from "~/store/resources-data/resources-data-actions";
@@
-39,9
+39,13
@@
export const removeCollectionFiles = (filePaths: string[]) =>
if (currentCollection) {
dispatch(snackbarActions.OPEN_SNACKBAR({ message: 'Removing...' }));
try {
if (currentCollection) {
dispatch(snackbarActions.OPEN_SNACKBAR({ message: 'Removing...' }));
try {
- await services.collectionService.deleteFiles(
''
, filePaths);
+ await services.collectionService.deleteFiles(
currentCollection.uuid
, filePaths);
dispatch<any>(loadCollectionFiles(currentCollection.uuid));
dispatch<any>(loadCollectionFiles(currentCollection.uuid));
- dispatch(snackbarActions.OPEN_SNACKBAR({ message: 'Removed.', hideDuration: 2000 }));
+ dispatch(snackbarActions.OPEN_SNACKBAR({
+ message: 'Removed.',
+ hideDuration: 2000,
+ kind: SnackbarKind.SUCCESS
+ }));
} catch (e) {
dispatch(snackbarActions.OPEN_SNACKBAR({
message: 'Could not remove file.',
} catch (e) {
dispatch(snackbarActions.OPEN_SNACKBAR({
message: 'Could not remove file.',
@@
-73,8
+77,8
@@
export const openFileRemoveDialog = (filePath: string) =>
? 'Are you sure you want to remove this directory?'
: 'Are you sure you want to remove this file?';
const info = isDirectory
? 'Are you sure you want to remove this directory?'
: 'Are you sure you want to remove this file?';
const info = isDirectory
- ? 'Removing files will change content adress.'
- : 'Removing a file will change content adress.';
+ ? 'Removing files will change content ad
d
ress.'
+ : 'Removing a file will change content ad
d
ress.';
dispatch(dialogActions.OPEN_DIALOG({
id: FILE_REMOVE_DIALOG,
dispatch(dialogActions.OPEN_DIALOG({
id: FILE_REMOVE_DIALOG,
@@
-97,7
+101,7
@@
export const openMultipleFilesRemoveDialog = () =>
data: {
title: 'Removing files',
text: 'Are you sure you want to remove selected files?',
data: {
title: 'Removing files',
text: 'Are you sure you want to remove selected files?',
- info: 'Removing files will change content adress.',
+ info: 'Removing files will change content ad
d
ress.',
confirmButtonLabel: 'Remove'
}
});
confirmButtonLabel: 'Remove'
}
});
@@
-130,7
+134,10
@@
export const renameFile = (newName: string) =>
dispatch(dialogActions.CLOSE_DIALOG({ id: RENAME_FILE_DIALOG }));
dispatch(snackbarActions.OPEN_SNACKBAR({ message: 'File name changed.', hideDuration: 2000 }));
} catch (e) {
dispatch(dialogActions.CLOSE_DIALOG({ id: RENAME_FILE_DIALOG }));
dispatch(snackbarActions.OPEN_SNACKBAR({ message: 'File name changed.', hideDuration: 2000 }));
} catch (e) {
- dispatch(stopSubmit(RENAME_FILE_DIALOG, { name: 'Could not rename the file' }));
+ const errors: FormErrors<RenameFileDialogData, string> = {
+ name: 'Could not rename the file'
+ };
+ dispatch(stopSubmit(RENAME_FILE_DIALOG, errors));
}
}
}
}
}
}