Remove migratePSUControlOption function & clean code

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

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git a/src/app/app.service.ts b/src/app/app.service.ts
@@ -35,8 +35,10 @@ 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;
+        delete config.plugins.psuControl.turnOnPSUWhenExitingSleep
+      }
     };
   }
 

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 {