//
// 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";
+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 { 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;
]);
}
+ async get(uuid: string, showErrors?: boolean, select?: string[], session?: Session) {
+ super.validateUuid(uuid);
+ const selectParam = select || defaultCollectionSelectedFields;
+ return super.get(uuid, showErrors, selectParam, session);
+ }
+
+ create(data?: Partial<CollectionResource>, showErrors?: boolean) {
+ return super.create({ ...data, preserveVersion: true }, showErrors);
+ }
+
+ update(uuid: string, data: Partial<CollectionResource>, showErrors?: boolean) {
+ const select = [...Object.keys(data), 'version', 'modifiedAt'];
+ return super.update(uuid, { ...data, preserveVersion: true }, showErrors, select);
+ }
+
async files(uuid: string) {
const request = await this.webdavClient.propfind(`c=${uuid}`);
if (request.responseXML != null) {
}
async deleteFiles(collectionUuid: string, filePaths: string[]) {
- for (const path of filePaths) {
- const splittedPath = path.split('/');
- if (collectionUuid) {
- await this.webdavClient.delete(`c=${collectionUuid}/${splittedPath[1]}`);
- } else {
+ 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}`);
+ } else {
+ await this.webdavClient.delete(`c=${path}`);
}
}
+ await this.update(collectionUuid, { preserveVersion: true });
}
- async uploadFiles(collectionUuid: string, files: File[], onProgress?: UploadProgress) {
+ 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 });
}
- moveFile(collectionUuid: string, oldPath: string, newPath: string) {
- return this.webdavClient.move(
+ async moveFile(collectionUuid: string, oldPath: string, newPath: string) {
+ await this.webdavClient.move(
`c=${collectionUuid}${oldPath}`,
- `c=${collectionUuid}${encodeURI(newPath)}`
+ `c=${collectionUuid}/${customEncodeURI(newPath)}`
);
+ await this.update(collectionUuid, { preserveVersion: true });
}
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}/`;
};
}
- private async uploadFile(collectionUuid: string, file: File, fileId: number, onProgress: UploadProgress = () => { 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'
},
onUploadProgress: (e: ProgressEvent) => {
onProgress(fileId, e.loaded, e.total, Date.now());
- }
+ },
};
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}`]: ''
+ }
+ }, {})
+ };
+
+ return CommonService.defaultResponse(
+ this.serverApi
+ .put<CollectionResource>(`/${this.resourceType}/${collectionUuid}`, payload),
+ this.actions,
+ true, // mapKeys
+ 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}`;
+ return {
+ ...obj,
+ [`${destinationPath}${sourceFile.split('/').slice(-1)}`]: `${sourcePdh}${sourcePath}`
+ };
+ }, {})
+ };
+
+ return CommonService.defaultResponse(
+ this.serverApi
+ .put<CollectionResource>(`/${this.resourceType}/${destinationCollectionUuid}`, payload),
+ this.actions,
+ true, // mapKeys
+ 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) {
+ return this.webdavClient.mkdir(`c=${collectionUuid}/${customEncodeURI(path)}`);
+ }
+
}
projects / arvados-workbench2.git / blobdiff