@iobroker/adapter-react-v5 7.7.3 → 7.7.4

package/build/Components/ObjectBrowser.d.ts

@@ -113,11 +113,11 @@ export declare const ITEM_IMAGES: Record<string, JSX.Element>;
 export interface ObjectBrowserFilter {
     id?: string;
     name?: string;
-    room?: string;
-    func?: string;
-    role?: string;
-    type?: string;
-    custom?: string;
+    room?: string[];
+    func?: string[];
+    role?: string[];
+    type?: string[];
+    custom?: string[];
     expertMode?: boolean;
 }
 interface AdapterColumn {

package/build/Components/ObjectBrowser.js

@@ -970,24 +970,30 @@ function applyFilter(item, filters, lang, objects, context, counter, customFilte
                 context.name = name;
             }
         }
-        if (filters.type) {
-            context.type = filters.type.toLowerCase();
+        if (filters.type?.length) {
+            context.type = filters.type.map(f => f.toLowerCase());
         }
-        if (filters.custom) {
-            context.custom = filters.custom.toLowerCase();
+        if (filters.custom?.length) {
+            context.custom = filters.custom.map(c => c.toLowerCase());
         }
-        if (filters.role) {
-            context.role = filters.role.toLowerCase();
+        if (filters.role?.length) {
+            context.role = filters.role.map(r => r.toLowerCase());
         }
-        if (filters.room) {
-            context.room = objects[filters.room]?.common?.members || [];
+        if (filters.room?.length) {
+            context.room = [];
+            filters.room.forEach(room => {
+                context.room = context.room.concat(objects[room]?.common?.members || []);
+            });
         }
-        if (filters.func) {
-            context.func = objects[filters.func]?.common?.members || [];
+        if (filters.func?.length) {
+            context.func = [];
+            filters.func.forEach(func => {
+                context.func = context.func.concat(objects[func]?.common?.members || []);
+            });
         }
     }
     const data = item.data;
-    if (data && data.id) {
+    if (data?.id) {
         const common = data.obj?.common;
         if (customFilter) {
             if (customFilter.type) {
@@ -1100,33 +1106,28 @@ function applyFilter(item, filters, lang, objects, context, counter, customFilte
                 filteredOut = !context.nameRx.test(data.fName);
             }
         }
-        if (!filteredOut && filters.role && common) {
-            if (common) {
-                filteredOut = !(typeof common.role === 'string' && common.role.startsWith(context.role));
-            }
-            else {
-                filteredOut = true;
-            }
+        if (!filteredOut && filters.role?.length && common) {
+            filteredOut = !(typeof common.role === 'string' && context.role.find(role => common.role.startsWith(role)));
         }
-        if (!filteredOut && context.room) {
+        if (!filteredOut && context.room?.length) {
             filteredOut = !context.room.find(id => id === data.id || data.id.startsWith(`${id}.`));
         }
-        if (!filteredOut && context.func) {
+        if (!filteredOut && context.func?.length) {
             filteredOut = !context.func.find(id => id === data.id || data.id.startsWith(`${id}.`));
         }
-        if (!filteredOut && context.type) {
-            filteredOut = !(data.obj && data.obj.type && data.obj.type === context.type);
+        if (!filteredOut && context.type?.length) {
+            filteredOut = !(data.obj?.type && context.type.includes(data.obj.type));
         }
         if (!filteredOut && selectedTypes) {
-            filteredOut = !(data.obj && data.obj.type && selectedTypes.includes(data.obj.type));
+            filteredOut = !(data.obj?.type && selectedTypes.includes(data.obj.type));
         }
-        if (!filteredOut && context.custom) {
+        if (!filteredOut && context.custom?.length) {
             if (common) {
-                if (context.custom === '_') {
+                if (context.custom.includes('_')) {
                     filteredOut = !!common.custom;
                 }
-                else {
-                    filteredOut = !common.custom?.[context.custom];
+                else if (common.custom) {
+                    filteredOut = !context.custom.find(custom => common.custom[custom]);
                 }
             }
             else {
@@ -1859,11 +1860,11 @@ let objectsAlreadyLoaded = false;
 const DEFAULT_FILTER = {
     id: '',
     name: '',
-    room: '',
-    func: '',
-    role: '',
-    type: '',
-    custom: '',
+    room: [],
+    func: [],
+    role: [],
+    type: [],
+    custom: [],
     expertMode: false,
 };
 export class ObjectBrowserClass extends Component {
@@ -1974,6 +1975,22 @@ export class ObjectBrowserClass extends Component {
         else {
             filter = { ...DEFAULT_FILTER };
         }
+        // Migrate old filters to new one
+        if (typeof filter.room === 'string') {
+            filter.room = [filter.room];
+        }
+        if (typeof filter.func === 'string') {
+            filter.func = [filter.func];
+        }
+        if (typeof filter.role === 'string') {
+            filter.role = [filter.role];
+        }
+        if (typeof filter.type === 'string') {
+            filter.type = [filter.type];
+        }
+        if (typeof filter.custom === 'string') {
+            filter.custom = [filter.custom];
+        }
         filter.expertMode =
             props.expertMode !== undefined
                 ? props.expertMode
@@ -2364,6 +2381,13 @@ export class ObjectBrowserClass extends Component {
             else if (this.state.selected.length === 1 && this.props.allowNonObjects) {
                 this.props.onSelect?.(this.state.selected, null, isDouble);
             }
+            else {
+                // we have more than one state
+                // Check if all IDs are objects
+                if (!this.props.allowNonObjects || !this.state.selected.find(id => !this.objects[id])) {
+                    this.props.onSelect?.(this.state.selected, null, isDouble);
+                }
+            }
         }
         else {
             this.localStorage.removeItem(`${this.props.dialogName || 'App'}.objectSelected`);
@@ -3011,12 +3035,27 @@ export class ObjectBrowserClass extends Component {
     onFilter(name, value) {
         this.filterTimer = null;
         const filter = { ...this.state.filter };
-        Object.keys(this.filterRefs).forEach(_name => {
+        Object.keys(this.filterRefs).forEach((_name) => {
             if (this.filterRefs[_name]?.current) {
                 const filterRef = this.filterRefs[_name].current;
                 for (let i = 0; i < filterRef.children.length; i++) {
                     if (filterRef.children[i].tagName === 'INPUT') {
-                        filter[_name] = filterRef.children[i].value;
+                        if (_name === 'role' ||
+                            _name === 'type' ||
+                            _name === 'func' ||
+                            _name === 'custom' ||
+                            _name === 'room') {
+                            const value = filterRef.children[i].value;
+                            if (value) {
+                                filter[_name] = value.split(',');
+                            }
+                            else {
+                                filter[_name] = undefined;
+                            }
+                        }
+                        else {
+                            filter[_name] = filterRef.children[i].value;
+                        }
                         break;
                     }
                 }
@@ -3082,12 +3121,12 @@ export class ObjectBrowserClass extends Component {
     getFilterSelect(name, values) {
         const hasIcons = !!values?.find(item => item.icon);
         return (React.createElement("div", { style: { position: 'relative' } },
-            React.createElement(Select, { variant: "standard", key: `${name}_${this.state.filterKey}`, ref: this.filterRefs[name], sx: styles.headerCellInput, className: "no-underline", onChange: () => {
+            React.createElement(Select, { variant: "standard", key: `${name}_${this.state.filterKey}`, ref: this.filterRefs[name], sx: styles.headerCellInput, className: "no-underline", multiple: true, onChange: () => {
                     if (this.filterTimer) {
                         clearTimeout(this.filterTimer);
                     }
                     this.filterTimer = setTimeout(() => this.onFilter(), 400);
-                }, defaultValue: this.state.filter[name] || '', inputProps: { name, id: name }, displayEmpty: true },
+                }, defaultValue: this.state.filter[name] || [], inputProps: { name, id: name }, displayEmpty: true },
                 React.createElement(MenuItem, { key: "empty", value: "" },
                     React.createElement("span", { style: styles.selectNone }, name === 'custom' ? this.texts.showAll : this.texts[`filter_${name}`])),
                 values?.map(item => {
@@ -3110,7 +3149,7 @@ export class ObjectBrowserClass extends Component {
             this.filterRefs[name]?.current?.childNodes[1]?.value ? (React.createElement(Box, { component: "div", sx: styles.selectClearButton },
                 React.createElement(IconButton, { size: "small", onClick: () => {
                         const newFilter = { ...this.state.filter };
-                        newFilter[name] = '';
+                        delete newFilter[name];
                         (this.filterRefs[name].current?.childNodes[1]).value = '';
                         this.localStorage.setItem(`${this.props.dialogName || 'App'}.objectFilter`, JSON.stringify(newFilter));
                         this.setState({ filter: newFilter, filterKey: this.state.filterKey + 1 }, () => this.props.onFilterChanged && this.props.onFilterChanged(newFilter));