X-Git-Url: https://git.arvados.org/arvados-workbench2.git/blobdiff_plain/f2b031de2183439f8aade2f290cd0e3f95f6438c..31e84a9315728c2f58a26bf0e9e1d2b38326fb86:/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 9feec699..9fd8a135 100644 --- a/src/services/collection-service/collection-service.ts +++ b/src/services/collection-service/collection-service.ts @@ -2,165 +2,113 @@ // // SPDX-License-Identifier: AGPL-3.0 -import * as _ from "lodash"; -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 { AxiosInstance } from "axios"; +import { CollectionFile, CollectionDirectory } from "~/models/collection-file"; import { WebDAV } from "~/common/webdav"; import { AuthService } from "../auth-service/auth-service"; -import { mapTree, getNodeChildren, getNode, TreeNode } from "../../models/tree"; -import { getTagValue } from "~/common/xml"; -import { FilterBuilder } from "~/common/api/filter-builder"; -import { CollectionFile, createCollectionFile, CollectionFileType, CollectionDirectory, createCollectionDirectory } from '~/models/collection-file'; -import { parseKeepManifestText, stringifyKeepManifest } from "../collection-files-service/collection-manifest-parser"; -import { KeepManifestStream } from "~/models/keep-manifest"; -import { createCollectionFilesTree } from '~/models/collection-file'; +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"; export type UploadProgress = (fileId: number, loaded: number, total: number, currentTime: number) => void; -export class CollectionService extends CommonResourceService { - constructor(serverApi: AxiosInstance, private keepService: KeepService, private webdavClient: WebDAV, private authService: AuthService) { - super(serverApi, "collections"); +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', + ]); + } + + create(data?: Partial) { + return super.create({ ...data, preserveVersion: true }); + } + + update(uuid: string, data: Partial) { + return super.update(uuid, { ...data, preserveVersion: true }); } async files(uuid: string) { - const request = await this.webdavClient.propfind(`/c=${uuid}`); + const request = await this.webdavClient.propfind(`c=${uuid}`); if (request.responseXML != null) { - const files = this.extractFilesData(request.responseXML); - const tree = createCollectionFilesTree(files); - const sortedTree = mapTree(node => { - const children = getNodeChildren(node.id)(tree).map(id => getNode(id)(tree)) as TreeNode[]; - children.sort((a, b) => - a.value.type !== b.value.type - ? a.value.type === CollectionFileType.DIRECTORY ? -1 : 1 - : a.value.name.localeCompare(b.value.name) - ); - return { ...node, children: children.map(child => child.id) }; - })(tree); - return sortedTree; + return extractFilesData(request.responseXML); } return Promise.reject(); } - async deleteFile(collectionUuid: string, filePath: string) { - return this.webdavClient.delete(`/c=${collectionUuid}${filePath}`); - } - - extractFilesData(document: Document) { - const collectionUrlPrefix = /\/c=[0-9a-zA-Z\-]*/; - return Array - .from(document.getElementsByTagName('D:response')) - .slice(1) // omit first element which is collection itself - .map(element => { - const name = getTagValue(element, 'D:displayname', ''); - const size = parseInt(getTagValue(element, 'D:getcontentlength', '0'), 10); - const pathname = getTagValue(element, 'D:href', ''); - const nameSuffix = `/${name || ''}`; - const directory = pathname - .replace(collectionUrlPrefix, '') - .replace(nameSuffix, ''); - const href = this.webdavClient.defaults.baseURL + pathname + '?api_token=' + this.authService.getApiToken(); + 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); - const data = { - url: href, - id: `${directory}/${name}`, - name, - path: directory, - }; + if (!parentPathFound) { + return [...acc, currentPath]; + } - return getTagValue(element, 'D:resourcetype', '') - ? createCollectionDirectory(data) - : createCollectionFile({ ...data, size }); + return acc; + }, []); - }); + 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 }); } - - private readFile(file: File): Promise { - return new Promise(resolve => { - const reader = new FileReader(); - reader.onload = () => { - resolve(reader.result as ArrayBuffer); - }; - - reader.readAsArrayBuffer(file); - }); + async uploadFiles(collectionUuid: string, files: File[], onProgress?: UploadProgress) { + 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.update(collectionUuid, { preserveVersion: true }); } - private uploadFile(keepServiceHost: string, file: File, fileId: number, onProgress?: UploadProgress): Promise { - return this.readFile(file).then(content => { - return axios.post(keepServiceHost, content, { - headers: { - 'Content-Type': 'text/octet-stream' - }, - onUploadProgress: (e: ProgressEvent) => { - if (onProgress) { - onProgress(fileId, e.loaded, e.total, Date.now()); - } - console.log(`${e.loaded} / ${e.total}`); - } - }).then(data => createCollectionFile({ - id: data.data, - name: file.name, - size: file.size - })); - }); + 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 }); } - 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)); + extendFileURL = (file: CollectionDirectory | CollectionFile) => { + const baseUrl = this.webdavClient.defaults.baseURL.endsWith('/') + ? this.webdavClient.defaults.baseURL.slice(0, -1) + : this.webdavClient.defaults.baseURL; + 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 + }; } - uploadFiles(collectionUuid: string, files: File[], onProgress?: UploadProgress): Promise { - const filters = new FilterBuilder() - .addEqual("service_type", "proxy"); - - return this.keepService.list({ filters: filters.getFilters() }).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; - - console.log("serviceHost", serviceHost); - - const files$ = files.map((f, idx) => this.uploadFile(serviceHost, f, idx, onProgress)); - return Promise.all(files$).then(values => { - return this.updateManifest(collectionUuid, values); - }); - } else { - return Promise.reject("Missing keep service host"); + private async uploadFile(collectionUuid: string, file: File, fileId: number, onProgress: UploadProgress = () => { return; }) { + const fileURL = `c=${collectionUuid}/${file.name}`; + 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); } }