@iobroker/adapter-react-v5 3.2.2 → 3.2.3

package/Components/ObjectBrowser.js

@@ -114,7 +114,7 @@ var COLOR_NAME_DISCONNECTED_LIGHT = '#6c5008';
 var styles = function styles(theme) {
   return {
     toolbar: {
-      minHeight: 38 //Theme.toolbar.height,
+      minHeight: 38 // Theme.toolbar.height,
       //        boxShadow: '0px 2px 4px -1px rgba(0, 0, 0, 0.2), 0px 4px 5px 0px rgba(0, 0, 0, 0.14), 0px 1px 10px 0px rgba(0, 0, 0, 0.12)'
     },
 
@@ -205,16 +205,16 @@ var styles = function styles(theme) {
     },
     tableDiv: {
       paddingTop: 0,
-      //theme.spacing(1),
+      // theme.spacing(1),
       paddingLeft: 0,
       width: "calc(100% - ".concat(theme.spacing(1), ")"),
-      height: "calc(100% - 38px)",
+      height: 'calc(100% - 38px)',
       overflow: 'auto'
     },
     tableRow: {
       paddingLeft: theme.spacing(1),
       height: ROW_HEIGHT,
-      lineHeight: ROW_HEIGHT + 'px',
+      lineHeight: "".concat(ROW_HEIGHT, "px"),
       verticalAlign: 'top',
       userSelect: 'none',
       width: '100%',
@@ -248,8 +248,8 @@ var styles = function styles(theme) {
       fontSize: '1rem',
       overflow: 'hidden',
       textOverflow: 'ellipsis',
-      //verticalAlign: 'top',
-      //position: 'relative',
+      // verticalAlign: 'top',
+      // position: 'relative',
       '& .copyButton': {
         display: 'none'
       },
@@ -274,8 +274,8 @@ var styles = function styles(theme) {
       overflow: 'hidden',
       textOverflow: 'ellipsis',
       whiteSpace: 'nowrap'
-      //display: 'inline-block',
-      //verticalAlign: 'top',
+      // display: 'inline-block',
+      // verticalAlign: 'top',
     },
 
     cellIdIconFolder: {
@@ -434,7 +434,7 @@ var styles = function styles(theme) {
     cellValueTooltipValue: {
       width: 120,
       display: 'inline-block',
-      //overflow: 'hidden',
+      // overflow: 'hidden',
       whiteSpace: 'nowrap',
       textOverflow: 'ellipsis'
     },
@@ -727,7 +727,7 @@ var styles = function styles(theme) {
 };
 function generateFile(filename, obj) {
   var el = document.createElement('a');
-  el.setAttribute('href', 'data:application/json;charset=utf-8,' + encodeURIComponent(JSON.stringify(obj, null, 2)));
+  el.setAttribute('href', "data:application/json;charset=utf-8,".concat(encodeURIComponent(JSON.stringify(obj, null, 2))));
   el.setAttribute('download', filename);
   el.style.display = 'none';
   document.body.appendChild(el);
@@ -757,6 +757,86 @@ function binarySearch(list, find, _start, _end) {
   if (find < list[middle]) {
     return binarySearch(list, find, _start, middle);
   }
+  return false;
+}
+function getName(name, lang) {
+  if (name && (0, _typeof2["default"])(name) === 'object') {
+    return (name[lang] || name.en || '').toString();
+  }
+  return (name || '').toString();
+}
+function getSelectIdIcon(objects, id, imagePrefix) {
+  imagePrefix = imagePrefix || '.'; // http://localhost:8081';
+  var src = '';
+  var _id_ = "system.adapter.".concat(id);
+  var aIcon = id && objects[_id_] && objects[_id_].common && objects[_id_].common.icon;
+  if (aIcon) {
+    // if not BASE64
+    if (!aIcon.startsWith('data:image/')) {
+      if (aIcon.includes('.')) {
+        src = "".concat(imagePrefix, "/adapter/").concat(objects[_id_].common.name, "/").concat(aIcon);
+      } else if (aIcon && aIcon.length < 3) {
+        return aIcon; // utf-8
+      } else {
+        return null; // '<i class="material-icons iob-list-icon">' + objects[_id_].common.icon + '</i>';
+      }
+    }
+
+    if (aIcon.startsWith('data:image/svg')) {
+      src = /*#__PURE__*/_react["default"].createElement(_reactInlinesvg["default"], {
+        src: aIcon,
+        width: 28,
+        height: 28
+      });
+    } else {
+      src = aIcon;
+    }
+  } else {
+    var common = objects[id] && objects[id].common;
+    if (common) {
+      var cIcon = common.icon;
+      if (cIcon) {
+        if (!cIcon.startsWith('data:image/')) {
+          if (cIcon.includes('.')) {
+            var instance;
+            if (objects[id].type === 'instance' || objects[id].type === 'adapter') {
+              src = "".concat(imagePrefix, "/adapter/").concat(common.name, "/").concat(cIcon);
+            } else if (id && id.startsWith('system.adapter.')) {
+              instance = id.split('.', 3);
+              if (cIcon[0] === '/') {
+                instance[2] += cIcon;
+              } else {
+                instance[2] += "/".concat(cIcon);
+              }
+              src = "".concat(imagePrefix, "/adapter/").concat(instance[2]);
+            } else {
+              instance = id.split('.', 2);
+              if (cIcon[0] === '/') {
+                instance[0] += cIcon;
+              } else {
+                instance[0] += "/".concat(cIcon);
+              }
+              src = "".concat(imagePrefix, "/adapter/").concat(instance[0]);
+            }
+          } else if (aIcon && aIcon.length < 3) {
+            return aIcon; // utf-8
+          } else {
+            return null;
+          }
+        } else if (cIcon.startsWith('data:image/svg')) {
+          // if base 64 image
+          src = /*#__PURE__*/_react["default"].createElement(_reactInlinesvg["default"], {
+            src: cIcon,
+            width: 28,
+            height: 28
+          });
+        } else {
+          src = cIcon;
+        }
+      }
+    }
+  }
+  return src || null;
 }
 function applyFilter(item, filters, lang, objects, context, counter, customFilter, selectedTypes, _depth) {
   _depth = _depth || 0;
@@ -878,12 +958,12 @@ function applyFilter(item, filters, lang, objects, context, counter, customFilte
     }
     if (!filteredOut && context.room) {
       filteredOut = !context.room.find(function (id) {
-        return id === data.id || data.id.startsWith(id + '.');
+        return id === data.id || data.id.startsWith("".concat(id, "."));
       });
     }
     if (!filteredOut && context.func) {
       filteredOut = !context.func.find(function (id) {
-        return id === data.id || data.id.startsWith(id + '.');
+        return id === data.id || data.id.startsWith("".concat(id, "."));
       });
     }
     if (!filteredOut && context.type) {
@@ -983,8 +1063,8 @@ function getSystemIcon(objects, id, k, imagePrefix) {
     });
   } else if (k < 2) {
     // detect "cloud.0"
-    if (objects['system.adapter.' + id]) {
-      icon = getSelectIdIcon(objects, 'system.adapter.' + id, imagePrefix);
+    if (objects["system.adapter.".concat(id)]) {
+      icon = getSelectIdIcon(objects, "system.adapter.".concat(id), imagePrefix);
     }
   }
   return icon || null;
@@ -1060,8 +1140,8 @@ function buildTree(objects, options) {
     do {
       repeat = false;
 
-      // If current level is still OK and we can add ID to children
-      if (!currentPath || id.startsWith(currentPath + '.')) {
+      // If current level is still OK, and we can add ID to children
+      if (!currentPath || id.startsWith("".concat(currentPath, "."))) {
         var _obj$common, _obj$common2, _obj$common3;
         // if more than one level added
         if (parts.length - currentPathLen > 1) {
@@ -1150,11 +1230,11 @@ function buildTree(objects, options) {
     var bName = getName(((_objects$b = objects[b]) === null || _objects$b === void 0 ? void 0 : (_objects$b$common = _objects$b.common) === null || _objects$b$common === void 0 ? void 0 : _objects$b$common.name) || b.split('.').pop());
     if (aName > bName) {
       return 1;
-    } else if (aName < bName) {
+    }
+    if (aName < bName) {
       return -1;
-    } else {
-      return 0;
     }
+    return 0;
   });
   info.funcEnums.sort(function (a, b) {
     var _objects$a2, _objects$a2$common, _objects$b2, _objects$b2$common;
@@ -1162,11 +1242,11 @@ function buildTree(objects, options) {
     var bName = getName(((_objects$b2 = objects[b]) === null || _objects$b2 === void 0 ? void 0 : (_objects$b2$common = _objects$b2.common) === null || _objects$b2$common === void 0 ? void 0 : _objects$b2$common.name) || b.split('.').pop());
     if (aName > bName) {
       return 1;
-    } else if (aName < bName) {
+    }
+    if (aName < bName) {
       return -1;
-    } else {
-      return 0;
     }
+    return 0;
   });
   info.roles.sort();
   info.types.sort();
@@ -1186,30 +1266,21 @@ function findNode(root, id, _parts, _path, _level) {
   }
   if (!root.children && root.data.id !== id) {
     return null;
-  } else {
-    var found;
-    for (var i = 0; i < root.children.length; i++) {
-      var _id = root.children[i].data.id;
-      if (_id === _path) {
-        found = root.children[i];
-        break;
-      } else if (_id > _path) {
-        break;
-      }
-    }
-    if (found) {
-      return findNode(found, id, _parts, _path + '.' + _parts[_level + 1], _level + 1);
-    } else {
-      return null;
+  }
+  var found;
+  for (var i = 0; i < root.children.length; i++) {
+    var _id = root.children[i].data.id;
+    if (_id === _path) {
+      found = root.children[i];
+      break;
+    } else if (_id > _path) {
+      break;
     }
   }
-}
-function getName(name, lang) {
-  if (name && (0, _typeof2["default"])(name) === 'object') {
-    return (name[lang] || name.en || '').toString();
-  } else {
-    return (name || '').toString();
+  if (found) {
+    return findNode(found, id, _parts, "".concat(_path, ".").concat(_parts[_level + 1]), _level + 1);
   }
+  return null;
 }
 function findRoomsForObject(data, id, lang, withParentInfo, rooms) {
   if (!id) {
@@ -1304,7 +1375,8 @@ function findFunctionsForObject(data, id, lang, withParentInfo, funcs) {
   };
 }
 
-/*function quality2text(q) {
+/*
+function quality2text(q) {
     if (!q) {
         return 'ok';
     }
@@ -1317,7 +1389,8 @@ function findFunctionsForObject(data, id, lang, withParentInfo, funcs) {
     if (q & 0x04) text += ' error';
 
     return text + (custom ? '|0x' + (custom >> 16).toString(16).toUpperCase() : '') + ' [0x' + q.toString(16).toUpperCase() + ']';
-}*/
+}
+*/
 
 function formatValue(id, state, obj, texts, dateFormat, isFloatComma) {
   var states = _Utils["default"].getStates(obj);
@@ -1360,11 +1433,10 @@ function formatValue(id, state, obj, texts, dateFormat, isFloatComma) {
       v = states[v];
     }
   }
-  var valFull;
   if (isCommon && isCommon.unit) {
     valText.u = isCommon.unit;
   }
-  valFull = [{
+  var valFull = [{
     t: texts.value,
     v: v
   }];
@@ -1428,81 +1500,6 @@ function formatValue(id, state, obj, texts, dateFormat, isFloatComma) {
     }
   };
 }
-function getSelectIdIcon(objects, id, imagePrefix) {
-  imagePrefix = imagePrefix || '.'; //http://localhost:8081';
-  var src = '';
-  var _id_ = 'system.adapter.' + id;
-  var aIcon = id && objects[_id_] && objects[_id_].common && objects[_id_].common.icon;
-  if (aIcon) {
-    // if not BASE64
-    if (!aIcon.startsWith('data:image/')) {
-      if (aIcon.includes('.')) {
-        src = "".concat(imagePrefix, "/adapter/").concat(objects[_id_].common.name, "/").concat(aIcon);
-      } else if (aIcon && aIcon.length < 3) {
-        return aIcon; // utf-8
-      } else {
-        return null; //'<i class="material-icons iob-list-icon">' + objects[_id_].common.icon + '</i>';
-      }
-    } else {
-      if (aIcon.startsWith('data:image/svg')) {
-        src = /*#__PURE__*/_react["default"].createElement(_reactInlinesvg["default"], {
-          src: aIcon,
-          width: 28,
-          height: 28
-        });
-      } else {
-        src = aIcon;
-      }
-    }
-  } else {
-    var common = objects[id] && objects[id].common;
-    if (common) {
-      var cIcon = common.icon;
-      if (cIcon) {
-        if (!cIcon.startsWith('data:image/')) {
-          if (cIcon.includes('.')) {
-            var instance;
-            if (objects[id].type === 'instance' || objects[id].type === 'adapter') {
-              src = "".concat(imagePrefix, "/adapter/").concat(common.name, "/").concat(cIcon);
-            } else if (id && id.startsWith('system.adapter.')) {
-              instance = id.split('.', 3);
-              if (cIcon[0] === '/') {
-                instance[2] += cIcon;
-              } else {
-                instance[2] += '/' + cIcon;
-              }
-              src = "".concat(imagePrefix, "/adapter/").concat(instance[2]);
-            } else {
-              instance = id.split('.', 2);
-              if (cIcon[0] === '/') {
-                instance[0] += cIcon;
-              } else {
-                instance[0] += '/' + cIcon;
-              }
-              src = "".concat(imagePrefix, "/adapter/").concat(instance[0]);
-            }
-          } else if (aIcon && aIcon.length < 3) {
-            return aIcon; // utf-8
-          } else {
-            return null;
-          }
-        } else {
-          // base 64 image
-          if (cIcon.startsWith('data:image/svg')) {
-            src = /*#__PURE__*/_react["default"].createElement(_reactInlinesvg["default"], {
-              src: cIcon,
-              width: 28,
-              height: 28
-            });
-          } else {
-            src = cIcon;
-          }
-        }
-      }
-    }
-  }
-  return src || null;
-}
 function prepareSparkData(values, from) {
   // set every hour one point
   var time = from;
@@ -1652,7 +1649,7 @@ var SCREEN_WIDTHS = {
       lastChange: 165
     }
   },
-  ///////////////
+  // /////////////
   // extra-large: 1920px
   xl: {
     idWidth: 550,
@@ -1688,7 +1685,7 @@ var ObjectBrowser = /*#__PURE__*/function (_Component) {
     (0, _classCallCheck2["default"])(this, ObjectBrowser);
     _this = _super.call(this, props);
     (0, _defineProperty2["default"])((0, _assertThisInitialized2["default"])(_this), "onStateChange", function (id, state) {
-      console.log('> stateChange ' + id);
+      console.log("> stateChange ".concat(id));
       if (_this.states[id]) {
         var item = _this.findItem(id);
         if (item && item.data.state) {
@@ -1703,18 +1700,16 @@ var ObjectBrowser = /*#__PURE__*/function (_Component) {
             _this.forceUpdate();
           }, 300);
         }
-      } else {
-        if (_this.statesUpdateTimer) {
-          clearTimeout(_this.statesUpdateTimer);
-          _this.statesUpdateTimer = null;
-        }
+      } else if (_this.statesUpdateTimer) {
+        clearTimeout(_this.statesUpdateTimer);
+        _this.statesUpdateTimer = null;
       }
     });
-    (0, _defineProperty2["default"])((0, _assertThisInitialized2["default"])(_this), "onObjectChange", function (id, obj, oldObj) {
+    (0, _defineProperty2["default"])((0, _assertThisInitialized2["default"])(_this), "onObjectChange", function (id, obj /* , oldObj */) {
       var newState;
       if (Array.isArray(id)) {
         id.forEach(function (event) {
-          console.log('> objectChange ' + event.id);
+          console.log("> objectChange ".concat(event.id));
           if (event.obj && typeof _this.props.filterFunc === 'function' && !_this.props.filterFunc(event.obj)) {
             return;
           }
@@ -1734,12 +1729,10 @@ var ObjectBrowser = /*#__PURE__*/function (_Component) {
             } else {
               delete _this.objects[event.id];
             }
-          } else if (_this.objects[event.id]) {
-            delete _this.objects[event.id];
           }
         });
       } else {
-        console.log('> objectChange ' + id);
+        console.log("> objectChange ".concat(id));
         _this.objects = _this.objects || [];
         if (obj && typeof _this.props.filterFunc === 'function' && !_this.props.filterFunc(obj)) {
           return;
@@ -1759,8 +1752,6 @@ var ObjectBrowser = /*#__PURE__*/function (_Component) {
           } else {
             delete _this.objects[id];
           }
-        } else if (_this.objects[id]) {
-          delete _this.objects[id];
         }
       }
       newState && _this.setState(newState);
@@ -1886,7 +1877,7 @@ var ObjectBrowser = /*#__PURE__*/function (_Component) {
                   break;
                 }
                 id = _context2.t1.value;
-                if (!(!objs.hasOwnProperty(id) || !objs[id])) {
+                if (!(!Object.hasOwn(objs, id) || !objs[id])) {
                   _context2.next = 6;
                   break;
                 }
@@ -2041,6 +2032,8 @@ var ObjectBrowser = /*#__PURE__*/function (_Component) {
                     _context3.t1 = _context3["catch"](1);
                     window.alert(_context3.t1);
                   case 38:
+                    return _context3.abrupt("return", null);
+                  case 39:
                   case "end":
                     return _context3.stop();
                 }
@@ -2086,88 +2079,86 @@ var ObjectBrowser = /*#__PURE__*/function (_Component) {
         var id = _this.state.selected[0] || _this.state.selectedNonObject;
         if (id.split('.').length < 2 || _this.objects[id] && ((_this$objects$id = _this.objects[id]) === null || _this$objects$id === void 0 ? void 0 : _this$objects$id.type) === 'state') {
           // show default tooltip
-        } else {
-          if (_this.state.filter.expertMode) {
-            switch ((_this$objects$id2 = _this.objects[id]) === null || _this$objects$id2 === void 0 ? void 0 : _this$objects$id2.type) {
-              case 'device':
-                value = [/*#__PURE__*/_react["default"].createElement("div", {
-                  key: 1
-                }, t('ra_Only following structures of objects are available:')), /*#__PURE__*/_react["default"].createElement("div", {
-                  key: 5
-                }, t('ra_Device → Channel → State')), /*#__PURE__*/_react["default"].createElement("div", {
-                  key: 7,
-                  style: {
-                    height: 10
-                  }
-                }), /*#__PURE__*/_react["default"].createElement("div", {
-                  key: 8
-                }, t('ra_Non-experts may create new objects only in "0_userdata.0" or "alias.0".')), /*#__PURE__*/_react["default"].createElement("div", {
-                  key: 9
-                }, t('ra_The experts may create objects everywhere but from second level (e.g. "vis.0" or "javascript.0").'))];
-                break;
-              case 'folder':
-                value = [/*#__PURE__*/_react["default"].createElement("div", {
-                  key: 1
-                }, t('ra_Only following structures of objects are available:')), /*#__PURE__*/_react["default"].createElement("div", {
-                  key: 2
-                }, t('ra_Folder → State')), /*#__PURE__*/_react["default"].createElement("div", {
-                  key: 3
-                }, t('ra_Folder → Channel → State')), /*#__PURE__*/_react["default"].createElement("div", {
-                  key: 4
-                }, t('ra_Folder → Device → Channel → State')), /*#__PURE__*/_react["default"].createElement("div", {
-                  key: 7,
-                  style: {
-                    height: 10
-                  }
-                }), /*#__PURE__*/_react["default"].createElement("div", {
-                  key: 8
-                }, t('ra_Non-experts may create new objects only in "0_userdata.0" or "alias.0".')), /*#__PURE__*/_react["default"].createElement("div", {
-                  key: 9
-                }, t('ra_The experts may create objects everywhere but from second level (e.g. "vis.0" or "javascript.0").'))];
-                break;
-              case 'channel':
-                value = [/*#__PURE__*/_react["default"].createElement("div", {
-                  key: 1
-                }, t('ra_Only following structures of objects are available:')), /*#__PURE__*/_react["default"].createElement("div", {
-                  key: 1
-                }, t('ra_Channel → State')), /*#__PURE__*/_react["default"].createElement("div", {
-                  key: 7,
-                  style: {
-                    height: 10
-                  }
-                }), /*#__PURE__*/_react["default"].createElement("div", {
-                  key: 8
-                }, t('ra_Non-experts may create new objects only in "0_userdata.0" or "alias.0".')), /*#__PURE__*/_react["default"].createElement("div", {
-                  key: 9
-                }, t('ra_The experts may create objects everywhere but from second level (e.g. "vis.0" or "javascript.0").'))];
-                break;
-              default:
-                break;
-            }
-          } else if (id.startsWith('alias.0') || id.startsWith('0_userdata')) {
-            value = [/*#__PURE__*/_react["default"].createElement("div", {
-              key: 1
-            }, t('ra_Only following structures of objects are available:')), /*#__PURE__*/_react["default"].createElement("div", {
-              key: 2
-            }, t('ra_Folder → State')), /*#__PURE__*/_react["default"].createElement("div", {
-              key: 3
-            }, t('ra_Folder → Channel → State')), /*#__PURE__*/_react["default"].createElement("div", {
-              key: 4
-            }, t('ra_Folder → Device → Channel → State')), /*#__PURE__*/_react["default"].createElement("div", {
-              key: 5
-            }, t('ra_Device → Channel → State')), /*#__PURE__*/_react["default"].createElement("div", {
-              key: 6
-            }, t('ra_Channel → State')), /*#__PURE__*/_react["default"].createElement("div", {
-              key: 7,
-              style: {
-                height: 10
-              }
-            }), /*#__PURE__*/_react["default"].createElement("div", {
-              key: 7
-            }, t('ra_Non-experts may create new objects only in "0_userdata.0" or "alias.0".')), /*#__PURE__*/_react["default"].createElement("div", {
-              key: 8
-            }, t('ra_The experts may create objects everywhere but from second level (e.g. "vis.0" or "javascript.0").'))];
+        } else if (_this.state.filter.expertMode) {
+          switch ((_this$objects$id2 = _this.objects[id]) === null || _this$objects$id2 === void 0 ? void 0 : _this$objects$id2.type) {
+            case 'device':
+              value = [/*#__PURE__*/_react["default"].createElement("div", {
+                key: 1
+              }, t('ra_Only following structures of objects are available:')), /*#__PURE__*/_react["default"].createElement("div", {
+                key: 5
+              }, t('ra_Device → Channel → State')), /*#__PURE__*/_react["default"].createElement("div", {
+                key: 7,
+                style: {
+                  height: 10
+                }
+              }), /*#__PURE__*/_react["default"].createElement("div", {
+                key: 8
+              }, t('ra_Non-experts may create new objects only in "0_userdata.0" or "alias.0".')), /*#__PURE__*/_react["default"].createElement("div", {
+                key: 9
+              }, t('ra_The experts may create objects everywhere but from second level (e.g. "vis.0" or "javascript.0").'))];
+              break;
+            case 'folder':
+              value = [/*#__PURE__*/_react["default"].createElement("div", {
+                key: 1
+              }, t('ra_Only following structures of objects are available:')), /*#__PURE__*/_react["default"].createElement("div", {
+                key: 2
+              }, t('ra_Folder → State')), /*#__PURE__*/_react["default"].createElement("div", {
+                key: 3
+              }, t('ra_Folder → Channel → State')), /*#__PURE__*/_react["default"].createElement("div", {
+                key: 4
+              }, t('ra_Folder → Device → Channel → State')), /*#__PURE__*/_react["default"].createElement("div", {
+                key: 7,
+                style: {
+                  height: 10
+                }
+              }), /*#__PURE__*/_react["default"].createElement("div", {
+                key: 8
+              }, t('ra_Non-experts may create new objects only in "0_userdata.0" or "alias.0".')), /*#__PURE__*/_react["default"].createElement("div", {
+                key: 9
+              }, t('ra_The experts may create objects everywhere but from second level (e.g. "vis.0" or "javascript.0").'))];
+              break;
+            case 'channel':
+              value = [/*#__PURE__*/_react["default"].createElement("div", {
+                key: 1
+              }, t('ra_Only following structures of objects are available:')), /*#__PURE__*/_react["default"].createElement("div", {
+                key: 1
+              }, t('ra_Channel → State')), /*#__PURE__*/_react["default"].createElement("div", {
+                key: 7,
+                style: {
+                  height: 10
+                }
+              }), /*#__PURE__*/_react["default"].createElement("div", {
+                key: 8
+              }, t('ra_Non-experts may create new objects only in "0_userdata.0" or "alias.0".')), /*#__PURE__*/_react["default"].createElement("div", {
+                key: 9
+              }, t('ra_The experts may create objects everywhere but from second level (e.g. "vis.0" or "javascript.0").'))];
+              break;
+            default:
+              break;
           }
+        } else if (id.startsWith('alias.0') || id.startsWith('0_userdata')) {
+          value = [/*#__PURE__*/_react["default"].createElement("div", {
+            key: 1
+          }, t('ra_Only following structures of objects are available:')), /*#__PURE__*/_react["default"].createElement("div", {
+            key: 2
+          }, t('ra_Folder → State')), /*#__PURE__*/_react["default"].createElement("div", {
+            key: 3
+          }, t('ra_Folder → Channel → State')), /*#__PURE__*/_react["default"].createElement("div", {
+            key: 4
+          }, t('ra_Folder → Device → Channel → State')), /*#__PURE__*/_react["default"].createElement("div", {
+            key: 5
+          }, t('ra_Device → Channel → State')), /*#__PURE__*/_react["default"].createElement("div", {
+            key: 6
+          }, t('ra_Channel → State')), /*#__PURE__*/_react["default"].createElement("div", {
+            key: 7,
+            style: {
+              height: 10
+            }
+          }), /*#__PURE__*/_react["default"].createElement("div", {
+            key: 7
+          }, t('ra_Non-experts may create new objects only in "0_userdata.0" or "alias.0".')), /*#__PURE__*/_react["default"].createElement("div", {
+            key: 8
+          }, t('ra_The experts may create objects everywhere but from second level (e.g. "vis.0" or "javascript.0").'))];
         }
       }
       return value.length ? value : t('ra_Add new child object to selected parent');
@@ -2213,10 +2204,11 @@ var ObjectBrowser = /*#__PURE__*/function (_Component) {
         var value = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : 'object';
         var rights = acl[value];
         check.forEach(function (el, i) {
+          // eslint-disable-next-line no-bitwise
           if (rights & el.valueNum) {
             arrayTooltipText.push( /*#__PURE__*/_react["default"].createElement("span", {
               key: value + i
-            }, _this.texts['acl' + el.group + '_' + el.title + '_' + value], ",", /*#__PURE__*/_react["default"].createElement("span", {
+            }, _this.texts["acl".concat(el.group, "_").concat(el.title, "_").concat(value)], ",", /*#__PURE__*/_react["default"].createElement("span", {
               className: value === 'object' ? _this.props.classes.rightsObject : _this.props.classes.rightsState
             }, el.value)));
           }
@@ -2224,10 +2216,10 @@ var ObjectBrowser = /*#__PURE__*/function (_Component) {
       };
       arrayTooltipText.push( /*#__PURE__*/_react["default"].createElement("span", {
         key: "group"
-      }, _this.texts.ownerGroup + ': ' + (acl.ownerGroup || '').replace('system.group.', '')));
+      }, "".concat(_this.texts.ownerGroup, ": ").concat((acl.ownerGroup || '').replace('system.group.', ''))));
       arrayTooltipText.push( /*#__PURE__*/_react["default"].createElement("span", {
         key: "owner"
-      }, _this.texts.ownerUser + ': ' + (acl.owner || '').replace('system.user.', '')));
+      }, "".concat(_this.texts.ownerUser, ": ").concat((acl.owner || '').replace('system.user.', ''))));
       funcRenderStateObject();
       if (acl.state) {
         funcRenderStateObject('state');
@@ -2252,16 +2244,16 @@ var ObjectBrowser = /*#__PURE__*/function (_Component) {
         if ((!_this.resizerMin || width > _this.resizerMin) && (!_this.resizerNextMin || widthNext > _this.resizerNextMin)) {
           _this.resizerCurrentWidths[_this.resizerActiveName] = width;
           _this.resizerCurrentWidths[_this.resizerNextName] = widthNext;
-          _this.resizerActiveDiv.style.width = width + 'px';
-          _this.resizerNextDiv.style.width = widthNext + 'px';
+          _this.resizerActiveDiv.style.width = "".concat(width, "px");
+          _this.resizerNextDiv.style.width = "".concat(widthNext, "px");
           _this.columnsVisibility[_this.resizerActiveName] = width;
           _this.columnsVisibility[_this.resizerNextName] = widthNext;
           if (_this.resizerNextName === 'nameHeader') {
-            _this.columnsVisibility['name'] = widthNext - _this.state.scrollBarWidth;
-            _this.resizerCurrentWidths['name'] = widthNext - _this.state.scrollBarWidth;
+            _this.columnsVisibility.name = widthNext - _this.state.scrollBarWidth;
+            _this.resizerCurrentWidths.name = widthNext - _this.state.scrollBarWidth;
           } else if (_this.resizerActiveName === 'nameHeader') {
-            _this.columnsVisibility['name'] = width - _this.state.scrollBarWidth;
-            _this.resizerCurrentWidths['name'] = width - _this.state.scrollBarWidth;
+            _this.columnsVisibility.name = width - _this.state.scrollBarWidth;
+            _this.resizerCurrentWidths.name = width - _this.state.scrollBarWidth;
           }
           _this.customWidth = true;
           _this.resizeTimeout && clearTimeout(_this.resizeTimeout);
@@ -2293,10 +2285,10 @@ var ObjectBrowser = /*#__PURE__*/function (_Component) {
         if (e.target.dataset.left === 'true') {
           _this.resizeLeft = true;
           _this.resizerNextDiv = _this.resizerActiveDiv.previousElementSibling;
-          var handle = _this.resizerNextDiv.querySelector('.' + _this.props.classes.resizeHandle);
+          var handle = _this.resizerNextDiv.querySelector(".".concat(_this.props.classes.resizeHandle));
           while (_this.resizerNextDiv && !handle && i < 10) {
             _this.resizerNextDiv = _this.resizerNextDiv.previousElementSibling;
-            handle = _this.resizerNextDiv.querySelector('.' + _this.props.classes.resizeHandle);
+            handle = _this.resizerNextDiv.querySelector(".".concat(_this.props.classes.resizeHandle));
             i++;
           }
           if (handle && handle.dataset.left !== 'true') {
@@ -2305,10 +2297,10 @@ var ObjectBrowser = /*#__PURE__*/function (_Component) {
         } else {
           _this.resizeLeft = false;
           _this.resizerNextDiv = _this.resizerActiveDiv.nextElementSibling;
-          /*while (this.resizerNextDiv && !this.resizerNextDiv.querySelector('.' + this.props.classes.resizeHandle) && i < 10) {
+          /* while (this.resizerNextDiv && !this.resizerNextDiv.querySelector('.' + this.props.classes.resizeHandle) && i < 10) {
               this.resizerNextDiv = this.resizerNextDiv.nextElementSibling;
               i++;
-          }*/
+          } */
         }
 
         _this.resizerNextName = _this.resizerNextDiv.dataset.name;
@@ -2349,19 +2341,21 @@ var ObjectBrowser = /*#__PURE__*/function (_Component) {
       _this.lastSelectedItems = _this.lastSelectedItems.filter(function (id) {
         return id;
       });
-    } catch (e) {}
+    } catch (e) {
+      // ignore
+    }
     var expanded = (window._localStorage || window.localStorage).getItem("".concat(props.dialogName || 'App', ".objectExpanded")) || '[]';
     try {
       expanded = JSON.parse(expanded);
     } catch (e) {
       expanded = [];
     }
-    var filter = props.defaultFilters || (window._localStorage || window.localStorage).getItem("".concat(props.dialogName || 'App', ".objectFilter")) || Object.assign({}, DEFAULT_FILTER);
+    var filter = props.defaultFilters || (window._localStorage || window.localStorage).getItem("".concat(props.dialogName || 'App', ".objectFilter")) || _objectSpread({}, DEFAULT_FILTER);
     if (typeof filter === 'string') {
       try {
         filter = JSON.parse(filter);
       } catch (e) {
-        filter = Object.assign({}, DEFAULT_FILTER);
+        filter = _objectSpread({}, DEFAULT_FILTER);
       }
     }
     filter.expertMode = props.expertMode !== undefined ? props.expertMode : (window._sessionStorage || window.sessionStorage).getItem('App.expertMode') === 'true';
@@ -2384,7 +2378,9 @@ var ObjectBrowser = /*#__PURE__*/function (_Component) {
       var pos = _this.visibleCols.indexOf('type');
       pos !== -1 && _this.visibleCols.splice(pos, 1);
     }
-    _this.possibleCols = SCREEN_WIDTHS.xl.fields;
+
+    // this.possibleCols = SCREEN_WIDTHS.xl.fields;
+
     var customDialog = null;
     if (props.router) {
       var location = props.router.getLocation();
@@ -2415,7 +2411,7 @@ var ObjectBrowser = /*#__PURE__*/function (_Component) {
       columnsWidths = {};
     }
     _this.imagePrefix = props.imagePrefix || '.';
-    var foldersFirst = (window._localStorage || window.localStorage).getItem((props.dialogName || 'App') + '.foldersFirst');
+    var foldersFirst = (window._localStorage || window.localStorage).getItem("".concat(props.dialogName || 'App', ".foldersFirst"));
     if (foldersFirst === 'false') {
       foldersFirst = false;
     } else if (foldersFirst === 'true') {
@@ -2425,7 +2421,7 @@ var ObjectBrowser = /*#__PURE__*/function (_Component) {
     }
     var statesView = false;
     try {
-      statesView = _this.props.objectStatesView ? JSON.parse((window._localStorage || window.localStorage).getItem((props.dialogName || 'App') + '.objectStatesView')) || false : false;
+      statesView = _this.props.objectStatesView ? JSON.parse((window._localStorage || window.localStorage).getItem("".concat(props.dialogName || 'App', ".objectStatesView"))) || false : false;
     } catch (error) {
       // ignore
     }
@@ -2447,7 +2443,6 @@ var ObjectBrowser = /*#__PURE__*/function (_Component) {
       viewFileDialog: '',
       enumDialog: null,
       roleDialog: null,
-      modalEmptyId: null,
       statesView: statesView,
       columns: columns,
       columnsForAdmin: null,
@@ -2523,7 +2518,7 @@ var ObjectBrowser = /*#__PURE__*/function (_Component) {
           if (id === 'id') {
             SCREEN_WIDTHS[_this.props.width].idWidth = resizerCurrentWidths.id;
           } else if (id === 'nameHeader') {
-            SCREEN_WIDTHS[_this.props.width].widths['name'] = resizerCurrentWidths[id];
+            SCREEN_WIDTHS[_this.props.width].widths.name = resizerCurrentWidths[id];
           } else if (SCREEN_WIDTHS[_this.props.width].widths[id] !== undefined) {
             SCREEN_WIDTHS[_this.props.width].widths[id] = resizerCurrentWidths[id];
           }
@@ -2543,7 +2538,7 @@ var ObjectBrowser = /*#__PURE__*/function (_Component) {
       var props = this.props;
       var objects;
       return new Promise(function (resolve) {
-        return _this2.setState({
+        _this2.setState({
           updating: true
         }, function () {
           return resolve();
@@ -2557,13 +2552,12 @@ var ObjectBrowser = /*#__PURE__*/function (_Component) {
             console.error('more than one type does not supported! Use filterFunc instead');
           }
           return props.socket.getObjectView(null, null, props.types[0]);
-        } else {
-          return !objects['system.config'] ? props.socket.getObject('system.config').then(function (obj) {
-            return {
-              'system.config': obj
-            };
-          }) : Promise.resolve(null);
         }
+        return !objects['system.config'] ? props.socket.getObject('system.config').then(function (obj) {
+          return {
+            'system.config': obj
+          };
+        }) : Promise.resolve(null);
       }).then(function (moreObjects) {
         _this2.systemConfig = objects['system.config'] || moreObjects['system.config'] || {};
         if (moreObjects) {
@@ -2616,7 +2610,7 @@ var ObjectBrowser = /*#__PURE__*/function (_Component) {
               _this2.defaultHistory = '';
             }
           })["catch"](function (e) {
-            return window.alert('Cannot get state: ' + e);
+            return window.alert("Cannot get state: ".concat(e));
           });
         }
         return _this2.getAdditionalColumns();
@@ -2636,7 +2630,7 @@ var ObjectBrowser = /*#__PURE__*/function (_Component) {
         if (node && !applyFilter(node, _this2.state.filter, _this2.state.lang, _this2.objects, null, null, props.customFilter, props.types)) {
           // reset filter
           _this2.setState({
-            filter: Object.assign({}, DEFAULT_FILTER),
+            filter: _objectSpread({}, DEFAULT_FILTER),
             columnsForAdmin: columnsForAdmin
           }, function () {
             _this2.setState({
@@ -2764,7 +2758,7 @@ var ObjectBrowser = /*#__PURE__*/function (_Component) {
 
       // remove all subscribes
       this.subscribes.forEach(function (pattern) {
-        console.log('- unsubscribe ' + pattern);
+        console.log("- unsubscribe ".concat(pattern));
         _this5.props.socket.unsubscribeState(pattern, _this5.onStateChange);
       });
       this.subscribes = [];
@@ -2780,7 +2774,7 @@ var ObjectBrowser = /*#__PURE__*/function (_Component) {
       var _this6 = this;
       // remove all subscribes
       this.subscribes.forEach(function (pattern) {
-        console.log('- unsubscribe ' + pattern);
+        console.log("- unsubscribe ".concat(pattern));
         _this6.props.socket.unsubscribeState(pattern, _this6.onStateChange);
       });
       this.subscribes = [];
@@ -2798,7 +2792,7 @@ var ObjectBrowser = /*#__PURE__*/function (_Component) {
     value: function renderErrorDialog() {
       var _this7 = this;
       return this.state.error ? /*#__PURE__*/_react["default"].createElement(_Dialog["default"], {
-        open: true,
+        open: !0,
         maxWidth: "sm",
         fullWidth: true,
         onClose: function onClose() {
@@ -2868,24 +2862,22 @@ var ObjectBrowser = /*#__PURE__*/function (_Component) {
             return _this8.onAfterSelect();
           });
         }
-      } else {
-        if (this.objects[toggleItem] && (!this.props.types || this.props.types.includes(this.objects[toggleItem].type))) {
-          (window._localStorage || window.localStorage).removeItem("".concat(this.props.dialogName || 'App', ".selectedNonObject"));
-          var selected = (0, _toConsumableArray2["default"])(this.state.selected);
-          var pos = selected.indexOf(toggleItem);
-          if (pos === -1) {
-            selected.push(toggleItem);
-            selected.sort();
-          } else if (!isDouble) {
-            selected.splice(pos, 1);
-          }
-          this.setState({
-            selected: selected,
-            selectedNonObject: ''
-          }, function () {
-            return _this8.onAfterSelect(isDouble);
-          });
+      } else if (this.objects[toggleItem] && (!this.props.types || this.props.types.includes(this.objects[toggleItem].type))) {
+        (window._localStorage || window.localStorage).removeItem("".concat(this.props.dialogName || 'App', ".selectedNonObject"));
+        var selected = (0, _toConsumableArray2["default"])(this.state.selected);
+        var pos = selected.indexOf(toggleItem);
+        if (pos === -1) {
+          selected.push(toggleItem);
+          selected.sort();
+        } else if (!isDouble) {
+          selected.splice(pos, 1);
         }
+        this.setState({
+          selected: selected,
+          selectedNonObject: ''
+        }, function () {
+          return _this8.onAfterSelect(isDouble);
+        });
       }
     }
 
@@ -2965,56 +2957,55 @@ var ObjectBrowser = /*#__PURE__*/function (_Component) {
       var _this9 = this;
       if (!this.state.columnsSelectorShow) {
         return null;
-      } else {
-        return /*#__PURE__*/_react["default"].createElement(_Dialog["default"], {
-          onClose: function onClose() {
-            return _this9.setState({
-              columnsSelectorShow: false
+      }
+      return /*#__PURE__*/_react["default"].createElement(_Dialog["default"], {
+        onClose: function onClose() {
+          return _this9.setState({
+            columnsSelectorShow: false
+          });
+        },
+        open: !0,
+        classes: {
+          root: _Utils["default"].clsx(this.props.classes.dialogColumns, this.props.classes["transparent_".concat(this.state.columnsDialogTransparent)])
+        }
+      }, /*#__PURE__*/_react["default"].createElement(_DialogTitle["default"], {
+        className: this.props.classes.fontSizeTitle
+      }, this.props.t('ra_Configure')), /*#__PURE__*/_react["default"].createElement(_DialogContent["default"], {
+        className: this.props.classes.fontSizeTitle
+      }, /*#__PURE__*/_react["default"].createElement(_FormControlLabel["default"], {
+        className: this.props.classes.switchColumnAuto,
+        control: /*#__PURE__*/_react["default"].createElement(_Switch["default"], {
+          checked: this.state.foldersFirst,
+          onChange: function onChange() {
+            (window._localStorage || window.localStorage).setItem("".concat(_this9.props.dialogName || 'App', ".foldersFirst"), _this9.state.foldersFirst ? 'false' : 'true');
+            _this9.setState({
+              foldersFirst: !_this9.state.foldersFirst
             });
-          },
-          open: true,
-          classes: {
-            root: _Utils["default"].clsx(this.props.classes.dialogColumns, this.props.classes['transparent_' + this.state.columnsDialogTransparent])
           }
-        }, /*#__PURE__*/_react["default"].createElement(_DialogTitle["default"], {
-          className: this.props.classes.fontSizeTitle
-        }, this.props.t('ra_Configure')), /*#__PURE__*/_react["default"].createElement(_DialogContent["default"], {
-          className: this.props.classes.fontSizeTitle
-        }, /*#__PURE__*/_react["default"].createElement(_FormControlLabel["default"], {
-          className: this.props.classes.switchColumnAuto,
-          control: /*#__PURE__*/_react["default"].createElement(_Switch["default"], {
-            checked: this.state.foldersFirst,
-            onChange: function onChange() {
-              (window._localStorage || window.localStorage).setItem((_this9.props.dialogName || 'App') + '.foldersFirst', _this9.state.foldersFirst ? 'false' : 'true');
-              _this9.setState({
-                foldersFirst: !_this9.state.foldersFirst
-              });
-            }
-          }),
-          label: this.props.t('ra_Folders always first')
-        }), /*#__PURE__*/_react["default"].createElement(_FormControlLabel["default"], {
-          className: this.props.classes.switchColumnAuto,
-          control: /*#__PURE__*/_react["default"].createElement(_Switch["default"], {
-            checked: this.state.linesEnabled,
-            onChange: function onChange() {
-              (window._localStorage || window.localStorage).setItem((_this9.props.dialogName || 'App') + '.lines', _this9.state.linesEnabled ? 'false' : 'true');
-              _this9.setState({
-                linesEnabled: !_this9.state.linesEnabled
-              });
-            }
-          }),
-          label: this.props.t('ra_Show lines between rows')
-        })), /*#__PURE__*/_react["default"].createElement(_DialogActions["default"], null, /*#__PURE__*/_react["default"].createElement(_Button["default"], {
-          variant: "contained",
-          onClick: function onClick() {
-            return _this9.setState({
-              columnsSelectorShow: false
+        }),
+        label: this.props.t('ra_Folders always first')
+      }), /*#__PURE__*/_react["default"].createElement(_FormControlLabel["default"], {
+        className: this.props.classes.switchColumnAuto,
+        control: /*#__PURE__*/_react["default"].createElement(_Switch["default"], {
+          checked: this.state.linesEnabled,
+          onChange: function onChange() {
+            (window._localStorage || window.localStorage).setItem("".concat(_this9.props.dialogName || 'App', ".lines"), _this9.state.linesEnabled ? 'false' : 'true');
+            _this9.setState({
+              linesEnabled: !_this9.state.linesEnabled
             });
-          },
-          color: "primary",
-          startIcon: /*#__PURE__*/_react["default"].createElement(_Close["default"], null)
-        }, this.texts['close'])));
-      }
+          }
+        }),
+        label: this.props.t('ra_Show lines between rows')
+      })), /*#__PURE__*/_react["default"].createElement(_DialogActions["default"], null, /*#__PURE__*/_react["default"].createElement(_Button["default"], {
+        variant: "contained",
+        onClick: function onClick() {
+          return _this9.setState({
+            columnsSelectorShow: false
+          });
+        },
+        color: "primary",
+        startIcon: /*#__PURE__*/_react["default"].createElement(_Close["default"], null)
+      }, this.texts.close)));
     }
 
     /**
@@ -3031,7 +3022,7 @@ var ObjectBrowser = /*#__PURE__*/function (_Component) {
           return columnsForAdmin = _this10.parseObjectForAdmins(columnsForAdmin, obj);
         });
         return columnsForAdmin;
-      })["catch"](function (e) {
+      })["catch"](function () {
         // window.alert('Cannot get adapters: ' + e);
         // Object browser in Web has no additional columns
       });
@@ -3066,7 +3057,7 @@ var ObjectBrowser = /*#__PURE__*/function (_Component) {
       if (!_root || !_parts.length) {
         return null;
       }
-      _partyId = (_partyId ? _partyId + '.' : '') + _parts.shift();
+      _partyId = (_partyId ? "".concat(_partyId, ".") : '') + _parts.shift();
       if (_root.children) {
         var item = _root.children.find(function (i) {
           return i.data.id === _partyId;
@@ -3074,15 +3065,15 @@ var ObjectBrowser = /*#__PURE__*/function (_Component) {
         if (item) {
           if (item.data.id === id) {
             return item;
-          } else if (_parts.length) {
+          }
+          if (_parts.length) {
             return this.findItem(id, _parts, item, _partyId);
           }
         } else {
           return null;
         }
-      } else {
-        return null;
       }
+      return null;
     }
 
     /**
@@ -3142,16 +3133,15 @@ var ObjectBrowser = /*#__PURE__*/function (_Component) {
           if (!item.path) {
             console.warn("Admin columns for ".concat(obj._id, " ignored, because path not found"));
             return null;
-          } else {
-            return {
-              path: item.path,
-              name: item.name[_this11.props.lang] || item.name.en,
-              width: item.width,
-              edit: !!item.edit,
-              type: item.type,
-              objTypes: item.objTypes
-            };
           }
+          return {
+            path: item.path,
+            name: item.name[_this11.props.lang] || item.name.en,
+            width: item.width,
+            edit: !!item.edit,
+            type: item.type,
+            objTypes: item.objTypes
+          };
         }).filter(function (item) {
           return item;
         });
@@ -3170,7 +3160,6 @@ var ObjectBrowser = /*#__PURE__*/function (_Component) {
     /**
      * @param {string} id
      * @param {ioBroker.Object} obj
-     * @param {import('./types').OldObject} oldObj
      */
   }, {
     key: "subscribe",
@@ -3239,12 +3228,12 @@ var ObjectBrowser = /*#__PURE__*/function (_Component) {
     value: function onFilter(name, value) {
       var _this13 = this;
       this.filterTimer = null;
-      var filter = {};
-      Object.keys(this.filterRefs).forEach(function (name) {
-        if (_this13.filterRefs[name] && _this13.filterRefs[name].current) {
-          for (var i = 0; i < _this13.filterRefs[name].current.children.length; i++) {
-            if (_this13.filterRefs[name].current.children[i].tagName === 'INPUT') {
-              filter[name] = _this13.filterRefs[name].current.children[i].value;
+      var filter = _objectSpread({}, this.state.filter);
+      Object.keys(this.filterRefs).forEach(function (_name) {
+        if (_this13.filterRefs[_name] && _this13.filterRefs[_name].current) {
+          for (var i = 0; i < _this13.filterRefs[_name].current.children.length; i++) {
+            if (_this13.filterRefs[_name].current.children[i].tagName === 'INPUT') {
+              filter[_name] = _this13.filterRefs[_name].current.children[i].value;
               break;
             }
           }
@@ -3256,9 +3245,8 @@ var ObjectBrowser = /*#__PURE__*/function (_Component) {
           (window._sessionStorage || window.sessionStorage).setItem('App.expertMode', value ? 'true' : 'false');
         }
       }
-      filter = Object.assign({}, this.state.filter, filter);
       if (JSON.stringify(this.state.filter) !== JSON.stringify(filter)) {
-        (window._localStorage || window.localStorage).setItem((this.props.dialogName || 'App') + '.objectFilter', JSON.stringify(filter));
+        (window._localStorage || window.localStorage).setItem("".concat(this.props.dialogName || 'App', ".objectFilter"), JSON.stringify(filter));
         this.setState({
           filter: filter
         }, function () {
@@ -3270,7 +3258,7 @@ var ObjectBrowser = /*#__PURE__*/function (_Component) {
     key: "clearFilter",
     value: function clearFilter() {
       var _this14 = this;
-      var filter = {};
+      var filter = _objectSpread({}, this.state.filter);
       Object.keys(this.filterRefs).forEach(function (name) {
         if (_this14.filterRefs[name] && _this14.filterRefs[name].current) {
           for (var i = 0; i < _this14.filterRefs[name].current.childNodes.length; i++) {
@@ -3283,9 +3271,8 @@ var ObjectBrowser = /*#__PURE__*/function (_Component) {
           }
         }
       });
-      filter = Object.assign({}, this.state.filter, filter);
       if (JSON.stringify(this.state.filter) !== JSON.stringify(filter)) {
-        (window._localStorage || window.localStorage).setItem((this.props.dialogName || 'App') + '.objectFilter', JSON.stringify(filter));
+        (window._localStorage || window.localStorage).setItem("".concat(this.props.dialogName || 'App', ".objectFilter"), JSON.stringify(filter));
         this.setState({
           filter: filter,
           filterKey: this.state.filterKey + 1
@@ -3316,8 +3303,8 @@ var ObjectBrowser = /*#__PURE__*/function (_Component) {
         _this$filterRefs$name2;
       return /*#__PURE__*/_react["default"].createElement(_FormControl["default"], {
         className: _Utils["default"].clsx(this.props.classes.headerCellInput, this.props.classes.filterInput),
-        key: name + '_' + this.state.filterKey
-        //style={{ marginTop: 0, marginBottom: 0 }}
+        key: "".concat(name, "_").concat(this.state.filterKey)
+        // style={{ marginTop: 0, marginBottom: 0 }}
         ,
         margin: "dense"
       }, /*#__PURE__*/_react["default"].createElement(_Input["default"], {
@@ -3326,7 +3313,7 @@ var ObjectBrowser = /*#__PURE__*/function (_Component) {
           underline: 'no-underline'
         },
         id: name,
-        placeholder: this.texts['filter_' + name],
+        placeholder: this.texts["filter_".concat(name)],
         defaultValue: this.state.filter[name],
         onChange: function onChange() {
           _this16.filterTimer && clearTimeout(_this16.filterTimer);
@@ -3370,9 +3357,9 @@ var ObjectBrowser = /*#__PURE__*/function (_Component) {
         }
       }, /*#__PURE__*/_react["default"].createElement(_Select["default"], {
         variant: "standard",
-        key: name + '_' + this.state.filterKey,
+        key: "".concat(name, "_").concat(this.state.filterKey),
         ref: this.filterRefs[name],
-        className: this.props.classes.headerCellInput + ' no-underline',
+        className: "".concat(this.props.classes.headerCellInput, " no-underline"),
         onChange: function onChange() {
           _this17.filterTimer && clearTimeout(_this17.filterTimer);
           _this17.filterTimer = setTimeout(function () {
@@ -3390,25 +3377,25 @@ var ObjectBrowser = /*#__PURE__*/function (_Component) {
         value: ""
       }, /*#__PURE__*/_react["default"].createElement("span", {
         className: this.props.classes.selectNone
-      }, this.texts['filter_' + name])), values.map(function (item) {
+      }, this.texts["filter_".concat(name)])), values.map(function (item) {
         var id;
-        var name;
+        var _name;
         var icon;
         if ((0, _typeof2["default"])(item) === 'object') {
           id = item.value;
-          name = item.name;
+          _name = item.name;
           icon = item.icon;
         } else {
           id = item;
-          name = item;
+          _name = item;
         }
         return /*#__PURE__*/_react["default"].createElement(_MenuItem["default"], {
           className: _this17.props.classes.headerCellSelectItem,
           key: id,
           value: id
-        }, icon ? icon : hasIcons ? /*#__PURE__*/_react["default"].createElement("div", {
+        }, icon || (hasIcons ? /*#__PURE__*/_react["default"].createElement("div", {
           className: "itemIcon"
-        }) : null, name);
+        }) : null), _name);
       })), (_this$filterRefs$name3 = this.filterRefs[name]) !== null && _this$filterRefs$name3 !== void 0 && (_this$filterRefs$name4 = _this$filterRefs$name3.current) !== null && _this$filterRefs$name4 !== void 0 && (_this$filterRefs$name5 = _this$filterRefs$name4.childNodes[1]) !== null && _this$filterRefs$name5 !== void 0 && _this$filterRefs$name5.value ? /*#__PURE__*/_react["default"].createElement("div", {
         className: _Utils["default"].clsx(this.props.classes.selectClearButton)
       }, /*#__PURE__*/_react["default"].createElement(_IconButton["default"], {
@@ -3417,7 +3404,7 @@ var ObjectBrowser = /*#__PURE__*/function (_Component) {
           var newFilter = _objectSpread({}, _this17.state.filter);
           newFilter[name] = '';
           _this17.filterRefs[name].current.childNodes[1].value = '';
-          (window._localStorage || window.localStorage).setItem((_this17.props.dialogName || 'App') + '.objectFilter', JSON.stringify(newFilter));
+          (window._localStorage || window.localStorage).setItem("".concat(_this17.props.dialogName || 'App', ".objectFilter"), JSON.stringify(newFilter));
           _this17.setState({
             filter: newFilter,
             filterKey: _this17.state.filterKey + 1
@@ -3514,9 +3501,8 @@ var ObjectBrowser = /*#__PURE__*/function (_Component) {
           };
         });
         return this.getFilterSelect('custom', customs);
-      } else {
-        return null;
       }
+      return null;
     }
 
     /**
@@ -3538,7 +3524,7 @@ var ObjectBrowser = /*#__PURE__*/function (_Component) {
       });
       if (root === this.root) {
         expanded.sort();
-        (window._localStorage || window.localStorage).setItem((this.props.dialogName || 'App') + '.objectExpanded', JSON.stringify(expanded));
+        (window._localStorage || window.localStorage).setItem("".concat(this.props.dialogName || 'App', ".objectExpanded"), JSON.stringify(expanded));
         this.setState({
           expanded: expanded
         });
@@ -3597,24 +3583,17 @@ var ObjectBrowser = /*#__PURE__*/function (_Component) {
      * @param {any[]} expanded
      */
   }, {
-    key: "collapseDepth",
-    value: function collapseDepth(depth, expanded) {
-      return expanded.filter(function (id) {
-        return id.split('.').length <= depth;
-      });
-    }
-
+    key: "onExpandVisible",
+    value:
     /**
      * @private
      */
-  }, {
-    key: "onExpandVisible",
-    value: function onExpandVisible() {
+    function onExpandVisible() {
       if (this.state.depth < 9) {
         var depth = this.state.depth + 1;
         var expanded = (0, _toConsumableArray2["default"])(this.state.expanded);
         this.expandDepth(this.root, depth, expanded);
-        (window._localStorage || window.localStorage).setItem((this.props.dialogName || 'App') + '.objectExpanded', JSON.stringify(expanded));
+        (window._localStorage || window.localStorage).setItem("".concat(this.props.dialogName || 'App', ".objectExpanded"), JSON.stringify(expanded));
         this.setState({
           depth: depth,
           expanded: expanded
@@ -3629,7 +3608,7 @@ var ObjectBrowser = /*#__PURE__*/function (_Component) {
     key: "onStatesViewVisible",
     value: function onStatesViewVisible() {
       var statesView = !this.state.statesView;
-      (window._localStorage || window.localStorage).setItem((this.props.dialogName || 'App') + '.objectStatesView', JSON.stringify(statesView));
+      (window._localStorage || window.localStorage).setItem("".concat(this.props.dialogName || 'App', ".objectStatesView"), JSON.stringify(statesView));
       this.setState({
         statesView: statesView
       });
@@ -3643,8 +3622,8 @@ var ObjectBrowser = /*#__PURE__*/function (_Component) {
     value: function onCollapseVisible() {
       if (this.state.depth > 0) {
         var depth = this.state.depth - 1;
-        var expanded = this.collapseDepth(depth, this.state.expanded);
-        (window._localStorage || window.localStorage).setItem((this.props.dialogName || 'App') + '.objectExpanded', JSON.stringify(expanded));
+        var expanded = ObjectBrowser.collapseDepth(depth, this.state.expanded);
+        (window._localStorage || window.localStorage).setItem("".concat(this.props.dialogName || 'App', ".objectExpanded"), JSON.stringify(expanded));
         this.setState({
           depth: depth,
           expanded: expanded
@@ -3664,7 +3643,7 @@ var ObjectBrowser = /*#__PURE__*/function (_Component) {
         var keys = Object.keys(this.objects);
         keys.sort();
         var id = this.state.selected[0] || this.state.selectedNonObject;
-        var idDot = id + '.';
+        var idDot = "".concat(id, ".");
         var idLen = idDot.length;
         for (var k = 0; k < keys.length; k++) {
           var key = keys[k];
@@ -3676,9 +3655,8 @@ var ObjectBrowser = /*#__PURE__*/function (_Component) {
           }
         }
         return result;
-      } else {
-        return [];
       }
+      return [];
     }
   }, {
     key: "_exportObjects",
@@ -3699,7 +3677,7 @@ var ObjectBrowser = /*#__PURE__*/function (_Component) {
             }
           }
         });
-        generateFile(id + '.json', result);
+        generateFile("".concat(id, ".json"), result);
       } else {
         window.alert(this.props.t('ra_Save of objects-tree is not possible'));
       }
@@ -3710,41 +3688,40 @@ var ObjectBrowser = /*#__PURE__*/function (_Component) {
       var _this25 = this;
       if (this.state.showExportDialog === false) {
         return null;
-      } else {
-        return /*#__PURE__*/_react["default"].createElement(_Dialog["default"], {
-          open: true
-        }, /*#__PURE__*/_react["default"].createElement(_DialogTitle["default"], null, this.props.t('Select type of export')), /*#__PURE__*/_react["default"].createElement(_DialogContent["default"], null, /*#__PURE__*/_react["default"].createElement(_DialogContentText["default"], null, this.props.t('You can export all objects or just the selected branch.'), /*#__PURE__*/_react["default"].createElement("br", null), this.props.t('Selected %s object(s)', this.state.showExportDialog))), /*#__PURE__*/_react["default"].createElement(_DialogActions["default"], null, /*#__PURE__*/_react["default"].createElement(_Button["default"], {
-          color: "grey",
-          variant: "outlined",
-          onClick: function onClick() {
-            return _this25.setState({
-              showExportDialog: false
-            }, function () {
-              return _this25._exportObjects(true);
-            });
-          }
-        }, this.props.t('ra_All objects')), /*#__PURE__*/_react["default"].createElement(_Button["default"], {
-          color: "primary",
-          variant: "contained",
-          autoFocus: true,
-          onClick: function onClick() {
-            return _this25.setState({
-              showExportDialog: false
-            }, function () {
-              return _this25._exportObjects(false);
-            });
-          }
-        }, this.props.t('ra_Only selected')), /*#__PURE__*/_react["default"].createElement(_Button["default"], {
-          color: "grey",
-          variant: "contained",
-          onClick: function onClick() {
-            return _this25.setState({
-              showExportDialog: false
-            });
-          },
-          startIcon: /*#__PURE__*/_react["default"].createElement(_Close["default"], null)
-        }, this.props.t('ra_Cancel'))));
       }
+      return /*#__PURE__*/_react["default"].createElement(_Dialog["default"], {
+        open: !0
+      }, /*#__PURE__*/_react["default"].createElement(_DialogTitle["default"], null, this.props.t('Select type of export')), /*#__PURE__*/_react["default"].createElement(_DialogContent["default"], null, /*#__PURE__*/_react["default"].createElement(_DialogContentText["default"], null, this.props.t('You can export all objects or just the selected branch.'), /*#__PURE__*/_react["default"].createElement("br", null), this.props.t('Selected %s object(s)', this.state.showExportDialog))), /*#__PURE__*/_react["default"].createElement(_DialogActions["default"], null, /*#__PURE__*/_react["default"].createElement(_Button["default"], {
+        color: "grey",
+        variant: "outlined",
+        onClick: function onClick() {
+          return _this25.setState({
+            showExportDialog: false
+          }, function () {
+            return _this25._exportObjects(true);
+          });
+        }
+      }, this.props.t('ra_All objects')), /*#__PURE__*/_react["default"].createElement(_Button["default"], {
+        color: "primary",
+        variant: "contained",
+        autoFocus: true,
+        onClick: function onClick() {
+          return _this25.setState({
+            showExportDialog: false
+          }, function () {
+            return _this25._exportObjects(false);
+          });
+        }
+      }, this.props.t('ra_Only selected')), /*#__PURE__*/_react["default"].createElement(_Button["default"], {
+        color: "grey",
+        variant: "contained",
+        onClick: function onClick() {
+          return _this25.setState({
+            showExportDialog: false
+          });
+        },
+        startIcon: /*#__PURE__*/_react["default"].createElement(_Close["default"], null)
+      }, this.props.t('ra_Cancel'))));
     }
 
     /**
@@ -3765,12 +3742,10 @@ var ObjectBrowser = /*#__PURE__*/function (_Component) {
         var id = this.state.selected[0] || this.state.selectedNonObject;
         if (id.split('.').length < 2 || this.objects[id] && this.objects[id].type === 'state') {
           allowObjectCreation = false;
-        } else {
-          if (this.state.filter.expertMode) {
-            allowObjectCreation = true;
-          } else if (id.startsWith('alias.0') || id.startsWith('0_userdata')) {
-            allowObjectCreation = true;
-          }
+        } else if (this.state.filter.expertMode) {
+          allowObjectCreation = true;
+        } else if (id.startsWith('alias.0') || id.startsWith('0_userdata')) {
+          allowObjectCreation = true;
         }
       }
       return /*#__PURE__*/_react["default"].createElement("div", {
@@ -3916,7 +3891,7 @@ var ObjectBrowser = /*#__PURE__*/function (_Component) {
           if (ids.length) {
             _this26.pauseSubscribe(true);
             if (ids.length === 1) {
-              (window._localStorage || window.localStorage).setItem((_this26.props.dialogName || 'App') + '.objectSelected', _this26.state.selected[0]);
+              (window._localStorage || window.localStorage).setItem("".concat(_this26.props.dialogName || 'App', ".objectSelected"), _this26.state.selected[0]);
               _this26.props.router && _this26.props.router.doNavigate(null, 'custom', _this26.state.selected[0]);
             }
             _this26.setState({
@@ -3947,7 +3922,7 @@ var ObjectBrowser = /*#__PURE__*/function (_Component) {
       } else {
         expanded.splice(pos, 1);
       }
-      (window._localStorage || window.localStorage).setItem((this.props.dialogName || 'App') + '.objectExpanded', JSON.stringify(expanded));
+      (window._localStorage || window.localStorage).setItem("".concat(this.props.dialogName || 'App', ".objectExpanded"), JSON.stringify(expanded));
       this.setState({
         expanded: expanded
       });
@@ -3963,7 +3938,7 @@ var ObjectBrowser = /*#__PURE__*/function (_Component) {
     value: function onCopy(e, text) {
       e.stopPropagation();
       e.preventDefault();
-      (0, _copyToClipboard["default"])(text);
+      (0, _copyToClipboard["default"])(text, null);
       if (text.length < 50) {
         this.setState({
           toast: this.props.t('ra_Copied %s', text)
@@ -3995,7 +3970,6 @@ var ObjectBrowser = /*#__PURE__*/function (_Component) {
           onClick: function onClick() {
             return _this27.setState({
               modalEditOfAccess: true,
-              modalEmptyId: id,
               modalEditOfAccessObjData: item.data
             });
           },
@@ -4029,7 +4003,7 @@ var ObjectBrowser = /*#__PURE__*/function (_Component) {
         size: "large"
       }, /*#__PURE__*/_react["default"].createElement("div", {
         className: classes.aclText
-      }, isNaN(Number(acl).toString(16)) ? Number(aclSystemConfig).toString(16) : Number(acl).toString(16)))) : /*#__PURE__*/_react["default"].createElement("div", {
+      }, Number.isNaN(Number(acl).toString(16)) ? Number(aclSystemConfig).toString(16) : Number(acl).toString(16)))) : /*#__PURE__*/_react["default"].createElement("div", {
         key: "aclEmpty",
         className: classes.cellButtonMinWidth
       }), /*#__PURE__*/_react["default"].createElement(_IconButton["default"], {
@@ -4065,7 +4039,7 @@ var ObjectBrowser = /*#__PURE__*/function (_Component) {
         "aria-label": "config",
         title: this.texts.customConfig,
         onClick: function onClick() {
-          (window._localStorage || window.localStorage).setItem((_this27.props.dialogName || 'App') + '.objectSelected', id);
+          (window._localStorage || window.localStorage).setItem("".concat(_this27.props.dialogName || 'App', ".objectSelected"), id);
           _this27.pauseSubscribe(true);
           _this27.props.router && _this27.props.router.doNavigate(null, 'customs', id);
           _this27.setState({
@@ -4084,7 +4058,7 @@ var ObjectBrowser = /*#__PURE__*/function (_Component) {
   }, {
     key: "readHistory",
     value: function readHistory(id) {
-      /*interface GetHistoryOptions {
+      /* interface GetHistoryOptions {
           instance?: string;
           start?: number;
           end?: number;
@@ -4098,7 +4072,7 @@ var ObjectBrowser = /*#__PURE__*/function (_Component) {
           ignoreNull?: boolean;
           sessionId?: any;
           aggregate?: 'minmax' | 'min' | 'max' | 'average' | 'total' | 'count' | 'none';
-      }*/
+      } */
       if (window.sparkline && this.defaultHistory && this.objects[id] && this.objects[id].common && this.objects[id].common.custom && this.objects[id].common.custom[this.defaultHistory]) {
         var now = new Date();
         now.setHours(now.getHours() - 24);
@@ -4126,7 +4100,7 @@ var ObjectBrowser = /*#__PURE__*/function (_Component) {
             }
           }
         })["catch"](function (e) {
-          return console.warn('Cannot read history: ' + e);
+          return console.warn("Cannot read history: ".concat(e));
         });
       }
     }
@@ -4151,7 +4125,8 @@ var ObjectBrowser = /*#__PURE__*/function (_Component) {
         return /*#__PURE__*/_react["default"].createElement("div", {
           className: _Utils["default"].clsx(classes.cellValueText, classes.cellValueFile)
         }, "[file]");
-      } else if (!this.states[id]) {
+      }
+      if (!this.states[id]) {
         if (obj.type === 'state') {
           !this.recordStates.includes(id) && this.recordStates.push(id);
           this.states[id] = {
@@ -4160,34 +4135,33 @@ var ObjectBrowser = /*#__PURE__*/function (_Component) {
           this.subscribe(id);
         }
         return null;
-      } else {
-        !this.recordStates.includes(id) && this.recordStates.push(id);
       }
+      !this.recordStates.includes(id) && this.recordStates.push(id);
       var state = this.states[id];
       var info = item.data.state;
       if (!info) {
-        info = item.data.state = item.data.state || formatValue(id, state, obj, this.texts, this.props.dateFormat, this.props.isFloatComma);
-        info.valFull = info.valFull.map(function (item) {
-          if (item.t === _this28.texts.quality && state.q) {
+        item.data.state = item.data.state || formatValue(id, state, obj, this.texts, this.props.dateFormat, this.props.isFloatComma);
+        info = item.data.state;
+        info.valFull = info.valFull.map(function (_item) {
+          if (_item.t === _this28.texts.quality && state.q) {
             return [/*#__PURE__*/_react["default"].createElement("div", {
               className: classes.cellValueTooltipBoth,
-              key: item.t
-            }, item.t, ": ", item.v),
-            //<div className={classes.cellValueTooltipValue} key={item.t + '_v'}>{item.v}</div>,
-            !item.nbr ? /*#__PURE__*/_react["default"].createElement("br", {
-              key: item.t + '_br'
-            }) : null];
-          } else {
-            return [/*#__PURE__*/_react["default"].createElement("div", {
-              className: classes.cellValueTooltipTitle,
-              key: item.t
-            }, item.t, ":"), /*#__PURE__*/_react["default"].createElement("div", {
-              className: classes.cellValueTooltipValue,
-              key: item.t + '_v'
-            }, item.v), !item.nbr ? /*#__PURE__*/_react["default"].createElement("br", {
-              key: item.t + '_br'
+              key: _item.t
+            }, _item.t, ":\xA0", _item.v),
+            // <div className={classes.cellValueTooltipValue} key={item.t + '_v'}>{item.v}</div>,
+            !_item.nbr ? /*#__PURE__*/_react["default"].createElement("br", {
+              key: "".concat(_item.t, "_br")
             }) : null];
           }
+          return [/*#__PURE__*/_react["default"].createElement("div", {
+            className: classes.cellValueTooltipTitle,
+            key: _item.t
+          }, _item.t, ":\xA0"), /*#__PURE__*/_react["default"].createElement("div", {
+            className: classes.cellValueTooltipValue,
+            key: "".concat(_item.t, "_v")
+          }, _item.v), !_item.nbr ? /*#__PURE__*/_react["default"].createElement("br", {
+            key: "".concat(_item.t, "_br")
+          }) : null];
         });
         if (this.defaultHistory && this.objects[id] && this.objects[id].common && this.objects[id].common.custom && this.objects[id].common.custom[this.defaultHistory]) {
           info.valFull.push( /*#__PURE__*/_react["default"].createElement("svg", {
@@ -4220,7 +4194,7 @@ var ObjectBrowser = /*#__PURE__*/function (_Component) {
           },
           key: "cc"
         })
-        //<IconEdit className={ Utils.clsx(classes.cellButtonsValueButton, 'copyButton', classes.cellButtonsValueButtonEdit) } key="ce" />
+        // <IconEdit className={ Utils.clsx(classes.cellButtonsValueButton, 'copyButton', classes.cellButtonsValueButtonEdit) } key="ce" />
         ];
       }
 
@@ -4253,49 +4227,49 @@ var ObjectBrowser = /*#__PURE__*/function (_Component) {
   }, {
     key: "_syncEnum",
     value: function _syncEnum(id, enumIds, newArray, cb) {
-      var _this29 = this;
+      var _this$info$objects$en,
+        _this29 = this;
       if (!enumIds || !enumIds.length) {
-        return cb && cb();
-      } else {
-        var _this$info$objects$en;
-        var enumId = enumIds.pop();
-        var promises = [];
-        if ((_this$info$objects$en = this.info.objects[enumId]) !== null && _this$info$objects$en !== void 0 && _this$info$objects$en.common) {
-          var _this$info$objects$en2, _this$info$objects$en3;
-          if ((_this$info$objects$en2 = this.info.objects[enumId].common.members) !== null && _this$info$objects$en2 !== void 0 && _this$info$objects$en2.length) {
-            var pos = this.info.objects[enumId].common.members.indexOf(id);
-            if (pos !== -1 && !newArray.includes(enumId)) {
-              // delete from members
-              var obj = JSON.parse(JSON.stringify(this.info.objects[enumId]));
-              obj.common.members.splice(pos, 1);
-              promises.push(this.props.socket.setObject(enumId, obj).then(function () {
-                return _this29.info.objects[enumId] = obj;
-              })["catch"](function (e) {
-                return _this29.showError(e);
-              }));
-            }
-          }
-
-          // add to it
-          if (newArray.includes(enumId) && !((_this$info$objects$en3 = this.info.objects[enumId].common.members) !== null && _this$info$objects$en3 !== void 0 && _this$info$objects$en3.includes(id))) {
-            // add to object
-            var _obj = JSON.parse(JSON.stringify(this.info.objects[enumId]));
-            _obj.common.members = _obj.common.members || [];
-            _obj.common.members.push(id);
-            _obj.common.members.sort();
-            promises.push(this.props.socket.setObject(enumId, _obj).then(function () {
-              return _this29.info.objects[enumId] = _obj;
+        cb && cb();
+        return;
+      }
+      var enumId = enumIds.pop();
+      var promises = [];
+      if ((_this$info$objects$en = this.info.objects[enumId]) !== null && _this$info$objects$en !== void 0 && _this$info$objects$en.common) {
+        var _this$info$objects$en2, _this$info$objects$en3;
+        if ((_this$info$objects$en2 = this.info.objects[enumId].common.members) !== null && _this$info$objects$en2 !== void 0 && _this$info$objects$en2.length) {
+          var pos = this.info.objects[enumId].common.members.indexOf(id);
+          if (pos !== -1 && !newArray.includes(enumId)) {
+            // delete from members
+            var obj = JSON.parse(JSON.stringify(this.info.objects[enumId]));
+            obj.common.members.splice(pos, 1);
+            promises.push(this.props.socket.setObject(enumId, obj).then(function () {
+              return _this29.info.objects[enumId] = obj;
             })["catch"](function (e) {
               return _this29.showError(e);
             }));
           }
         }
-        Promise.all(promises).then(function () {
-          return setTimeout(function () {
-            return _this29._syncEnum(id, enumIds, newArray, cb);
-          }, 0);
-        });
+
+        // add to it
+        if (newArray.includes(enumId) && !((_this$info$objects$en3 = this.info.objects[enumId].common.members) !== null && _this$info$objects$en3 !== void 0 && _this$info$objects$en3.includes(id))) {
+          // add to object
+          var _obj = JSON.parse(JSON.stringify(this.info.objects[enumId]));
+          _obj.common.members = _obj.common.members || [];
+          _obj.common.members.push(id);
+          _obj.common.members.sort();
+          promises.push(this.props.socket.setObject(enumId, _obj).then(function () {
+            return _this29.info.objects[enumId] = _obj;
+          })["catch"](function (e) {
+            return _this29.showError(e);
+          }));
+        }
       }
+      Promise.all(promises).then(function () {
+        return setTimeout(function () {
+          return _this29._syncEnum(id, enumIds, newArray, cb);
+        }, 0);
+      });
     }
 
     /**
@@ -4308,7 +4282,7 @@ var ObjectBrowser = /*#__PURE__*/function (_Component) {
       var _this30 = this;
       var toCheck = (0, _toConsumableArray2["default"])(this.info[enumName === 'func' ? 'funcEnums' : 'roomEnums']);
       return new Promise(function (resolve) {
-        return _this30._syncEnum(id, toCheck, newArray, function (error) {
+        _this30._syncEnum(id, toCheck, newArray, function (error) {
           error && _this30.showError(error);
           // force update of object
           resolve();
@@ -4336,14 +4310,14 @@ var ObjectBrowser = /*#__PURE__*/function (_Component) {
             icon: getSelectIdIcon(_this31.objects, id, _this31.imagePrefix)
           };
         });
-        enums.forEach(function (item) {
-          if (item.icon && typeof item.icon == 'string') {
-            item.icon = /*#__PURE__*/_react["default"].createElement("div", {
+        enums.forEach(function (_item) {
+          if (_item.icon && typeof _item.icon === 'string') {
+            _item.icon = /*#__PURE__*/_react["default"].createElement("div", {
               className: _this31.props.classes.enumIconDiv
             }, /*#__PURE__*/_react["default"].createElement("img", {
-              src: item.icon,
+              src: _item.icon,
               className: _this31.props.classes.enumIcon,
-              alt: item.name
+              alt: _item.name
             }));
           }
         });
@@ -4378,17 +4352,17 @@ var ObjectBrowser = /*#__PURE__*/function (_Component) {
           classes: {
             root: this.props.classes.enumList
           }
-        }, enums.map(function (item) {
+        }, enums.map(function (_item) {
           var id;
           var name;
           var icon;
-          if ((0, _typeof2["default"])(item) === 'object') {
-            id = item.value;
-            name = item.name;
-            icon = item.icon;
+          if ((0, _typeof2["default"])(_item) === 'object') {
+            id = _item.value;
+            name = _item.name;
+            icon = _item.icon;
           } else {
-            id = item;
-            name = item;
+            id = _item;
+            name = _item;
           }
           var labelId = "checkbox-list-label-".concat(id);
           return /*#__PURE__*/_react["default"].createElement(_ListItem["default"], {
@@ -4423,9 +4397,8 @@ var ObjectBrowser = /*#__PURE__*/function (_Component) {
             id: labelId
           }, name), icon ? /*#__PURE__*/_react["default"].createElement(_ListItemSecondaryAction["default"], null, icon) : null);
         })));
-      } else {
-        return null;
       }
+      return null;
     }
 
     /**
@@ -4453,9 +4426,8 @@ var ObjectBrowser = /*#__PURE__*/function (_Component) {
             });
           }
         });
-      } else {
-        return null;
       }
+      return null;
     }
 
     /**
@@ -4475,11 +4447,10 @@ var ObjectBrowser = /*#__PURE__*/function (_Component) {
         }
         this.customColumnDialog = null;
         this.props.socket.getObject(this.state.columnsEditCustomDialog.obj._id).then(function (obj) {
-          if (_this33.setCustomValue(obj, _this33.state.columnsEditCustomDialog.it, value)) {
+          if (ObjectBrowser.setCustomValue(obj, _this33.state.columnsEditCustomDialog.it, value)) {
             return _this33.props.socket.setObject(obj._id, obj);
-          } else {
-            throw new Error(_this33.props.t('ra_Cannot update attribute, because not found in the object'));
           }
+          throw new Error(_this33.props.t('ra_Cannot update attribute, because not found in the object'));
         }).then(function () {
           return _this33.setState({
             columnsEditCustomDialog: null
@@ -4504,7 +4475,7 @@ var ObjectBrowser = /*#__PURE__*/function (_Component) {
       var _this34 = this;
       if (this.state.columnsEditCustomDialog) {
         if (!this.customColumnDialog) {
-          var value = this.getCustomValue(this.state.columnsEditCustomDialog.obj, this.state.columnsEditCustomDialog.it);
+          var value = ObjectBrowser.getCustomValue(this.state.columnsEditCustomDialog.obj, this.state.columnsEditCustomDialog.it);
           this.customColumnDialog = {
             type: this.state.columnsEditCustomDialog.it.type || (0, _typeof2["default"])(value),
             initValue: (value === null || value === undefined ? '' : value).toString(),
@@ -4519,10 +4490,10 @@ var ObjectBrowser = /*#__PURE__*/function (_Component) {
           },
           maxWidth: "md",
           "aria-labelledby": "custom-dialog-title",
-          open: true
+          open: !0
         }, /*#__PURE__*/_react["default"].createElement(_DialogTitle["default"], {
           id: "custom-dialog-title"
-        }, this.props.t('ra_Edit object field') + ': ' + this.state.columnsEditCustomDialog.obj._id), /*#__PURE__*/_react["default"].createElement(_DialogContent["default"], null, /*#__PURE__*/_react["default"].createElement(_DialogContentText["default"], {
+        }, "".concat(this.props.t('ra_Edit object field'), ": ").concat(this.state.columnsEditCustomDialog.obj._id)), /*#__PURE__*/_react["default"].createElement(_DialogContent["default"], null, /*#__PURE__*/_react["default"].createElement(_DialogContentText["default"], {
           id: "alert-dialog-description"
         }, this.customColumnDialog.type === 'boolean' ? /*#__PURE__*/_react["default"].createElement(_FormControlLabel["default"], {
           control: /*#__PURE__*/_react["default"].createElement(_Checkbox["default"], {
@@ -4540,7 +4511,7 @@ var ObjectBrowser = /*#__PURE__*/function (_Component) {
               }
             }
           }),
-          label: this.state.columnsEditCustomDialog.it.name + ' (' + this.state.columnsEditCustomDialog.it.pathText + ')'
+          label: "".concat(this.state.columnsEditCustomDialog.it.name, " (").concat(this.state.columnsEditCustomDialog.it.pathText, ")")
         }) : /*#__PURE__*/_react["default"].createElement(_TextField["default"], {
           variant: "standard",
           defaultValue: this.customColumnDialog.value,
@@ -4575,88 +4546,18 @@ var ObjectBrowser = /*#__PURE__*/function (_Component) {
           },
           startIcon: /*#__PURE__*/_react["default"].createElement(_Close["default"], null)
         }, this.props.t('ra_Cancel'))));
-      } else {
-        return null;
-      }
-    }
-
-    /**
-     * @private
-     * @param {any} obj
-     * @param {any} it
-     */
-  }, {
-    key: "getCustomValue",
-    value: function getCustomValue(obj, it) {
-      if (obj && obj._id && obj._id.startsWith(it.adapter + '.') && it.path.length > 1) {
-        var p = it.path;
-        var value;
-        if (obj[p[0]] && (0, _typeof2["default"])(obj[p[0]]) === 'object') {
-          if (p.length === 2) {
-            // most common case
-            value = obj[p[0]][p[1]];
-          } else if (p.length === 3) {
-            value = obj[p[0]][p[1]] && (0, _typeof2["default"])(obj[p[0]][p[1]]) === 'object' ? obj[p[0]][p[1]][p[2]] : null;
-          } else if (p.length === 4) {
-            value = obj[p[0]][p[1]] && (0, _typeof2["default"])(obj[p[0]][p[1]]) === 'object' && obj[p[0]][p[1]][p[2]] ? obj[p[0]][p[1]][p[2]][p[3]] : null;
-          } else if (p.length === 5) {
-            value = obj[p[0]][p[1]] && (0, _typeof2["default"])(obj[p[0]][p[1]]) === 'object' && obj[p[0]][p[1]][p[2]] && obj[p[0]][p[1]][p[2]][p[3]] ? obj[p[0]][p[1]][p[2]][p[3]][p[4]] : null;
-          } else if (p.length === 6) {
-            value = obj[p[0]][p[1]] && (0, _typeof2["default"])(obj[p[0]][p[1]]) === 'object' && obj[p[0]][p[1]][p[2]] && obj[p[0]][p[1]][p[2]][p[3]] && obj[p[0]][p[1]][p[2]][p[3]][p[4]] ? obj[p[0]][p[1]][p[2]][p[3]][p[4]][p[5]] : null;
-          }
-          if (value === undefined || value === null) {
-            return null;
-          } else {
-            return value;
-          }
-        }
-      } else {
-        return null;
       }
+      return null;
     }
 
     /**
      * @private
      * @param {any} obj
      * @param {any} it
-     * @param {any} value
      */
   }, {
-    key: "setCustomValue",
-    value: function setCustomValue(obj, it, value) {
-      if (obj && obj._id && obj._id.startsWith(it.adapter + '.') && it.path.length > 1) {
-        var p = it.path;
-        if (obj[p[0]] && (0, _typeof2["default"])(obj[p[0]]) === 'object') {
-          if (p.length === 2) {
-            // most common case
-            obj[p[0]][p[1]] = value;
-            return true;
-          } else if (p.length === 3) {
-            if (obj[p[0]][p[1]] && (0, _typeof2["default"])(obj[p[0]][p[1]]) === 'object') {
-              obj[p[0]][p[1]][p[2]] = value;
-              return true;
-            }
-          } else if (p.length === 4) {
-            if (obj[p[0]][p[1]] && (0, _typeof2["default"])(obj[p[0]][p[1]]) === 'object' && obj[p[0]][p[1]][p[2]] && (0, _typeof2["default"])(obj[p[0]][p[1]][p[2]]) === 'object') {
-              obj[p[0]][p[1]][p[2]][p[3]] = value;
-              return true;
-            }
-          } else if (p.length === 5) {
-            if (obj[p[0]][p[1]] && (0, _typeof2["default"])(obj[p[0]][p[1]]) === 'object' && obj[p[0]][p[1]][p[2]] && (0, _typeof2["default"])(obj[p[0]][p[1]][p[2]]) === 'object' && obj[p[0]][p[1]][p[2]][p[3]] && (0, _typeof2["default"])(obj[p[0]][p[1]][p[2]][p[3]]) === 'object') {
-              obj[p[0]][p[1]][p[2]][p[3]][p[4]] = value;
-              return true;
-            }
-          } else if (p.length === 6) {
-            if (obj[p[0]][p[1]] && (0, _typeof2["default"])(obj[p[0]][p[1]]) === 'object' && obj[p[0]][p[1]][p[2]] && (0, _typeof2["default"])(obj[p[0]][p[1]][p[2]]) === 'object' && obj[p[0]][p[1]][p[2]][p[3]] && (0, _typeof2["default"])(obj[p[0]][p[1]][p[2]][p[3]]) === 'object' && obj[p[0]][p[1]][p[2]][p[3]][p[4]] && (0, _typeof2["default"])(obj[p[0]][p[1]][p[2]][p[3]][p[4]]) === 'object') {
-              obj[p[0]][p[1]][p[2]][p[3]][p[4]][p[5]] = value;
-              return true;
-            }
-          }
-        }
-      }
-      return false;
-    }
-
+    key: "renderCustomValue",
+    value:
     /**
      * Renders a custom value.
      * @param {any} obj
@@ -4664,15 +4565,13 @@ var ObjectBrowser = /*#__PURE__*/function (_Component) {
      * @param {any} item
      * @returns {JSX.Element | null}
      */
-  }, {
-    key: "renderCustomValue",
-    value: function renderCustomValue(obj, it, item) {
+    function renderCustomValue(obj, it, item) {
       var _this35 = this;
-      var text = this.getCustomValue(obj, it);
+      var text = ObjectBrowser.getCustomValue(obj, it);
       if (text !== null && text !== undefined) {
         if (it.edit && !this.props.notEditable && (!it.objTypes || it.objTypes.includes(obj.type))) {
           return /*#__PURE__*/_react["default"].createElement("div", {
-            className: _Utils["default"].clsx(this.props.classes.columnCustom, this.props.classes.columnCustomEditable, this.props.classes['columnCustom_' + it.align]),
+            className: _Utils["default"].clsx(this.props.classes.columnCustom, this.props.classes.columnCustomEditable, this.props.classes["columnCustom_".concat(it.align)]),
             onClick: function onClick() {
               return _this35.setState({
                 columnsEditCustomDialog: {
@@ -4684,14 +4583,12 @@ var ObjectBrowser = /*#__PURE__*/function (_Component) {
               });
             }
           }, text);
-        } else {
-          return /*#__PURE__*/_react["default"].createElement("div", {
-            className: _Utils["default"].clsx(this.props.classes.columnCustom, this.props.classes['columnCustom_' + it.align])
-          }, text);
         }
-      } else {
-        return null;
+        return /*#__PURE__*/_react["default"].createElement("div", {
+          className: _Utils["default"].clsx(this.props.classes.columnCustom, this.props.classes["columnCustom_".concat(it.align)])
+        }, text);
       }
+      return null;
     }
 
     /**
@@ -4734,16 +4631,14 @@ var ObjectBrowser = /*#__PURE__*/function (_Component) {
             return _this36.toggleExpanded(id);
           }
         });
+      } else if (obj.common && obj.common.write === false && obj.type === 'state') {
+        iconFolder = /*#__PURE__*/_react["default"].createElement(_IconDocumentReadOnly["default"], {
+          className: classes.cellIdIconDocument
+        });
       } else {
-        if (obj.common && obj.common.write === false && obj.type === 'state') {
-          iconFolder = /*#__PURE__*/_react["default"].createElement(_IconDocumentReadOnly["default"], {
-            className: classes.cellIdIconDocument
-          });
-        } else {
-          iconFolder = /*#__PURE__*/_react["default"].createElement(_IconDocument["default"], {
-            className: classes.cellIdIconDocument
-          });
-        }
+        iconFolder = /*#__PURE__*/_react["default"].createElement(_IconDocument["default"], {
+          className: classes.cellIdIconDocument
+        });
       }
       var iconItem = null;
       if (item.data.icon) {
@@ -4809,9 +4704,9 @@ var ObjectBrowser = /*#__PURE__*/function (_Component) {
         }
       }
       if (obj) {
-        obj.from && newValueTitle.push(this.texts.objectChangedFrom + ' ' + obj.from.replace(/^system\.adapter\.|^system\./, ''));
-        obj.user && newValueTitle.push(this.texts.objectChangedBy + ' ' + obj.user.replace(/^system\.user\./, ''));
-        obj.ts && newValueTitle.push(this.texts.objectChangedByUser + ' ' + _Utils["default"].formatDate(new Date(obj.ts), this.props.dateFormat));
+        obj.from && newValueTitle.push("".concat(this.texts.objectChangedFrom, " ").concat(obj.from.replace(/^system\.adapter\.|^system\./, '')));
+        obj.user && newValueTitle.push("".concat(this.texts.objectChangedBy, " ").concat(obj.user.replace(/^system\.user\./, '')));
+        obj.ts && newValueTitle.push("".concat(this.texts.objectChangedByUser, " ").concat(_Utils["default"].formatDate(new Date(obj.ts), this.props.dateFormat)));
       }
       var readWriteAlias = (0, _typeof2["default"])(common === null || common === void 0 ? void 0 : (_common$alias = common.alias) === null || _common$alias === void 0 ? void 0 : _common$alias.id) === 'object';
       var alias = id.startsWith('alias.') && common !== null && common !== void 0 && (_common$alias2 = common.alias) !== null && _common$alias2 !== void 0 && _common$alias2.id ? readWriteAlias ? /*#__PURE__*/_react["default"].createElement("div", {
@@ -4867,7 +4762,7 @@ var ObjectBrowser = /*#__PURE__*/function (_Component) {
         Object.keys(common.statusStates).forEach(function (name) {
           var _id = common.statusStates[name];
           if (_id.split('.').length < 3) {
-            _id = id + '.' + _id;
+            _id = "".concat(id, ".").concat(_id);
           }
           ids[name] = _id;
           if (!_this36.states[_id]) {
@@ -5038,7 +4933,7 @@ var ObjectBrowser = /*#__PURE__*/function (_Component) {
         style: {
           width: this.columnsVisibility.type
         }
-      }, typeImg, " ", obj && obj.type) : null, this.columnsVisibility.role ? /*#__PURE__*/_react["default"].createElement("div", {
+      }, typeImg, "\xA0", obj && obj.type) : null, this.columnsVisibility.role ? /*#__PURE__*/_react["default"].createElement("div", {
         className: classes.cellRole,
         style: {
           width: this.columnsVisibility.role,
@@ -5112,7 +5007,7 @@ var ObjectBrowser = /*#__PURE__*/function (_Component) {
             width: _this36.columnsVisibility[it.id]
           },
           key: it.id,
-          title: it.adapter + ' => ' + it.pathText
+          title: "".concat(it.adapter, " => ").concat(it.pathText)
         }, _this36.renderCustomValue(obj, it, item));
       }), this.columnsVisibility.val ? /*#__PURE__*/_react["default"].createElement("div", {
         className: classes.cellValue,
@@ -5122,29 +5017,28 @@ var ObjectBrowser = /*#__PURE__*/function (_Component) {
         },
         onClick: valueEditable ? function () {
           if (!obj || !_this36.states) {
-            return null;
-          }
-          if ((common === null || common === void 0 ? void 0 : common.type) === 'file') {
-            return _this36.setState({
+            // return;
+          } else if ((common === null || common === void 0 ? void 0 : common.type) === 'file') {
+            _this36.setState({
               viewFileDialog: id
             });
-          }
-
-          // in non-expert mode control button directly
-          if (!_this36.state.filter.expertMode && item.data.button) {
-            return _this36.props.socket.setState(id, true)["catch"](function (e) {
-              return window.alert("Cannot write state \"".concat(id, "\": ").concat(e));
-            });
-          }
-          _this36.edit = {
-            val: _this36.states[id] ? _this36.states[id].val : '',
-            q: _this36.states[id] ? _this36.states[id].q || 0 : 0,
-            ack: false,
-            id: id
-          };
-          _this36.setState({
-            updateOpened: true
-          });
+          } else
+            // in non-expert mode control button directly
+            if (!_this36.state.filter.expertMode && item.data.button) {
+              _this36.props.socket.setState(id, true)["catch"](function (e) {
+                return window.alert("Cannot write state \"".concat(id, "\": ").concat(e));
+              });
+            } else {
+              _this36.edit = {
+                val: _this36.states[id] ? _this36.states[id].val : '',
+                q: _this36.states[id] ? _this36.states[id].q || 0 : 0,
+                ack: false,
+                id: id
+              };
+              _this36.setState({
+                updateOpened: true
+              });
+            }
         } : undefined
       }, this.renderColumnValue(id, item, classes)) : null, this.columnsVisibility.buttons ? /*#__PURE__*/_react["default"].createElement("div", {
         className: classes.cellButtons,
@@ -5323,12 +5217,12 @@ var ObjectBrowser = /*#__PURE__*/function (_Component) {
         if (columnsForAdmin && columns) {
           Object.keys(columnsForAdmin).sort().forEach(function (adapter) {
             return columnsForAdmin[adapter].forEach(function (column) {
-              var id = '_' + adapter + '_' + column.path;
+              var id = "_".concat(adapter, "_").concat(column.path);
               _this38.columnsVisibility[id] = columns.includes(id);
               if (columns.includes(id)) {
                 var item = {
                   adapter: adapter,
-                  id: '_' + adapter + '_' + column.path,
+                  id: "_".concat(adapter, "_").concat(column.path),
                   name: column.name,
                   path: column.path.split('.'),
                   pathText: column.path
@@ -5369,9 +5263,8 @@ var ObjectBrowser = /*#__PURE__*/function (_Component) {
           var newWidth = Object.keys(this.columnsVisibility).reduce(function (accumulator, name) {
             if (name === 'id' || typeof _this38.columnsVisibility[name] === 'string' || !_this38.columnsVisibility[name]) {
               return accumulator;
-            } else {
-              return accumulator + _this38.columnsVisibility[name];
             }
+            return accumulator + _this38.columnsVisibility[name];
           }, 0);
           this.columnsVisibility.id = "calc(100% - ".concat(newWidth, "px)");
         }
@@ -5411,7 +5304,7 @@ var ObjectBrowser = /*#__PURE__*/function (_Component) {
         "data-min": 240,
         "data-name": "id"
       }, this.getFilterInput('id'), /*#__PURE__*/_react["default"].createElement("div", {
-        className: this.props.classes.resizeHandle + ' ' + this.props.classes.resizeHandleRight,
+        className: "".concat(this.props.classes.resizeHandle, " ").concat(this.props.classes.resizeHandleRight),
         onMouseDown: this.resizerMouseDown,
         onDoubleClick: this.resizerReset,
         title: this.props.t('ra_Double click to reset table layout')
@@ -5498,7 +5391,7 @@ var ObjectBrowser = /*#__PURE__*/function (_Component) {
         "data-min": 120,
         "data-name": "val"
       }, /*#__PURE__*/_react["default"].createElement("div", {
-        className: this.props.classes.resizeHandle + ' ' + this.props.classes.resizeHandleLeft,
+        className: "".concat(this.props.classes.resizeHandle, " ").concat(this.props.classes.resizeHandleLeft),
         "data-left": "true",
         onMouseDown: this.resizerMouseDown,
         onDoubleClick: this.resizerReset,
@@ -5508,7 +5401,7 @@ var ObjectBrowser = /*#__PURE__*/function (_Component) {
         style: {
           width: this.columnsVisibility.buttons
         }
-      }, " ", this.getFilterSelectCustoms()) : null);
+      }, ' ', this.getFilterSelectCustoms()) : null);
     }
 
     /**
@@ -5533,7 +5426,7 @@ var ObjectBrowser = /*#__PURE__*/function (_Component) {
           });
         },
         message: this.state.toast,
-        action: /*#__PURE__*/_react["default"].createElement(_react["default"].Fragment, null, /*#__PURE__*/_react["default"].createElement(_IconButton["default"], {
+        action: /*#__PURE__*/_react["default"].createElement(_IconButton["default"], {
           size: "small",
           "aria-label": "close",
           color: "inherit",
@@ -5544,7 +5437,7 @@ var ObjectBrowser = /*#__PURE__*/function (_Component) {
           }
         }, /*#__PURE__*/_react["default"].createElement(_Close["default"], {
           fontSize: "small"
-        })))
+        }))
       });
     }
 
@@ -5563,10 +5456,8 @@ var ObjectBrowser = /*#__PURE__*/function (_Component) {
               scrollBarWidth: scrollBarWidth
             });
           }, 100);
-        } else {
-          if (!this.selectedFound && (this.state.selected && this.state.selected[0] || this.lastSelectedItems)) {
-            this.scrollToItem(this.state.selected && this.state.selected[0] || this.lastSelectedItems);
-          }
+        } else if (!this.selectedFound && (this.state.selected && this.state.selected[0] || this.lastSelectedItems)) {
+          this.scrollToItem(this.state.selected && this.state.selected[0] || this.lastSelectedItems);
         }
       }
     }
@@ -5620,9 +5511,8 @@ var ObjectBrowser = /*#__PURE__*/function (_Component) {
             _this42.props.router && _this42.props.router.doNavigate('tab-objects');
           }
         });
-      } else {
-        return null;
       }
+      return null;
     }
 
     /**
@@ -5639,7 +5529,7 @@ var ObjectBrowser = /*#__PURE__*/function (_Component) {
         q: valAck.q || 0,
         expire: valAck.expire || undefined
       })["catch"](function (e) {
-        return _this43.showError('Cannot write value: ' + e);
+        return _this43.showError("Cannot write value: ".concat(e));
       });
     }
 
@@ -5746,7 +5636,7 @@ var ObjectBrowser = /*#__PURE__*/function (_Component) {
         return null;
       }
       if (!this.edit.id) {
-        console.error('Invalid ID for edit: ' + JSON.stringify(this.edit));
+        console.error("Invalid ID for edit: ".concat(JSON.stringify(this.edit)));
         return null;
       }
       if (!this.objects[this.edit.id]) {
@@ -5815,18 +5705,20 @@ var ObjectBrowser = /*#__PURE__*/function (_Component) {
       }, 200);
       if (!this.state.loaded) {
         return /*#__PURE__*/_react["default"].createElement(_CircularProgress["default"], {
-          key: this.props.dialogName + '_c'
+          key: "".concat(this.props.dialogName, "_c")
         });
-      } else {
-        var classes = this.props.classes;
-        var items = this.renderItem(this.root, undefined, classes);
-        return /*#__PURE__*/_react["default"].createElement(_TabContainer["default"], {
-          key: this.props.dialogName
-        }, /*#__PURE__*/_react["default"].createElement(_TabHeader["default"], null, this.getToolbar()), /*#__PURE__*/_react["default"].createElement(_TabContent["default"], null, this.renderHeader(), /*#__PURE__*/_react["default"].createElement("div", {
-          className: this.props.classes.tableDiv,
-          ref: this.tableRef
-        }, items)), this.renderToast(), this.renderColumnsEditCustomDialog(), this.renderColumnsSelectorDialog(), this.renderCustomDialog(), this.renderEditValueDialog(), this.renderEditObjectDialog(), this.renderViewObjectFileDialog(), this.renderEditRoleDialog(), this.renderEnumDialog(), this.renderErrorDialog(), this.renderExportDialog(), this.state.modalNewObj && this.props.modalNewObject && this.props.modalNewObject(this), this.state.modalEditOfAccess && this.props.modalEditOfAccessControl && this.props.modalEditOfAccessControl(this, this.state.modalEditOfAccessObjData));
       }
+      var classes = this.props.classes;
+      var items = this.renderItem(this.root, undefined, classes);
+      return /*#__PURE__*/_react["default"].createElement(_TabContainer["default"], {
+        key: this.props.dialogName,
+        classes: {}
+      }, /*#__PURE__*/_react["default"].createElement(_TabHeader["default"], null, this.getToolbar()), /*#__PURE__*/_react["default"].createElement(_TabContent["default"], {
+        classes: {}
+      }, this.renderHeader(), /*#__PURE__*/_react["default"].createElement("div", {
+        className: this.props.classes.tableDiv,
+        ref: this.tableRef
+      }, items)), this.renderToast(), this.renderColumnsEditCustomDialog(), this.renderColumnsSelectorDialog(), this.renderCustomDialog(), this.renderEditValueDialog(), this.renderEditObjectDialog(), this.renderViewObjectFileDialog(), this.renderEditRoleDialog(), this.renderEnumDialog(), this.renderErrorDialog(), this.renderExportDialog(), this.state.modalNewObj && this.props.modalNewObject && this.props.modalNewObject(this), this.state.modalEditOfAccess && this.props.modalEditOfAccessControl && this.props.modalEditOfAccessControl(this, this.state.modalEditOfAccessObjData));
     }
   }], [{
     key: "getDerivedStateFromProps",
@@ -5835,11 +5727,88 @@ var ObjectBrowser = /*#__PURE__*/function (_Component) {
       var changed = false;
       if (props.expertMode !== undefined && props.expertMode !== state.filter.expertMode) {
         changed = true;
-        newState.filter = Object.assign({}, state.filter);
+        newState.filter = _objectSpread({}, state.filter);
         newState.filter.expertMode = props.expertMode;
       }
       return changed ? newState : null;
     }
+  }, {
+    key: "collapseDepth",
+    value: function collapseDepth(depth, expanded) {
+      return expanded.filter(function (id) {
+        return id.split('.').length <= depth;
+      });
+    }
+  }, {
+    key: "getCustomValue",
+    value: function getCustomValue(obj, it) {
+      if (obj && obj._id && obj._id.startsWith("".concat(it.adapter, ".")) && it.path.length > 1) {
+        var p = it.path;
+        var value;
+        if (obj[p[0]] && (0, _typeof2["default"])(obj[p[0]]) === 'object') {
+          if (p.length === 2) {
+            // most common case
+            value = obj[p[0]][p[1]];
+          } else if (p.length === 3) {
+            value = obj[p[0]][p[1]] && (0, _typeof2["default"])(obj[p[0]][p[1]]) === 'object' ? obj[p[0]][p[1]][p[2]] : null;
+          } else if (p.length === 4) {
+            value = obj[p[0]][p[1]] && (0, _typeof2["default"])(obj[p[0]][p[1]]) === 'object' && obj[p[0]][p[1]][p[2]] ? obj[p[0]][p[1]][p[2]][p[3]] : null;
+          } else if (p.length === 5) {
+            value = obj[p[0]][p[1]] && (0, _typeof2["default"])(obj[p[0]][p[1]]) === 'object' && obj[p[0]][p[1]][p[2]] && obj[p[0]][p[1]][p[2]][p[3]] ? obj[p[0]][p[1]][p[2]][p[3]][p[4]] : null;
+          } else if (p.length === 6) {
+            value = obj[p[0]][p[1]] && (0, _typeof2["default"])(obj[p[0]][p[1]]) === 'object' && obj[p[0]][p[1]][p[2]] && obj[p[0]][p[1]][p[2]][p[3]] && obj[p[0]][p[1]][p[2]][p[3]][p[4]] ? obj[p[0]][p[1]][p[2]][p[3]][p[4]][p[5]] : null;
+          }
+          if (value === undefined || value === null) {
+            return null;
+          }
+          return value;
+        }
+      }
+      return null;
+    }
+
+    /**
+     * @private
+     * @param {any} obj
+     * @param {any} it
+     * @param {any} value
+     */
+  }, {
+    key: "setCustomValue",
+    value: function setCustomValue(obj, it, value) {
+      if (obj && obj._id && obj._id.startsWith("".concat(it.adapter, ".")) && it.path.length > 1) {
+        var p = it.path;
+        if (obj[p[0]] && (0, _typeof2["default"])(obj[p[0]]) === 'object') {
+          if (p.length === 2) {
+            // most common case
+            obj[p[0]][p[1]] = value;
+            return true;
+          }
+          if (p.length === 3) {
+            if (obj[p[0]][p[1]] && (0, _typeof2["default"])(obj[p[0]][p[1]]) === 'object') {
+              obj[p[0]][p[1]][p[2]] = value;
+              return true;
+            }
+          } else if (p.length === 4) {
+            if (obj[p[0]][p[1]] && (0, _typeof2["default"])(obj[p[0]][p[1]]) === 'object' && obj[p[0]][p[1]][p[2]] && (0, _typeof2["default"])(obj[p[0]][p[1]][p[2]]) === 'object') {
+              obj[p[0]][p[1]][p[2]][p[3]] = value;
+              return true;
+            }
+          } else if (p.length === 5) {
+            if (obj[p[0]][p[1]] && (0, _typeof2["default"])(obj[p[0]][p[1]]) === 'object' && obj[p[0]][p[1]][p[2]] && (0, _typeof2["default"])(obj[p[0]][p[1]][p[2]]) === 'object' && obj[p[0]][p[1]][p[2]][p[3]] && (0, _typeof2["default"])(obj[p[0]][p[1]][p[2]][p[3]]) === 'object') {
+              obj[p[0]][p[1]][p[2]][p[3]][p[4]] = value;
+              return true;
+            }
+          } else if (p.length === 6) {
+            if (obj[p[0]][p[1]] && (0, _typeof2["default"])(obj[p[0]][p[1]]) === 'object' && obj[p[0]][p[1]][p[2]] && (0, _typeof2["default"])(obj[p[0]][p[1]][p[2]]) === 'object' && obj[p[0]][p[1]][p[2]][p[3]] && (0, _typeof2["default"])(obj[p[0]][p[1]][p[2]][p[3]]) === 'object' && obj[p[0]][p[1]][p[2]][p[3]][p[4]] && (0, _typeof2["default"])(obj[p[0]][p[1]][p[2]][p[3]][p[4]]) === 'object') {
+              obj[p[0]][p[1]][p[2]][p[3]][p[4]][p[5]] = value;
+              return true;
+            }
+          }
+        }
+      }
+      return false;
+    }
   }]);
   return ObjectBrowser;
 }(_react.Component);
@@ -5887,11 +5856,11 @@ ObjectBrowser.propTypes = {
   objectImportExport: _propTypes["default"].bool,
   // optional toolbar button
   objectEditOfAccessControl: _propTypes["default"].bool,
-  //Access Control
+  // Access Control
   modalNewObject: _propTypes["default"].func,
   // modal add object
   modalEditOfAccessControl: _propTypes["default"].func,
-  //modal Edit Of Access Control
+  // modal Edit Of Access Control
   onObjectDelete: _propTypes["default"].func,
   // optional function (id, hasChildren, objectExists) {  }
   customFilter: _propTypes["default"].object,