@iobroker/adapter-react-v5 4.6.2 → 4.6.3

package/Components/ObjectBrowser.js

@@ -16,6 +16,7 @@ var _inherits2 = _interopRequireDefault(require("@babel/runtime/helpers/inherits
 var _possibleConstructorReturn2 = _interopRequireDefault(require("@babel/runtime/helpers/possibleConstructorReturn"));
 var _getPrototypeOf2 = _interopRequireDefault(require("@babel/runtime/helpers/getPrototypeOf"));
 var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
+var _classPrivateFieldGet2 = _interopRequireDefault(require("@babel/runtime/helpers/classPrivateFieldGet"));
 var _typeof2 = _interopRequireDefault(require("@babel/runtime/helpers/typeof"));
 var _react = _interopRequireWildcard(require("react"));
 var _propTypes = _interopRequireDefault(require("prop-types"));
@@ -47,12 +48,17 @@ function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj &&
 function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
 function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { (0, _defineProperty2["default"])(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
 function _createSuper(Derived) { var hasNativeReflectConstruct = _isNativeReflectConstruct(); return function _createSuperInternal() { var Super = (0, _getPrototypeOf2["default"])(Derived), result; if (hasNativeReflectConstruct) { var NewTarget = (0, _getPrototypeOf2["default"])(this).constructor; result = Reflect.construct(Super, arguments, NewTarget); } else { result = Super.apply(this, arguments); } return (0, _possibleConstructorReturn2["default"])(this, result); }; }
-function _isNativeReflectConstruct() { if (typeof Reflect === "undefined" || !Reflect.construct) return false; if (Reflect.construct.sham) return false; if (typeof Proxy === "function") return true; try { Boolean.prototype.valueOf.call(Reflect.construct(Boolean, [], function () {})); return true; } catch (e) { return false; } } /**
-                                                                                                                                                                                                                                                                                                                                           * Copyright 2020-2023, Denis Haev <dogafox@gmail.com>
-                                                                                                                                                                                                                                                                                                                                           *
-                                                                                                                                                                                                                                                                                                                                           * MIT License
-                                                                                                                                                                                                                                                                                                                                           *
-                                                                                                                                                                                                                                                                                                                                           **/ // Icons
+function _isNativeReflectConstruct() { if (typeof Reflect === "undefined" || !Reflect.construct) return false; if (Reflect.construct.sham) return false; if (typeof Proxy === "function") return true; try { Boolean.prototype.valueOf.call(Reflect.construct(Boolean, [], function () {})); return true; } catch (e) { return false; } }
+function _classPrivateFieldInitSpec(obj, privateMap, value) { _checkPrivateRedeclaration(obj, privateMap); privateMap.set(obj, value); }
+function _checkPrivateRedeclaration(obj, privateCollection) { if (privateCollection.has(obj)) { throw new TypeError("Cannot initialize the same private elements twice on an object"); } }
+function _createForOfIteratorHelper(o, allowArrayLike) { var it = typeof Symbol !== "undefined" && o[Symbol.iterator] || o["@@iterator"]; if (!it) { if (Array.isArray(o) || (it = _unsupportedIterableToArray(o)) || allowArrayLike && o && typeof o.length === "number") { if (it) o = it; var i = 0; var F = function F() {}; return { s: F, n: function n() { if (i >= o.length) return { done: true }; return { done: false, value: o[i++] }; }, e: function e(_e) { throw _e; }, f: F }; } throw new TypeError("Invalid attempt to iterate non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); } var normalCompletion = true, didErr = false, err; return { s: function s() { it = it.call(o); }, n: function n() { var step = it.next(); normalCompletion = step.done; return step; }, e: function e(_e2) { didErr = true; err = _e2; }, f: function f() { try { if (!normalCompletion && it["return"] != null) it["return"](); } finally { if (didErr) throw err; } } }; }
+function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o === "string") return _arrayLikeToArray(o, minLen); var n = Object.prototype.toString.call(o).slice(8, -1); if (n === "Object" && o.constructor) n = o.constructor.name; if (n === "Map" || n === "Set") return Array.from(o); if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray(o, minLen); }
+function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len = arr.length; for (var i = 0, arr2 = new Array(len); i < len; i++) arr2[i] = arr[i]; return arr2; } /**
+                                                                                                                                                                                     * Copyright 2020-2023, Denis Haev <dogafox@gmail.com>
+                                                                                                                                                                                     *
+                                                                                                                                                                                     * MIT License
+                                                                                                                                                                                     *
+                                                                                                                                                                                     **/ // Icons
 // own
 var ICON_SIZE = 24;
 var ROW_HEIGHT = 32;
@@ -1230,7 +1236,7 @@ function buildTree(objects, options) {
 
       // 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;
+        var _obj$common, _obj$common2, _obj$common3, _obj$common4;
         // if more than one level added
         if (parts.length - currentPathLen > 1) {
           var curPath = currentPath;
@@ -1267,15 +1273,15 @@ function buildTree(objects, options) {
         var _croot = {
           data: {
             name: parts[parts.length - 1],
-            title: getName(obj && obj.common && obj.common.name, options.lang),
+            title: getName(obj === null || obj === void 0 || (_obj$common = obj.common) === null || _obj$common === void 0 ? void 0 : _obj$common.name, options.lang),
             obj: obj,
             parent: croot,
             icon: getSelectIdIcon(objects, id, imagePrefix) || getSystemIcon(objects, id, 0, imagePrefix),
             id: id,
-            hasCustoms: ((_obj$common = obj.common) === null || _obj$common === void 0 ? void 0 : _obj$common.custom) && Object.keys(obj.common.custom).length,
+            hasCustoms: ((_obj$common2 = obj.common) === null || _obj$common2 === void 0 ? void 0 : _obj$common2.custom) && Object.keys(obj.common.custom).length,
             level: parts.length - 1,
             generated: false,
-            button: obj.type === 'state' && ((_obj$common2 = obj.common) === null || _obj$common2 === void 0 ? void 0 : _obj$common2.role) && typeof obj.common.role === 'string' && obj.common.role.startsWith('button') && ((_obj$common3 = obj.common) === null || _obj$common3 === void 0 ? void 0 : _obj$common3.write) !== false
+            button: obj.type === 'state' && ((_obj$common3 = obj.common) === null || _obj$common3 === void 0 ? void 0 : _obj$common3.role) && typeof obj.common.role === 'string' && obj.common.role.startsWith('button') && ((_obj$common4 = obj.common) === null || _obj$common4 === void 0 ? void 0 : _obj$common4.write) !== false
           }
         };
         croot.children = croot.children || [];
@@ -1377,20 +1383,32 @@ function findRoomsForObject(data, id, lang, withParentInfo, rooms) {
     };
   }
   rooms = rooms || [];
-  for (var i = 0; i < data.roomEnums.length; i++) {
-    var _data$objects$data$ro, _common$members;
-    var common = (_data$objects$data$ro = data.objects[data.roomEnums[i]]) === null || _data$objects$data$ro === void 0 ? void 0 : _data$objects$data$ro.common;
-    var name = getName(common.name, lang);
-    if (common !== null && common !== void 0 && (_common$members = common.members) !== null && _common$members !== void 0 && _common$members.includes(id) && !rooms.includes(name)) {
-      if (!withParentInfo) {
-        rooms.push(name);
-      } else {
-        rooms.push({
-          name: name,
-          origin: id
-        });
+  var _iterator = _createForOfIteratorHelper(data.roomEnums),
+    _step;
+  try {
+    for (_iterator.s(); !(_step = _iterator.n()).done;) {
+      var _data$objects$room, _common$members;
+      var room = _step.value;
+      var common = (_data$objects$room = data.objects[room]) === null || _data$objects$room === void 0 ? void 0 : _data$objects$room.common;
+      if (!common) {
+        continue;
+      }
+      var name = getName(common.name, lang);
+      if ((_common$members = common.members) !== null && _common$members !== void 0 && _common$members.includes(id) && !rooms.includes(name)) {
+        if (!withParentInfo) {
+          rooms.push(name);
+        } else {
+          rooms.push({
+            name: name,
+            origin: id
+          });
+        }
       }
     }
+  } catch (err) {
+    _iterator.e(err);
+  } finally {
+    _iterator.f();
   }
   var ownEnums;
 
@@ -1434,8 +1452,11 @@ function findFunctionsForObject(data, id, lang, withParentInfo, funcs) {
   for (var i = 0; i < data.funcEnums.length; i++) {
     var _data$objects$data$fu, _common$members3;
     var common = (_data$objects$data$fu = data.objects[data.funcEnums[i]]) === null || _data$objects$data$fu === void 0 ? void 0 : _data$objects$data$fu.common;
+    if (!common) {
+      continue;
+    }
     var name = getName(common.name, lang);
-    if (common !== null && common !== void 0 && (_common$members3 = common.members) !== null && _common$members3 !== void 0 && _common$members3.includes(id) && !funcs.includes(name)) {
+    if ((_common$members3 = common.members) !== null && _common$members3 !== void 0 && _common$members3.includes(id) && !funcs.includes(name)) {
       if (!withParentInfo) {
         funcs.push(name);
       } else {
@@ -1500,16 +1521,24 @@ function formatValue(options) {
   var type = (0, _typeof2["default"])(v);
   if (isCommon !== null && isCommon !== void 0 && isCommon.role && typeof isCommon.role === 'string' && isCommon.role.match(/^value\.time|^date/)) {
     if (v && typeof v === 'string') {
-      if (v.length === 13) {
-        // (length of "1647597254924") warning, this solution only works till Nov 20 2286 18:46:39CET
+      if (_Utils["default"].isStringInteger(v)) {
+        // we assume a unix ts
         v = new Date(parseInt(v, 10)).toString();
       } else {
-        // we don't know what is that, so leave it as it is
+        // check if parsable by new date
+        try {
+          var parsedDate = new Date(v);
+          if (_Utils["default"].isValidDate(parsedDate)) {
+            v = parsedDate.toString();
+          }
+        } catch (_unused) {
+          // ignore
+        }
       }
     } else {
       if (v > 946681200 && v < 946681200000) {
         // '2000-01-01T00:00:00' => 946681200000
-        v *= 1000; // may be the time is in seconds (UNIX time)
+        v *= 1000; // maybe the time is in seconds (UNIX time)
       }
       // null and undefined could not be here. See `let v = (isCommon && isCommon.type === 'file') ....` above
       v = v ? new Date(v).toString() : v;
@@ -1796,6 +1825,7 @@ var objectsAlreadyLoaded = false;
 /**
  * @extends {React.Component<import('./types').ObjectBrowserProps>}
  */
+var _NON_EXPERT_NAMESPACES = /*#__PURE__*/new WeakMap();
 var ObjectBrowser = /*#__PURE__*/function (_Component) {
   (0, _inherits2["default"])(ObjectBrowser, _Component);
   var _super = _createSuper(ObjectBrowser);
@@ -1806,6 +1836,14 @@ var ObjectBrowser = /*#__PURE__*/function (_Component) {
     var _this;
     (0, _classCallCheck2["default"])(this, ObjectBrowser);
     _this = _super.call(this, props);
+    /**
+     * Namespaces which are allowed to be edited by non-expert users
+     * @type {string[]}
+     */
+    _classPrivateFieldInitSpec((0, _assertThisInitialized2["default"])(_this), _NON_EXPERT_NAMESPACES, {
+      writable: true,
+      value: ['0_userdata.0.', 'alias.0.']
+    });
     /**
      * Context menu handler.
      */
@@ -2020,18 +2058,18 @@ var ObjectBrowser = /*#__PURE__*/function (_Component) {
      */
     (0, _defineProperty2["default"])((0, _assertThisInitialized2["default"])(_this), "loadObjects", /*#__PURE__*/function () {
       var _ref2 = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee2(objs) {
-        var id, obj, enums, state;
+        var id, obj, enums, val, ack, state;
         return _regenerator["default"].wrap(function _callee2$(_context2) {
           while (1) switch (_context2.prev = _context2.next) {
             case 0:
               if (!objs) {
-                _context2.next = 42;
+                _context2.next = 57;
                 break;
               }
               _context2.t0 = _regenerator["default"].keys(objs);
             case 2:
               if ((_context2.t1 = _context2.t0()).done) {
-                _context2.next = 42;
+                _context2.next = 57;
                 break;
               }
               id = _context2.t1.value;
@@ -2043,69 +2081,103 @@ var ObjectBrowser = /*#__PURE__*/function (_Component) {
             case 6:
               obj = objs[id];
               enums = null;
+              val = void 0;
+              ack = void 0;
               if (obj && obj.common && obj.common.enums) {
                 enums = obj.common.enums;
                 delete obj.common.enums;
               } else {
                 enums = null;
               }
-              _context2.prev = 9;
-              _context2.next = 12;
+              if (obj.val) {
+                val = obj.val;
+                try {
+                  val = JSON.parse(val);
+                } catch (e) {
+                  console.log("Cannot parse value: ".concat(e));
+                  val = null;
+                }
+                delete obj.val;
+              }
+              if (obj.ack !== undefined) {
+                ack = obj.ack;
+                delete obj.ack;
+              }
+              _context2.prev = 13;
+              _context2.next = 16;
               return _this.props.socket.setObject(id, obj);
-            case 12:
+            case 16:
               _context2.t2 = enums;
               if (!_context2.t2) {
-                _context2.next = 16;
+                _context2.next = 20;
                 break;
               }
-              _context2.next = 16;
+              _context2.next = 20;
               return _this._createAllEnums(enums, obj._id);
-            case 16:
+            case 20:
               if (!(obj.type === 'state')) {
-                _context2.next = 35;
+                _context2.next = 50;
                 break;
               }
-              _context2.prev = 17;
-              _context2.next = 20;
-              return _this.props.socket.getState(obj._id);
-            case 20:
-              state = _context2.sent;
-              if (!(!state || state.val === null)) {
-                _context2.next = 30;
+              if (!(val !== undefined && val !== null)) {
+                _context2.next = 32;
                 break;
               }
               _context2.prev = 22;
               _context2.next = 25;
-              return _this.props.socket.setState(obj._id, !obj.common || obj.common.def === undefined ? null : obj.common.def, true);
+              return _this.props.socket.setState(obj._id, val, ack !== undefined ? ack : true);
             case 25:
               _context2.next = 30;
               break;
             case 27:
               _context2.prev = 27;
               _context2.t3 = _context2["catch"](22);
-              window.alert("Cannot set state \"".concat(obj._id, "\": ").concat(_context2.t3));
+              window.alert("Cannot set state \"".concat(obj._id, " with ").concat(val, "\": ").concat(_context2.t3));
             case 30:
-              _context2.next = 35;
+              _context2.next = 50;
               break;
             case 32:
               _context2.prev = 32;
-              _context2.t4 = _context2["catch"](17);
-              window.alert("Cannot read state \"".concat(obj._id, "\": ").concat(_context2.t4));
+              _context2.next = 35;
+              return _this.props.socket.getState(obj._id);
             case 35:
-              _context2.next = 40;
-              break;
-            case 37:
+              state = _context2.sent;
+              if (!(!state || state.val === null)) {
+                _context2.next = 45;
+                break;
+              }
               _context2.prev = 37;
-              _context2.t5 = _context2["catch"](9);
-              window.alert(_context2.t5);
+              _context2.next = 40;
+              return _this.props.socket.setState(obj._id, !obj.common || obj.common.def === undefined ? null : obj.common.def, true);
             case 40:
-              _context2.next = 2;
+              _context2.next = 45;
               break;
             case 42:
+              _context2.prev = 42;
+              _context2.t4 = _context2["catch"](37);
+              window.alert("Cannot set state \"".concat(obj._id, "\": ").concat(_context2.t4));
+            case 45:
+              _context2.next = 50;
+              break;
+            case 47:
+              _context2.prev = 47;
+              _context2.t5 = _context2["catch"](32);
+              window.alert("Cannot read state \"".concat(obj._id, "\": ").concat(_context2.t5));
+            case 50:
+              _context2.next = 55;
+              break;
+            case 52:
+              _context2.prev = 52;
+              _context2.t6 = _context2["catch"](13);
+              window.alert(_context2.t6);
+            case 55:
+              _context2.next = 2;
+              break;
+            case 57:
             case "end":
               return _context2.stop();
           }
-        }, _callee2, null, [[9, 37], [17, 32], [22, 27]]);
+        }, _callee2, null, [[13, 52], [22, 27], [32, 47], [37, 42]]);
       }));
       return function (_x3) {
         return _ref2.apply(this, arguments);
@@ -2121,7 +2193,7 @@ var ObjectBrowser = /*#__PURE__*/function (_Component) {
         var r = new FileReader();
         r.onload = /*#__PURE__*/function () {
           var _ref3 = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee3(e) {
-            var contents, json, len, id, enums, state;
+            var contents, json, len, id, enums, val, ack, state;
             return _regenerator["default"].wrap(function _callee3$(_context3) {
               while (1) switch (_context3.prev = _context3.next) {
                 case 0:
@@ -2138,7 +2210,7 @@ var ObjectBrowser = /*#__PURE__*/function (_Component) {
                   return _this.loadObjects(json);
                 case 8:
                   window.alert(_this.props.t('ra_%s object(s) processed', len));
-                  _context3.next = 33;
+                  _context3.next = 40;
                   break;
                 case 11:
                   if (id) {
@@ -2152,52 +2224,76 @@ var ObjectBrowser = /*#__PURE__*/function (_Component) {
                     enums = json.common.enums;
                     delete json.common.enums;
                   }
-                  _context3.next = 17;
+                  if (json.val) {
+                    val = json.val;
+                    try {
+                      val = JSON.parse(val);
+                    } catch (e) {
+                      console.log("Cannot parse value: ".concat(e));
+                      val = null;
+                    }
+                    delete json.val;
+                  }
+                  if (json.ack !== undefined) {
+                    ack = json.ack;
+                    delete json.ack;
+                  }
+                  _context3.next = 19;
                   return _this.props.socket.setObject(json._id, json);
-                case 17:
+                case 19:
                   if (!(json.type === 'state')) {
-                    _context3.next = 24;
+                    _context3.next = 31;
+                    break;
+                  }
+                  if (!(val !== undefined && val !== null)) {
+                    _context3.next = 25;
                     break;
                   }
-                  _context3.next = 20;
+                  _context3.next = 23;
+                  return _this.props.socket.setState(json._id, val, ack === undefined ? true : ack);
+                case 23:
+                  _context3.next = 31;
+                  break;
+                case 25:
+                  _context3.next = 27;
                   return _this.props.socket.getState(json._id);
-                case 20:
+                case 27:
                   state = _context3.sent;
                   if (!(!state || state.val === null || state.val === undefined)) {
-                    _context3.next = 24;
+                    _context3.next = 31;
                     break;
                   }
-                  _context3.next = 24;
-                  return _this.props.socket.getState(json._id, json.common.def === undefined ? null : json.common.def, true);
-                case 24:
+                  _context3.next = 31;
+                  return _this.props.socket.setState(json._id, json.common.def === undefined ? null : json.common.def, true);
+                case 31:
                   if (!enums) {
-                    _context3.next = 27;
+                    _context3.next = 34;
                     break;
                   }
-                  _context3.next = 27;
+                  _context3.next = 34;
                   return _this._createAllEnums(enums, json._id);
-                case 27:
+                case 34:
                   window.alert(_this.props.t('ra_%s was imported', json._id));
-                  _context3.next = 33;
+                  _context3.next = 40;
                   break;
-                case 30:
-                  _context3.prev = 30;
+                case 37:
+                  _context3.prev = 37;
                   _context3.t0 = _context3["catch"](13);
                   window.alert(_context3.t0);
-                case 33:
-                  _context3.next = 38;
+                case 40:
+                  _context3.next = 45;
                   break;
-                case 35:
-                  _context3.prev = 35;
+                case 42:
+                  _context3.prev = 42;
                   _context3.t1 = _context3["catch"](1);
                   window.alert(_context3.t1);
-                case 38:
+                case 45:
                   return _context3.abrupt("return", null);
-                case 39:
+                case 46:
                 case "end":
                   return _context3.stop();
               }
-            }, _callee3, null, [[1, 35], [13, 30]]);
+            }, _callee3, null, [[1, 42], [13, 37]]);
           }));
           return function (_x4) {
             return _ref3.apply(this, arguments);
@@ -2604,7 +2700,8 @@ var ObjectBrowser = /*#__PURE__*/function (_Component) {
       showExportDialog: false,
       linesEnabled: (window._localStorage || window.localStorage).getItem("".concat(props.dialogName || 'App', ".lines")) === 'true',
       showDescription: (window._localStorage || window.localStorage).getItem("".concat(props.dialogName || 'App', ".desc")) !== 'false',
-      showContextMenu: null
+      showContextMenu: null,
+      noStatesByExportImport: false
     };
     _this.edit = {};
     _this.texts = {
@@ -2810,6 +2907,20 @@ var ObjectBrowser = /*#__PURE__*/function (_Component) {
       });
     }
 
+    /**
+     * Check if it is a non-expert id
+     *
+     * @param id id to test
+     * @return {boolean}
+     */
+  }, {
+    key: "isNonExpertId",
+    value: function isNonExpertId(id) {
+      return !!(0, _classPrivateFieldGet2["default"])(this, _NON_EXPERT_NAMESPACES).find(function (saveNamespace) {
+        return id.startsWith(saveNamespace);
+      });
+    }
+
     /**
      * @private
      * @param {ioBroker.EmptyCallback?} cb
@@ -2931,6 +3042,36 @@ var ObjectBrowser = /*#__PURE__*/function (_Component) {
       this.subscribes = [];
       this.objects = {};
     }
+
+    /** @typedef {{ id: string, obj: ioBroker.Object, item: any }} ShowDeleteDialogOptions */
+
+    /**
+     * Show the delete dialog for a given object
+     *
+     * @param {ShowDeleteDialogOptions} options
+     */
+  }, {
+    key: "showDeleteDialog",
+    value: function showDeleteDialog(options) {
+      var _item$children2, _obj$common5;
+      var id = options.id,
+        obj = options.obj,
+        item = options.item;
+
+      // calculate the number of children
+      var keys = Object.keys(this.objects);
+      keys.sort();
+      var count = 0;
+      var start = "".concat(id, ".");
+      for (var i = 0; i < keys.length; i++) {
+        if (keys[i].startsWith(start)) {
+          count++;
+        } else if (keys[i] > start) {
+          break;
+        }
+      }
+      this.props.onObjectDelete(id, !!((_item$children2 = item.children) !== null && _item$children2 !== void 0 && _item$children2.length), !((_obj$common5 = obj.common) !== null && _obj$common5 !== void 0 && _obj$common5.dontDelete), count + 1);
+    }
   }, {
     key: "refreshComponent",
     value:
@@ -3649,12 +3790,12 @@ var ObjectBrowser = /*#__PURE__*/function (_Component) {
     value: function getFilterSelectFunction() {
       var _this19 = this;
       var func = this.info.funcEnums.map(function (id) {
-        var _this19$objects$id;
+        var _this19$objects$id, _this19$objects$id2;
         return {
-          name: getName(_this19.objects[id] && _this19.objects[id].common && _this19.objects[id].common.name || id.split('.').pop()),
+          name: getName(((_this19$objects$id = _this19.objects[id]) === null || _this19$objects$id === void 0 || (_this19$objects$id = _this19$objects$id.common) === null || _this19$objects$id === void 0 ? void 0 : _this19$objects$id.name) || id.split('.').pop()),
           value: id,
           icon: /*#__PURE__*/_react["default"].createElement(_Icon["default"], {
-            src: ((_this19$objects$id = _this19.objects[id]) === null || _this19$objects$id === void 0 || (_this19$objects$id = _this19$objects$id.common) === null || _this19$objects$id === void 0 ? void 0 : _this19$objects$id.icon) || '',
+            src: ((_this19$objects$id2 = _this19.objects[id]) === null || _this19$objects$id2 === void 0 || (_this19$objects$id2 = _this19$objects$id2.common) === null || _this19$objects$id2 === void 0 ? void 0 : _this19$objects$id2.icon) || '',
             className: _this19.props.classes.selectIcon
           })
         };
@@ -3851,45 +3992,105 @@ var ObjectBrowser = /*#__PURE__*/function (_Component) {
     }
   }, {
     key: "_exportObjects",
-    value: function _exportObjects(isAll) {
-      var _this24 = this;
-      if (isAll) {
-        generateFile('allObjects.json', this.objects);
-      } else if (this.state.selected.length || this.state.selectedNonObject) {
-        var result = {};
-        var id = this.state.selected[0] || this.state.selectedNonObject;
-        this._getSelectedIdsForExport().forEach(function (key) {
-          result[key] = JSON.parse(JSON.stringify(_this24.objects[key]));
-          // add enum information
-          if (result[key].common) {
-            var enums = _this24.getEnumsForId(key);
-            if (enums) {
-              result[key].common.enums = enums;
-            }
+    value: function () {
+      var _exportObjects2 = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee5(isAll, noStatesByExportImport) {
+        var result, id, ids, i, _result$key, key, state, enums;
+        return _regenerator["default"].wrap(function _callee5$(_context5) {
+          while (1) switch (_context5.prev = _context5.next) {
+            case 0:
+              if (!isAll) {
+                _context5.next = 4;
+                break;
+              }
+              generateFile('allObjects.json', this.objects);
+              _context5.next = 25;
+              break;
+            case 4:
+              if (!(this.state.selected.length || this.state.selectedNonObject)) {
+                _context5.next = 24;
+                break;
+              }
+              result = {};
+              id = this.state.selected[0] || this.state.selectedNonObject;
+              ids = this._getSelectedIdsForExport();
+              i = 0;
+            case 9:
+              if (!(i < ids.length)) {
+                _context5.next = 21;
+                break;
+              }
+              key = ids[i];
+              result[key] = JSON.parse(JSON.stringify(this.objects[key]));
+
+              // read states values
+              if (!(((_result$key = result[key]) === null || _result$key === void 0 ? void 0 : _result$key.type) === 'state' && !noStatesByExportImport)) {
+                _context5.next = 17;
+                break;
+              }
+              _context5.next = 15;
+              return this.props.socket.getState(key);
+            case 15:
+              state = _context5.sent;
+              if (state) {
+                result[key].val = state.val;
+                result[key].ack = state.ack;
+              }
+            case 17:
+              // add enum information
+              if (result[key].common) {
+                enums = this.getEnumsForId(key);
+                if (enums) {
+                  result[key].common.enums = enums;
+                }
+              }
+            case 18:
+              i++;
+              _context5.next = 9;
+              break;
+            case 21:
+              generateFile("".concat(id, ".json"), result, noStatesByExportImport);
+              _context5.next = 25;
+              break;
+            case 24:
+              window.alert(this.props.t('ra_Save of objects-tree is not possible'));
+            case 25:
+            case "end":
+              return _context5.stop();
           }
-        });
-        generateFile("".concat(id, ".json"), result);
-      } else {
-        window.alert(this.props.t('ra_Save of objects-tree is not possible'));
+        }, _callee5, this);
+      }));
+      function _exportObjects(_x5, _x6) {
+        return _exportObjects2.apply(this, arguments);
       }
-    }
+      return _exportObjects;
+    }()
   }, {
     key: "renderExportDialog",
     value: function renderExportDialog() {
-      var _this25 = this;
+      var _this24 = this;
       if (this.state.showExportDialog === false) {
         return null;
       }
       return /*#__PURE__*/_react["default"].createElement(_material.Dialog, {
         open: !0
-      }, /*#__PURE__*/_react["default"].createElement(_material.DialogTitle, null, this.props.t('Select type of export')), /*#__PURE__*/_react["default"].createElement(_material.DialogContent, null, /*#__PURE__*/_react["default"].createElement(_material.DialogContentText, 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(_material.DialogActions, null, /*#__PURE__*/_react["default"].createElement(_material.Button, {
+      }, /*#__PURE__*/_react["default"].createElement(_material.DialogTitle, null, this.props.t('Select type of export')), /*#__PURE__*/_react["default"].createElement(_material.DialogContent, null, /*#__PURE__*/_react["default"].createElement(_material.DialogContentText, 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("br", null), /*#__PURE__*/_react["default"].createElement(_material.FormControlLabel, {
+        control: /*#__PURE__*/_react["default"].createElement(_material.Checkbox, {
+          checked: this.state.noStatesByExportImport,
+          onChange: function onChange(e) {
+            return _this24.setState({
+              noStatesByExportImport: e.target.checked
+            });
+          }
+        }),
+        label: this.props.t('ra_Do not export values of states')
+      }))), /*#__PURE__*/_react["default"].createElement(_material.DialogActions, null, /*#__PURE__*/_react["default"].createElement(_material.Button, {
         color: "grey",
         variant: "outlined",
         onClick: function onClick() {
-          return _this25.setState({
+          return _this24.setState({
             showExportDialog: false
           }, function () {
-            return _this25._exportObjects(true);
+            return _this24._exportObjects(true, _this24.state.noStatesByExportImport);
           });
         }
       }, this.props.t('ra_All objects'), ' ', "(", Object.keys(this.objects).length, ")"), /*#__PURE__*/_react["default"].createElement(_material.Button, {
@@ -3897,17 +4098,17 @@ var ObjectBrowser = /*#__PURE__*/function (_Component) {
         variant: "contained",
         autoFocus: true,
         onClick: function onClick() {
-          return _this25.setState({
+          return _this24.setState({
             showExportDialog: false
           }, function () {
-            return _this25._exportObjects(false);
+            return _this24._exportObjects(false, _this24.state.noStatesByExportImport);
           });
         }
       }, this.props.t('ra_Only selected'), ' ', "(", this.state.showExportDialog, ")"), /*#__PURE__*/_react["default"].createElement(_material.Button, {
         color: "grey",
         variant: "contained",
         onClick: function onClick() {
-          return _this25.setState({
+          return _this24.setState({
             showExportDialog: false
           });
         },
@@ -3922,7 +4123,7 @@ var ObjectBrowser = /*#__PURE__*/function (_Component) {
      * @returns {JSX.Element}
      */
     function getToolbar() {
-      var _this26 = this;
+      var _this25 = this;
       var allowObjectCreation = false;
       if (this.state.selected.length || this.state.selectedNonObject) {
         var id = this.state.selected[0] || this.state.selectedNonObject;
@@ -3953,7 +4154,7 @@ var ObjectBrowser = /*#__PURE__*/function (_Component) {
         }
       }, /*#__PURE__*/_react["default"].createElement("div", null, /*#__PURE__*/_react["default"].createElement(_material.IconButton, {
         onClick: function onClick() {
-          return _this26.refreshComponent();
+          return _this25.refreshComponent();
         },
         disabled: this.state.updating,
         size: "large"
@@ -3966,7 +4167,7 @@ var ObjectBrowser = /*#__PURE__*/function (_Component) {
         key: "expertMode",
         color: this.state.filter.expertMode ? 'secondary' : 'default',
         onClick: function onClick() {
-          return _this26.onFilter('expertMode', !_this26.state.filter.expertMode);
+          return _this25.onFilter('expertMode', !_this25.state.filter.expertMode);
         },
         size: "large"
       }, /*#__PURE__*/_react["default"].createElement(_IconExpert["default"], null))), !this.props.disableColumnSelector && /*#__PURE__*/_react["default"].createElement(_material.Tooltip, {
@@ -3978,7 +4179,7 @@ var ObjectBrowser = /*#__PURE__*/function (_Component) {
         key: "columnSelector",
         color: this.state.columnsAuto ? 'primary' : 'default',
         onClick: function onClick() {
-          return _this26.setState({
+          return _this25.setState({
             columnsSelectorShow: true
           });
         },
@@ -3991,7 +4192,7 @@ var ObjectBrowser = /*#__PURE__*/function (_Component) {
       }, /*#__PURE__*/_react["default"].createElement(_material.IconButton, {
         key: "expandAll",
         onClick: function onClick() {
-          return _this26.onExpandAll();
+          return _this25.onExpandAll();
         },
         size: "large"
       }, /*#__PURE__*/_react["default"].createElement(_IconOpen["default"], null))), /*#__PURE__*/_react["default"].createElement(_material.Tooltip, {
@@ -4002,7 +4203,7 @@ var ObjectBrowser = /*#__PURE__*/function (_Component) {
       }, /*#__PURE__*/_react["default"].createElement(_material.IconButton, {
         key: "collapseAll",
         onClick: function onClick() {
-          return _this26.onCollapseAll();
+          return _this25.onCollapseAll();
         },
         size: "large"
       }, /*#__PURE__*/_react["default"].createElement(_IconClosed["default"], null))), /*#__PURE__*/_react["default"].createElement(_material.Tooltip, {
@@ -4014,7 +4215,7 @@ var ObjectBrowser = /*#__PURE__*/function (_Component) {
         key: "expandVisible",
         color: "primary",
         onClick: function onClick() {
-          return _this26.onExpandVisible();
+          return _this25.onExpandVisible();
         },
         size: "large"
       }, /*#__PURE__*/_react["default"].createElement(StyledBadge, {
@@ -4029,7 +4230,7 @@ var ObjectBrowser = /*#__PURE__*/function (_Component) {
         key: "collapseVisible",
         color: "primary",
         onClick: function onClick() {
-          return _this26.onCollapseVisible();
+          return _this25.onCollapseVisible();
         },
         size: "large"
       }, /*#__PURE__*/_react["default"].createElement(StyledBadge, {
@@ -4042,7 +4243,7 @@ var ObjectBrowser = /*#__PURE__*/function (_Component) {
         }
       }, /*#__PURE__*/_react["default"].createElement(_material.IconButton, {
         onClick: function onClick() {
-          return _this26.onStatesViewVisible();
+          return _this25.onStatesViewVisible();
         },
         size: "large"
       }, /*#__PURE__*/_react["default"].createElement(_iconsMaterial.LooksOne, {
@@ -4054,9 +4255,9 @@ var ObjectBrowser = /*#__PURE__*/function (_Component) {
         }
       }, /*#__PURE__*/_react["default"].createElement(_material.IconButton, {
         onClick: function onClick() {
-          (window._localStorage || window.localStorage).setItem("".concat(_this26.props.dialogName || 'App', ".desc"), _this26.state.showDescription ? 'false' : 'true');
-          _this26.setState({
-            showDescription: !_this26.state.showDescription
+          (window._localStorage || window.localStorage).setItem("".concat(_this25.props.dialogName || 'App', ".desc"), _this25.state.showDescription ? 'false' : 'true');
+          _this25.setState({
+            showDescription: !_this25.state.showDescription
           });
         },
         size: "large"
@@ -4070,7 +4271,7 @@ var ObjectBrowser = /*#__PURE__*/function (_Component) {
       }, /*#__PURE__*/_react["default"].createElement("div", null, /*#__PURE__*/_react["default"].createElement(_material.IconButton, {
         disabled: !allowObjectCreation,
         onClick: function onClick() {
-          return _this26.setState({
+          return _this25.setState({
             modalNewObj: true
           });
         },
@@ -4087,7 +4288,7 @@ var ObjectBrowser = /*#__PURE__*/function (_Component) {
           input.setAttribute('id', 'files');
           input.setAttribute('opacity', 0);
           input.addEventListener('change', function (e) {
-            return _this26.handleJsonUpload(e);
+            return _this25.handleJsonUpload(e);
           }, false);
           input.click();
         },
@@ -4099,8 +4300,8 @@ var ObjectBrowser = /*#__PURE__*/function (_Component) {
         }
       }, /*#__PURE__*/_react["default"].createElement(_material.IconButton, {
         onClick: function onClick() {
-          return _this26.setState({
-            showExportDialog: _this26._getSelectedIdsForExport().length
+          return _this25.setState({
+            showExportDialog: _this25._getSelectedIdsForExport().length
           });
         },
         size: "large"
@@ -4114,7 +4315,7 @@ var ObjectBrowser = /*#__PURE__*/function (_Component) {
           whiteSpace: 'nowrap'
         }
       }, "".concat(this.props.t('ra_Objects'), ": ").concat(Object.keys(this.info.objects).length, ", ").concat(this.props.t('ra_States'), ": ").concat(Object.keys(this.info.objects).filter(function (el) {
-        return _this26.info.objects[el].type === 'state';
+        return _this25.info.objects[el].type === 'state';
       }).length)), this.props.objectEditBoolean && /*#__PURE__*/_react["default"].createElement(_material.Tooltip, {
         title: this.props.t('ra_Edit custom config'),
         classes: {
@@ -4123,19 +4324,19 @@ var ObjectBrowser = /*#__PURE__*/function (_Component) {
       }, /*#__PURE__*/_react["default"].createElement(_material.IconButton, {
         onClick: function onClick() {
           // get all visible states
-          var ids = getVisibleItems(_this26.root, 'state', _this26.objects);
+          var ids = getVisibleItems(_this25.root, 'state', _this25.objects);
           if (ids.length) {
-            _this26.pauseSubscribe(true);
+            _this25.pauseSubscribe(true);
             if (ids.length === 1) {
-              (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]);
+              (window._localStorage || window.localStorage).setItem("".concat(_this25.props.dialogName || 'App', ".objectSelected"), _this25.state.selected[0]);
+              _this25.props.router && _this25.props.router.doNavigate(null, 'custom', _this25.state.selected[0]);
             }
-            _this26.setState({
+            _this25.setState({
               customDialog: ids
             });
           } else {
-            _this26.setState({
-              toast: _this26.props.t('ra_please select object')
+            _this25.setState({
+              toast: _this25.props.t('ra_please select object')
             });
           }
         },
@@ -4194,8 +4395,8 @@ var ObjectBrowser = /*#__PURE__*/function (_Component) {
      * @param {{ cellButtonsButton: string | undefined; cellButtonsButtonAlone: any; cellButtonsButtonIcon: string | undefined; cellButtonsButtonWithCustoms: any; }} classes
      */
     function renderColumnButtons(id, item, classes) {
-      var _this27 = this,
-        _item$children3,
+      var _this26 = this,
+        _item$children4,
         _item$data$obj$common,
         _item$data$obj$common3;
       if (!item.data.obj) {
@@ -4204,7 +4405,7 @@ var ObjectBrowser = /*#__PURE__*/function (_Component) {
         }, this.state.filter.expertMode && this.props.objectEditOfAccessControl ? /*#__PURE__*/_react["default"].createElement(_material.IconButton, {
           className: _Utils["default"].clsx(classes.cellButtonsButton, classes.cellButtonsEmptyButton, classes.cellButtonMinWidth),
           onClick: function onClick() {
-            return _this27.setState({
+            return _this26.setState({
               modalEditOfAccess: true,
               modalEditOfAccessObjData: item.data
             });
@@ -4216,9 +4417,9 @@ var ObjectBrowser = /*#__PURE__*/function (_Component) {
           "aria-label": "delete",
           title: this.texts.deleteObject,
           onClick: function onClick() {
-            var _item$children2;
+            var _item$children3;
             // calculate number of children
-            var keys = Object.keys(_this27.objects);
+            var keys = Object.keys(_this26.objects);
             keys.sort();
             var count = 0;
             var start = "".concat(id, ".");
@@ -4229,7 +4430,7 @@ var ObjectBrowser = /*#__PURE__*/function (_Component) {
                 break;
               }
             }
-            _this27.props.onObjectDelete(id, !!((_item$children2 = item.children) !== null && _item$children2 !== void 0 && _item$children2.length), false, count + 1);
+            _this26.props.onObjectDelete(id, !!((_item$children3 = item.children) !== null && _item$children3 !== void 0 && _item$children3.length), false, count + 1);
           }
         }, /*#__PURE__*/_react["default"].createElement(_iconsMaterial.Delete, {
           className: classes.cellButtonsButtonIcon
@@ -4238,6 +4439,7 @@ var ObjectBrowser = /*#__PURE__*/function (_Component) {
       item.data.aclTooltip = item.data.aclTooltip || this.renderTooltipAccessControl(item.data.obj.acl);
       var acl = item.data.obj.acl ? item.data.obj.type === 'state' ? item.data.obj.acl.state : item.data.obj.acl.object : 0;
       var aclSystemConfig = item.data.obj.acl && (item.data.obj.type === 'state' ? this.systemConfig.common.defaultNewAcl.state : this.systemConfig.common.defaultNewAcl.object);
+      var showEdit = this.state.filter.expertMode || this.isNonExpertId(item.data.id);
       return [this.state.filter.expertMode && this.props.objectEditOfAccessControl ? /*#__PURE__*/_react["default"].createElement(_material.Tooltip, {
         key: "acl",
         title: item.data.aclTooltip,
@@ -4247,7 +4449,7 @@ var ObjectBrowser = /*#__PURE__*/function (_Component) {
       }, /*#__PURE__*/_react["default"].createElement(_material.IconButton, {
         className: classes.cellButtonMinWidth,
         onClick: function onClick() {
-          return _this27.setState({
+          return _this26.setState({
             modalEditOfAccess: true,
             modalEditOfAccessObjData: item.data
           });
@@ -4258,29 +4460,32 @@ var ObjectBrowser = /*#__PURE__*/function (_Component) {
       }, Number.isNaN(Number(acl)) ? Number(aclSystemConfig).toString(16) : Number(acl).toString(16)))) : /*#__PURE__*/_react["default"].createElement("div", {
         key: "aclEmpty",
         className: classes.cellButtonMinWidth
-      }), /*#__PURE__*/_react["default"].createElement(_material.IconButton, {
+      }), showEdit ? /*#__PURE__*/_react["default"].createElement(_material.IconButton, {
         key: "edit",
         className: classes.cellButtonsButton,
         size: "small",
         "aria-label": "edit",
         title: this.texts.editObject,
         onClick: function onClick() {
-          (window._localStorage || window.localStorage).setItem("".concat(_this27.props.dialogName || 'App', ".objectSelected"), id);
-          _this27.setState({
+          (window._localStorage || window.localStorage).setItem("".concat(_this26.props.dialogName || 'App', ".objectSelected"), id);
+          _this26.setState({
             editObjectDialog: id,
             editObjectAlias: false
           });
         }
       }, /*#__PURE__*/_react["default"].createElement(_iconsMaterial.Edit, {
         className: classes.cellButtonsButtonIcon
-      })), this.props.onObjectDelete && ((_item$children3 = item.children) !== null && _item$children3 !== void 0 && _item$children3.length || !((_item$data$obj$common = item.data.obj.common) !== null && _item$data$obj$common !== void 0 && _item$data$obj$common.dontDelete)) ? /*#__PURE__*/_react["default"].createElement(_material.IconButton, {
+      })) : /*#__PURE__*/_react["default"].createElement("div", {
+        key: "editDisabled",
+        className: classes.cellButtonsButton
+      }), this.props.onObjectDelete && ((_item$children4 = item.children) !== null && _item$children4 !== void 0 && _item$children4.length || !((_item$data$obj$common = item.data.obj.common) !== null && _item$data$obj$common !== void 0 && _item$data$obj$common.dontDelete)) ? /*#__PURE__*/_react["default"].createElement(_material.IconButton, {
         key: "delete",
         className: classes.cellButtonsButton,
         size: "small",
         "aria-label": "delete",
         onClick: function onClick() {
-          var _item$children4, _item$data$obj$common2;
-          var keys = Object.keys(_this27.objects);
+          var _item$children5, _item$data$obj$common2;
+          var keys = Object.keys(_this26.objects);
           keys.sort();
           var count = 0;
           var start = "".concat(id, ".");
@@ -4291,7 +4496,7 @@ var ObjectBrowser = /*#__PURE__*/function (_Component) {
               break;
             }
           }
-          _this27.props.onObjectDelete(id, !!((_item$children4 = item.children) !== null && _item$children4 !== void 0 && _item$children4.length), !((_item$data$obj$common2 = item.data.obj.common) !== null && _item$data$obj$common2 !== void 0 && _item$data$obj$common2.dontDelete), count);
+          _this26.props.onObjectDelete(id, !!((_item$children5 = item.children) !== null && _item$children5 !== void 0 && _item$children5.length), !((_item$data$obj$common2 = item.data.obj.common) !== null && _item$data$obj$common2 !== void 0 && _item$data$obj$common2.dontDelete), count);
         },
         title: this.texts.deleteObject
       }, /*#__PURE__*/_react["default"].createElement(_iconsMaterial.Delete, {
@@ -4303,10 +4508,10 @@ var ObjectBrowser = /*#__PURE__*/function (_Component) {
         "aria-label": "config",
         title: this.texts.customConfig,
         onClick: function onClick() {
-          (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({
+          (window._localStorage || window.localStorage).setItem("".concat(_this26.props.dialogName || 'App', ".objectSelected"), id);
+          _this26.pauseSubscribe(true);
+          _this26.props.router && _this26.props.router.doNavigate(null, 'customs', id);
+          _this26.setState({
             customDialog: [id]
           });
         }
@@ -4379,13 +4584,13 @@ var ObjectBrowser = /*#__PURE__*/function (_Component) {
   }, {
     key: "renderColumnValue",
     value: function renderColumnValue(id, item, classes) {
-      var _obj$common4,
-        _this28 = this;
+      var _obj$common6,
+        _this27 = this;
       var obj = item.data.obj;
       if (!obj || !this.states) {
         return null;
       }
-      if (((_obj$common4 = obj.common) === null || _obj$common4 === void 0 ? void 0 : _obj$common4.type) === 'file') {
+      if (((_obj$common6 = obj.common) === null || _obj$common6 === void 0 ? void 0 : _obj$common6.type) === 'file') {
         return /*#__PURE__*/_react["default"].createElement("div", {
           className: _Utils["default"].clsx(classes.cellValueText, classes.cellValueFile)
         }, "[file]");
@@ -4413,7 +4618,7 @@ var ObjectBrowser = /*#__PURE__*/function (_Component) {
         });
         info = item.data.state;
         info.valFull = info.valFull.map(function (_item) {
-          if (_item.t === _this28.texts.quality && state.q) {
+          if (_item.t === _this27.texts.quality && state.q) {
             return [/*#__PURE__*/_react["default"].createElement("div", {
               className: classes.cellValueTooltipBoth,
               key: _item.t
@@ -4460,7 +4665,7 @@ var ObjectBrowser = /*#__PURE__*/function (_Component) {
         }, "(", info.valText.s, ")") : null, /*#__PURE__*/_react["default"].createElement(_IconCopy["default"], {
           className: _Utils["default"].clsx(classes.cellButtonsValueButton, 'copyButton', classes.cellButtonsValueButtonCopy),
           onClick: function onClick(e) {
-            return _this28.onCopy(e, copyText);
+            return _this27.onCopy(e, copyText);
           },
           key: "cc"
         })
@@ -4487,7 +4692,7 @@ var ObjectBrowser = /*#__PURE__*/function (_Component) {
           popper: this.props.classes.cellValueTooltipBox
         },
         onOpen: function onOpen() {
-          return _this28.readHistory(id);
+          return _this27.readHistory(id);
         }
       }, /*#__PURE__*/_react["default"].createElement("div", {
         style: info.style,
@@ -4503,7 +4708,7 @@ var ObjectBrowser = /*#__PURE__*/function (_Component) {
     key: "_syncEnum",
     value: function _syncEnum(id, enumIds, newArray, cb) {
       var _this$info$objects$en,
-        _this29 = this;
+        _this28 = this;
       if (!enumIds || !enumIds.length) {
         cb && cb();
         return;
@@ -4519,9 +4724,9 @@ var ObjectBrowser = /*#__PURE__*/function (_Component) {
             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;
+              return _this28.info.objects[enumId] = obj;
             })["catch"](function (e) {
-              return _this29.showError(e);
+              return _this28.showError(e);
             }));
           }
         }
@@ -4534,15 +4739,15 @@ var ObjectBrowser = /*#__PURE__*/function (_Component) {
           _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;
+            return _this28.info.objects[enumId] = _obj;
           })["catch"](function (e) {
-            return _this29.showError(e);
+            return _this28.showError(e);
           }));
         }
       }
       Promise.all(promises).then(function () {
         return setTimeout(function () {
-          return _this29._syncEnum(id, enumIds, newArray, cb);
+          return _this28._syncEnum(id, enumIds, newArray, cb);
         }, 0);
       });
     }
@@ -4554,11 +4759,11 @@ var ObjectBrowser = /*#__PURE__*/function (_Component) {
   }, {
     key: "syncEnum",
     value: function syncEnum(id, enumName, newArray) {
-      var _this30 = this;
+      var _this29 = this;
       var toCheck = (0, _toConsumableArray2["default"])(this.info[enumName === 'func' ? 'funcEnums' : 'roomEnums']);
       return new Promise(function (resolve) {
-        _this30._syncEnum(id, toCheck, newArray, function (error) {
-          error && _this30.showError(error);
+        _this29._syncEnum(id, toCheck, newArray, function (error) {
+          error && _this29.showError(error);
           // force update of object
           resolve();
         });
@@ -4572,17 +4777,18 @@ var ObjectBrowser = /*#__PURE__*/function (_Component) {
   }, {
     key: "renderEnumDialog",
     value: function renderEnumDialog() {
-      var _this31 = this;
+      var _this30 = this;
       if (this.state.enumDialog) {
         var type = this.state.enumDialog.type;
         var item = this.state.enumDialog.item;
         var itemEnums = this.state.enumDialogEnums;
         var enumsOriginal = this.state.enumDialog.enumsOriginal;
         var enums = (type === 'room' ? this.info.roomEnums : this.info.funcEnums).map(function (id) {
+          var _this30$objects$id;
           return {
-            name: getName(_this31.objects[id] && _this31.objects[id].common && _this31.objects[id].common.name || id.split('.').pop(), _this31.props.lang),
+            name: getName(((_this30$objects$id = _this30.objects[id]) === null || _this30$objects$id === void 0 || (_this30$objects$id = _this30$objects$id.common) === null || _this30$objects$id === void 0 ? void 0 : _this30$objects$id.name) || id.split('.').pop(), _this30.props.lang),
             value: id,
-            icon: getSelectIdIcon(_this31.objects, id, _this31.imagePrefix)
+            icon: getSelectIdIcon(_this30.objects, id, _this30.imagePrefix)
           };
         }).sort(function (a, b) {
           return a.name > b.name ? 1 : -1;
@@ -4590,10 +4796,10 @@ var ObjectBrowser = /*#__PURE__*/function (_Component) {
         enums.forEach(function (_item) {
           if (_item.icon && typeof _item.icon === 'string') {
             _item.icon = /*#__PURE__*/_react["default"].createElement("div", {
-              className: _this31.props.classes.enumIconDiv
+              className: _this30.props.classes.enumIconDiv
             }, /*#__PURE__*/_react["default"].createElement("img", {
               src: _item.icon,
-              className: _this31.props.classes.enumIcon,
+              className: _this30.props.classes.enumIcon,
               alt: _item.name
             }));
           }
@@ -4604,7 +4810,7 @@ var ObjectBrowser = /*#__PURE__*/function (_Component) {
         return /*#__PURE__*/_react["default"].createElement(_material.Dialog, {
           className: this.props.classes.enumDialog,
           onClose: function onClose() {
-            return _this31.setState({
+            return _this30.setState({
               enumDialog: null
             });
           },
@@ -4618,8 +4824,8 @@ var ObjectBrowser = /*#__PURE__*/function (_Component) {
           disabled: JSON.stringify(enumsOriginal) === JSON.stringify(itemEnums),
           size: "small",
           onClick: function onClick() {
-            return _this31.syncEnum(item.data.id, type, itemEnums).then(function () {
-              return _this31.setState({
+            return _this30.syncEnum(item.data.id, type, itemEnums).then(function () {
+              return _this30.setState({
                 enumDialog: null,
                 enumDialogEnums: null
               });
@@ -4643,24 +4849,24 @@ var ObjectBrowser = /*#__PURE__*/function (_Component) {
           }
           var labelId = "checkbox-list-label-".concat(id);
           return /*#__PURE__*/_react["default"].createElement(_material.ListItem, {
-            className: _this31.props.classes.headerCellSelectItem,
+            className: _this30.props.classes.headerCellSelectItem,
             key: id,
             onClick: function onClick() {
               var pos = itemEnums.indexOf(id);
-              var enumDialogEnums = JSON.parse(JSON.stringify(_this31.state.enumDialogEnums));
+              var enumDialogEnums = JSON.parse(JSON.stringify(_this30.state.enumDialogEnums));
               if (pos === -1) {
                 enumDialogEnums.push(id);
                 enumDialogEnums.sort();
               } else {
                 enumDialogEnums.splice(pos, 1);
               }
-              _this31.setState({
+              _this30.setState({
                 enumDialogEnums: enumDialogEnums
               });
             }
           }, /*#__PURE__*/_react["default"].createElement(_material.ListItemIcon, {
             classes: {
-              root: _this31.props.classes.enumCheckbox
+              root: _this30.props.classes.enumCheckbox
             }
           }, /*#__PURE__*/_react["default"].createElement(_material.Checkbox, {
             edge: "start",
@@ -4685,7 +4891,7 @@ var ObjectBrowser = /*#__PURE__*/function (_Component) {
   }, {
     key: "renderEditRoleDialog",
     value: function renderEditRoleDialog() {
-      var _this32 = this;
+      var _this31 = this;
       if (this.state.roleDialog && this.props.objectBrowserEditRole) {
         var ObjectBrowserEditRole = this.props.objectBrowserEditRole;
         return /*#__PURE__*/_react["default"].createElement(ObjectBrowserEditRole, {
@@ -4696,9 +4902,9 @@ var ObjectBrowser = /*#__PURE__*/function (_Component) {
           roles: this.info.roles,
           onClose: function onClose(obj) {
             if (obj) {
-              _this32.info.objects[_this32.state.roleDialog] = obj;
+              _this31.info.objects[_this31.state.roleDialog] = obj;
             }
-            _this32.setState({
+            _this31.setState({
               roleDialog: false
             });
           }
@@ -4714,7 +4920,7 @@ var ObjectBrowser = /*#__PURE__*/function (_Component) {
   }, {
     key: "onColumnsEditCustomDialogClose",
     value: function onColumnsEditCustomDialogClose(isSave) {
-      var _this33 = this;
+      var _this32 = this;
       if (isSave) {
         var value = this.customColumnDialog.value;
         if (this.customColumnDialog.type === 'boolean') {
@@ -4724,16 +4930,16 @@ var ObjectBrowser = /*#__PURE__*/function (_Component) {
         }
         this.customColumnDialog = null;
         this.props.socket.getObject(this.state.columnsEditCustomDialog.obj._id).then(function (obj) {
-          if (ObjectBrowser.setCustomValue(obj, _this33.state.columnsEditCustomDialog.it, value)) {
-            return _this33.props.socket.setObject(obj._id, obj);
+          if (ObjectBrowser.setCustomValue(obj, _this32.state.columnsEditCustomDialog.it, value)) {
+            return _this32.props.socket.setObject(obj._id, obj);
           }
-          throw new Error(_this33.props.t('ra_Cannot update attribute, because not found in the object'));
+          throw new Error(_this32.props.t('ra_Cannot update attribute, because not found in the object'));
         }).then(function () {
-          return _this33.setState({
+          return _this32.setState({
             columnsEditCustomDialog: null
           });
         })["catch"](function (e) {
-          return _this33.showError(e);
+          return _this32.showError(e);
         });
       } else {
         this.customColumnDialog = null;
@@ -4749,7 +4955,7 @@ var ObjectBrowser = /*#__PURE__*/function (_Component) {
   }, {
     key: "renderColumnsEditCustomDialog",
     value: function renderColumnsEditCustomDialog() {
-      var _this34 = this;
+      var _this33 = this;
       if (this.state.columnsEditCustomDialog) {
         if (!this.customColumnDialog) {
           var value = ObjectBrowser.getCustomValue(this.state.columnsEditCustomDialog.obj, this.state.columnsEditCustomDialog.it);
@@ -4761,7 +4967,7 @@ var ObjectBrowser = /*#__PURE__*/function (_Component) {
         }
         return /*#__PURE__*/_react["default"].createElement(_material.Dialog, {
           onClose: function onClose() {
-            return _this34.setState({
+            return _this33.setState({
               columnsEditCustomDialog: null
             });
           },
@@ -4775,14 +4981,14 @@ var ObjectBrowser = /*#__PURE__*/function (_Component) {
         }, this.customColumnDialog.type === 'boolean' ? /*#__PURE__*/_react["default"].createElement(_material.FormControlLabel, {
           control: /*#__PURE__*/_react["default"].createElement(_material.Checkbox, {
             onKeyUp: function onKeyUp(e) {
-              return e.keyCode === 13 && _this34.onColumnsEditCustomDialogClose(true);
+              return e.keyCode === 13 && _this33.onColumnsEditCustomDialogClose(true);
             },
             defaultChecked: this.customColumnDialog.value === 'true',
             onChange: function onChange(e) {
-              _this34.customColumnDialog.value = e.target.checked.toString();
-              var changed = _this34.customColumnDialog.value !== _this34.customColumnDialog.initValue;
-              if (changed === !_this34.state.customColumnDialogValueChanged) {
-                _this34.setState({
+              _this33.customColumnDialog.value = e.target.checked.toString();
+              var changed = _this33.customColumnDialog.value !== _this33.customColumnDialog.initValue;
+              if (changed === !_this33.state.customColumnDialogValueChanged) {
+                _this33.setState({
                   customColumnDialogValueChanged: changed
                 });
               }
@@ -4794,14 +5000,14 @@ var ObjectBrowser = /*#__PURE__*/function (_Component) {
           defaultValue: this.customColumnDialog.value,
           fullWidth: true,
           onKeyUp: function onKeyUp(e) {
-            return e.keyCode === 13 && _this34.onColumnsEditCustomDialogClose(true);
+            return e.keyCode === 13 && _this33.onColumnsEditCustomDialogClose(true);
           },
           label: "".concat(this.state.columnsEditCustomDialog.it.name, " (").concat(this.state.columnsEditCustomDialog.it.pathText, ")"),
           onChange: function onChange(e) {
-            _this34.customColumnDialog.value = e.target.value;
-            var changed = _this34.customColumnDialog.value !== _this34.customColumnDialog.initValue;
-            if (changed === !_this34.state.customColumnDialogValueChanged) {
-              _this34.setState({
+            _this33.customColumnDialog.value = e.target.value;
+            var changed = _this33.customColumnDialog.value !== _this33.customColumnDialog.initValue;
+            if (changed === !_this33.state.customColumnDialogValueChanged) {
+              _this33.setState({
                 customColumnDialogValueChanged: changed
               });
             }
@@ -4810,7 +5016,7 @@ var ObjectBrowser = /*#__PURE__*/function (_Component) {
         }))), /*#__PURE__*/_react["default"].createElement(_material.DialogActions, null, /*#__PURE__*/_react["default"].createElement(_material.Button, {
           variant: "contained",
           onClick: function onClick() {
-            return _this34.onColumnsEditCustomDialogClose(true);
+            return _this33.onColumnsEditCustomDialogClose(true);
           },
           disabled: !this.state.customColumnDialogValueChanged,
           color: "primary",
@@ -4819,7 +5025,7 @@ var ObjectBrowser = /*#__PURE__*/function (_Component) {
           color: "grey",
           variant: "contained",
           onClick: function onClick() {
-            return _this34.onColumnsEditCustomDialogClose();
+            return _this33.onColumnsEditCustomDialogClose();
           },
           startIcon: /*#__PURE__*/_react["default"].createElement(_iconsMaterial.Close, null)
         }, this.props.t('ra_Cancel'))));
@@ -4843,14 +5049,14 @@ var ObjectBrowser = /*#__PURE__*/function (_Component) {
      * @returns {JSX.Element | null}
      */
     function renderCustomValue(obj, it, item) {
-      var _this35 = this;
+      var _this34 = this;
       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_".concat(it.align)]),
             onClick: function onClick() {
-              return _this35.setState({
+              return _this34.setState({
                 columnsEditCustomDialog: {
                   item: item,
                   it: it,
@@ -4879,7 +5085,7 @@ var ObjectBrowser = /*#__PURE__*/function (_Component) {
   }, {
     key: "renderLeaf",
     value: function renderLeaf(item, isExpanded, classes, counter) {
-      var _this36 = this,
+      var _this35 = this,
         _common$alias,
         _common$alias2,
         _this$states$id2,
@@ -4900,12 +5106,12 @@ var ObjectBrowser = /*#__PURE__*/function (_Component) {
         iconFolder = isExpanded ? /*#__PURE__*/_react["default"].createElement(_IconOpen["default"], {
           className: classes.cellIdIconFolder,
           onClick: function onClick() {
-            return _this36.toggleExpanded(id);
+            return _this35.toggleExpanded(id);
           }
         }) : /*#__PURE__*/_react["default"].createElement(_IconClosed["default"], {
           className: classes.cellIdIconFolder,
           onClick: function onClick() {
-            return _this36.toggleExpanded(id);
+            return _this35.toggleExpanded(id);
           }
         });
       } else if (obj.common && obj.common.write === false && obj.type === 'state') {
@@ -4992,10 +5198,10 @@ var ObjectBrowser = /*#__PURE__*/function (_Component) {
         onClick: function onClick(e) {
           e.stopPropagation();
           e.preventDefault();
-          _this36.onSelect(common.alias.id.read);
+          _this35.onSelect(common.alias.id.read);
           setTimeout(function () {
-            return _this36.expandAllSelected(function () {
-              return _this36.scrollToItem(common.alias.id.read);
+            return _this35.expandAllSelected(function () {
+              return _this35.scrollToItem(common.alias.id.read);
             });
           }, 100);
         },
@@ -5004,10 +5210,10 @@ var ObjectBrowser = /*#__PURE__*/function (_Component) {
         onClick: function onClick(e) {
           e.stopPropagation();
           e.preventDefault();
-          _this36.onSelect(common.alias.id.write);
+          _this35.onSelect(common.alias.id.write);
           setTimeout(function () {
-            return _this36.expandAllSelected(function () {
-              return _this36.scrollToItem(common.alias.id.write);
+            return _this35.expandAllSelected(function () {
+              return _this35.scrollToItem(common.alias.id.write);
             });
           }, 100);
         },
@@ -5016,10 +5222,10 @@ var ObjectBrowser = /*#__PURE__*/function (_Component) {
         onClick: function onClick(e) {
           e.stopPropagation();
           e.preventDefault();
-          _this36.onSelect(common.alias.id);
+          _this35.onSelect(common.alias.id);
           setTimeout(function () {
-            return _this36.expandAllSelected(function () {
-              return _this36.scrollToItem(common.alias.id);
+            return _this35.expandAllSelected(function () {
+              return _this35.scrollToItem(common.alias.id);
             });
           }, 100);
         },
@@ -5051,17 +5257,17 @@ var ObjectBrowser = /*#__PURE__*/function (_Component) {
             _id = "".concat(id, ".").concat(_id);
           }
           ids[name] = _id;
-          if (!_this36.states[_id]) {
-            var _this36$objects$_id;
-            if (((_this36$objects$_id = _this36.objects[_id]) === null || _this36$objects$_id === void 0 ? void 0 : _this36$objects$_id.type) === 'state') {
-              !_this36.recordStates.includes(_id) && _this36.recordStates.push(_id);
-              _this36.states[_id] = {
+          if (!_this35.states[_id]) {
+            var _this35$objects$_id;
+            if (((_this35$objects$_id = _this35.objects[_id]) === null || _this35$objects$_id === void 0 ? void 0 : _this35$objects$_id.type) === 'state') {
+              !_this35.recordStates.includes(_id) && _this35.recordStates.push(_id);
+              _this35.states[_id] = {
                 val: null
               };
-              _this36.subscribe(_id);
+              _this35.subscribe(_id);
             }
           } else {
-            !_this36.recordStates.includes(_id) && _this36.recordStates.push(_id);
+            !_this35.recordStates.includes(_id) && _this35.recordStates.push(_id);
           }
         });
         // calculate color
@@ -5162,8 +5368,7 @@ var ObjectBrowser = /*#__PURE__*/function (_Component) {
         key: id,
         id: id,
         onMouseDown: function onMouseDown(e) {
-          e.preventDefault();
-          _this36.onSelect(id);
+          _this35.onSelect(id);
           var isRightMB;
           if ('which' in e) {
             // Gecko (Firefox), WebKit (Safari/Chrome) & Opera
@@ -5173,19 +5378,19 @@ var ObjectBrowser = /*#__PURE__*/function (_Component) {
             isRightMB = e.button === 2;
           }
           if (isRightMB) {
-            _this36.contextMenu = {
+            _this35.contextMenu = {
               item: item,
               ts: Date.now()
             };
           } else {
-            _this36.contextMenu = null;
+            _this35.contextMenu = null;
           }
         },
         onDoubleClick: function onDoubleClick() {
           if (!item.children) {
-            _this36.onSelect(id, true);
+            _this35.onSelect(id, true);
           } else {
-            _this36.toggleExpanded(id);
+            _this35.toggleExpanded(id);
           }
         }
       }, /*#__PURE__*/_react["default"].createElement(_material.Grid, {
@@ -5221,7 +5426,7 @@ var ObjectBrowser = /*#__PURE__*/function (_Component) {
       }, iconItem), /*#__PURE__*/_react["default"].createElement("div", null, /*#__PURE__*/_react["default"].createElement(_IconCopy["default"], {
         className: _Utils["default"].clsx(classes.cellCopyButton, 'copyButton'),
         onClick: function onClick(e) {
-          return _this36.onCopy(e, id);
+          return _this35.onCopy(e, id);
         }
       }))), this.columnsVisibility.name ? /*#__PURE__*/_react["default"].createElement("div", {
         className: _Utils["default"].clsx(classes.cellName, useDesc && classes.cellNameWithDesc),
@@ -5235,7 +5440,7 @@ var ObjectBrowser = /*#__PURE__*/function (_Component) {
       }, /*#__PURE__*/_react["default"].createElement(_IconCopy["default"], {
         className: _Utils["default"].clsx(classes.cellCopyButton, 'copyButton'),
         onClick: function onClick(e) {
-          return _this36.onCopy(e, item.data.title);
+          return _this35.onCopy(e, item.data.title);
         }
       })) : null) : null, !this.state.statesView ? /*#__PURE__*/_react["default"].createElement(_react["default"].Fragment, null, this.columnsVisibility.type ? /*#__PURE__*/_react["default"].createElement("div", {
         className: classes.cellType,
@@ -5249,7 +5454,7 @@ var ObjectBrowser = /*#__PURE__*/function (_Component) {
           cursor: this.state.filter.expertMode && enumEditable && this.props.objectBrowserEditRole ? 'text' : 'default'
         },
         onClick: this.state.filter.expertMode && enumEditable && this.props.objectBrowserEditRole ? function () {
-          return _this36.setState({
+          return _this35.setState({
             roleDialog: item.data.id
           });
         } : undefined
@@ -5260,8 +5465,8 @@ var ObjectBrowser = /*#__PURE__*/function (_Component) {
           cursor: enumEditable ? 'text' : 'default'
         },
         onClick: enumEditable ? function () {
-          var enums = findEnumsForObjectAsIds(_this36.info, item.data.id, 'roomEnums');
-          _this36.setState({
+          var enums = findEnumsForObjectAsIds(_this35.info, item.data.id, 'roomEnums');
+          _this35.setState({
             enumDialogEnums: enums,
             enumDialog: {
               item: item,
@@ -5277,8 +5482,8 @@ var ObjectBrowser = /*#__PURE__*/function (_Component) {
           cursor: enumEditable ? 'text' : 'default'
         },
         onClick: enumEditable ? function () {
-          var enums = findEnumsForObjectAsIds(_this36.info, item.data.id, 'funcEnums');
-          _this36.setState({
+          var enums = findEnumsForObjectAsIds(_this35.info, item.data.id, 'funcEnums');
+          _this35.setState({
             enumDialogEnums: enums,
             enumDialog: {
               item: item,
@@ -5313,11 +5518,11 @@ var ObjectBrowser = /*#__PURE__*/function (_Component) {
         return /*#__PURE__*/_react["default"].createElement("div", {
           className: classes.cellAdapter,
           style: {
-            width: _this36.columnsVisibility[it.id]
+            width: _this35.columnsVisibility[it.id]
           },
           key: it.id,
           title: "".concat(it.adapter, " => ").concat(it.pathText)
-        }, _this36.renderCustomValue(obj, it, item));
+        }, _this35.renderCustomValue(obj, it, item));
       }), this.columnsVisibility.val ? /*#__PURE__*/_react["default"].createElement("div", {
         className: classes.cellValue,
         style: {
@@ -5325,26 +5530,26 @@ var ObjectBrowser = /*#__PURE__*/function (_Component) {
           cursor: valueEditable ? (common === null || common === void 0 ? void 0 : common.type) === 'file' ? 'zoom-in' : item.data.button ? 'grab' : 'text' : 'default'
         },
         onClick: valueEditable ? function () {
-          if (!obj || !_this36.states) {
+          if (!obj || !_this35.states) {
             // return;
           } else if ((common === null || common === void 0 ? void 0 : common.type) === 'file') {
-            _this36.setState({
+            _this35.setState({
               viewFileDialog: id
             });
             // eslint-disable-next-line brace-style
-          } else if (!_this36.state.filter.expertMode && item.data.button) {
+          } else if (!_this35.state.filter.expertMode && item.data.button) {
             // in non-expert mode control button directly
-            _this36.props.socket.setState(id, true)["catch"](function (e) {
+            _this35.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,
+            _this35.edit = {
+              val: _this35.states[id] ? _this35.states[id].val : '',
+              q: _this35.states[id] ? _this35.states[id].q || 0 : 0,
               ack: false,
               id: id
             };
-            _this36.setState({
+            _this35.setState({
               updateOpened: true
             });
           }
@@ -5368,7 +5573,7 @@ var ObjectBrowser = /*#__PURE__*/function (_Component) {
   }, {
     key: "renderItem",
     value: function renderItem(root, isExpanded, classes, counter) {
-      var _this37 = this;
+      var _this36 = this;
       var items = [];
       counter = counter || {
         count: 0
@@ -5396,9 +5601,9 @@ var ObjectBrowser = /*#__PURE__*/function (_Component) {
         if (!this.state.foldersFirst) {
           root.children && items.push(root.children.map(function (item) {
             // do not render too many items in column editor mode
-            if (!_this37.state.columnsSelectorShow || counter.count < 15) {
+            if (!_this36.state.columnsSelectorShow || counter.count < 15) {
               if (item.data.sumVisibility) {
-                return _this37.renderItem(item, undefined, classes, counter);
+                return _this36.renderItem(item, undefined, classes, counter);
               }
             }
             return null;
@@ -5408,9 +5613,9 @@ var ObjectBrowser = /*#__PURE__*/function (_Component) {
           root.children && items.push(root.children.map(function (item) {
             if (item.children) {
               // do not render too many items in column editor mode
-              if (!_this37.state.columnsSelectorShow || counter.count < 15) {
+              if (!_this36.state.columnsSelectorShow || counter.count < 15) {
                 if (item.data.sumVisibility) {
-                  return _this37.renderItem(item, undefined, classes, counter);
+                  return _this36.renderItem(item, undefined, classes, counter);
                 }
               }
             }
@@ -5420,9 +5625,9 @@ var ObjectBrowser = /*#__PURE__*/function (_Component) {
           root.children && items.push(root.children.map(function (item) {
             if (!item.children) {
               // do not render too many items in column editor mode
-              if (!_this37.state.columnsSelectorShow || counter.count < 15) {
+              if (!_this36.state.columnsSelectorShow || counter.count < 15) {
                 if (item.data.sumVisibility) {
-                  return _this37.renderItem(item, undefined, classes, counter);
+                  return _this36.renderItem(item, undefined, classes, counter);
                 }
               }
             }
@@ -5443,7 +5648,7 @@ var ObjectBrowser = /*#__PURE__*/function (_Component) {
   }, {
     key: "calculateColumnsVisibility",
     value: function calculateColumnsVisibility(columnsAuto, columns, columnsForAdmin, columnsWidths) {
-      var _this38 = this;
+      var _this37 = this;
       columnsWidths = columnsWidths || this.state.columnsWidths;
       columnsForAdmin = columnsForAdmin || this.state.columnsForAdmin;
       columns = columns || this.state.columns || [];
@@ -5527,7 +5732,7 @@ var ObjectBrowser = /*#__PURE__*/function (_Component) {
           Object.keys(columnsForAdmin).sort().forEach(function (adapter) {
             return columnsForAdmin[adapter].forEach(function (column) {
               var id = "_".concat(adapter, "_").concat(column.path);
-              _this38.columnsVisibility[id] = columns.includes(id);
+              _this37.columnsVisibility[id] = columns.includes(id);
               if (columns.includes(id)) {
                 var item = {
                   adapter: adapter,
@@ -5545,11 +5750,11 @@ var ObjectBrowser = /*#__PURE__*/function (_Component) {
                     item.objTypes = column.objTypes;
                   }
                 }
-                _this38.adapterColumns.push(item);
-                _this38.columnsVisibility[id] = columnsWidths[item.id] || column.width || SCREEN_WIDTHS[_this38.props.width].widths.func || SCREEN_WIDTHS.xl.widths.func;
-                _widthSum2 += _this38.columnsVisibility[id];
+                _this37.adapterColumns.push(item);
+                _this37.columnsVisibility[id] = columnsWidths[item.id] || column.width || SCREEN_WIDTHS[_this37.props.width].widths.func || SCREEN_WIDTHS.xl.widths.func;
+                _widthSum2 += _this37.columnsVisibility[id];
               } else {
-                _this38.columnsVisibility[id] = 0;
+                _this37.columnsVisibility[id] = 0;
               }
             });
           });
@@ -5570,10 +5775,10 @@ var ObjectBrowser = /*#__PURE__*/function (_Component) {
           this.columnsVisibility.nameHeader = "calc(100% - ".concat(_widthSum2 + 5 + this.state.scrollBarWidth, "px)");
         } else {
           var newWidth = Object.keys(this.columnsVisibility).reduce(function (accumulator, name) {
-            if (name === 'id' || typeof _this38.columnsVisibility[name] === 'string' || !_this38.columnsVisibility[name]) {
+            if (name === 'id' || typeof _this37.columnsVisibility[name] === 'string' || !_this37.columnsVisibility[name]) {
               return accumulator;
             }
-            return accumulator + _this38.columnsVisibility[name];
+            return accumulator + _this37.columnsVisibility[name];
           }, 0);
           this.columnsVisibility.id = "calc(100% - ".concat(newWidth, "px)");
         }
@@ -5607,22 +5812,81 @@ var ObjectBrowser = /*#__PURE__*/function (_Component) {
       if (event.code === 'ArrowRight' || event.code === 'ArrowLeft') {
         this.toggleExpanded(selectedId);
       }
+      if (event.code === 'Delete') {
+        var _obj$common7;
+        var item = this.getItemFromRoot(this.root, selectedId);
+        var obj = item.data.obj;
+        if (obj && !((_obj$common7 = obj.common) !== null && _obj$common7 !== void 0 && _obj$common7.dontDelete)) {
+          this.showDeleteDialog({
+            id: selectedId,
+            obj: obj,
+            item: item
+          });
+        }
+      }
     }
+
+    /**
+     * Find the id from the root
+     *
+     * @param {Record<string, any>} root The current root
+     * @param {string} id the object id
+     *
+     * @returns {any}
+     */
   }, {
-    key: "renderHeader",
+    key: "getItemFromRoot",
+    value: function getItemFromRoot(root, id) {
+      var idArr = id.split('.');
+      var currId = '';
+      var _iterator2 = _createForOfIteratorHelper(idArr),
+        _step2;
+      try {
+        for (_iterator2.s(); !(_step2 = _iterator2.n()).done;) {
+          var idEntry = _step2.value;
+          currId = currId ? "".concat(currId, ".").concat(idEntry) : idEntry;
+          root = root.children.find(function (item) {
+            return item.data.id === currId;
+          });
+        }
+      } catch (err) {
+        _iterator2.e(err);
+      } finally {
+        _iterator2.f();
+      }
+      return root;
+    }
+  }, {
+    key: "renderHandleRight",
     value:
+    /**
+     * Render a right handle for resizing
+     *
+     * @return {JSX.Element}
+     */
+    function renderHandleRight() {
+      return /*#__PURE__*/_react["default"].createElement("div", {
+        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')
+      });
+    }
+
     /**
      * @private
      * @returns {JSX.Element}
      */
-    function renderHeader() {
-      var _this39 = this;
+  }, {
+    key: "renderHeader",
+    value: function renderHeader() {
+      var _this38 = this;
       var classes = this.props.classes;
       var filterClearInValue = null;
       if (!this.columnsVisibility.buttons && !this.isFilterEmpty()) {
         filterClearInValue = /*#__PURE__*/_react["default"].createElement(_material.IconButton, {
           onClick: function onClick() {
-            return _this39.clearFilter();
+            return _this38.clearFilter();
           },
           className: classes.buttonClearFilter,
           title: this.props.t('ra_Clear filter'),
@@ -5641,79 +5905,83 @@ var ObjectBrowser = /*#__PURE__*/function (_Component) {
         },
         "data-min": 240,
         "data-name": "id"
-      }, this.getFilterInput('id'), /*#__PURE__*/_react["default"].createElement("div", {
-        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')
-      })), this.columnsVisibility.name ? /*#__PURE__*/_react["default"].createElement("div", {
+      }, this.getFilterInput('id'), this.renderHandleRight()), this.columnsVisibility.name ? /*#__PURE__*/_react["default"].createElement("div", {
         className: classes.headerCell,
         style: {
-          width: this.columnsVisibility.nameHeader
+          width: this.columnsVisibility.nameHeader,
+          position: 'relative'
         },
         "data-min": 100,
         "data-name": "nameHeader"
-      }, this.getFilterInput('name')) : null, !this.state.statesView && /*#__PURE__*/_react["default"].createElement(_react["default"].Fragment, null, this.columnsVisibility.type ? /*#__PURE__*/_react["default"].createElement("div", {
+      }, this.getFilterInput('name'), this.renderHandleRight()) : null, !this.state.statesView && /*#__PURE__*/_react["default"].createElement(_react["default"].Fragment, null, this.columnsVisibility.type ? /*#__PURE__*/_react["default"].createElement("div", {
         className: classes.headerCell,
         style: {
-          width: this.columnsVisibility.type
+          width: this.columnsVisibility.type,
+          position: 'relative'
         },
         "data-min": 100,
         "data-name": "type"
-      }, this.getFilterSelectType()) : null, this.columnsVisibility.role ? /*#__PURE__*/_react["default"].createElement("div", {
+      }, this.getFilterSelectType(), this.renderHandleRight()) : null, this.columnsVisibility.role ? /*#__PURE__*/_react["default"].createElement("div", {
         className: classes.headerCell,
         style: {
-          width: this.columnsVisibility.role
+          width: this.columnsVisibility.role,
+          position: 'relative'
         },
         "data-min": 100,
         "data-name": "role"
-      }, this.getFilterSelectRole()) : null, this.columnsVisibility.room ? /*#__PURE__*/_react["default"].createElement("div", {
+      }, this.getFilterSelectRole(), this.renderHandleRight()) : null, this.columnsVisibility.room ? /*#__PURE__*/_react["default"].createElement("div", {
         className: classes.headerCell,
         style: {
-          width: this.columnsVisibility.room
+          width: this.columnsVisibility.room,
+          position: 'relative'
         },
         "data-min": 100,
         "data-name": "room"
-      }, this.getFilterSelectRoom()) : null, this.columnsVisibility.func ? /*#__PURE__*/_react["default"].createElement("div", {
+      }, this.getFilterSelectRoom(), this.renderHandleRight()) : null, this.columnsVisibility.func ? /*#__PURE__*/_react["default"].createElement("div", {
         className: classes.headerCell,
         style: {
-          width: this.columnsVisibility.func
+          width: this.columnsVisibility.func,
+          position: 'relative'
         },
         "data-min": 100,
         "data-name": "func"
-      }, this.getFilterSelectFunction()) : null), this.state.statesView && /*#__PURE__*/_react["default"].createElement(_react["default"].Fragment, null, /*#__PURE__*/_react["default"].createElement("div", {
+      }, this.getFilterSelectFunction(), this.renderHandleRight()) : null), this.state.statesView && /*#__PURE__*/_react["default"].createElement(_react["default"].Fragment, null, /*#__PURE__*/_react["default"].createElement("div", {
         className: _Utils["default"].clsx(classes.headerCell, classes.headerCellValue),
         style: {
-          width: this.columnsVisibility.changedFrom
+          width: this.columnsVisibility.changedFrom,
+          position: 'relative'
         },
         "data-min": 100,
         "data-name": "changedFrom"
-      }, this.props.t('ra_Changed from')), /*#__PURE__*/_react["default"].createElement("div", {
+      }, this.props.t('ra_Changed from'), this.renderHandleRight()), /*#__PURE__*/_react["default"].createElement("div", {
         className: _Utils["default"].clsx(classes.headerCell, classes.headerCellValue),
         style: {
-          width: this.columnsVisibility.qualityCode
+          width: this.columnsVisibility.qualityCode,
+          position: 'relative'
         },
         "data-min": 100,
         "data-name": "qualityCode"
-      }, this.props.t('ra_Quality code')), /*#__PURE__*/_react["default"].createElement("div", {
+      }, this.props.t('ra_Quality code'), this.renderHandleRight()), /*#__PURE__*/_react["default"].createElement("div", {
         className: _Utils["default"].clsx(classes.headerCell, classes.headerCellValue),
         style: {
-          width: this.columnsVisibility.timestamp
+          width: this.columnsVisibility.timestamp,
+          position: 'relative'
         },
         "data-min": 100,
         "data-name": "timestamp"
-      }, this.props.t('ra_Timestamp')), /*#__PURE__*/_react["default"].createElement("div", {
+      }, this.props.t('ra_Timestamp'), this.renderHandleRight()), /*#__PURE__*/_react["default"].createElement("div", {
         className: _Utils["default"].clsx(classes.headerCell, classes.headerCellValue),
         style: {
-          width: this.columnsVisibility.lastChange
+          width: this.columnsVisibility.lastChange,
+          position: 'relative'
         },
         "data-min": 100,
         "data-name": "lastChange"
-      }, this.props.t('ra_Last change'))), this.adapterColumns.map(function (item) {
+      }, this.props.t('ra_Last change'), this.renderHandleRight())), this.adapterColumns.map(function (item) {
         return /*#__PURE__*/_react["default"].createElement("div", {
           className: _Utils["default"].clsx(classes.headerCell, classes.headerCellValue),
           style: {
-            width: _this39.columnsVisibility[item.id]
+            width: _this38.columnsVisibility[item.id]
           },
           title: item.adapter,
           key: item.id,
@@ -5749,17 +6017,17 @@ var ObjectBrowser = /*#__PURE__*/function (_Component) {
   }, {
     key: "renderToast",
     value: function renderToast() {
-      var _this40 = this;
+      var _this39 = this;
       return /*#__PURE__*/_react["default"].createElement(_material.Snackbar, {
         open: !!this.state.toast,
         autoHideDuration: 3000,
         onClick: function onClick() {
-          return _this40.setState({
+          return _this39.setState({
             toast: ''
           });
         },
         onClose: function onClose() {
-          return _this40.setState({
+          return _this39.setState({
             toast: ''
           });
         },
@@ -5769,7 +6037,7 @@ var ObjectBrowser = /*#__PURE__*/function (_Component) {
           "aria-label": "close",
           color: "inherit",
           onClick: function onClick() {
-            return _this40.setState({
+            return _this39.setState({
               toast: ''
             });
           }
@@ -5785,12 +6053,12 @@ var ObjectBrowser = /*#__PURE__*/function (_Component) {
   }, {
     key: "componentDidUpdate",
     value: function componentDidUpdate() {
-      var _this41 = this;
+      var _this40 = this;
       if (this.tableRef.current) {
         var scrollBarWidth = this.tableRef.current.offsetWidth - this.tableRef.current.clientWidth;
         if (this.state.scrollBarWidth !== scrollBarWidth) {
           setTimeout(function () {
-            return _this41.setState({
+            return _this40.setState({
               scrollBarWidth: scrollBarWidth
             });
           }, 100);
@@ -5818,12 +6086,12 @@ var ObjectBrowser = /*#__PURE__*/function (_Component) {
   }, {
     key: "renderCustomDialog",
     value: function renderCustomDialog() {
-      var _this42 = this;
+      var _this41 = this;
       if (this.state.customDialog && this.props.objectCustomDialog) {
         var ObjectCustomDialog = this.props.objectCustomDialog;
         return /*#__PURE__*/_react["default"].createElement(ObjectCustomDialog, {
           reportChangedIds: function reportChangedIds(changedIds) {
-            return _this42.changedIds = (0, _toConsumableArray2["default"])(changedIds);
+            return _this41.changedIds = (0, _toConsumableArray2["default"])(changedIds);
           },
           objectIDs: this.state.customDialog,
           expertMode: this.state.filter.expertMode,
@@ -5837,16 +6105,16 @@ var ObjectBrowser = /*#__PURE__*/function (_Component) {
           objects: this.objects,
           customsInstances: this.info.customs,
           onClose: function onClose() {
-            _this42.pauseSubscribe(false);
-            _this42.setState({
+            _this41.pauseSubscribe(false);
+            _this41.setState({
               customDialog: null
             });
-            if (_this42.changedIds) {
-              _this42.changedIds = null;
+            if (_this41.changedIds) {
+              _this41.changedIds = null;
               // update all changed IDs
-              _this42.forceUpdate();
+              _this41.forceUpdate();
             }
-            _this42.props.router && _this42.props.router.doNavigate('tab-objects');
+            _this41.props.router && _this41.props.router.doNavigate('tab-objects');
           }
         });
       }
@@ -5860,14 +6128,14 @@ var ObjectBrowser = /*#__PURE__*/function (_Component) {
   }, {
     key: "onUpdate",
     value: function onUpdate(valAck) {
-      var _this43 = this;
+      var _this42 = this;
       this.props.socket.setState(this.edit.id, {
         val: valAck.val,
         ack: valAck.ack,
         q: valAck.q || 0,
         expire: valAck.expire || undefined
       })["catch"](function (e) {
-        return _this43.showError("Cannot write value: ".concat(e));
+        return _this42.showError("Cannot write value: ".concat(e));
       });
     }
 
@@ -5878,7 +6146,7 @@ var ObjectBrowser = /*#__PURE__*/function (_Component) {
   }, {
     key: "renderEditObjectDialog",
     value: function renderEditObjectDialog() {
-      var _this44 = this;
+      var _this43 = this;
       if (!this.state.editObjectDialog || !this.props.objectBrowserEditObject) {
         return null;
       }
@@ -5890,45 +6158,45 @@ var ObjectBrowser = /*#__PURE__*/function (_Component) {
         objects: this.objects,
         dateFormat: this.props.dateFormat,
         isFloatComma: this.props.isFloatComma,
-        themeName: this.props.themeName,
+        themeType: this.props.themeType,
         socket: this.props.socket,
         dialogName: this.props.dialogName,
         aliasTab: this.state.editObjectAlias,
         t: this.props.t,
         expertMode: this.state.filter.expertMode,
         onNewObject: function onNewObject(obj) {
-          return _this44.props.socket.setObject(obj._id, obj).then(function () {
-            return _this44.setState({
+          return _this43.props.socket.setObject(obj._id, obj).then(function () {
+            return _this43.setState({
               editObjectDialog: obj._id,
               editObjectAlias: false
             }, function () {
-              return _this44.onSelect(obj._id);
+              return _this43.onSelect(obj._id);
             });
           })["catch"](function (e) {
-            return _this44.showError("Cannot write object: ".concat(e));
+            return _this43.showError("Cannot write object: ".concat(e));
           });
         },
         onClose: function onClose(obj) {
           if (obj) {
             var updateAlias;
-            if (_this44.state.editObjectDialog.startsWith('alias.')) {
-              var _this44$objects$_this, _obj$common5;
-              if (JSON.stringify((_this44$objects$_this = _this44.objects[_this44.state.editObjectDialog].common) === null || _this44$objects$_this === void 0 ? void 0 : _this44$objects$_this.alias) !== JSON.stringify((_obj$common5 = obj.common) === null || _obj$common5 === void 0 ? void 0 : _obj$common5.alias)) {
-                updateAlias = _this44.state.editObjectDialog;
+            if (_this43.state.editObjectDialog.startsWith('alias.')) {
+              var _this43$objects$_this, _obj$common8;
+              if (JSON.stringify((_this43$objects$_this = _this43.objects[_this43.state.editObjectDialog].common) === null || _this43$objects$_this === void 0 ? void 0 : _this43$objects$_this.alias) !== JSON.stringify((_obj$common8 = obj.common) === null || _obj$common8 === void 0 ? void 0 : _obj$common8.alias)) {
+                updateAlias = _this43.state.editObjectDialog;
               }
             }
-            _this44.props.socket.setObject(obj._id, obj).then(function () {
-              if (updateAlias && _this44.subscribes.includes(updateAlias)) {
-                _this44.unsubscribe(updateAlias);
+            _this43.props.socket.setObject(obj._id, obj).then(function () {
+              if (updateAlias && _this43.subscribes.includes(updateAlias)) {
+                _this43.unsubscribe(updateAlias);
                 setTimeout(function () {
-                  return _this44.subscribe(updateAlias);
+                  return _this43.subscribe(updateAlias);
                 }, 100);
               }
             })["catch"](function (e) {
-              return _this44.showError("Cannot write object: ".concat(e));
+              return _this43.showError("Cannot write object: ".concat(e));
             });
           }
-          _this44.setState({
+          _this43.setState({
             editObjectDialog: '',
             editObjectAlias: false
           });
@@ -5943,7 +6211,7 @@ var ObjectBrowser = /*#__PURE__*/function (_Component) {
   }, {
     key: "renderViewObjectFileDialog",
     value: function renderViewObjectFileDialog() {
-      var _this45 = this;
+      var _this44 = this;
       if (!this.state.viewFileDialog || !this.props.objectBrowserViewFile) {
         return null;
       }
@@ -5957,7 +6225,7 @@ var ObjectBrowser = /*#__PURE__*/function (_Component) {
         t: this.props.t,
         expertMode: this.state.filter.expertMode,
         onClose: function onClose() {
-          return _this45.setState({
+          return _this44.setState({
             viewFileDialog: ''
           });
         }
@@ -5971,7 +6239,7 @@ var ObjectBrowser = /*#__PURE__*/function (_Component) {
   }, {
     key: "renderAliasEditorDialog",
     value: function renderAliasEditorDialog() {
-      var _this46 = this;
+      var _this45 = this;
       if (!this.props.objectBrowserAliasEditor || !this.state.showAliasEditor) {
         return null;
       }
@@ -5986,35 +6254,46 @@ var ObjectBrowser = /*#__PURE__*/function (_Component) {
         t: this.props.t,
         expertMode: this.state.filter.expertMode,
         onClose: function onClose() {
-          return _this46.setState({
+          return _this45.setState({
             showAliasEditor: ''
           });
         },
-        onRedirect: function onRedirect(id) {
-          return _this46.setState({
-            editObjectDialog: id,
-            showAliasEditor: false,
-            editObjectAlias: true
-          });
+        onRedirect: function onRedirect(id, timeout) {
+          return setTimeout(function () {
+            return _this45.onSelect(id, false, function () {
+              return _this45.expandAllSelected(function () {
+                _this45.scrollToItem(id);
+                setTimeout(function () {
+                  return _this45.setState({
+                    editObjectDialog: id,
+                    showAliasEditor: false,
+                    editObjectAlias: true
+                  });
+                }, 300);
+              });
+            });
+          }, timeout || 0);
         }
       });
     }
 
     /**
+     * Renders the right mouse button context menu
+     *
      * @private
      * @returns {JSX.Element | null}
      */
   }, {
     key: "renderContextMenu",
     value: function renderContextMenu() {
-      var _this47 = this,
-        _obj$common6,
-        _obj$common7,
-        _obj$common8,
+      var _this46 = this,
         _obj$common9,
         _obj$common10,
-        _item$children5,
-        _obj$common12;
+        _obj$common11,
+        _obj$common12,
+        _obj$common13,
+        _item$children6,
+        _obj$common15;
       if (!this.state.showContextMenu) {
         return null;
       }
@@ -6038,14 +6317,14 @@ var ObjectBrowser = /*#__PURE__*/function (_Component) {
       var ITEMS = {
         EDIT: {
           key: '0',
-          visibility: this.props.objectBrowserEditObject && obj,
+          visibility: this.props.objectBrowserEditObject && obj && (this.state.filter.expertMode || this.isNonExpertId(id)),
           icon: /*#__PURE__*/_react["default"].createElement(_iconsMaterial.Edit, {
             fontSize: "small",
             className: this.props.classes.contextMenuEdit
           }),
           label: this.texts.editObject,
           onClick: function onClick() {
-            return _this47.setState({
+            return _this46.setState({
               editObjectDialog: item.data.id,
               showContextMenu: null,
               editObjectAlias: false
@@ -6054,27 +6333,27 @@ var ObjectBrowser = /*#__PURE__*/function (_Component) {
         },
         EDIT_VALUE: {
           key: '1',
-          visibility: this.states && !this.props.notEditable && obj && obj.type === 'state' && ((_obj$common6 = obj.common) === null || _obj$common6 === void 0 ? void 0 : _obj$common6.type) !== 'file' && (this.state.filter.expertMode || obj.common.write !== false),
+          visibility: this.states && !this.props.notEditable && obj && obj.type === 'state' && ((_obj$common9 = obj.common) === null || _obj$common9 === void 0 ? void 0 : _obj$common9.type) !== 'file' && (this.state.filter.expertMode || obj.common.write !== false),
           icon: /*#__PURE__*/_react["default"].createElement(_iconsMaterial.FormatItalic, {
             fontSize: "small",
             className: this.props.classes.contextMenuEditValue
           }),
           label: this.props.t('ra_Edit value'),
           onClick: function onClick() {
-            _this47.edit = {
-              val: _this47.states[id] ? _this47.states[id].val : '',
-              q: _this47.states[id] ? _this47.states[id].q || 0 : 0,
+            _this46.edit = {
+              val: _this46.states[id] ? _this46.states[id].val : '',
+              q: _this46.states[id] ? _this46.states[id].q || 0 : 0,
               ack: false,
               id: id
             };
-            _this47.setState({
+            _this46.setState({
               updateOpened: true,
               showContextMenu: null
             });
           }
         },
         VIEW: {
-          visibility: this.props.objectBrowserViewFile && obj && obj.type === 'state' && ((_obj$common7 = obj.common) === null || _obj$common7 === void 0 ? void 0 : _obj$common7.type) === 'file',
+          visibility: this.props.objectBrowserViewFile && obj && obj.type === 'state' && ((_obj$common10 = obj.common) === null || _obj$common10 === void 0 ? void 0 : _obj$common10.type) === 'file',
           icon: /*#__PURE__*/_react["default"].createElement(_iconsMaterial.FindInPage, {
             fontSize: "small",
             className: this.props.classes.contextMenuView
@@ -6082,7 +6361,7 @@ var ObjectBrowser = /*#__PURE__*/function (_Component) {
           className: '',
           label: this.props.t('ra_View file'),
           onClick: function onClick() {
-            return _this47.setState({
+            return _this46.setState({
               viewFileDialog: obj._id,
               showContextMenu: null
             });
@@ -6090,7 +6369,7 @@ var ObjectBrowser = /*#__PURE__*/function (_Component) {
         },
         CUSTOM: {
           key: '2',
-          visibility: this.props.objectCustomDialog && this.info.hasSomeCustoms && obj && obj.type === 'state' && ((_obj$common8 = obj.common) === null || _obj$common8 === void 0 ? void 0 : _obj$common8.type) !== 'file',
+          visibility: this.props.objectCustomDialog && this.info.hasSomeCustoms && obj && obj.type === 'state' && ((_obj$common11 = obj.common) === null || _obj$common11 === void 0 ? void 0 : _obj$common11.type) !== 'file',
           icon: /*#__PURE__*/_react["default"].createElement(_iconsMaterial.Settings, {
             fontSize: "small",
             className: item.data.hasCustoms ? this.props.classes.cellButtonsButtonWithCustoms : this.props.classes.cellButtonsButtonWithoutCustoms
@@ -6098,9 +6377,9 @@ var ObjectBrowser = /*#__PURE__*/function (_Component) {
           className: this.props.classes.contextMenuCustom,
           label: this.texts.customConfig,
           onClick: function onClick() {
-            _this47.pauseSubscribe(true);
-            _this47.props.router && _this47.props.router.doNavigate(null, 'customs', id);
-            _this47.setState({
+            _this46.pauseSubscribe(true);
+            _this46.props.router && _this46.props.router.doNavigate(null, 'customs', id);
+            _this46.setState({
               customDialog: [id],
               showContextMenu: null
             });
@@ -6117,7 +6396,7 @@ var ObjectBrowser = /*#__PURE__*/function (_Component) {
           className: this.props.classes.contextMenuACL,
           label: this.props.t('ra_Edit ACL'),
           onClick: function onClick() {
-            return _this47.setState({
+            return _this46.setState({
               showContextMenu: null,
               modalEditOfAccess: true,
               modalEditOfAccessObjData: item.data
@@ -6134,7 +6413,7 @@ var ObjectBrowser = /*#__PURE__*/function (_Component) {
           className: '',
           label: this.props.t('ra_Edit role'),
           onClick: function onClick() {
-            return _this47.setState({
+            return _this46.setState({
               roleDialog: item.data.id,
               showContextMenu: null
             });
@@ -6150,8 +6429,8 @@ var ObjectBrowser = /*#__PURE__*/function (_Component) {
           className: '',
           label: this.props.t('ra_Edit function'),
           onClick: function onClick() {
-            var enums = findEnumsForObjectAsIds(_this47.info, item.data.id, 'funcEnums');
-            _this47.setState({
+            var enums = findEnumsForObjectAsIds(_this46.info, item.data.id, 'funcEnums');
+            _this46.setState({
               enumDialogEnums: enums,
               enumDialog: {
                 item: item,
@@ -6172,8 +6451,8 @@ var ObjectBrowser = /*#__PURE__*/function (_Component) {
           className: '',
           label: this.props.t('ra_Edit room'),
           onClick: function onClick() {
-            var enums = findEnumsForObjectAsIds(_this47.info, item.data.id, 'roomEnums');
-            _this47.setState({
+            var enums = findEnumsForObjectAsIds(_this46.info, item.data.id, 'roomEnums');
+            _this46.setState({
               enumDialogEnums: enums,
               enumDialog: {
                 item: item,
@@ -6186,22 +6465,22 @@ var ObjectBrowser = /*#__PURE__*/function (_Component) {
         },
         ALIAS: {
           key: '7',
-          visibility: !this.props.notEditable && this.props.objectBrowserAliasEditor && this.props.objectBrowserEditObject && this.state.filter.expertMode && obj && obj.type === 'state' && ((_obj$common9 = obj.common) === null || _obj$common9 === void 0 ? void 0 : _obj$common9.type) !== 'file',
+          visibility: !this.props.notEditable && this.props.objectBrowserAliasEditor && this.props.objectBrowserEditObject && this.state.filter.expertMode && obj && obj.type === 'state' && ((_obj$common12 = obj.common) === null || _obj$common12 === void 0 ? void 0 : _obj$common12.type) !== 'file',
           icon: /*#__PURE__*/_react["default"].createElement(_iconsMaterial.Link, {
-            className: obj !== null && obj !== void 0 && (_obj$common10 = obj.common) !== null && _obj$common10 !== void 0 && _obj$common10.alias ? this.props.classes.cellButtonsButtonWithCustoms : this.props.classes.cellButtonsButtonWithoutCustoms
+            className: obj !== null && obj !== void 0 && (_obj$common13 = obj.common) !== null && _obj$common13 !== void 0 && _obj$common13.alias ? this.props.classes.cellButtonsButtonWithCustoms : this.props.classes.cellButtonsButtonWithoutCustoms
           }),
           className: '',
           label: this.props.t('ra_Edit alias'),
           onClick: function onClick() {
-            var _obj$common11;
-            if ((_obj$common11 = obj.common) !== null && _obj$common11 !== void 0 && _obj$common11.alias) {
-              _this47.setState({
+            var _obj$common14;
+            if ((_obj$common14 = obj.common) !== null && _obj$common14 !== void 0 && _obj$common14.alias) {
+              _this46.setState({
                 editObjectDialog: item.data.id,
                 showContextMenu: null,
                 editObjectAlias: true
               });
             } else {
-              _this47.setState({
+              _this46.setState({
                 showContextMenu: null,
                 showAliasEditor: item.data.id
               });
@@ -6210,7 +6489,7 @@ var ObjectBrowser = /*#__PURE__*/function (_Component) {
         },
         DELETE: {
           key: 'Delete',
-          visibility: this.props.onObjectDelete && (((_item$children5 = item.children) === null || _item$children5 === void 0 ? void 0 : _item$children5.length) || obj && !((_obj$common12 = obj.common) !== null && _obj$common12 !== void 0 && _obj$common12.dontDelete)),
+          visibility: this.props.onObjectDelete && (((_item$children6 = item.children) === null || _item$children6 === void 0 ? void 0 : _item$children6.length) || obj && !((_obj$common15 = obj.common) !== null && _obj$common15 !== void 0 && _obj$common15.dontDelete)),
           icon: /*#__PURE__*/_react["default"].createElement(_iconsMaterial.Delete, {
             fontSize: "small",
             className: this.props.classes.contextMenuDelete
@@ -6218,23 +6497,14 @@ var ObjectBrowser = /*#__PURE__*/function (_Component) {
           className: this.props.classes.contextMenuDelete,
           label: this.texts.deleteObject,
           onClick: function onClick() {
-            _this47.setState({
+            return _this46.setState({
               showContextMenu: null
             }, function () {
-              var _item$children6, _obj$common13;
-              // calculate number of children
-              var keys = Object.keys(_this47.objects);
-              keys.sort();
-              var count = 0;
-              var start = "".concat(id, ".");
-              for (var i = 0; i < keys.length; i++) {
-                if (keys[i].startsWith(start)) {
-                  count++;
-                } else if (keys[i] > start) {
-                  break;
-                }
-              }
-              _this47.props.onObjectDelete(id, !!((_item$children6 = item.children) !== null && _item$children6 !== void 0 && _item$children6.length), !((_obj$common13 = obj.common) !== null && _obj$common13 !== void 0 && _obj$common13.dontDelete), count + 1);
+              return _this46.showDeleteDialog({
+                id: id,
+                obj: obj || {},
+                item: item
+              });
             });
           }
         }
@@ -6249,13 +6519,13 @@ var ObjectBrowser = /*#__PURE__*/function (_Component) {
             style: ITEMS[key].iconStyle,
             className: ITEMS[key].listItemIconClass
           }, ITEMS[key].icon), /*#__PURE__*/_react["default"].createElement(_material.ListItemText, null, ITEMS[key].label), ITEMS[key].key ? /*#__PURE__*/_react["default"].createElement("div", {
-            className: _this47.props.classes.contextMenuKeys
-          }, "Alt+".concat(ITEMS[key].key === 'Delete' ? _this47.props.t('ra_Del') : ITEMS[key].key)) : null));
+            className: _this46.props.classes.contextMenuKeys
+          }, "Alt+".concat(ITEMS[key].key === 'Delete' ? _this46.props.t('ra_Del') : ITEMS[key].key)) : null));
         }
       });
       if (!items.length) {
         setTimeout(function () {
-          return _this47.setState({
+          return _this46.setState({
             showContextMenu: null
           });
         }, 100);
@@ -6277,10 +6547,10 @@ var ObjectBrowser = /*#__PURE__*/function (_Component) {
         },
         anchorEl: el,
         onClose: function onClose() {
-          _this47.setState({
+          _this46.setState({
             showContextMenu: null
           });
-          _this47.contextMenu = null;
+          _this46.contextMenu = null;
         }
       }, items);
     }
@@ -6293,7 +6563,7 @@ var ObjectBrowser = /*#__PURE__*/function (_Component) {
     key: "renderEditValueDialog",
     value: function renderEditValueDialog() {
       var _this$objects$this$ed,
-        _this48 = this;
+        _this47 = this;
       if (!this.state.updateOpened || !this.props.objectBrowserValue) {
         return null;
       }
@@ -6306,11 +6576,13 @@ var ObjectBrowser = /*#__PURE__*/function (_Component) {
         return null;
       }
       var type = (_this$objects$this$ed = this.objects[this.edit.id].common) !== null && _this$objects$this$ed !== void 0 && _this$objects$this$ed.type ? this.objects[this.edit.id].common.type : (0, _typeof2["default"])(this.edit.val);
+      var role = this.objects[this.edit.id].common.role;
       var ObjectBrowserValue = this.props.objectBrowserValue;
       return /*#__PURE__*/_react["default"].createElement(ObjectBrowserValue, {
         t: this.props.t,
         lang: this.props.lang,
         type: type,
+        role: role,
         states: _Utils["default"].getStates(this.objects[this.edit.id]),
         themeType: this.props.themeType,
         expertMode: this.state.filter.expertMode,
@@ -6320,10 +6592,10 @@ var ObjectBrowser = /*#__PURE__*/function (_Component) {
         defaultHistory: this.defaultHistory,
         dateFormat: this.props.dateFormat,
         onClose: function onClose(res) {
-          _this48.setState({
+          _this47.setState({
             updateOpened: false
           });
-          res && _this48.onUpdate(res);
+          res && _this47.onUpdate(res);
         }
       });
     }
@@ -6335,7 +6607,7 @@ var ObjectBrowser = /*#__PURE__*/function (_Component) {
   }, {
     key: "render",
     value: function render() {
-      var _this49 = this;
+      var _this48 = this;
       this.recordStates = [];
       this.unsubscribeTimer && clearTimeout(this.unsubscribeTimer);
 
@@ -6348,13 +6620,13 @@ var ObjectBrowser = /*#__PURE__*/function (_Component) {
         applyFilter(this.root, this.state.filter, this.props.lang, this.objects, null, counter, this.props.customFilter, this.props.types);
         if (counter.count < 500 && !this.state.expandAllVisible) {
           setTimeout(function () {
-            return _this49.setState({
+            return _this48.setState({
               expandAllVisible: true
             });
           });
         } else if (counter.count >= 500 && this.state.expandAllVisible) {
           setTimeout(function () {
-            return _this49.setState({
+            return _this48.setState({
               expandAllVisible: false
             });
           });
@@ -6362,8 +6634,8 @@ var ObjectBrowser = /*#__PURE__*/function (_Component) {
         this.lastAppliedFilter = jsonFilter;
       }
       this.unsubscribeTimer = setTimeout(function () {
-        _this49.unsubscribeTimer = null;
-        _this49.checkUnsubscribes();
+        _this48.unsubscribeTimer = null;
+        _this48.checkUnsubscribes();
       }, 200);
       if (!this.state.loaded) {
         return /*#__PURE__*/_react["default"].createElement(_material.CircularProgress, {
@@ -6373,17 +6645,14 @@ var ObjectBrowser = /*#__PURE__*/function (_Component) {
       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: {},
+        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,
         onKeyDown: function onKeyDown(event) {
-          return _this49.navigateKeyPress(event);
+          return _this48.navigateKeyPress(event);
         },
         tabIndex: 0
-      }, /*#__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.renderContextMenu(), this.renderToast(), this.renderColumnsEditCustomDialog(), this.renderColumnsSelectorDialog(), this.renderCustomDialog(), this.renderEditValueDialog(), this.renderEditObjectDialog(), this.renderViewObjectFileDialog(), this.renderAliasEditorDialog(), 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));
     }
   }], [{
@@ -6484,8 +6753,12 @@ ObjectBrowser.defaultProps = {
   objectStatesView: false,
   objectImportExport: false,
   objectEditOfAccessControl: false,
-  modalNewObject: function modalNewObject() {},
-  modalEditOfAccessControl: function modalEditOfAccessControl() {}
+  modalNewObject: function modalNewObject() {
+    return undefined;
+  },
+  modalEditOfAccessControl: function modalEditOfAccessControl() {
+    return undefined;
+  }
 };
 ObjectBrowser.propTypes = {
   dialogName: _propTypes["default"].string,
@@ -6556,7 +6829,7 @@ ObjectBrowser.propTypes = {
   // optional ['name', 'type', 'role', 'room', 'func', 'val', 'buttons']
   // eslint-disable-next-line react/no-unused-prop-types
   root: _propTypes["default"].string,
-  // optional, shows only elements of this root
+  // optional. Shows only elements of this root
 
   objectsWorker: _propTypes["default"].object,
   // optional cache of objects