[arvados-workbench2] updated: 2.6.0-22-gcfe49be6
git repository hosting
git at public.arvados.org
Wed May 24 03:59:43 UTC 2023
Summary of changes:
.../collection-service/collection-service.ts | 35 ++++++++++++++++------
.../common-service/common-resource-service.ts | 7 +++--
.../collections/collection-partial-copy-actions.ts | 5 +++-
.../collections/collection-partial-move-actions.ts | 10 +++++--
4 files changed, 42 insertions(+), 15 deletions(-)
via cfe49be676877567de9704e8d7968d611fa77fc9 (commit)
via e3c678438f8400d15843dc745df83525a53b07e3 (commit)
from c9cbcb68f87f432452991e5e904fff7d65395e6c (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 cfe49be676877567de9704e8d7968d611fa77fc9
Author: Stephen Smith <stephen at curii.com>
Date: Tue May 23 23:59:01 2023 -0400
20031: Prevent movng collection items to itself, show error toast if attempted
Arvados-DCO-1.1-Signed-off-by: Stephen Smith <stephen at curii.com>
diff --git a/src/services/collection-service/collection-service.ts b/src/services/collection-service/collection-service.ts
index 7d734fa6..b6687985 100644
--- a/src/services/collection-service/collection-service.ts
+++ b/src/services/collection-service/collection-service.ts
@@ -13,12 +13,14 @@ import { ApiActions } from "services/api/api-actions";
import { Session } from "models/session";
import { CommonService } from "services/common-service/common-service";
import { snakeCase } from "lodash";
+import { CommonResourceServiceError } from "services/common-service/common-resource-service";
export type UploadProgress = (fileId: number, loaded: number, total: number, currentTime: number) => void;
type CollectionPartialUpdateOrCreate = Partial<CollectionResource> & Pick<CollectionResource, "uuid"> |
Partial<CollectionResource> & Pick<CollectionResource, "ownerUuid">;
export const emptyCollectionPdh = 'd41d8cd98f00b204e9800998ecf8427e+0';
+export const SOURCE_DESTINATION_EQUAL_ERROR_MESSAGE = 'Source and destination cannot be the same';
export class CollectionService extends TrashableResourceService<CollectionResource> {
constructor(serverApi: AxiosInstance, private webdavClient: WebDAV, private authService: AuthService, actions: ApiActions) {
@@ -172,10 +174,10 @@ export class CollectionService extends TrashableResourceService<CollectionResour
copyFiles(sourcePdh: string, files: string[], destinationCollection: CollectionPartialUpdateOrCreate, destinationPath: string, showErrors?: boolean) {
const fileMap = files.reduce((obj, sourceFile) => {
- const sourceFileName = sourceFile.split('/').filter(Boolean).slice(-1).join("");
+ const fileBasename = sourceFile.split('/').filter(Boolean).slice(-1).join("");
return {
...obj,
- [this.combineFilePath([destinationPath, sourceFileName])]: `${sourcePdh}${this.combineFilePath([sourceFile])}`
+ [this.combineFilePath([destinationPath, fileBasename])]: `${sourcePdh}${this.combineFilePath([sourceFile])}`
};
}, {});
@@ -184,16 +186,31 @@ export class CollectionService extends TrashableResourceService<CollectionResour
moveFiles(sourceUuid: string, sourcePdh: string, files: string[], destinationCollection: CollectionPartialUpdateOrCreate, destinationPath: string, showErrors?: boolean) {
if (sourceUuid === destinationCollection.uuid) {
+ let errors: CommonResourceServiceError[] = [];
const fileMap = files.reduce((obj, sourceFile) => {
- const sourceFileName = sourceFile.split('/').filter(Boolean).slice(-1).join("");
- return {
- ...obj,
- [this.combineFilePath([destinationPath, sourceFileName])]: `${sourcePdh}${this.combineFilePath([sourceFile])}`,
- [this.combineFilePath([sourceFile])]: '',
- };
+ const fileBasename = sourceFile.split('/').filter(Boolean).slice(-1).join("");
+ const fileDestinationPath = this.combineFilePath([destinationPath, fileBasename]);
+ const fileSourcePath = this.combineFilePath([sourceFile]);
+ const fileSourceUri = `${sourcePdh}${fileSourcePath}`;
+
+
+ if (fileDestinationPath !== fileSourcePath) {
+ return {
+ ...obj,
+ [fileDestinationPath]: fileSourceUri,
+ [fileSourcePath]: '',
+ };
+ } else {
+ errors.push(CommonResourceServiceError.SOURCE_DESTINATION_CANNOT_BE_SAME);
+ return obj;
+ }
}, {});
- return this.replaceFiles({uuid: sourceUuid}, fileMap, showErrors)
+ if (errors.length === 0) {
+ return this.replaceFiles({uuid: sourceUuid}, fileMap, showErrors)
+ } else {
+ return Promise.reject({errors});
+ }
} else {
return this.copyFiles(sourcePdh, files, destinationCollection, destinationPath, showErrors)
.then(() => {
diff --git a/src/services/common-service/common-resource-service.ts b/src/services/common-service/common-resource-service.ts
index d9be8dae..11bfec38 100644
--- a/src/services/common-service/common-resource-service.ts
+++ b/src/services/common-service/common-resource-service.ts
@@ -13,6 +13,7 @@ export enum CommonResourceServiceError {
OWNERSHIP_CYCLE = 'OwnershipCycle',
MODIFYING_CONTAINER_REQUEST_FINAL_STATE = 'ModifyingContainerRequestFinalState',
NAME_HAS_ALREADY_BEEN_TAKEN = 'NameHasAlreadyBeenTaken',
+ SOURCE_DESTINATION_CANNOT_BE_SAME = 'SourceDestinationCannotBeSame',
UNKNOWN = 'Unknown',
NONE = 'None'
}
@@ -53,7 +54,7 @@ export class CommonResourceService<T extends Resource> extends CommonService<T>
}
export const getCommonResourceServiceError = (errorResponse: any) => {
- if ('errors' in errorResponse) {
+ if (errorResponse && 'errors' in errorResponse) {
const error = errorResponse.errors.join('');
switch (true) {
case /UniqueViolation/.test(error):
@@ -64,11 +65,11 @@ export const getCommonResourceServiceError = (errorResponse: any) => {
return CommonResourceServiceError.MODIFYING_CONTAINER_REQUEST_FINAL_STATE;
case /Name has already been taken/.test(error):
return CommonResourceServiceError.NAME_HAS_ALREADY_BEEN_TAKEN;
+ case new RegExp(CommonResourceServiceError.SOURCE_DESTINATION_CANNOT_BE_SAME).test(error):
+ return CommonResourceServiceError.SOURCE_DESTINATION_CANNOT_BE_SAME;
default:
return CommonResourceServiceError.UNKNOWN;
}
}
return CommonResourceServiceError.NONE;
};
-
-
diff --git a/src/store/collections/collection-partial-move-actions.ts b/src/store/collections/collection-partial-move-actions.ts
index b8b4eeb8..1d979f31 100644
--- a/src/store/collections/collection-partial-move-actions.ts
+++ b/src/store/collections/collection-partial-move-actions.ts
@@ -17,6 +17,7 @@ import { SnackbarKind, snackbarActions } from "store/snackbar/snackbar-actions";
import { RootState } from "store/store";
import { FileOperationLocation } from "store/tree-picker/tree-picker-actions";
import { CollectionResource } from "models/collection";
+import { SOURCE_DESTINATION_EQUAL_ERROR_MESSAGE } from "services/collection-service/collection-service";
export const COLLECTION_PARTIAL_MOVE_TO_NEW_COLLECTION = 'COLLECTION_PARTIAL_MOVE_TO_NEW_DIALOG';
export const COLLECTION_PARTIAL_MOVE_TO_SELECTED_COLLECTION = 'COLLECTION_PARTIAL_MOVE_TO_SELECTED_DIALOG';
@@ -170,7 +171,9 @@ export const moveCollectionPartialToExistingCollection = (fileSelection: Collect
dispatch(progressIndicatorActions.STOP_WORKING(COLLECTION_PARTIAL_MOVE_TO_SELECTED_COLLECTION));
} catch (e) {
const error = getCommonResourceServiceError(e);
- if (error === CommonResourceServiceError.UNKNOWN) {
+ if (error === CommonResourceServiceError.SOURCE_DESTINATION_CANNOT_BE_SAME) {
+ dispatch(snackbarActions.OPEN_SNACKBAR({ message: SOURCE_DESTINATION_EQUAL_ERROR_MESSAGE, hideDuration: 2000, kind: SnackbarKind.ERROR }));
+ } else if (error === CommonResourceServiceError.UNKNOWN) {
dispatch(dialogActions.CLOSE_DIALOG({ id: COLLECTION_PARTIAL_MOVE_TO_SELECTED_COLLECTION }));
dispatch(snackbarActions.OPEN_SNACKBAR({ message: 'Could not copy this files to selected collection', hideDuration: 2000, kind: SnackbarKind.ERROR }));
}
commit e3c678438f8400d15843dc745df83525a53b07e3
Author: Stephen Smith <stephen at curii.com>
Date: Tue May 23 23:46:12 2023 -0400
20031: Cancel submit spinner on collection file move/copy error
Arvados-DCO-1.1-Signed-off-by: Stephen Smith <stephen at curii.com>
diff --git a/src/store/collections/collection-partial-copy-actions.ts b/src/store/collections/collection-partial-copy-actions.ts
index 8a3340b3..8e8dbdbb 100644
--- a/src/store/collections/collection-partial-copy-actions.ts
+++ b/src/store/collections/collection-partial-copy-actions.ts
@@ -103,7 +103,7 @@ export const copyCollectionPartialToNewCollection = (fileSelection: CollectionFi
} catch (e) {
const error = getCommonResourceServiceError(e);
if (error === CommonResourceServiceError.UNIQUE_NAME_VIOLATION) {
- dispatch(stopSubmit(COLLECTION_PARTIAL_COPY_FORM_NAME, { name: 'Collection with this name already exists.' } as FormErrors));
+ dispatch(snackbarActions.OPEN_SNACKBAR({ message: 'Collection with this name already exists', hideDuration: 2000, kind: SnackbarKind.ERROR }));
} else if (error === CommonResourceServiceError.UNKNOWN) {
dispatch(dialogActions.CLOSE_DIALOG({ id: COLLECTION_PARTIAL_COPY_FORM_NAME }));
dispatch(snackbarActions.OPEN_SNACKBAR({ message: 'Could not create a copy of collection', hideDuration: 2000, kind: SnackbarKind.ERROR }));
@@ -111,6 +111,7 @@ export const copyCollectionPartialToNewCollection = (fileSelection: CollectionFi
dispatch(dialogActions.CLOSE_DIALOG({ id: COLLECTION_PARTIAL_COPY_FORM_NAME }));
dispatch(snackbarActions.OPEN_SNACKBAR({ message: 'Collection has been copied but may contain incorrect files.', hideDuration: 2000, kind: SnackbarKind.ERROR }));
}
+ dispatch(stopSubmit(COLLECTION_PARTIAL_COPY_FORM_NAME));
dispatch(progressIndicatorActions.STOP_WORKING(COLLECTION_PARTIAL_COPY_FORM_NAME));
}
}
@@ -171,6 +172,7 @@ export const copyCollectionPartialToExistingCollection = (fileSelection: Collect
dispatch(dialogActions.CLOSE_DIALOG({ id: COLLECTION_PARTIAL_COPY_TO_SELECTED_COLLECTION }));
dispatch(snackbarActions.OPEN_SNACKBAR({ message: 'Could not copy this files to selected collection', hideDuration: 2000, kind: SnackbarKind.ERROR }));
}
+ dispatch(stopSubmit(COLLECTION_PARTIAL_COPY_TO_SELECTED_COLLECTION));
dispatch(progressIndicatorActions.STOP_WORKING(COLLECTION_PARTIAL_COPY_TO_SELECTED_COLLECTION));
}
}
@@ -238,6 +240,7 @@ export const copyCollectionPartialToSeparateCollections = (fileSelection: Collec
dispatch(dialogActions.CLOSE_DIALOG({ id: COLLECTION_PARTIAL_COPY_TO_SEPARATE_COLLECTIONS }));
dispatch(snackbarActions.OPEN_SNACKBAR({ message: 'Collection has been copied but may contain incorrect files.', hideDuration: 2000, kind: SnackbarKind.ERROR }));
}
+ dispatch(stopSubmit(COLLECTION_PARTIAL_COPY_TO_SEPARATE_COLLECTIONS));
dispatch(progressIndicatorActions.STOP_WORKING(COLLECTION_PARTIAL_COPY_TO_SEPARATE_COLLECTIONS));
}
}
diff --git a/src/store/collections/collection-partial-move-actions.ts b/src/store/collections/collection-partial-move-actions.ts
index 318971a0..b8b4eeb8 100644
--- a/src/store/collections/collection-partial-move-actions.ts
+++ b/src/store/collections/collection-partial-move-actions.ts
@@ -3,7 +3,7 @@
// SPDX-License-Identifier: AGPL-3.0
import { Dispatch } from "redux";
-import { initialize, startSubmit } from "redux-form";
+import { initialize, startSubmit, stopSubmit } from "redux-form";
import { CommonResourceServiceError, getCommonResourceServiceError } from "services/common-service/common-resource-service";
import { ServiceRepository } from "services/services";
import { CollectionFileSelection, CollectionPanelDirectory, CollectionPanelFile, filterCollectionFilesBySelection, getCollectionSelection } from "store/collection-panel/collection-panel-files/collection-panel-files-state";
@@ -107,6 +107,7 @@ export const moveCollectionPartialToNewCollection = (fileSelection: CollectionFi
dispatch(dialogActions.CLOSE_DIALOG({ id: COLLECTION_PARTIAL_MOVE_TO_NEW_COLLECTION }));
dispatch(snackbarActions.OPEN_SNACKBAR({ message: 'Could not move files to selected collection', hideDuration: 2000, kind: SnackbarKind.ERROR }));
}
+ dispatch(stopSubmit(COLLECTION_PARTIAL_MOVE_TO_NEW_COLLECTION));
dispatch(progressIndicatorActions.STOP_WORKING(COLLECTION_PARTIAL_MOVE_TO_NEW_COLLECTION));
}
}
@@ -173,6 +174,7 @@ export const moveCollectionPartialToExistingCollection = (fileSelection: Collect
dispatch(dialogActions.CLOSE_DIALOG({ id: COLLECTION_PARTIAL_MOVE_TO_SELECTED_COLLECTION }));
dispatch(snackbarActions.OPEN_SNACKBAR({ message: 'Could not copy this files to selected collection', hideDuration: 2000, kind: SnackbarKind.ERROR }));
}
+ dispatch(stopSubmit(COLLECTION_PARTIAL_MOVE_TO_SELECTED_COLLECTION));
dispatch(progressIndicatorActions.STOP_WORKING(COLLECTION_PARTIAL_MOVE_TO_SELECTED_COLLECTION));
}
}
@@ -240,6 +242,7 @@ export const moveCollectionPartialToSeparateCollections = (fileSelection: Collec
dispatch(dialogActions.CLOSE_DIALOG({ id: COLLECTION_PARTIAL_MOVE_TO_SEPARATE_COLLECTIONS }));
dispatch(snackbarActions.OPEN_SNACKBAR({ message: 'Collection has been copied but may contain incorrect files.', hideDuration: 2000, kind: SnackbarKind.ERROR }));
}
+ dispatch(stopSubmit(COLLECTION_PARTIAL_MOVE_TO_SEPARATE_COLLECTIONS));
dispatch(progressIndicatorActions.STOP_WORKING(COLLECTION_PARTIAL_MOVE_TO_SEPARATE_COLLECTIONS));
}
}
-----------------------------------------------------------------------
hooks/post-receive
--
More information about the arvados-commits
mailing list