@iobroker/adapter-react-v5 7.6.18 → 7.6.20

package/build/Components/ObjectBrowser.js

@@ -715,6 +715,14 @@ function ButtonIcon(props) {
             React.createElement("path", { d: "m195.23077,24.30769c-36,3 -67,12 -96,26c-49,24 -82,61 -93,104l-3,11l-1,50c0,46 0,49 2,59l5,20c21,58 84,103 165,116c16,3 53,4 70,2c60,-6 111,-28 147,-64c21,-21 36,-49 40,-74a866,866 0 0 0 1,-104c-3,-18 -6,-28 -13,-43c-26,-52 -87,-90 -162,-101c-16,-2 -48,-3 -63,-2l1,0zm60,23c36,5 70,18 95,35c31,20 51,47 59,77c2,7 2,11 2,25c1,15 0,18 -2,26c-19,69 -104,117 -200,114c-47,-2 -90,-15 -124,-38c-31,-20 -51,-47 -59,-77c-3,-11 -4,-32 -2,-43c8,-42 41,-78 91,-101a260,260 0 0 1 140,-19l0,1zm-221,222c21,26 57,49 95,62c81,27 174,14 239,-32c14,-10 31,-27 41,-41c2,-2 2,-2 2,7c-1,23 -16,50 -38,72c-78,74 -233,74 -311,-1a121,121 0 0 1 -39,-76l0,-6l3,4l8,11z" }),
             React.createElement("path", { d: "m201.23077,47.30769c-40,3 -79,19 -104,44c-55,55 -38,133 37,171c52,26 122,24 172,-5c30,-17 51,-42 58,-71c3,-11 3,-34 0,-45c-6,-23 -21,-44 -40,-60l-27,-16a184,184 0 0 0 -96,-18zm30,21c56,5 100,35 112,75c4,11 4,30 0,41c-8,25 -26,45 -54,59a166,166 0 0 1 -160,-8a98,98 0 0 1 -41,-53c-5,-18 -2,-39 8,-57c23,-39 79,-62 135,-57z" }))));
 }
+/** Converts ioB pattern into regex */
+export function pattern2RegEx(pattern) {
+    pattern = (pattern || '').toString();
+    const startsWithWildcard = pattern[0] === '*';
+    const endsWithWildcard = pattern[pattern.length - 1] === '*';
+    pattern = pattern.replace(/[-/\\^$+?.()|[\]{}]/g, '\\$&').replace(/\*/g, '.*');
+    return (startsWithWildcard ? '' : '^') + pattern + (endsWithWildcard ? '' : '$');
+}
 /**
  * Function that walks through all keys of an object or array and applies a function to each key.
  */
