X-Git-Url: https://git.arvados.org/arvados-workbench2.git/blobdiff_plain/f1bbac648067f651d408d3cad39fd31d9a36354d..1bfca4b4878bb12ffa2cb6caf967e5d0904a95c9:/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 cf2d53e8..1a03d8da 100644 --- a/src/services/collection-service/collection-service.ts +++ b/src/services/collection-service/collection-service.ts @@ -2,91 +2,125 @@ // // SPDX-License-Identifier: AGPL-3.0 -import { CommonResourceService } from "../../common/api/common-resource-service"; -import { CollectionResource } from "../../models/collection"; -import axios, { AxiosInstance } from "axios"; -import { KeepService } from "../keep-service/keep-service"; -import { FilterBuilder } from "../../common/api/filter-builder"; -import { CollectionFile, CollectionFileType, createCollectionFile } from "../../models/collection-file"; -import { parseKeepManifestText, stringifyKeepManifest } from "../collection-files-service/collection-manifest-parser"; -import * as _ from "lodash"; -import { KeepManifestStream } from "../../models/keep-manifest"; - -export class CollectionService extends CommonResourceService { - constructor(serverApi: AxiosInstance, private keepService: KeepService) { - super(serverApi, "collections"); +import { CollectionResource, defaultCollectionSelectedFields } from "models/collection"; +import { AxiosInstance } from "axios"; +import { CollectionFile, CollectionDirectory } from "models/collection-file"; +import { WebDAV } from "common/webdav"; +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 { Session } from "models/session"; + +export type UploadProgress = (fileId: number, loaded: number, total: number, currentTime: number) => void; + +export class CollectionService extends TrashableResourceService { + constructor(serverApi: AxiosInstance, private webdavClient: WebDAV, private authService: AuthService, actions: ApiActions) { + super(serverApi, "collections", actions, [ + 'fileCount', + 'fileSizeTotal', + 'replicationConfirmed', + 'replicationConfirmedAt', + 'storageClassesConfirmed', + 'storageClassesConfirmedAt', + 'unsignedManifestText', + 'version', + ]); } - uploadFile(keepServiceHost: string, file: File, fileIdx = 0): Promise { - const fd = new FormData(); - fd.append(`file_${fileIdx}`, file); + async get(uuid: string, showErrors?: boolean, select?: string[], session?: Session) { + super.validateUuid(uuid); + const selectParam = select || defaultCollectionSelectedFields; + return super.get(uuid, showErrors, selectParam, session); + } - return axios.post(keepServiceHost, fd, { - onUploadProgress: (e: ProgressEvent) => { - console.log(`${e.loaded} / ${e.total}`); - } - }).then(data => createCollectionFile({ - id: data.data, - name: file.name, - size: file.size - })); + create(data?: Partial, showErrors?: boolean) { + return super.create({ ...data, preserveVersion: true }, showErrors); } - private async updateManifest(collectionUuid: string, files: CollectionFile[]): Promise { - const collection = await this.get(collectionUuid); - const manifest: KeepManifestStream[] = parseKeepManifestText(collection.manifestText); - - files.forEach(f => { - let kms = manifest.find(stream => stream.name === f.path); - if (!kms) { - kms = { - files: [], - locators: [], - name: f.path - }; - manifest.push(kms); - } - kms.locators.push(f.id); - const len = kms.files.length; - const nextPos = len > 0 - ? parseInt(kms.files[len - 1].position, 10) + kms.files[len - 1].size - : 0; - kms.files.push({ - name: f.name, - position: nextPos.toString(), - size: f.size - }); - }); - - console.log(manifest); - - const manifestText = stringifyKeepManifest(manifest); - const data = { ...collection, manifestText }; - return this.update(collectionUuid, CommonResourceService.mapKeys(_.snakeCase)(data)); + update(uuid: string, data: Partial, showErrors?: boolean) { + const select = [...Object.keys(data), 'version', 'modifiedAt']; + return super.update(uuid, { ...data, preserveVersion: true }, showErrors, select); } - uploadFiles(collectionUuid: string, files: File[]) { - console.log("Uploading files", files); + async files(uuid: string) { + const request = await this.webdavClient.propfind(`c=${uuid}`); + if (request.responseXML != null) { + return extractFilesData(request.responseXML); + } + return Promise.reject(); + } - const filters = FilterBuilder.create() - .addEqual("service_type", "proxy"); + 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); - return this.keepService.list({ filters }).then(data => { - if (data.items && data.items.length > 0) { - const serviceHost = - (data.items[0].serviceSslFlag ? "https://" : "http://") + - data.items[0].serviceHost + - ":" + data.items[0].servicePort; + if (!parentPathFound) { + return [...acc, currentPath]; + } - console.log("Servicehost", serviceHost); + return acc; + }, []); - const files$ = files.map((f, idx) => this.uploadFile(serviceHost, f, idx)); - Promise.all(files$).then(values => { - this.updateManifest(collectionUuid, values).then(() => { - console.log("Upload done!"); - }); - }); + for (const path of sortedUniquePaths) { + if (path.indexOf(collectionUuid) === -1) { + await this.webdavClient.delete(`c=${collectionUuid}${path}`); + } else { + await this.webdavClient.delete(`c=${path}`); } - }); + } + await this.update(collectionUuid, { preserveVersion: true }); + } + + 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, 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 }); + } + + extendFileURL = (file: CollectionDirectory | CollectionFile) => { + 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}/`; + const splittedPrevFileUrl = file.url.split('/'); + const url = `${baseUrl}/${splittedPrevFileUrl[1]}${userApiToken}${splittedPrevFileUrl.slice(2).join('/')}`; + return { + ...file, + url + }; + } + + 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' + }, + onUploadProgress: (e: ProgressEvent) => { + onProgress(fileId, e.loaded, e.total, Date.now()); + }, + }; + return this.webdavClient.upload(fileURL, [file], requestConfig); } }