[ARVADOS-WORKBENCH2] updated: 1.4.1-450-g4f4cebf8

[Git user]

Summary of changes:
 src/common/config.ts                  | 14 +++++++-------
 src/store/auth/auth-action-session.ts |  2 +-
 2 files changed, 8 insertions(+), 8 deletions(-)

       via  4f4cebf8158be10759181225c8a95c807c57b54f (commit)
       via  fec738a21a4107bf60c3bcff7d274697833e01dd (commit)
       via  1efb1298d58148c4060f00b3713812f4d6f5b90c (commit)
      from  c0f171c6612dc5afae0c24a93673e454fcd73909 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.


commit 4f4cebf8158be10759181225c8a95c807c57b54f
Merge: c0f171c6 fec738a2
Author: Peter Amstutz <peter.amstutz at curii.com>
Date:   Thu Oct 1 16:52:35 2020 -0400

    Merge branch '16927-trailing-slash' refs #16927
    
    Arvados-DCO-1.1-Signed-off-by: Peter Amstutz <peter.amstutz at curii.com>


commit fec738a21a4107bf60c3bcff7d274697833e01dd
Author: Peter Amstutz <peter.amstutz at curii.com>
Date:   Thu Oct 1 16:51:46 2020 -0400

    16927: Remove clusterConfigJSON local variable
    
    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 1504cdcc..afbeb5ae 100644
--- a/src/common/config.ts
+++ b/src/common/config.ts
@@ -157,7 +157,6 @@ export const fetchConfig = () => {
             return Axios.get<ClusterConfigJSON>(getClusterConfigURL(workbenchConfig.API_HOST)).then(async response => {
                 const apiRevision = await getApiRevision(response.data.Services.Controller.ExternalURL.replace(/\/+$/, ''));
                 const config = { ...buildConfig(response.data), apiRevision };
-                const clusterConfigJSON = config.clusterConfig;
                 const warnLocalConfig = (varName: string) => console.warn(
                     `A value for ${varName} was found in ${WORKBENCH_CONFIG_URL}. To use the Arvados centralized configuration instead, \
 remove the entire ${varName} entry from ${WORKBENCH_CONFIG_URL}`);
@@ -171,7 +170,7 @@ remove the entire ${varName} entry from ${WORKBENCH_CONFIG_URL}`);
                     fileViewerConfigUrl = workbenchConfig.FILE_VIEWERS_CONFIG_URL;
                 }
                 else {
-                    fileViewerConfigUrl = clusterConfigJSON.Workbench.FileViewersConfigURL || "/file-viewers-example.json";
+                    fileViewerConfigUrl = config.clusterConfig.Workbench.FileViewersConfigURL || "/file-viewers-example.json";
                 }
                 config.fileViewersConfigUrl = fileViewerConfigUrl;
 
@@ -181,7 +180,7 @@ remove the entire ${varName} entry from ${WORKBENCH_CONFIG_URL}`);
                     vocabularyUrl = workbenchConfig.VOCABULARY_URL;
                 }
                 else {
-                    vocabularyUrl = clusterConfigJSON.Workbench.VocabularyURL || "/vocabulary-example.json";
+                    vocabularyUrl = config.clusterConfig.Workbench.VocabularyURL || "/vocabulary-example.json";
                 }
                 config.vocabularyUrl = vocabularyUrl;
 

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


hooks/post-receive
--