Merge branch 'main' into 19462-colorscheme refs #19462

[arvados-workbench2.git] / src / common / webdav.ts

diff --git a/src/common/webdav.ts b/src/common/webdav.ts
index 0b77f8c33262e9b7b0b284b4da682d6ec58ceb85..d4f904ae9832461abd777e5c8f6a112c49d14e65 100644 (file)
--- a/src/common/webdav.ts
+++ b/src/common/webdav.ts
@@ -30,6 +30,12 @@ export class WebDAV {
             data
         })
 
+    get = (url: string, config: WebDAVRequestConfig = {}) =>
+        this.request({
+            ...config, url,
+            method: 'GET'
+        })
+
     upload = (url: string, files: File[], config: WebDAVRequestConfig = {}) => {
         return Promise.all(
             files.map(file => this.request({
@@ -79,17 +85,20 @@ export class WebDAV {
                     ? this.defaults.baseURL+'/'
                     : ''}${customEncodeURI(config.url)}`);
 
-            if (config.headers && config.headers.Destination) {
-                const regexp = /(http[s]?:\/\/)?([^\/\s]+\/)(.*)/;
-                const match = decodeURIComponent(config.headers.Destination).match(regexp) || {};
-                config.headers.Destination = `${match[1]}${match[2]}${customEncodeURI(match[3])}`;
-            }
-
             const headers = { ...this.defaults.headers, ...config.headers };
             Object
                 .keys(headers)
                 .forEach(key => r.setRequestHeader(key, headers[key]));
 
+            if (!(window as any).cancelTokens) {
+                Object.assign(window, { cancelTokens: {} });
+            }
+
+            (window as any).cancelTokens[config.url] = () => {
+                resolve(r);
+                r.abort();
+            }
+
             if (config.onUploadProgress) {
                 r.upload.addEventListener('progress', config.onUploadProgress);
             }
@@ -135,4 +144,4 @@ interface RequestConfig {
     headers?: { [key: string]: string };
     data?: any;
     onUploadProgress?: (event: ProgressEvent) => void;
-}
\ No newline at end of file
+}