From 31a2dd7cd307e93430aa71bc5c54d85ae786d9bb Mon Sep 17 00:00:00 2001
From: arteck <6681528+arteck@users.noreply.github.com>
Date: Sun, 26 Nov 2023 10:14:39 +0100
Subject: [PATCH] corr group from exclude dialogue

---
 README.md                |   1 +
 admin/admin.js           |   3 +
 admin/index_m.html       |  12 ++--
 admin/tab_m.html         | 120 +++++++++++++++++++++------------------
 lib/statescontroller.js  |   2 +-
 lib/zbDeviceConfigure.js |   6 +-
 lib/zigbeecontroller.js  |  26 ++++++++-
 main.js                  |   1 +
 package-lock.json        |   6 --
 9 files changed, 102 insertions(+), 75 deletions(-)

diff --git a/README.md b/README.md
index adda4e80..8ab8ccbe 100644
--- a/README.md
+++ b/README.md
@@ -135,6 +135,7 @@ You can thank the authors by these links:
 
 ## Changelog
 ### next
+* (arteck) corr group from exclude dialog
 * (arteck) legacy mode off
 
 ### 1.8.24 (2023-09-05)
diff --git a/admin/admin.js b/admin/admin.js
index 1867996e..3d7eaa5c 100644
--- a/admin/admin.js
+++ b/admin/admin.js
@@ -2595,6 +2595,9 @@ function prepareExcludeDialog(excludeObj) {
                 }
                 return device.common.type;
             } else {
+                if (device.common.type == 'group') {
+                    return null;
+                }
                 return device.common.type;
             }
         },
diff --git a/admin/index_m.html b/admin/index_m.html
index 9ab2f1c3..ffd34756 100644
--- a/admin/index_m.html
+++ b/admin/index_m.html
@@ -976,7 +976,7 @@ <h5 id="devActResult" class="card-title"></h5>
         <div class="modal-content">
             <h3 class="translate">Config device</h3>
             <div class="row">
-                <div class="co1l">
+                <div class="col1">
                     <div class="input-field">
                         <input id="d_name" type="text" class="value validate">
                         <label for="d_name" class="translate">Name</label>
@@ -992,7 +992,7 @@ <h3 class="translate">Config device</h3>
                 <div class="col1">
                     <div class="input-field groups">
                         <select id="d_groups_ep0" class="materialSelect" multiple>
-                            <option value="1">value</option>
+                            <option value="1">select</option>
                         </select>
                         <label for="d_groups_ep0" class="translate">Groups</label>
                     </div>
@@ -1007,7 +1007,7 @@ <h3 class="translate">Config device</h3>
                 <div class="col">
                     <div class="input-field groups">
                         <select id="d_groups_ep1" class="materialSelect" multiple>
-                            <option value="1">value</option>
+                            <option value="1">select</option>
                         </select>
                         <label for="d_groups_ep1" class="translate">Groups</label>
                     </div>
@@ -1022,7 +1022,7 @@ <h3 class="translate">Config device</h3>
                 <div class="col">
                     <div class="input-field groups">
                         <select id="d_groups_ep2" class="materialSelect" multiple>
-                            <option value="1">value</option>
+                            <option value="1">select</option>
                         </select>
                         <label for="d_groups_ep2" class="translate">Groups</label>
                     </div>
@@ -1037,7 +1037,7 @@ <h3 class="translate">Config device</h3>
                 <div class="col">
                     <div class="input-field groups">
                         <select id="d_groups_ep3" class="materialSelect" multiple>
-                            <option value="1">value</option>
+                            <option value="1">select</option>
                         </select>
                         <label for="d_groups_ep3" class="translate">Groups</label>
                     </div>
@@ -1076,7 +1076,7 @@ <h3 class="translate">Edit Group</h3>
                     <div class="input-field members">
                         <label for="g_members" class="translate">Members</label>
                         <select id="g_members" class="materialSelect" multiple>
