Fix alias devices listing datapoints from other devices (#597, #536)

Grouping several independent aliases under one alias device made the
type-detector merge them: it filled the detected device's slots — indicators
(UNREACH/LOWBAT/ERROR) as well as regular states like ON_ACTUAL — from the sibling
channels of the grouping. The Devices tab then listed datapoints belonging to
completely different devices, and editing or clearing such a slot could modify or
delete another device's alias state.

Drop detected state mappings that are aliases sitting in a different alias channel
than the device's primary (required) state. Required states are never dropped, and
real hardware states have no common.alias, so genuine device-level indicators on a
neighbouring channel (e.g. Homematic LOWBAT on the .0 channel) are left intact.
Applied to both the list detection and the edit dialog auto-fill.

Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>

Author: krobipd

src-admin/src/Devices/SmartDetector.ts

@@ -34,3 +34,40 @@ export default class IOBChannelDetector {
         return this.detector.detect(options);
     }
 }
+
+/**
+ * Devices-side guard for type-detector issue #597 / #536.
+ *
+ * When several independent aliases are grouped under one alias *device*, the
+ * type-detector merges them into a single detected device: it fills the device's
+ * slots — indicators (UNREACH, LOWBAT, ERROR) as well as regular states like
+ * ON_ACTUAL — from the sibling channels of that grouping. The detected device then
+ * lists datapoints that belong to completely different devices (see the issue
+ * screenshots: a motion alias showing a Shelly's "online", or a dimmer showing
+ * another light's status).
+ *
+ * We drop mappings that are aliases sitting in a *different* alias channel than the
+ * device's primary (required) state. Required states are never dropped, and real
+ * hardware states carry no `common.alias`, so genuine device-level states on a
+ * neighbouring channel (e.g. a Homematic LOWBAT on the .0 channel) stay untouched.
+ */
+export function removeForeignAliasStates(control: PatternControl, objects: Record<string, ioBroker.Object>): void {
+    const primary = control.states.find(s => s.id && s.required) || control.states.find(s => s.id);
+    if (!primary?.id) {
+        return;
+    }
+    const homeChannel = primary.id.substring(0, primary.id.lastIndexOf('.'));
+    for (const state of control.states) {
+        if (!state.id || state.required) {
+            continue;
+        }
+        const common = objects[state.id]?.common as ioBroker.StateCommon | undefined;
+        if (!common?.alias) {
+            // real hardware (no alias) – keep genuine device-level states
+            continue;
+        }
+        if (state.id.substring(0, state.id.lastIndexOf('.')) !== homeChannel) {
+            state.id = '';
+        }
+    }
+}

src-admin/src/Dialogs/DialogEditDevice.tsx

@@ -52,6 +52,7 @@ import {
     extendDeviceTypeTranslation,
 } from '@iobroker/adapter-react-v5';
 import ChannelDetector, { type Types, type DetectorState, type ExternalPatternControl } from '@iobroker/type-detector';
+import { removeForeignAliasStates } from '../Devices/SmartDetector';
 
 import DialogEditProperties, { type DialogEditPropertiesState } from './DialogEditProperties';
 import DialogAddState from './DialogAddState';
@@ -788,6 +789,10 @@ class DialogEditDevice extends React.Component<DialogEditDeviceProps, DialogEdit
             return;
         }
 
+        // #597/#536: strip indicator datapoints that leaked in from sibling channels
+        // of an alias-device grouping so auto-fill does not re-introduce them.
+        detected.forEach(control => removeForeignAliasStates(control, this.props.objects));
+
         // Use the first detection result matching our device type
         const match = detected.find(d => d.type === deviceType);
         if (!match?.states) {

src-admin/src/Tabs/ListDevices.tsx

@@ -97,7 +97,7 @@ import {
     setSmartName,
 } from '../Components/helpers/utils';
 import type { PatternControlEx, ListItem } from '../types';
-import SmartDetector from '../Devices/SmartDetector';
+import SmartDetector, { removeForeignAliasStates } from '../Devices/SmartDetector';
 import DialogEdit from '../Dialogs/DialogEditDevice';
 import DialogNew from '../Dialogs/DialogNewDevice';
 import LocalUtils from '../Components/helpers/LocalUtils';
@@ -1207,7 +1207,12 @@ export default class ListDevices extends Component<ListDevicesProps, ListDevices
                 _keysOptional: keys,
                 ignoreCache: true,
             });
-            result?.forEach(device => devices.push(device as PatternControlEx));
+            result?.forEach(device => {
+                // #597/#536: drop indicator datapoints that leaked in from sibling
+                // channels of an alias-device grouping before they reach the UI.
+                removeForeignAliasStates(device, this.objects);
+                devices.push(device as PatternControlEx);
+            });
             if (di % DETECT_CHUNK === DETECT_CHUNK - 1) {
                 await new Promise(resolve => setTimeout(resolve));
                 if (detectGen !== this.detectGeneration) {