Remove migratePSUControlOption function & clean code

Co-authored-by: Timon G. <[email protected]>
UnchartedBull · Dec 22, 2020 · 2fde959 · 2fde959
1 parent 6b1b290
commit 2fde959
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 23 deletions.
diff --git a/src/app/app.component.ts b/src/app/app.component.ts
@@ -40,10 +40,6 @@ export class AppComponent implements OnInit {
     if (this.configService && this.configService.isInitialized()) {
       if (this.configService.isLoaded()) {
         if (this.configService.isValid()) {
-          // TODO: this call is only here to allow migration path on `turnOnPrinterWhenExitingSleep`
-          //       option release.
-          this.migratePSUControlOption();
-
           this.waitForOctoprint();
         } else {
           this.checkInvalidConfig();
@@ -60,7 +56,7 @@ export class AppComponent implements OnInit {
     const errors = this.configService.getErrors();
 
     if (this.service.hasUpdateError(errors)) {
-      if (this.service.autoFixErrors(errors)) {
+      if (this.service.fixUpdateErrors(errors)) {
         this.initialize();
       } else {
         this.configService.setUpdate();
@@ -130,16 +126,4 @@ export class AppComponent implements OnInit {
     //   })
     //   .finally(() => clearTimeout(showPrinterConnectedTimeout));
   }
-
-  // TODO: this method is only here to allow migration path on `turnOnPrinterWhenExitingSleep`
-  //       option release, which can break current PSUControl behaviour.
-  //       It will be removed when all people have used a release with this fix.
-  private migratePSUControlOption() {
-    const config = this.configService.getCurrentConfig();
-    if (config.plugins.psuControl.turnOnPSUWhenExitingSleep) {
-      config.octodash.turnOnPrinterWhenExitingSleep = true;
-      config.plugins.psuControl.turnOnPSUWhenExitingSleep = false;
-      this.configService.saveConfig(config);
-    }
-  }
 }
diff --git a/src/app/app.service.ts b/src/app/app.service.ts
@@ -35,13 +35,15 @@ export class AppService {
         (config.plugins.tpLinkSmartPlug = { enabled: true, smartPlugIP: '127.0.0.1' }),
       ".octodash should have required property 'previewProgressCircle'": config =>
         (config.octodash.previewProgressCircle = false),
-      ".octodash should have required property 'turnOnPrinterWhenExitingSleep'": config =>
-        (config.octodash.turnOnPrinterWhenExitingSleep = false),
+      ".octodash should have required property 'turnOnPrinterWhenExitingSleep'": config => {
+        config.octodash.turnOnPrinterWhenExitingSleep = config.plugins.psuControl.turnOnPSUWhenExitingSleep ?? false;
+        delete config.plugins.psuControl.turnOnPSUWhenExitingSleep
+      }
     };
   }
 
-  // If the errors can be automatically fixed return true here
-  public autoFixErrors(errors: string[]): boolean {
+  // If all errors can be automatically fixed return true here
+  public fixUpdateErrors(errors: string[]): boolean {
     const config = this.configService.getCurrentConfig();
 
     let fullyAutofixed = true;

diff --git a/src/app/config/config.model.ts b/src/app/config/config.model.ts
@@ -70,7 +70,7 @@ interface EnclosurePlugin extends Plugin {
 interface PSUControlPlugin extends Plugin {
   // TODO: this option still exists to allow migration path... need to be removed
   // when the new `turnOnPSUWhenExitingSleep` will be released
-  turnOnPSUWhenExitingSleep: boolean;
+  turnOnPSUWhenExitingSleep?: boolean;
 }
 
 interface TPLinkSmartPlugPlugin extends Plugin {

diff --git a/src/app/config/config.service.ts b/src/app/config/config.service.ts
@@ -80,7 +80,7 @@ export class ConfigService {
 
   public getErrors(): string[] {
     const errors = [];
-    this.validator.errors.forEach((error): void => {
+    this.validator.errors?.forEach((error): void => {
       if (error.keyword === 'type') {
         errors.push(`${error.dataPath} ${error.message}`);
       } else {
@@ -97,6 +97,7 @@ export class ConfigService {
       const configStored = this.store.get('config');
       if (this.validateGiven(configStored)) {
         this.config = config;
+        this.valid = true;
         this.generateHttpHeaders();
         return null;
       } else {