import { extractFilesData } from "./collection-service-files-response";
import { TrashableResourceService } from "services/common-service/trashable-resource-service";
import { ApiActions } from "services/api/api-actions";
-import { customEncodeURI } from "common/url";
import { Session } from "models/session";
import { CommonService } from "services/common-service/common-service";
export type UploadProgress = (fileId: number, loaded: number, total: number, currentTime: number) => void;
+export const emptyCollectionUuid = 'd41d8cd98f00b204e9800998ecf8427e+0';
+
export class CollectionService extends TrashableResourceService<CollectionResource> {
constructor(serverApi: AxiosInstance, private webdavClient: WebDAV, private authService: AuthService, actions: ApiActions) {
super(serverApi, "collections", actions, [
return Promise.reject();
}
- async deleteFiles(collectionUuid: string, filePaths: string[]) {
- const sortedUniquePaths = Array.from(new Set(filePaths))
- .sort((a, b) => a.length - b.length)
- .reduce((acc, currentPath) => {
- const parentPathFound = acc.find((parentPath) => currentPath.indexOf(`${parentPath}/`) > -1);
-
- if (!parentPathFound) {
- return [...acc, currentPath];
- }
-
- return acc;
- }, []);
-
- for (const path of sortedUniquePaths) {
- if (path.indexOf(collectionUuid) === -1) {
- await this.webdavClient.delete(`c=${collectionUuid}${path}`);
+ private combineFilePath(parts: string[]) {
+ return parts.reduce((path, part) => {
+ // Trim leading and trailing slashes
+ const trimmedPart = part.split('/').filter(Boolean).join('/');
+ if (trimmedPart.length) {
+ const separator = path.endsWith('/') ? '' : '/';
+ return `${path}${separator}${trimmedPart}`;
} else {
- await this.webdavClient.delete(`c=${path}`);
+ return path;
}
- }
- await this.update(collectionUuid, { preserveVersion: true });
+ }, "/");
+ }
+
+ private replaceFiles(collectionUuid: string, fileMap: {}, showErrors?: boolean) {
+ const payload = {
+ collection: {
+ preserve_version: true
+ },
+ replace_files: fileMap
+ };
+
+ return CommonService.defaultResponse(
+ this.serverApi
+ .put<CollectionResource>(`/${this.resourceType}/${collectionUuid}`, payload),
+ this.actions,
+ true, // mapKeys
+ showErrors
+ );
}
async uploadFiles(collectionUuid: string, files: File[], onProgress?: UploadProgress, targetLocation: string = '') {
await this.update(collectionUuid, { preserveVersion: true });
}
- async moveFile(collectionUuid: string, oldPath: string, newPath: string) {
- await this.webdavClient.move(
- `c=${collectionUuid}${oldPath}`,
- `c=${collectionUuid}/${customEncodeURI(newPath)}`
- );
- await this.update(collectionUuid, { preserveVersion: true });
+ async renameFile(collectionUuid: string, collectionPdh: string, oldPath: string, newPath: string) {
+ return this.replaceFiles(collectionUuid, {
+ [this.combineFilePath([newPath])]: `${collectionPdh}${this.combineFilePath([oldPath])}`,
+ [this.combineFilePath([oldPath])]: '',
+ });
}
extendFileURL = (file: CollectionDirectory | CollectionFile) => {
return this.webdavClient.upload(fileURL, [file], requestConfig);
}
- batchFileDelete(collectionUuid: string, files: string[], showErrors?: boolean) {
- const payload = {
- collection: {
- preserve_version: true
- },
- replace_files: files.reduce((obj, filePath) => {
- const pathStart = filePath.startsWith('/') ? '' : '/';
- return {
- ...obj,
- [`${pathStart}${filePath}`]: ''
+ deleteFiles(collectionUuid: string, files: string[], showErrors?: boolean) {
+ const optimizedFiles = files
+ .sort((a, b) => a.length - b.length)
+ .reduce((acc, currentPath) => {
+ const parentPathFound = acc.find((parentPath) => currentPath.indexOf(`${parentPath}/`) > -1);
+
+ if (!parentPathFound) {
+ return [...acc, currentPath];
}
- }, {})
- };
- return CommonService.defaultResponse(
- this.serverApi
- .put<CollectionResource>(`/${this.resourceType}/${collectionUuid}`, payload),
- this.actions,
- true, // mapKeys
- showErrors
- );
+ return acc;
+ }, []);
+
+ const fileMap = optimizedFiles.reduce((obj, filePath) => {
+ return {
+ ...obj,
+ [this.combineFilePath([filePath])]: ''
+ }
+ }, {})
+
+ return this.replaceFiles(collectionUuid, fileMap, showErrors);
}
- batchFileCopy(sourcePdh: string, files: string[], destinationCollectionUuid: string, destinationCollectionPath: string, showErrors?: boolean) {
- const pathStart = destinationCollectionPath.startsWith('/') ? '' : '/';
- const separator = destinationCollectionPath.endsWith('/') ? '' : '/';
- const destinationPath = `${pathStart}${destinationCollectionPath}${separator}`;
- const payload = {
- collection: {
- preserve_version: true
- },
- replace_files: files.reduce((obj, sourceFile) => {
- const sourcePath = sourceFile.startsWith('/') ? sourceFile : `/${sourceFile}`;
+ copyFiles(sourcePdh: string, files: string[], destinationCollectionUuid: string, destinationPath: string, showErrors?: boolean) {
+ 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])}`
+ };
+ }, {});
+
+ return this.replaceFiles(destinationCollectionUuid, fileMap, showErrors);
+ }
+
+ moveFiles(sourceUuid: string, sourcePdh: string, files: string[], destinationCollectionUuid: string, destinationPath: string, showErrors?: boolean) {
+ if (sourceUuid === destinationCollectionUuid) {
+ const fileMap = files.reduce((obj, sourceFile) => {
+ const sourceFileName = sourceFile.split('/').filter(Boolean).slice(-1).join("");
return {
...obj,
- [`${destinationPath}${sourceFile.split('/').slice(-1)}`]: `${sourcePdh}${sourcePath}`
+ [this.combineFilePath([destinationPath, sourceFileName])]: `${sourcePdh}${this.combineFilePath([sourceFile])}`,
+ [this.combineFilePath([sourceFile])]: '',
};
- }, {})
- };
-
- return CommonService.defaultResponse(
- this.serverApi
- .put<CollectionResource>(`/${this.resourceType}/${destinationCollectionUuid}`, payload),
- this.actions,
- true, // mapKeys
- showErrors
- );
+ }, {});
+
+ return this.replaceFiles(sourceUuid, fileMap, showErrors)
+ } else {
+ return this.copyFiles(sourcePdh, files, destinationCollectionUuid, destinationPath, showErrors)
+ .then(() => {
+ return this.deleteFiles(sourceUuid, files, showErrors);
+ });
+ }
}
- batchFileMove(sourceUuid: string, sourcePdh: string, files: string[], destinationCollectionUuid: string, destinationPath: string, showErrors?: boolean) {
- return this.batchFileCopy(sourcePdh, files, destinationCollectionUuid, destinationPath, showErrors)
- .then(() => {
- return this.batchFileDelete(sourceUuid, files, showErrors);
- });
- }
+ createDirectory(collectionUuid: string, path: string, showErrors?: boolean) {
+ const fileMap = {[this.combineFilePath([path])]: emptyCollectionUuid};
- createDirectory(collectionUuid: string, path: string) {
- return this.webdavClient.mkdir(`c=${collectionUuid}/${customEncodeURI(path)}`);
+ return this.replaceFiles(collectionUuid, fileMap, showErrors);
}
}
projects / arvados-workbench2.git / blobdiff