[ARVADOS-WORKBENCH2] created: 1.4.1-180-gd42a3b48

Git user git at public.arvados.org
Wed Dec 18 14:40:42 UTC 2019


        at  d42a3b489691c1bb26ed69a49b25bebcd5f65402 (commit)


commit d42a3b489691c1bb26ed69a49b25bebcd5f65402
Author: Peter Amstutz <peter.amstutz at curii.com>
Date:   Wed Dec 18 09:40:03 2019 -0500

    15936: Workbench2 should use WebDAVDownload for file listings
    
    Arvados-DCO-1.1-Signed-off-by: Peter Amstutz <peter.amstutz at curii.com>

diff --git a/src/common/config.ts b/src/common/config.ts
index 7d974342..4d4c1be7 100644
--- a/src/common/config.ts
+++ b/src/common/config.ts
@@ -38,6 +38,9 @@ export interface ClusterConfigJSON {
         }
         WebDAV: {
             ExternalURL: string
+        },
+        WebDAVDownload: {
+            ExternalURL: string
         }
     };
     Workbench: {
@@ -78,7 +81,7 @@ export const buildConfig = (clusterConfigJSON: ClusterConfigJSON): Config => {
     config.websocketUrl = clusterConfigJSON.Services.Websocket.ExternalURL;
     config.workbench2Url = clusterConfigJSON.Services.Workbench2.ExternalURL;
     config.workbenchUrl = clusterConfigJSON.Services.Workbench1.ExternalURL;
-    config.keepWebServiceUrl = clusterConfigJSON.Services.WebDAV.ExternalURL;
+    config.keepWebServiceUrl = clusterConfigJSON.Services.WebDAVDownload.ExternalURL;
     config.loginCluster = clusterConfigJSON.Login.LoginCluster;
     config.clusterConfig = clusterConfigJSON;
     mapRemoteHosts(clusterConfigJSON, config);
@@ -148,6 +151,7 @@ export const mockClusterConfigJSON = (config: Partial<ClusterConfigJSON>): Clust
         Workbench2: { ExternalURL: "" },
         Websocket: { ExternalURL: "" },
         WebDAV: { ExternalURL: "" },
+        WebDAVDownload: { ExternalURL: "" },
     },
     Workbench: {
         ArvadosDocsite: "",

-----------------------------------------------------------------------


hooks/post-receive
-- 




More information about the arvados-commits mailing list