fix: Ensure new settings are set on existing installations

gabe565 · May 9, 2024 · 7cc0e87 · 7cc0e87
1 parent 234cbc8
commit 7cc0e87
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 6 deletions.
diff --git a/src/com.gabe565.nightscout.sdPlugin/actions/template/property-inspector/inspector.js b/src/com.gabe565.nightscout.sdPlugin/actions/template/property-inspector/inspector.js
@@ -7,11 +7,7 @@ $PI.onConnected((jsn) => {
   const { payload, context } = actionInfo;
   const { settings } = payload;
 
-  if (Object.keys(settings).length !== 0) {
-    Utils.setFormValue(settings, form);
-  } else {
-    Utils.setFormValue(DefaultSettings, form);
-  }
+  Utils.setFormValue({ ...DefaultSettings, ...settings }, form);
 
   form.addEventListener(
     "input",

diff --git a/src/com.gabe565.nightscout.sdPlugin/js/Nightscout.js b/src/com.gabe565.nightscout.sdPlugin/js/Nightscout.js
@@ -14,7 +14,7 @@ class Nightscout {
   }
 
   async setSettings(settings) {
-    this.settings = settings;
+    this.settings = { ...DefaultSettings, ...settings };
     if (this.settings.nightscoutUrl) {
       if (this.settings.token) {
         try {