Merge pull request #2772 from codefori/fix/new_config_fallback

Fix fallback value and rename configuration reference

Author: worksofliam

src/api/IBMi.ts

@@ -67,7 +67,7 @@ interface ConnectionCallbacks {
 }
 
 interface ConnectionConfigFiles {
-  connection: ConfigFile<RemoteConfigFile>;
+  settings: ConfigFile<RemoteConfigFile>;
 }
 
 export default class IBMi {
@@ -88,7 +88,7 @@ export default class IBMi {
   private componentManager = new ComponentManager(this);
 
   private configFiles: ConnectionConfigFiles = {
-    connection: new ConfigFile<RemoteConfigFile>(this, `codefori`, {})
+    settings: new ConfigFile<RemoteConfigFile>(this, `settings`, {})
   };
 
   /**
@@ -506,7 +506,7 @@ export default class IBMi {
       callbacks.progress({ message: `Loading remote configuration files.` });
       await this.loadRemoteConfigs();
 
-      const remoteConnectionConfig = this.getConfigFile<RemoteConfigFile>(`connection`);
+      const remoteConnectionConfig = this.getConfigFile<RemoteConfigFile>(`settings`);
       if (remoteConnectionConfig.getState().server === `ok`) {
         const remoteConfig = await remoteConnectionConfig.get();
 

src/api/configuration/serverFile.ts

@@ -61,7 +61,7 @@ export class ConfigFile<T> {
   }
 
   async get() {
-    return this.serverData;
+    return this.serverData || this.fallback;
   }
 
   reset() {

src/webviews/settings/index.ts

@@ -50,10 +50,11 @@ export class SettingsUI {
             // Reload config to initialize any new config parameters.
             config = await IBMi.connectionManager.load(connection.currentConnectionName);
 
-            const serverConfigOk = connection.getConfigFile(`connection`).getState().server === `ok`;
+            const remoteConnectionConfig = connection.getConfigFile<RemoteConfigFile>(`settings`);
+            const serverConfigOk = remoteConnectionConfig.getState().server === `ok`;
 
             if (serverConfigOk) {
-              serverConfig = await connection.getConfigFile<RemoteConfigFile>(`connection`).get();
+              serverConfig = await remoteConnectionConfig.get();
             }
           } else {
             vscode.window.showErrorMessage(`No connection is active.`);