-                            <option value="1">Значение</option>
+                            <option value="1">value</option>
                         </select>
                     </div>
                 </div>
diff --git a/admin/tab_m.html b/admin/tab_m.html
index 05dc4510..d98747f9 100644
--- a/admin/tab_m.html
+++ b/admin/tab_m.html
@@ -672,67 +672,75 @@ <h6>Others</h6>
     <div class="materialize-dialogs m">
       <div id="modaledit" class="modal">
           <div class="modal-content">
-            <h3 class="translate">Config device</h3>
-            <div class="row">
-              <div class="col">
-                <div class="input-field">
-                    <input id="d_name" type="text" class="value validate">
-                    <label for="d_name" class="translate">Name</label>
-                </div>
-              </div>
-            </div>
-            <div class="row epid0">
-              <div class="col">
-                <div class=endpointid>
-                  <p class="translate device_with_endpoint">Main Endpoint</p>
-                </div>
-              </div>
-              <div class="col1">
-                <div class="input-field groups">
-                    <select id="d_groups_ep0" class="materialSelect" multiple><option value="1">value</option></select>
-                    <label for="d_groups_ep0" class="translate">Groups</label>
-                </div>
-              </div>
-            </div>
-            <div class="row epid1">
-              <div class="col epid">
-                <div class=endpointid>
-                  <p class="translate device_with_endpoint">Sub Endpoint 1</p>
-                </div>
-              </div>
-              <div class="col">
-                <div class="input-field groups">
-                    <select id="d_groups_ep1" class="materialSelect" multiple><option value="1">value</option></select>
-                    <label for="d_groups_ep1" class="translate">Groups</label>
-                </div>
+              <h3 class="translate">Config device</h3>
+              <div class="row">
+                  <div class="col1">
+                      <div class="input-field">
+                          <input id="d_name" type="text" class="value validate">
+                          <label for="d_name" class="translate">Name</label>
+                      </div>
+                  </div>
               </div>
-            </div>
-            <div class="row epid2">
-              <div class="col epid">
-                <div class=endpointid>
-                  <p class="translate device_with_endpoint">Sub Endpoint 2</p>
-                </div>
+              <div class="row epid0">
+                  <div class="col">
+                      <div class=endpointid>
+                          <p class="translate device_with_endpoint">Main Endpoint</p>
+                      </div>
+                  </div>
+                  <div class="col1">
+                      <div class="input-field groups">
+                          <select id="d_groups_ep0" class="materialSelect" multiple>
+                              <option value="1">select</option>
+                          </select>
+                          <label for="d_groups_ep0" class="translate">Groups</label>
+                      </div>
+                  </div>
               </div>
-              <div class="col">
-                <div class="input-field groups">
-                    <select id="d_groups_ep2" class="materialSelect" multiple><option value="1">value</option></select>
-                    <label for="d_groups_ep2" class="translate">Groups</label>
-                </div>
+              <div class="row epid1">
+                  <div class="col epid">
+                      <div class=endpointid>
+                          <p class="translate device_with_endpoint">Sub Endpoint 1</p>
+                      </div>
+                  </div>
+                  <div class="col">
+                      <div class="input-field groups">
+                          <select id="d_groups_ep1" class="materialSelect" multiple>
+                              <option value="1">select</option>
+                          </select>
+                          <label for="d_groups_ep1" class="translate">Groups</label>
+                      </div>
+                  </div>
               </div>
-            </div>
-            <div class="row epid3">
-              <div class="col epid">
-                <div class=endpointid>
-                  <p class="translate device_with_endpoint">Sub Endpoint 3</p>
-                </div>
+              <div class="row epid2">
+                  <div class="col epid">
+                      <div class=endpointid>
+                          <p class="translate device_with_endpoint">Sub Endpoint 2</p>
+                      </div>
+                  </div>
+                  <div class="col">
+                      <div class="input-field groups">
+                          <select id="d_groups_ep2" class="materialSelect" multiple>
+                              <option value="1">select</option>
+                          </select>
+                          <label for="d_groups_ep2" class="translate">Groups</label>
+                      </div>
+                  </div>
               </div>
