mod: change form initialization

src/app/components/dashboard-settings/dashboard-settings.component.ts

@@ -43,20 +43,15 @@ export class DashboardSettingsComponent implements OnInit {
 
   ngOnInit() {
     this.settingsService.settings$.subscribe(settings => {
-      const protocols = Object.keys(settings.protocols);
-      this.form = this.settingsFormBuilder.createDefaultForm(protocols);
-
-      if (this.form) {
-        this.initializeForm();
-      }
+      this.initializeForm(settings);
     });
   }
 
-  initializeForm() {
-    const currentSettings = this.settingsService.getSettings();
-    if (this.form) {
-      this.form.patchValue(currentSettings);
-    }
+  initializeForm(settings: Settings) {
+    const protocols = Object.keys(settings.protocols);
+
+    this.form = this.settingsFormBuilder.createDefaultForm(protocols);
+    this.form.patchValue(settings);
   }
 
   onSubmit() {

src/app/components/dashboard/dashboard.component.ts

@@ -42,9 +42,7 @@ export class DashboardComponent implements OnInit {
 
   ngOnInit() {
     this.configurationApi.fetchAppliedConfiguration().subscribe(config => {
-      if (config) {
-        this.settingsService.initSettings(config.protocols);
-      }
+      this.settingsService.initSettings(config.protocols);
     });
   }
 

src/app/service/settings.service.ts

@@ -39,8 +39,4 @@ export class SettingsService {
   updateSettings(settings: Settings) {
     this.settingsSubject.next(settings);
   }
-
-  getSettings(): Settings {
-    return this.settingsSubject.value;
-  }
 }