@@ -820,7 +828,7 @@ options) {
 }
 // d=data, t=target, s=start, e=end, m=middle
 function binarySearch(list, find, _start, _end) {
-    _start = _start || 0;
+    _start ||= 0;
     if (_end === undefined) {
         _end = list.length - 1;
         if (!_end) {
@@ -853,10 +861,10 @@ function getName(name, lang) {
 }
 export function getSelectIdIconFromObjects(objects, id, lang, imagePrefix) {
     // `admin` has prefix '.' and `web` has '../..'
-    imagePrefix = imagePrefix || '.'; // http://localhost:8081';
+    imagePrefix ||= '.'; // http://localhost:8081';
     let src = '';
     const _id_ = `system.adapter.${id}`;
-    const aIcon = id && objects[_id_] && objects[_id_].common && objects[_id_].common.icon;
+    const aIcon = id && objects[_id_]?.common?.icon;
     if (aIcon) {
         // if not BASE64
         if (!aIcon.startsWith('data:image/')) {
@@ -940,15 +948,27 @@ export function getSelectIdIconFromObjects(objects, id, lang, imagePrefix) {
     return src || null;
 }
 function applyFilter(item, filters, lang, objects, context, counter, customFilter, selectedTypes, _depth) {
-    _depth = _depth || 0;
+    _depth ||= 0;
     let filteredOut = false;
     if (!context) {
         context = {};
         if (filters.id) {
-            context.id = filters.id.toLowerCase();
+            const id = filters.id.toLowerCase();
+            if (id.includes('*')) {
+                context.idRx = new RegExp(pattern2RegEx(filters.id), 'i');
+            }
+            else {
+                context.id = id;
+            }
         }
         if (filters.name) {
-            context.name = filters.name.toLowerCase();
+            const name = filters.name.toLowerCase();
+            if (name.includes('*')) {
+                context.nameRx = new RegExp(pattern2RegEx(name), 'i');
+            }
+            else {
+                context.name = name;
+            }
         }
         if (filters.type) {
             context.type = filters.type.toLowerCase();
@@ -1056,10 +1076,13 @@ function applyFilter(item, filters, lang, objects, context, counter, customFilte
             }
             filteredOut = !data.fID.includes(context.id);
         }
+        if (!filteredOut && context.idRx) {
+            filteredOut = !context.idRx.test(data.id);
+        }
         if (!filteredOut && context.name) {
             if (common) {
                 if (data.fName === undefined) {
-                    data.fName = (common && getName(common.name, lang)) || '';
+                    data.fName = getName(common.name, lang) || '';
                     data.fName = data.fName.toLowerCase();
                 }
                 filteredOut = !data.fName.includes(context.name);
@@ -1068,6 +1091,15 @@ function applyFilter(item, filters, lang, objects, context, counter, customFilte
                 filteredOut = true;
             }
         }
+        if (!filteredOut && context.nameRx) {
+            if (common) {
+                if (data.fName === undefined) {
+                    data.fName = getName(common.name, lang) || '';
+                    data.fName = data.fName.toLowerCase();
+                }
+                filteredOut = !context.nameRx.test(data.fName);
+            }
+        }
         if (!filteredOut && filters.role && common) {
             if (common) {
                 filteredOut = !(typeof common.role === 'string' && common.role.startsWith(context.role));
@@ -1094,7 +1126,7 @@ function applyFilter(item, filters, lang, objects, context, counter, customFilte
                     filteredOut = !!common.custom;
                 }
                 else {
-                    filteredOut = !common.custom || !common.custom[context.custom];
+                    filteredOut = !common.custom?.[context.custom];
                 }
             }
             else {
@@ -1124,7 +1156,7 @@ function applyFilter(item, filters, lang, objects, context, counter, customFilte
     return data.visible || data.hasVisibleChildren;
 }
 function getVisibleItems(item, type, objects, _result) {
-    _result = _result || [];
+    _result ||= [];
     const data = item.data;
     if (data.sumVisibility) {
         if (data.id && objects[data.id] && (!type || objects[data.id].type === type)) {
@@ -1324,7 +1356,7 @@ function buildTree(objects, options) {
                                     generated: true,
                                 },
                             };
-                            cRoot.children = cRoot.children || [];
+                            cRoot.children ||= [];
                             cRoot.children.push(_cRoot);
                             cRoot = _cRoot;
                             info.ids.push(curPath); // IDs will be added by alphabet
@@ -1360,7 +1392,7 @@ function buildTree(objects, options) {
                             obj.common.role.startsWith('url'),
                     },
                 };
-                cRoot.children = cRoot.children || [];
+                cRoot.children ||= [];
                 cRoot.children.push(_cRoot);
                 cRoot = _cRoot;
                 currentPathLen = parts.length;
@@ -1449,7 +1481,7 @@ function findNode(root, id, _parts, _path, _level) {
         }
     }
     if (found) {
-        _level = _level || 0;
+        _level ||= 0;
         return findNode(found, id, _parts, `${_path}.${_parts[_level + 1]}`, _level + 1);
     }
     return null;
@@ -1458,7 +1490,7 @@ function findRoomsForObject(info, id, lang, rooms) {
     if (!id) {
         return { rooms: [], per: false };
     }
-    rooms = rooms || [];
+    rooms ||= [];
     for (const room of info.roomEnums) {
         const common = info.objects[room]?.common;
         if (!common) {
@@ -1484,7 +1516,7 @@ function findEnumsForObjectAsIds(info, id, enumName, funcs) {
     if (!id) {
         return [];
     }
-    funcs = funcs || [];
+    funcs ||= [];
     for (let i = 0; i < info[enumName].length; i++) {
         const common = info.objects[info[enumName][i]]?.common;
         if (common?.members?.includes(id) && !funcs.includes(info[enumName][i])) {
@@ -1498,7 +1530,7 @@ function findFunctionsForObject(info, id, lang, funcs) {
     if (!id) {
         return { funcs: [], pef: false };
     }
-    funcs = funcs || [];
+    funcs ||= [];
     for (let i = 0; i < info.funcEnums.length; i++) {
         const common = info.objects[info.funcEnums[i]]?.common;
         if (!common) {
@@ -1696,8 +1728,8 @@ function prepareSparkData(values, from) {
             }
             else {
                 // remove nulls
-                values[i - 1].val = values[i - 1].val || 0;
-                values[i].val = values[i].val || 0;
+                values[i - 1].val ||= 0;
+                values[i].val ||= 0;
                 // interpolate
                 const nm1 = values[i - 1].val;
                 const n = values[i].val;
@@ -2197,7 +2229,7 @@ export class ObjectBrowserClass extends Component {
                 this.objects = {};
                 const propsTypes = props.types;
                 Object.keys(objects).forEach(id => {
-                    const type = objects[id] && objects[id].type;
+                    const type = objects[id]?.type;
                     // include "folder" types too
                     if (type &&
                         (type === 'channel' ||
@@ -2240,7 +2272,7 @@ export class ObjectBrowserClass extends Component {
             this.root = root;
             this.info = info;
             // Show first selected item
-            const node = this.state.selected && this.state.selected.length && findNode(this.root, this.state.selected[0]);
+            const node = this.state.selected?.length && findNode(this.root, this.state.selected[0]);
             this.lastAppliedFilter = null;
             // If the selected ID is not visible, reset filter
             if (node &&
@@ -2299,18 +2331,20 @@ export class ObjectBrowserClass extends Component {
             if (this.selectFirst && this.selectFirst !== this.state.selected[0]) {
                 this.selectFirst = '';
             }
+            // If the this.state.selected[0] filtered out, disable the filter
+            const item = this.findItem(this.state.selected[0]);
+            if (item?.data && !item.data.visible) {
+                // If the selected ID is not visible, reset filter
+                this.clearFilter();
+            }
             if (this.state.selected.length === 1 && this.objects[this.state.selected[0]]) {
                 const name = Utils.getObjectName(this.objects, this.state.selected[0], null, {
                     language: this.props.lang,
                 });
-                if (this.props.onSelect) {
-                    this.props.onSelect(this.state.selected, name, isDouble);
-                }
+                this.props.onSelect?.(this.state.selected, name, isDouble);
             }
             else if (this.state.selected.length === 1 && this.props.allowNonObjects) {
-                if (this.props.onSelect) {
-                    this.props.onSelect(this.state.selected, null, isDouble);
-                }
+                this.props.onSelect?.(this.state.selected, null, isDouble);
             }
         }
         else {
@@ -2430,9 +2464,7 @@ export class ObjectBrowserClass extends Component {
                 break;
             }
         }
-        if (this.props.onObjectDelete) {
-            this.props.onObjectDelete(id, !!item.children?.length, !obj.common?.dontDelete, count + 1);
-        }
+        this.props.onObjectDelete?.(id, !!item.children?.length, !obj.common?.dontDelete, count + 1);
     }
     /**
      * Context menu handler.
@@ -2615,28 +2647,27 @@ export class ObjectBrowserClass extends Component {
                     this.state.columnsForAdmin &&
                         Object.keys(this.state.columnsForAdmin)
                             .sort()
-                            .map(adapter => this.state.columnsForAdmin &&
-                            this.state.columnsForAdmin[adapter].map(column => (React.createElement(ListItemButton, { onClick: () => {
-                                    if (!this.state.columnsAuto) {
-                                        const columns = [...(this.state.columns || [])];
-                                        const id = `_${adapter}_${column.path}`;
-                                        const pos = columns.indexOf(id);
-                                        if (pos === -1) {
-                                            columns.push(id);
-                                            columns.sort();
-                                        }
-                                        else {
-                                            columns.splice(pos, 1);
-                                        }
-                                        this.calculateColumnsVisibility(null, columns);
-                                        this.localStorage.setItem(`${this.props.dialogName || 'App'}.columns`, JSON.stringify(columns));
-                                        this.setState({ columns });
+                            .map(adapter => this.state.columnsForAdmin?.[adapter].map(column => (React.createElement(ListItemButton, { onClick: () => {
+                                if (!this.state.columnsAuto) {
+                                    const columns = [...(this.state.columns || [])];
+                                    const id = `_${adapter}_${column.path}`;
+                                    const pos = columns.indexOf(id);
+                                    if (pos === -1) {
+                                        columns.push(id);
+                                        columns.sort();
+                                    }
+                                    else {
+                                        columns.splice(pos, 1);
                                     }
-                                }, key: `${adapter}_${column.name}` },
-                                React.createElement(ListItemIcon, null,
-                                    React.createElement(Checkbox, { disabled: this.state.columnsAuto, edge: "start", checked: !this.state.columnsAuto &&
-                                            this.state.columns?.includes(`_${adapter}_${column.path}`), disableRipple: true })),
-                                React.createElement(ListItemText, { primary: `${column.name} (${adapter})` }))))),
+                                    this.calculateColumnsVisibility(null, columns);
+                                    this.localStorage.setItem(`${this.props.dialogName || 'App'}.columns`, JSON.stringify(columns));
+                                    this.setState({ columns });
+                                }
+                            }, key: `${adapter}_${column.name}` },
+                            React.createElement(ListItemIcon, null,
+                                React.createElement(Checkbox, { disabled: this.state.columnsAuto, edge: "start", checked: !this.state.columnsAuto &&
+                                        this.state.columns?.includes(`_${adapter}_${column.path}`), disableRipple: true })),
+                            React.createElement(ListItemText, { primary: `${column.name} (${adapter})` }))))),
                     this._renderDefinedList(true))),
             React.createElement(DialogActions, null,
                 React.createElement(Button, { variant: "contained", onClick: () => this.setState({ columnsSelectorShow: false }), color: "primary", startIcon: React.createElement(IconClose, null) }, this.texts.close))));
@@ -2669,8 +2700,8 @@ export class ObjectBrowserClass extends Component {
      * Find an item.
      */
     findItem(id, _parts, _root, _partyId) {
-        _parts = _parts || id.split('.');
-        _root = _root || this.root;
+        _parts ||= id.split('.');
+        _root ||= this.root;
         if (!_root || !_parts.length) {
             return null;
         }
@@ -2722,7 +2753,7 @@ export class ObjectBrowserClass extends Component {
         }
     };
     parseObjectForAdmins(columnsForAdmin, obj) {
-        if (obj.common && obj.common.adminColumns && obj.common.name) {
+        if (obj.common?.adminColumns && obj.common.name) {
             const columns = obj.common.adminColumns;
             let aColumns;
             if (columns && typeof columns !== 'object') {
@@ -2774,8 +2805,8 @@ export class ObjectBrowserClass extends Component {
             else {
                 cColumns = null;
             }
-            if (cColumns && cColumns.length) {
-                columnsForAdmin = columnsForAdmin || {};
+            if (cColumns?.length) {
+                columnsForAdmin ||= {};
                 columnsForAdmin[obj.common.name] = cColumns.sort((a, b) => a.path > b.path ? -1 : a.path < b.path ? 1 : 0);
             }
         }
@@ -2908,7 +2939,7 @@ export class ObjectBrowserClass extends Component {
                 newInnerState = { columnsForAdmin };
             }
         }
-        this.objects = this.objects || {};
+        this.objects ||= {};
         if (obj) {
             this.objects[id] = obj;
         }
@@ -2957,7 +2988,7 @@ export class ObjectBrowserClass extends Component {
         this.filterTimer = null;
         const filter = { ...this.state.filter };
         Object.keys(this.filterRefs).forEach(_name => {
-            if (this.filterRefs[_name] && this.filterRefs[_name].current) {
+            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') {
@@ -2981,7 +3012,7 @@ export class ObjectBrowserClass extends Component {
     clearFilter() {
         const filter = { ...this.state.filter };
         Object.keys(this.filterRefs).forEach(name => {
-            if (this.filterRefs[name] && this.filterRefs[name].current) {
+            if (this.filterRefs[name]?.current) {
                 const filterRef = this.filterRefs[name].current;
                 for (let i = 0; i < filterRef.childNodes.length; i++) {
                     const item = filterRef.childNodes[i];
@@ -2995,7 +3026,7 @@ export class ObjectBrowserClass extends Component {
         });
         if (JSON.stringify(this.state.filter) !== JSON.stringify(filter)) {
             this.localStorage.setItem(`${this.props.dialogName || 'App'}.objectFilter`, JSON.stringify(filter));
-            this.setState({ filter, filterKey: this.state.filterKey + 1 }, () => this.props.onFilterChanged && this.props.onFilterChanged(filter));
+            this.setState({ filter, filterKey: this.state.filterKey + 1 }, () => this.props.onFilterChanged?.(filter));
         }
     }
     isFilterEmpty() {
@@ -3003,7 +3034,9 @@ export class ObjectBrowserClass extends Component {
         return !someNotEmpty;
     }
     getFilterInput(filterName) {
-        return (React.createElement(FormControl, { sx: this.styles.filterInput, key: `${filterName}_${this.state.filterKey}`, 
+        return (React.createElement(FormControl, { sx: this.styles.filterInput, key: `${filterName}_${this.state.filterKey}`, title: filterName === 'name' || filterName === 'id'
+                ? this.props.t('ra_You can use * as wildcard')
+                : undefined, 
             // style={{ marginTop: 0, marginBottom: 0 }}
             margin: "dense" },
             React.createElement(Input, { ref: this.filterRefs[filterName], classes: { underline: 'no-underline' }, id: filterName, placeholder: this.texts[`filter_${filterName}`], defaultValue: this.state.filter[filterName] || '', onChange: () => {
@@ -3100,7 +3133,7 @@ export class ObjectBrowserClass extends Component {
     }
     onExpandAll(root, expanded) {
         const _root = root || this.root;
-        expanded = expanded || [];
+        expanded ||= [];
         _root?.children?.forEach((item) => {
             if (item.data.sumVisibility) {
                 expanded.push(item.data.id);
@@ -3119,7 +3152,7 @@ export class ObjectBrowserClass extends Component {
         this.setState({ expanded: [], depth: 0, selected: [] }, () => this.onAfterSelect());
     }
     expandDepth(root, depth, expanded) {
-        root = root || this.root;
+        root ||= this.root;
         if (depth > 0) {
             root.children?.forEach(item => {
                 if (item.data.sumVisibility) {
@@ -3210,15 +3243,15 @@ export class ObjectBrowserClass extends Component {
                             native: {},
                             type: 'enum',
                         };
-                oldObj.common = oldObj.common || {};
+                oldObj.common ||= {};
                 oldObj.common.members = [objId];
                 oldObj.type = 'enum';
                 await this.props.socket.setObject(id, oldObj);
             }
             else if (!oldObj.common?.members?.includes(objId)) {
-                oldObj.common = oldObj.common || {};
+                oldObj.common ||= {};
                 oldObj.type = 'enum';
-                oldObj.common.members = oldObj.common.members || [];
+                oldObj.common.members ||= [];
                 // add the missing object
                 oldObj.common.members.push(objId);
                 oldObj.common.members.sort();
@@ -3236,7 +3269,7 @@ export class ObjectBrowserClass extends Component {
                 let enums = null;
                 let val;
                 let ack;
-                if (obj && obj.common && obj.common.enums) {
+                if (obj?.common?.enums) {
                     enums = obj.common.enums;
                     delete obj.common.enums;
                 }
@@ -3759,7 +3792,7 @@ export class ObjectBrowserClass extends Component {
                         ...styles.cellButtonMinWidth,
                     }, onClick: () => this.setState({ modalEditOfAccess: true, modalEditOfAccessObjData: item.data }), size: "large" },
                     React.createElement("div", { style: { height: 15 } }, "---"))) : null,
-                this.props.onObjectDelete && item.children && item.children.length ? (React.createElement(IconButton, { sx: {
+                this.props.onObjectDelete && item.children?.length ? (React.createElement(IconButton, { sx: {
                         ...styles.cellButtonsButton,
                         ...styles.cellButtonsButtonAlone,
                     }, size: "small", "aria-label": "delete", title: this.texts.deleteObject, onClick: () => {
@@ -3947,6 +3980,7 @@ export class ObjectBrowserClass extends Component {
     }
     /**
      * This function renders the value in different forms in the table
+     *
      * @param id state ID
      * @param item Item
      * @param narrowStyleWithDetails if use mobile view
@@ -4045,7 +4079,7 @@ export class ObjectBrowserClass extends Component {
                 } }, val)));
     }
     _syncEnum(id, enumIds, newArray, cb) {
-        if (!enumIds || !enumIds.length) {
+        if (!enumIds?.length) {
             if (cb) {
                 cb();
             }
@@ -4070,7 +4104,7 @@ export class ObjectBrowserClass extends Component {
             if (newArray.includes(enumId) && !this.info.objects[enumId].common.members?.includes(id)) {
                 // add to object
                 const obj = JSON.parse(JSON.stringify(this.info.objects[enumId]));
-                obj.common.members = obj.common.members || [];
+                obj.common.members ||= [];
                 obj.common.members.push(id);
                 obj.common.members.sort();
                 promises.push(this.props.socket
@@ -5324,7 +5358,7 @@ export class ObjectBrowserClass extends Component {
     };
     resizerMouseDown = (e) => {
         this.storedWidths ||= JSON.parse(JSON.stringify(SCREEN_WIDTHS[this.props.width || 'lg']));
-        this.resizerCurrentWidths = this.resizerCurrentWidths || {};
+        this.resizerCurrentWidths ||= {};
         this.resizerActiveDiv = e.target.parentNode;
         this.resizerActiveName = this.resizerActiveDiv.dataset.name || null;
         if (this.resizerActiveName) {
@@ -5736,7 +5770,7 @@ export class ObjectBrowserClass extends Component {
                 onClick: () => {
                     this.edit = {
                         val: this.states[id] ? this.states[id].val : '',
-                        q: this.states[id] ? this.states[id].q || 0 : 0,
+                        q: this.states[id]?.q || 0,
                         ack: false,
                         id,
                     };