-              <div class="col">
-                <div class="input-field groups">
-                    <select id="d_groups_ep3" class="materialSelect" multiple><option value="1">value</option></select>
-                    <label for="d_groups_ep3" class="translate">Groups</label>
-                </div>
+              <div class="row epid3">
+                  <div class="col epid">
+                      <div class=endpointid>
+                          <p class="translate device_with_endpoint">Sub Endpoint 3</p>
+                      </div>
+                  </div>
+                  <div class="col">
+                      <div class="input-field groups">
+                          <select id="d_groups_ep3" class="materialSelect" multiple>
+                              <option value="1">select</option>
+                          </select>
+                          <label for="d_groups_ep3" class="translate">Groups</label>
+                      </div>
+                  </div>
               </div>
-            </div>
           </div>
           <div class="modal-footer">
               <a name="save" href="#!" class="modal-action modal-close waves-effect waves-green btn green translate">Save</a>
diff --git a/lib/statescontroller.js b/lib/statescontroller.js
index 4fedc324..c0cafa89 100644
--- a/lib/statescontroller.js
+++ b/lib/statescontroller.js
@@ -8,7 +8,7 @@ const fs = require('fs');
 const request = require('request');
 
 let savedDeviceNames = {};
-let knownUndefinedDevices = {};
+const knownUndefinedDevices = {};
 
 class StatesController extends EventEmitter {
     constructor(adapter) {
diff --git a/lib/zbDeviceConfigure.js b/lib/zbDeviceConfigure.js
index dd6f0bfd..0f9877cc 100755
--- a/lib/zbDeviceConfigure.js
+++ b/lib/zbDeviceConfigure.js
@@ -130,11 +130,11 @@ class DeviceConfigure extends BaseExtension {
     }
 
     async doConfigure(device, mappedDevice) {
-        this.info(`Configuring ${device.ieeeAddr} ${device.modelID}`);
         const coordinatorEndpoint = await this.zigbee.getDevicesByType('Coordinator')[0].endpoints[0];
         try {
-            if (this.mappedDevice !== null && this.mappedDevice !== undefined) {
-                await this.mappedDevice.configure(device, coordinatorEndpoint, this);
+            if (mappedDevice !== undefined) {
+                this.info(`Configuring ${device.ieeeAddr} ${device.modelID}`);
+                await mappedDevice.configure(device, coordinatorEndpoint, this);
                 device.meta.configured = zigbeeHerdsmanConverters.getConfigureKey(mappedDevice);
                 device.save();
                 this.info(`DeviceConfigure successful ${device.ieeeAddr} ${device.modelID}`);
diff --git a/lib/zigbeecontroller.js b/lib/zigbeecontroller.js
index ff36c892..6545a1ce 100644
--- a/lib/zigbeecontroller.js
+++ b/lib/zigbeecontroller.js
@@ -3,6 +3,7 @@
 const pathLib = require('path');
 const ZigbeeHerdsman = require('zigbee-herdsman');
 const zigbeeHerdsmanConverters = require('zigbee-herdsman-converters');
+const zigbeeHerdsmanConvertersPhilips = require('zigbee-herdsman-converters/lib/philips');
 const EventEmitter = require('events').EventEmitter;
 const safeJsonStringify = require('./json');
 const DeviceAvailabilityExt = require('./zbDeviceAvailability');
@@ -10,8 +11,24 @@ const DeviceConfigureExt = require('./zbDeviceConfigure');
 const DeviceEventExt = require('./zbDeviceEvent');
 const DelayedActionExt = require('./zbDelayedAction');
 const utils = require('./utils');
+
 const groupConverters = [
     zigbeeHerdsmanConverters.toZigbeeConverters.light_onoff_brightness,
+    zigbeeHerdsmanConverters.toZigbeeConverters.light_color_colortemp,
+    zigbeeHerdsmanConvertersPhilips.tz.effect, // Support Hue effects for groups
+    zigbeeHerdsmanConverters.toZigbeeConverters.ignore_transition,
+    zigbeeHerdsmanConverters.toZigbeeConverters.cover_position_tilt,
+    zigbeeHerdsmanConverters.toZigbeeConverters.thermostat_occupied_heating_setpoint,
+    zigbeeHerdsmanConverters.toZigbeeConverters.tint_scene,
+    zigbeeHerdsmanConverters.toZigbeeConverters.light_brightness_move,
+    zigbeeHerdsmanConverters.toZigbeeConverters.light_brightness_step,
+    zigbeeHerdsmanConverters.toZigbeeConverters.light_colortemp_step,
+    zigbeeHerdsmanConverters.toZigbeeConverters.light_colortemp_move,
+    zigbeeHerdsmanConverters.toZigbeeConverters.light_hue_saturation_move,
+    zigbeeHerdsmanConverters.toZigbeeConverters.light_hue_saturation_step
+
+
+    /*   zigbeeHerdsmanConverters.toZigbeeConverters.light_onoff_brightness,
     zigbeeHerdsmanConverters.toZigbeeConverters.light_colortemp,
     zigbeeHerdsmanConverters.toZigbeeConverters.light_color,
     zigbeeHerdsmanConverters.toZigbeeConverters.light_alert,
@@ -20,7 +37,8 @@ const groupConverters = [
     zigbeeHerdsmanConverters.toZigbeeConverters.light_brightness_step,
     zigbeeHerdsmanConverters.toZigbeeConverters.light_colortemp_move,
     zigbeeHerdsmanConverters.toZigbeeConverters.light_colortemp_step,
-    zigbeeHerdsmanConverters.toZigbeeConverters.light_colortemp_startup
+    zigbeeHerdsmanConverters.toZigbeeConverters.light_colortemp_startup*/
+
 ];
 
 function isFunction(functionToCheck) {
@@ -70,6 +88,8 @@ class ZigbeeController extends EventEmitter {
             adapter: {
                 forceStartWithInconsistentAdapterConfiguration: options.startWithInconsistent
             },
+            legacy : false,
+
         };
         // https://github.com/ioBroker/ioBroker.zigbee/issues/668
         if (!options.extPanIdFix) {
@@ -818,7 +838,7 @@ class ZigbeeController extends EventEmitter {
             this.debug(`addDevFromGroup - entity: ${utils.getEntityInfo(entity)}`);
             // generate group debug info and display it
             const members = await this.getGroupMembersFromController(groupId);
-            let memberIDs = [];
+            const memberIDs = [];
             for (const member of members) {
                 memberIDs.push(member.ieee);
             }
@@ -868,7 +888,7 @@ class ZigbeeController extends EventEmitter {
             const group = await this.resolveEntity(groupId);
 
             const members = await this.getGroupMembersFromController(groupId);
-            let memberIDs = [];
+            const memberIDs = [];
             for (const member of members) {
                 memberIDs.push(member.ieee);
             }
diff --git a/main.js b/main.js
index 59527837..2061353c 100644
--- a/main.js
+++ b/main.js
@@ -965,6 +965,7 @@ class Zigbee extends utils.Adapter {
             disableBackup: this.config.disableBackup,
             extPanIdFix: extPanIdFix,
             startWithInconsistent: this.config.startWithInconsistent || false,
+            legacy: false,
         };
     }
 
diff --git a/package-lock.json b/package-lock.json
index b6485cfc..bbb70c8f 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -9,14 +9,8 @@
       "version": "1.8.24",
       "license": "MIT",
       "dependencies": {
-
-    
-        "serialport": "^12.0.0",
-  
-
         "@iobroker/adapter-core": "^3.0.4",
         "tar": "^6.2.0",
-
         "typescript": "^5.2.2",
         "zigbee-herdsman": "0.23.0",
         "zigbee-herdsman-converters": "15.125.0"