import { ApiActions } from "services/api/api-actions";
import { Session } from "models/session";
import { CommonService } from "services/common-service/common-service";
+import { snakeCase } from "lodash";
+import { CommonResourceServiceError } from "services/common-service/common-resource-service";
export type UploadProgress = (fileId: number, loaded: number, total: number, currentTime: number) => void;
+type CollectionPartialUpdateOrCreate = Partial<CollectionResource> & Pick<CollectionResource, "uuid"> |
+ Partial<CollectionResource> & Pick<CollectionResource, "ownerUuid">;
export const emptyCollectionPdh = 'd41d8cd98f00b204e9800998ecf8427e+0';
+export const SOURCE_DESTINATION_EQUAL_ERROR_MESSAGE = 'Source and destination cannot be the same';
export class CollectionService extends TrashableResourceService<CollectionResource> {
- constructor(serverApi: AxiosInstance, private webdavClient: WebDAV, private authService: AuthService, actions: ApiActions) {
+ constructor(serverApi: AxiosInstance, private keepWebdavClient: WebDAV, private authService: AuthService, actions: ApiActions) {
super(serverApi, "collections", actions, [
'fileCount',
'fileSizeTotal',
}
async files(uuid: string) {
- const request = await this.webdavClient.propfind(`c=${uuid}`);
+ const request = await this.keepWebdavClient.propfind(`c=${uuid}`);
if (request.responseXML != null) {
return extractFilesData(request.responseXML);
}
}, "/");
}
- private replaceFiles(collectionUuid: string, fileMap: {}, showErrors?: boolean) {
+ private replaceFiles(data: CollectionPartialUpdateOrCreate, fileMap: {}, showErrors?: boolean) {
const payload = {
collection: {
- preserve_version: true
+ preserve_version: true,
+ ...CommonService.mapKeys(snakeCase)(data),
+ // Don't send uuid in payload when creating
+ uuid: undefined,
},
replace_files: fileMap
};
-
- return CommonService.defaultResponse(
- this.serverApi
- .put<CollectionResource>(`/${this.resourceType}/${collectionUuid}`, payload),
- this.actions,
- true, // mapKeys
- showErrors
- );
+ if (data.uuid) {
+ return CommonService.defaultResponse(
+ this.serverApi
+ .put<CollectionResource>(`/${this.resourceType}/${data.uuid}`, payload),
+ this.actions,
+ true, // mapKeys
+ showErrors
+ );
+ } else {
+ return CommonService.defaultResponse(
+ this.serverApi
+ .post<CollectionResource>(`/${this.resourceType}`, payload),
+ this.actions,
+ true, // mapKeys
+ showErrors
+ );
+ }
}
async uploadFiles(collectionUuid: string, files: File[], onProgress?: UploadProgress, targetLocation: string = '') {
}
async renameFile(collectionUuid: string, collectionPdh: string, oldPath: string, newPath: string) {
- return this.replaceFiles(collectionUuid, {
+ return this.replaceFiles({uuid: collectionUuid}, {
[this.combineFilePath([newPath])]: `${collectionPdh}${this.combineFilePath([oldPath])}`,
[this.combineFilePath([oldPath])]: '',
});
}
extendFileURL = (file: CollectionDirectory | CollectionFile) => {
- const baseUrl = this.webdavClient.getBaseUrl().endsWith('/')
- ? this.webdavClient.getBaseUrl().slice(0, -1)
- : this.webdavClient.getBaseUrl();
+ const baseUrl = this.keepWebdavClient.getBaseUrl().endsWith('/')
+ ? this.keepWebdavClient.getBaseUrl().slice(0, -1)
+ : this.keepWebdavClient.getBaseUrl();
const apiToken = this.authService.getApiToken();
const encodedApiToken = apiToken ? encodeURI(apiToken) : '';
const userApiToken = `/t=${encodedApiToken}/`;
}
async getFileContents(file: CollectionFile) {
- return (await this.webdavClient.get(`c=${file.id}`)).response;
+ return (await this.keepWebdavClient.get(`c=${file.id}`)).response;
}
private async uploadFile(collectionUuid: string, file: File, fileId: number, onProgress: UploadProgress = () => { return; }, targetLocation: string = '') {
onProgress(fileId, e.loaded, e.total, Date.now());
},
};
- return this.webdavClient.upload(fileURL, [file], requestConfig);
+ return this.keepWebdavClient.upload(fileURL, [file], requestConfig);
}
deleteFiles(collectionUuid: string, files: string[], showErrors?: boolean) {
}
}, {})
- return this.replaceFiles(collectionUuid, fileMap, showErrors);
+ return this.replaceFiles({uuid: collectionUuid}, fileMap, showErrors);
}
- copyFiles(sourcePdh: string, files: string[], destinationCollectionUuid: string, destinationPath: string, showErrors?: boolean) {
+ copyFiles(sourcePdh: string, files: string[], destinationCollection: CollectionPartialUpdateOrCreate, destinationPath: string, showErrors?: boolean) {
const fileMap = files.reduce((obj, sourceFile) => {
- const sourceFileName = sourceFile.split('/').filter(Boolean).slice(-1).join("");
+ const fileBasename = sourceFile.split('/').filter(Boolean).slice(-1).join("");
return {
...obj,
- [this.combineFilePath([destinationPath, sourceFileName])]: `${sourcePdh}${this.combineFilePath([sourceFile])}`
+ [this.combineFilePath([destinationPath, fileBasename])]: `${sourcePdh}${this.combineFilePath([sourceFile])}`
};
}, {});
- return this.replaceFiles(destinationCollectionUuid, fileMap, showErrors);
+ return this.replaceFiles(destinationCollection, fileMap, showErrors);
}
- moveFiles(sourceUuid: string, sourcePdh: string, files: string[], destinationCollectionUuid: string, destinationPath: string, showErrors?: boolean) {
- if (sourceUuid === destinationCollectionUuid) {
+ moveFiles(sourceUuid: string, sourcePdh: string, files: string[], destinationCollection: CollectionPartialUpdateOrCreate, destinationPath: string, showErrors?: boolean) {
+ if (sourceUuid === destinationCollection.uuid) {
+ let errors: CommonResourceServiceError[] = [];
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])]: '',
- };
+ const fileBasename = sourceFile.split('/').filter(Boolean).slice(-1).join("");
+ const fileDestinationPath = this.combineFilePath([destinationPath, fileBasename]);
+ const fileSourcePath = this.combineFilePath([sourceFile]);
+ const fileSourceUri = `${sourcePdh}${fileSourcePath}`;
+
+
+ if (fileDestinationPath !== fileSourcePath) {
+ return {
+ ...obj,
+ [fileDestinationPath]: fileSourceUri,
+ [fileSourcePath]: '',
+ };
+ } else {
+ errors.push(CommonResourceServiceError.SOURCE_DESTINATION_CANNOT_BE_SAME);
+ return obj;
+ }
}, {});
- return this.replaceFiles(sourceUuid, fileMap, showErrors)
+ if (errors.length === 0) {
+ return this.replaceFiles({uuid: sourceUuid}, fileMap, showErrors)
+ } else {
+ return Promise.reject({errors});
+ }
} else {
- return this.copyFiles(sourcePdh, files, destinationCollectionUuid, destinationPath, showErrors)
+ return this.copyFiles(sourcePdh, files, destinationCollection, 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);
+ return this.replaceFiles({uuid: collectionUuid}, fileMap, showErrors);
}
}
projects / arvados.git / blobdiff