Merge pull request #4309 from RaananW/config-order

Viewer configuration-loading order changed:

Viewer/src/configuration/loader.ts

@@ -36,8 +36,6 @@ export class ConfigurationLoader {
 
         let extendedConfiguration = getConfigurationType(loadedConfig.extends || "");
 
-        loadedConfig = deepmerge(extendedConfiguration, loadedConfig);
-
         if (loadedConfig.configuration) {
 
             let mapperType = "json";
@@ -72,13 +70,14 @@ export class ConfigurationLoader {
                 }
             }).then((data: any) => {
                 let mapper = mapperManager.getMapper(mapperType);
-                let parsed = mapper.map(data);
-                let merged = deepmerge(loadedConfig, parsed);
+                let parsed = deepmerge(mapper.map(data), loadedConfig);
+                let merged = deepmerge(extendedConfiguration, parsed);
                 processConfigurationCompatibility(merged);
                 if (callback) callback(merged);
                 return merged;
             });
         } else {
+            loadedConfig = deepmerge(extendedConfiguration, loadedConfig);
             processConfigurationCompatibility(loadedConfig);
             if (callback) callback(loadedConfig);
             return Promise.resolve(loadedConfig);