@iobroker/adapter-react-v5 3.1.27 → 3.1.30

package/Components/ObjectBrowser.js

@@ -902,25 +902,27 @@ function applyFilter(item, filters, lang, objects, context, counter, customFilte
   var data = item.data;
 
   if (data && data.id) {
-    var common = data.obj && data.obj.common;
+    var _data$obj;
+
+    var common = (_data$obj = data.obj) === null || _data$obj === void 0 ? void 0 : _data$obj.common;
 
     if (customFilter) {
       var _customFilter$common, _customFilter$common2, _customFilter$common3;
 
       if (customFilter.type) {
         if (typeof customFilter.type === 'string') {
-          if (customFilter.type !== data.obj.type) {
+          if (!data.obj || customFilter.type !== data.obj.type) {
             filteredOut = true;
           }
         } else if (Array.isArray(customFilter.type)) {
-          if (!customFilter.type.includes(data.obj.type)) {
+          if (!data.obj || !customFilter.type.includes(data.obj.type)) {
             filteredOut = true;
           }
         }
       }
 
       if (!filteredOut && (_customFilter$common = customFilter.common) !== null && _customFilter$common !== void 0 && _customFilter$common.type) {
-        if (!common || !common.type) {
+        if (!(common !== null && common !== void 0 && common.type)) {
           filteredOut = true;
         } else if (typeof customFilter.common.type === 'string') {
           if (customFilter.common.type !== common.type) {
@@ -934,7 +936,7 @@ function applyFilter(item, filters, lang, objects, context, counter, customFilte
       }
 
       if (!filteredOut && (_customFilter$common2 = customFilter.common) !== null && _customFilter$common2 !== void 0 && _customFilter$common2.role) {
-        if (!common || !common.role) {
+        if (!(common !== null && common !== void 0 && common.role)) {
           filteredOut = true;
         } else if (typeof customFilter.common.role === 'string') {
           if (common.role.startsWith(customFilter.common.role)) {
@@ -950,7 +952,7 @@ function applyFilter(item, filters, lang, objects, context, counter, customFilte
       }
 
       if (!filteredOut && (_customFilter$common3 = customFilter.common) !== null && _customFilter$common3 !== void 0 && _customFilter$common3.custom) {
-        if (!common || !common.custom) {
+        if (!(common !== null && common !== void 0 && common.custom)) {
           filteredOut = true;
         } else if (customFilter.common.custom === '_dataSources') {
           // TODO: make it configurable
@@ -2401,7 +2403,8 @@ var ObjectBrowser = /*#__PURE__*/function (_Component) {
 
         var id = _this.state.selected[0] || _this.state.selectedNonObject;
 
-        if (id.split('.').length < 2 || _this.objects[id] && ((_this$objects$id = _this.objects[id]) === null || _this$objects$id === void 0 ? void 0 : _this$objects$id.type) === 'state') {} else {
+        if (id.split('.').length < 2 || _this.objects[id] && ((_this$objects$id = _this.objects[id]) === null || _this$objects$id === void 0 ? void 0 : _this$objects$id.type) === 'state') {// show default tooltip
+        } else {
           if (_this.state.filter.expertMode) {
             switch ((_this$objects$id2 = _this.objects[id]) === null || _this$objects$id2 === void 0 ? void 0 : _this$objects$id2.type) {
               case 'device':
@@ -2409,7 +2412,16 @@ var ObjectBrowser = /*#__PURE__*/function (_Component) {
                   key: 1
                 }, t('ra_Only following structures of objects are available:')), /*#__PURE__*/_react["default"].createElement("div", {
                   key: 5
-                }, t('ra_Device → Channel → State'))];
+                }, t('ra_Device → Channel → State')), /*#__PURE__*/_react["default"].createElement("div", {
+                  key: 7,
+                  style: {
+                    height: 10
+                  }
+                }), /*#__PURE__*/_react["default"].createElement("div", {
+                  key: 8
+                }, t('ra_Non-experts may create new objects only in "0_userdata.0" or "alias.0".')), /*#__PURE__*/_react["default"].createElement("div", {
+                  key: 9
+                }, t('ra_The experts may create objects everywhere but from second level (e.g. "vis.0" or "javascript.0").'))];
                 break;
 
               case 'folder':
@@ -2421,7 +2433,16 @@ var ObjectBrowser = /*#__PURE__*/function (_Component) {
                   key: 3
                 }, t('ra_Folder → Channel → State')), /*#__PURE__*/_react["default"].createElement("div", {
                   key: 4
-                }, t('ra_Folder → Device → Channel → State'))];
+                }, t('ra_Folder → Device → Channel → State')), /*#__PURE__*/_react["default"].createElement("div", {
+                  key: 7,
+                  style: {
+                    height: 10
+                  }
+                }), /*#__PURE__*/_react["default"].createElement("div", {
+                  key: 8
+                }, t('ra_Non-experts may create new objects only in "0_userdata.0" or "alias.0".')), /*#__PURE__*/_react["default"].createElement("div", {
+                  key: 9
+                }, t('ra_The experts may create objects everywhere but from second level (e.g. "vis.0" or "javascript.0").'))];
                 break;
 
               case 'channel':
@@ -2429,7 +2450,16 @@ var ObjectBrowser = /*#__PURE__*/function (_Component) {
                   key: 1
                 }, t('ra_Only following structures of objects are available:')), /*#__PURE__*/_react["default"].createElement("div", {
                   key: 1
-                }, t('ra_Channel → State'))];
+                }, t('ra_Channel → State')), /*#__PURE__*/_react["default"].createElement("div", {
+                  key: 7,
+                  style: {
+                    height: 10
+                  }
+                }), /*#__PURE__*/_react["default"].createElement("div", {
+                  key: 8
+                }, t('ra_Non-experts may create new objects only in "0_userdata.0" or "alias.0".')), /*#__PURE__*/_react["default"].createElement("div", {
+                  key: 9
+                }, t('ra_The experts may create objects everywhere but from second level (e.g. "vis.0" or "javascript.0").'))];
                 break;
 
               default:
@@ -2439,6 +2469,21 @@ var ObjectBrowser = /*#__PURE__*/function (_Component) {
             value = [/*#__PURE__*/_react["default"].createElement("div", {
               key: 1
             }, t('ra_Only following structures of objects are available:')), /*#__PURE__*/_react["default"].createElement("div", {
+              key: 2
+            }, t('ra_Folder → State')), /*#__PURE__*/_react["default"].createElement("div", {
+              key: 3
+            }, t('ra_Folder → Channel → State')), /*#__PURE__*/_react["default"].createElement("div", {
+              key: 4
+            }, t('ra_Folder → Device → Channel → State')), /*#__PURE__*/_react["default"].createElement("div", {
+              key: 5
+            }, t('ra_Device → Channel → State')), /*#__PURE__*/_react["default"].createElement("div", {
+              key: 6
+            }, t('ra_Channel → State')), /*#__PURE__*/_react["default"].createElement("div", {
+              key: 7,
+              style: {
+                height: 10
+              }
+            }), /*#__PURE__*/_react["default"].createElement("div", {
               key: 7
             }, t('ra_Non-experts may create new objects only in "0_userdata.0" or "alias.0".')), /*#__PURE__*/_react["default"].createElement("div", {
               key: 8
@@ -2713,7 +2758,7 @@ var ObjectBrowser = /*#__PURE__*/function (_Component) {
     }).filter(function (id) {
       return id;
     });
-    var columns = (window._localStorage || window.localStorage).getItem("".concat(props.dialogName || 'App', ".columns"));
+    var columns = null; // (window._localStorage || window.localStorage).getItem(`${props.dialogName || 'App'}.columns`);
 
     try {
       columns = columns ? JSON.parse(columns) : null;
@@ -2721,7 +2766,7 @@ var ObjectBrowser = /*#__PURE__*/function (_Component) {
       columns = null;
     }
 
-    var columnsWidths = (window._localStorage || window.localStorage).getItem("".concat(props.dialogName || 'App', ".columnsWidths"));
+    var columnsWidths = null; // (window._localStorage || window.localStorage).getItem(`${props.dialogName || 'App'}.columnsWidths`);
 
     try {
       columnsWidths = columnsWidths ? JSON.parse(columnsWidths) : {};
@@ -2863,6 +2908,7 @@ var ObjectBrowser = /*#__PURE__*/function (_Component) {
       var _this2 = this;
 
       var props = this.props;
+      var objects;
       return new Promise(function (resolve) {
         return _this2.setState({
           updating: true
@@ -2871,8 +2917,33 @@ var ObjectBrowser = /*#__PURE__*/function (_Component) {
         });
       }).then(function () {
         return _this2.props.objectsWorker ? _this2.props.objectsWorker.getObjects(update) : props.socket.getObjects(update, true);
-      }).then(function (objects) {
-        _this2.systemConfig = objects['system.config'] || {};
+      }).then(function (_objects) {
+        objects = _objects;
+
+        if (props.types && props.types[0] !== 'state') {
+          if (props.length >= 1) {
+            console.error('more than one type does not supported!');
+          }
+
+          return props.socket.getObjectView(null, null, props.types[0]);
+        } else {
+          return props.socket.getObject('system.config').then(function (obj) {
+            return {
+              'system.config': obj
+            };
+          });
+        }
+      }).then(function (moreObjects) {
+        _this2.systemConfig = objects['system.config'] || moreObjects['system.config'] || {};
+
+        if (moreObjects) {
+          if (moreObjects['system.config']) {
+            delete moreObjects['system.config'];
+          }
+
+          Object.assign(objects, moreObjects);
+        }
+
         _this2.systemConfig.common = _this2.systemConfig.common || {};
         _this2.systemConfig.common.defaultNewAcl = _this2.systemConfig.common.defaultNewAcl || {};
         _this2.systemConfig.common.defaultNewAcl.owner = _this2.systemConfig.common.defaultNewAcl.owner || 'system.user.admin';
@@ -2902,7 +2973,7 @@ var ObjectBrowser = /*#__PURE__*/function (_Component) {
         } else if (props.types) {
           _this2.objects = {};
           Object.keys(objects).forEach(function (id) {
-            var type = objects[id] && objects[id].type;
+            var type = objects[id] && objects[id].type; // include "folder" types too
 
             if (type && (type === 'channel' || type === 'device' || type === 'enum' || type === 'folder' || type === 'adapter' || type === 'instance' || props.types.includes(type))) {
               _this2.objects[id] = objects[id];