homebridge-melcloud-control 3.9.0-beta.12 → 3.9.0-beta.14

package/config.schema.json

@@ -1813,7 +1813,7 @@
     {
       "key": "accounts",
       "type": "tabarray",
-      "title": "{{ value.name || 'account' }}",
+      "title": "{{ value.name }}",
       "items": [
         "accounts[].name",
         "accounts[].user",

package/homebridge-ui/public/index.html

@@ -15,11 +15,6 @@
       <img src="homebridge-melcloud-control.png" alt="Image" height="100" />
     </div>
 
-    <!-- Config button -->
-    <div class="text-center mt-3">
-      <button type="button" class="btn btn-primary" id="configButton" disabled>⚙️ Config</button>
-    </div>
-
     <!-- Tabs -->
     <ul class="nav nav-tabs mt-3" id="accountTabs" role="tablist"></ul>
 
@@ -48,10 +43,7 @@
       const tabs = document.getElementById("accountTabs");
       const content = document.getElementById("accountTabsContent");
 
-      let configButtonState = false;
-      const configButton = document.getElementById('configButton');
-
-      function updateConfigButtonState(account) {
+      function updateConfigButtonState(account, configButton) {
         const hasMultipleDevices =
           (account.ataDevices?.length || 0) > 1 ||
           (account.atwDevices?.length || 0) > 1 ||
@@ -117,11 +109,19 @@
                 <option value="19" ${account.language == 19 ? 'selected' : ''}>Türkçe</option>
               </select>
             </div>
-            <button type="button" class="btn btn-secondary" id="logIn-${i}">Connect</button>
-            <button type="button" class="btn btn-danger ms-2" id="remove-${i}">❌ Remove Account</button>
+            <div class="mb-3">
+              <button type="button" class="btn btn-secondary" id="logIn-${i}">Connect</button>
+              <button type="button" class="btn btn-danger ms-2" id="remove-${i}">Remove Account</button>
+              <button type="button" class="btn btn-primary ms-2" id="config-${i}" disabled>⚙️ Config</button>
+            </div>
           </form>`;
         content.appendChild(pane);
 
+        const configButton = document.getElementById(`config-${i}`);
+
+        // Enable config button if devices > 1
+        updateConfigButtonState(account, configButton);
+
         // Handle input updates
         pane.querySelector("form").addEventListener("input", async () => {
           account.name = document.getElementById(`name-${i}`).value;
@@ -156,7 +156,6 @@
               language: account.language
             });
 
-            const newDevices = { ata: [], ataPresets: [], atw: [], atwPresets: [], erv: [], ervPresets: [] };
             const devicesByType = { ata: [], atw: [], erv: [] };
             for (const d of devicesInMelCloud) {
               if (d.Type === 0) devicesByType.ata.push(d);
@@ -164,62 +163,39 @@
               if (d.Type === 3) devicesByType.erv.push(d);
             }
 
-            // Remove stale function
+            // Initialize device arrays if missing
+            account.ataDevices = account.ataDevices ?? [{}];
+            account.atwDevices = account.atwDevices ?? [{}];
+            account.ervDevices = account.ervDevices ?? [{}];
+
+            // Remove stale devices
             function removeStaleDevices(configDevices, melcloudDevices) {
               const melcloudIds = melcloudDevices.map(d => d.DeviceID);
-              const removed = [];
               for (let j = configDevices.length - 1; j >= 0; j--) {
                 const dev = configDevices[j];
-                if (dev.id !== 0 && !melcloudIds.includes(dev.id)) {
-                  removed.push(dev);
-                  configDevices.splice(j, 1);
-                }
+                if (dev.id !== 0 && !melcloudIds.includes(dev.id)) configDevices.splice(j, 1);
               }
-              return removed;
             }
 
-            const ataDevices = account.ataDevices ?? (account.ataDevices = []);
-            const atwDevices = account.atwDevices ?? (account.atwDevices = []);
-            const ervDevices = account.ervDevices ?? (account.ervDevices = []);
+            removeStaleDevices(account.ataDevices, devicesByType.ata);
+            removeStaleDevices(account.atwDevices, devicesByType.atw);
+            removeStaleDevices(account.ervDevices, devicesByType.erv);
 
-            removeStaleDevices(ataDevices, devicesByType.ata);
-            removeStaleDevices(atwDevices, devicesByType.atw);
-            removeStaleDevices(ervDevices, devicesByType.erv);
-
-            // Add new devices & presets
-            function handleDevices(configArray, devicesArray, typeName, newDevicesArr, newPresetsArr) {
+            // Add new devices
+            function addDevices(configArray, devicesArray) {
               devicesArray.forEach(d => {
-                let existing = configArray.find(x => x.id === d.DeviceID);
-                if (!existing) {
-                  existing = { id: d.DeviceID, type: d.Type, typeString: typeName, name: d.DeviceName, displayMode: 1, presets: [], buttonsSensors: [] };
-                  configArray.push(existing);
-                  newDevicesArr.push(existing);
+                if (!configArray.find(x => x.id === d.DeviceID)) {
+                  configArray.push({ id: d.DeviceID, type: d.Type, name: d.DeviceName });
                 }
-                (d.Presets || []).forEach(p => {
-                  const preset = { ...p, id: p.ID, name: p.NumberDescription, displayType: 0, namePrefix: false };
-                  if (!existing.presets.some(pr => pr.id === p.ID)) {
-                    existing.presets.push(preset);
-                    newPresetsArr.push(preset);
-                  }
-                });
               });
             }
 
-            handleDevices(ataDevices, devicesByType.ata, "Air Conditioner", newDevices.ata, newDevices.ataPresets);
-            handleDevices(atwDevices, devicesByType.atw, "Heat Pump", newDevices.atw, newDevices.atwPresets);
-            handleDevices(ervDevices, devicesByType.erv, "ERV", newDevices.erv, newDevices.ervPresets);
-
-            // Update info
-            function updateInfo(id, text, color) {
-              const el = document.getElementById(id);
-              if (el) { el.innerHTML = text; el.style.color = color; }
-            }
-
-            const textInfo = `Found devices: ATA(${newDevices.ata.length}), ATW(${newDevices.atw.length}), ERV(${newDevices.erv.length})`;
-            updateInfo('info', textInfo, 'green');
+            addDevices(account.ataDevices, devicesByType.ata);
+            addDevices(account.atwDevices, devicesByType.atw);
+            addDevices(account.ervDevices, devicesByType.erv);
 
             // Update Config button state
-            updateConfigButtonState(account);
+            updateConfigButtonState(account, configButton);
 
             await homebridge.updatePluginConfig(pluginConfig);
             await homebridge.savePluginConfig(pluginConfig);
@@ -229,6 +205,15 @@
             homebridge.hideSpinner();
           }
         });
+
+        // Config button click
+        configButton.addEventListener('click', () => {
+          if (configButton.classList.contains('btn-primary')) {
+            homebridge.showSchemaForm();
+          } else {
+            homebridge.hideSchemaForm();
+          }
+        });
       }
 
       // Render accounts
@@ -250,18 +235,6 @@
         new bootstrap.Tab(document.getElementById(`tab-${i}`)).show();
       });
 
-      // Config button toggle
-      configButton.addEventListener('click', () => {
-        if (configButtonState) {
-          homebridge.hideSchemaForm();
-          configButton.className = "btn btn-secondary";
-        } else {
-          homebridge.showSchemaForm();
-          configButton.className = "btn btn-primary";
-        }
-        configButtonState = !configButtonState;
-      });
-
     })();
   </script>
 </body>

package/package.json

@@ -1,7 +1,7 @@
 {
   "displayName": "MELCloud Control",
   "name": "homebridge-melcloud-control",
-  "version": "3.9.0-beta.12",
+  "version": "3.9.0-beta.14",
   "description": "Homebridge plugin to control Mitsubishi Air Conditioner, Heat Pump and Energy Recovery Ventilation.",
   "license": "MIT",
   "author": "grzegorz914",