X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/7ace628b611d7674e420262d9fc5e757e8c686a6..43567d1d96d5a86d81f6c30e411bad1deaafdda6:/src/services/collection-service/collection-service.ts diff --git a/src/services/collection-service/collection-service.ts b/src/services/collection-service/collection-service.ts index a3a7cf8f3a..74cf75956f 100644 --- a/src/services/collection-service/collection-service.ts +++ b/src/services/collection-service/collection-service.ts @@ -2,7 +2,7 @@ // // SPDX-License-Identifier: AGPL-3.0 -import { CollectionResource } from "models/collection"; +import { CollectionResource, defaultCollectionSelectedFields } from "models/collection"; import { AxiosInstance } from "axios"; import { CollectionFile, CollectionDirectory } from "models/collection-file"; import { WebDAV } from "common/webdav"; @@ -10,13 +10,13 @@ import { AuthService } from "../auth-service/auth-service"; 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 { FilterBuilder } from "services/api/filter-builder"; -import { ListArguments } from "services/common-service/common-service"; 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 emptyCollectionPdh = 'd41d8cd98f00b204e9800998ecf8427e+0'; + export class CollectionService extends TrashableResourceService { constructor(serverApi: AxiosInstance, private webdavClient: WebDAV, private authService: AuthService, actions: ApiActions) { super(serverApi, "collections", actions, [ @@ -33,28 +33,17 @@ export class CollectionService extends TrashableResourceService) { - return super.create({ ...data, preserveVersion: true }); + create(data?: Partial, showErrors?: boolean) { + return super.create({ ...data, preserveVersion: true }, showErrors); } - update(uuid: string, data: Partial) { + update(uuid: string, data: Partial, showErrors?: boolean) { const select = [...Object.keys(data), 'version', 'modifiedAt']; - return super.update(uuid, { ...data, preserveVersion: true }, select); + return super.update(uuid, { ...data, preserveVersion: true }, showErrors, select); } async files(uuid: string) { @@ -65,50 +54,56 @@ export class CollectionService extends TrashableResourceService 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 }); + }, "/"); } - async uploadFiles(collectionUuid: string, files: File[], onProgress?: UploadProgress) { + private replaceFiles(collectionUuid: string, fileMap: {}, showErrors?: boolean) { + const payload = { + collection: { + preserve_version: true + }, + replace_files: fileMap + }; + + return CommonService.defaultResponse( + this.serverApi + .put(`/${this.resourceType}/${collectionUuid}`, payload), + this.actions, + true, // mapKeys + showErrors + ); + } + + async uploadFiles(collectionUuid: string, files: File[], onProgress?: UploadProgress, targetLocation: string = '') { if (collectionUuid === "" || files.length === 0) { return; } // files have to be uploaded sequentially for (let idx = 0; idx < files.length; idx++) { - await this.uploadFile(collectionUuid, files[idx], idx, onProgress); + await this.uploadFile(collectionUuid, files[idx], idx, onProgress, targetLocation); } 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) => { - const baseUrl = this.webdavClient.defaults.baseURL.endsWith('/') - ? this.webdavClient.defaults.baseURL.slice(0, -1) - : this.webdavClient.defaults.baseURL; + const baseUrl = this.webdavClient.getBaseUrl().endsWith('/') + ? this.webdavClient.getBaseUrl().slice(0, -1) + : this.webdavClient.getBaseUrl(); const apiToken = this.authService.getApiToken(); const encodedApiToken = apiToken ? encodeURI(apiToken) : ''; const userApiToken = `/t=${encodedApiToken}/`; @@ -120,8 +115,12 @@ export class CollectionService extends TrashableResourceService { return; }) { - const fileURL = `c=${collectionUuid}/${file.name}`; + async getFileContents(file: CollectionFile) { + return (await this.webdavClient.get(`c=${file.id}`)).response; + } + + private async uploadFile(collectionUuid: string, file: File, fileId: number, onProgress: UploadProgress = () => { return; }, targetLocation: string = '') { + const fileURL = `c=${targetLocation !== '' ? targetLocation : collectionUuid}/${file.name}`.replace('//', '/'); const requestConfig = { headers: { 'Content-Type': 'text/octet-stream' @@ -132,4 +131,66 @@ export class CollectionService extends TrashableResourceService a.length - b.length) + .reduce((acc, currentPath) => { + const parentPathFound = acc.find((parentPath) => currentPath.indexOf(`${parentPath}/`) > -1); + + if (!parentPathFound) { + return [...acc, currentPath]; + } + + return acc; + }, []); + + const fileMap = optimizedFiles.reduce((obj, filePath) => { + return { + ...obj, + [this.combineFilePath([filePath])]: '' + } + }, {}) + + return this.replaceFiles(collectionUuid, fileMap, showErrors); + } + + 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, + [this.combineFilePath([destinationPath, sourceFileName])]: `${sourcePdh}${this.combineFilePath([sourceFile])}`, + [this.combineFilePath([sourceFile])]: '', + }; + }, {}); + + return this.replaceFiles(sourceUuid, fileMap, showErrors) + } else { + return this.copyFiles(sourcePdh, files, destinationCollectionUuid, destinationPath, showErrors) + .then(() => { + return this.deleteFiles(sourceUuid, files, showErrors); + }); + } + } + + createDirectory(collectionUuid: string, path: string, showErrors?: boolean) { + const fileMap = {[this.combineFilePath([path])]: emptyCollectionPdh}; + + return this.replaceFiles(collectionUuid, fileMap, showErrors); + } + }