@iobroker/adapter-react-v5 3.1.20 → 3.1.23

package/Components/ObjectBrowser.js

@@ -911,10 +911,63 @@ function applyFilter(item, filters, lang, objects, context, counter, customFilte
     var common = data.obj && data.obj.common;
 
     if (customFilter) {
-      if (customFilter.type && customFilter.type !== data.obj.type) {
-        filteredOut = true;
-      } else if (customFilter.common && customFilter.common.custom) {
-        if (!common || !common.custom || customFilter.common.custom !== true && !common.custom[customFilter.common.custom]) {
+      var _customFilter$common, _customFilter$common2, _customFilter$common3;
+
+      if (customFilter.type) {
+        if (typeof customFilter.type === 'string') {
+          if (customFilter.type !== data.obj.type) {
+            filteredOut = true;
+          }
+        } else if (Array.isArray(customFilter.type)) {
+          if (!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) {
+          filteredOut = true;
+        } else if (typeof customFilter.common.type === 'string') {
+          if (customFilter.common.type !== common.type) {
+            filteredOut = true;
+          }
+        } else if (Array.isArray(customFilter.common.type)) {
+          if (!customFilter.type.includes(common.type)) {
+            filteredOut = true;
+          }
+        }
+      }
+
+      if (!filteredOut && (_customFilter$common2 = customFilter.common) !== null && _customFilter$common2 !== void 0 && _customFilter$common2.role) {
+        if (!common || !common.role) {
+          filteredOut = true;
+        } else if (typeof customFilter.common.role === 'string') {
+          if (common.role.startsWith(customFilter.common.role)) {
+            filteredOut = true;
+          }
+        } else if (Array.isArray(customFilter.common.role)) {
+          if (!customFilter.common.role.find(function (role) {
+            return customFilter.role.includes(role);
+          })) {
+            filteredOut = true;
+          }
+        }
+      }
+
+      if (!filteredOut && (_customFilter$common3 = customFilter.common) !== null && _customFilter$common3 !== void 0 && _customFilter$common3.custom) {
+        if (!common || !common.custom) {
+          filteredOut = true;
+        } else if (customFilter.common.custom === '_dataSources') {
+          // TODO: make it configurable
+          if (!Object.keys(common.custom).find(function (id) {
+            return id.startsWith('history.') || id.startsWith('sql.') || id.startsWith('influxdb.');
+          })) {
+            filteredOut = true;
+          }
+        } else if (customFilter.common.custom !== true && !Object.keys(common.custom).find(function (id) {
+          return id.startsWith(customFilter.common.custom);
+        })) {
           filteredOut = true;
         }
       }
@@ -4258,7 +4311,7 @@ var ObjectBrowser = /*#__PURE__*/function (_Component) {
         },
         disabled: this.state.updating,
         size: "large"
-      }, /*#__PURE__*/_react["default"].createElement(_Refresh["default"], null)))), this.props.showExpertButton && /*#__PURE__*/_react["default"].createElement(_Tooltip["default"], {
+      }, /*#__PURE__*/_react["default"].createElement(_Refresh["default"], null)))), this.props.showExpertButton && !this.props.expertMode && /*#__PURE__*/_react["default"].createElement(_Tooltip["default"], {
         title: this.props.t('ra_expertMode')
       }, /*#__PURE__*/_react["default"].createElement(_IconButton["default"], {
         key: "expertMode",
@@ -6494,7 +6547,17 @@ ObjectBrowser.propTypes = {
   onObjectDelete: _propTypes["default"].func,
   // optional function (id, hasChildren, objectExists) {  }
   customFilter: _propTypes["default"].object,
-  // optional {common: {custom: true}} or {common: {custom: 'sql.0'}}
+  // optional
+  // `{common: {custom: true}}` - show only objects with some custom settings
+  // `{common: {custom: 'sql.0'}}` - show only objects with sql.0 custom settings (only of the specific instance)
+  // `{common: {custom: '_dataSources'}}` - show only objects of adapters `influxdb' or 'sql' or 'history'
+  // `{common: {custom: 'adapterName.'}}` - show only objects of custom settings of specific adapter (all instances)
+  // `{type: 'channel'}` - show only channels
+  // `{type: ['channel', 'device']}` - show only channels and devices
+  // `{common: {type: 'number'}` - show only states of type 'number
+  // `{common: {type: ['number', 'string']}` - show only states of type 'number and string
+  // `{common: {role: 'switch']}` - show only states with roles starting from switch
+  // `{common: {role: ['switch', 'button]}` - show only states with roles starting from `switch` and `button`
   objectBrowserValue: _propTypes["default"].object,
   objectBrowserEditObject: _propTypes["default"].object,
   objectBrowserEditRole: _propTypes["default"].object,