@iobroker/adapter-react-v5 7.4.9 → 7.4.12

package/build/Components/ObjectBrowser.d.ts

@@ -97,6 +97,13 @@ export interface TreeItem {
     data: TreeItemData;
     children?: TreeItem[];
 }
+export declare function filterRoles(roleArray: {
+    role: string;
+    type: ioBroker.CommonType;
+}[], type: ioBroker.CommonType, defaultRoles?: {
+    role: string;
+    type: ioBroker.CommonType;
+}[]): string[];
 export declare function getSelectIdIconFromObjects(objects: Record<string, ioBroker.Object>, id: string, lang: ioBroker.Languages, imagePrefix?: string): string | JSX.Element | null;
 export declare const ITEM_IMAGES: Record<string, JSX.Element>;
 export interface ObjectBrowserFilter {
@@ -121,11 +128,15 @@ interface AdapterColumn {
     align?: 'center' | 'left' | 'right';
 }
 interface ObjectBrowserEditRoleProps {
-    roles: string[];
+    roleArray: {
+        role: string;
+        type: ioBroker.CommonType;
+    }[];
     id: string;
     socket: Connection;
     onClose: (obj?: ioBroker.Object | null) => void;
     t: Translate;
+    commonType: ioBroker.CommonType;
 }
 interface ObjectViewFileDialogProps {
     t: Translate;
@@ -188,7 +199,10 @@ interface ObjectBrowserValueProps {
 interface ObjectBrowserEditObjectProps {
     socket: Connection;
     obj: ioBroker.AnyObject;
-    roleArray: string[];
+    roleArray: {
+        role: string;
+        type: ioBroker.CommonType;
+    }[];
     expertMode: boolean;
     themeType: ThemeType;
     theme: IobTheme;
@@ -204,6 +218,10 @@ interface ObjectBrowserEditObjectProps {
 }
 export interface ObjectAliasEditorProps {
     t: Translate;
+    roleArray: {
+        role: string;
+        type: ioBroker.CommonType;
+    }[];
     socket: Connection;
     objects: Record<string, ioBroker.AnyObject>;
     onRedirect: (id: string, delay?: number) => void;

package/build/Components/ObjectBrowser.js

@@ -784,6 +784,17 @@ excludeTranslations) {
         result[key] = isObject ? filterObject(value, filterKeys, excludeTranslations) : value;
     });
 }
+export function filterRoles(roleArray, type, defaultRoles) {
+    const bigRoleArray = [];
+    roleArray.forEach(role => (role.type === 'mixed' || role.type) === type &&
+        !bigRoleArray.includes(role.role) &&
+        bigRoleArray.push(role.role));
+    defaultRoles.forEach(role => (role.type === 'mixed' || role.type) === type &&
+        !bigRoleArray.includes(role.role) &&
+        bigRoleArray.push(role.role));
+    bigRoleArray.sort();
+    return bigRoleArray;
+}
 /**
  * Function to generate a json-file for an object and trigger download it
  */
@@ -1233,9 +1244,9 @@ function buildTree(objects, options) {
         }
         if (obj) {
             const common = obj.common;
-            const role = common && common.role;
-            if (role && !info.roles.includes(role)) {
-                info.roles.push(role);
+            const role = common?.role;
+            if (role && !info.roles.find(it => it.role === role)) {
+                info.roles.push({ role, type: common.type });
             }
             else if (id.startsWith('enum.rooms.')) {
                 info.roomEnums.push(id);
@@ -1403,7 +1414,7 @@ function buildTree(objects, options) {
         }
         return 0;
     });
-    info.roles.sort();
+    info.roles.sort((a, b) => a.role.localeCompare(b.role));
     info.types.sort();
     return { info, root };
 }
@@ -2287,10 +2298,32 @@ export class ObjectBrowserClass extends Component {
         else {
             this.localStorage.removeItem(`${this.props.dialogName || 'App'}.objectSelected`);
             if (this.state.selected.length) {
-                this.setState({ selected: [] }, () => this.props.onSelect && this.props.onSelect([], ''));
+                this.setState({ selected: [] }, () => {
+                    if (this.props.onSelect) {
+                        if (this.state.focused && this.props.allowNonObjects) {
+                            // remove a task to select the pre-selected item if now we want to see another object
+                            if (this.selectFirst && this.selectFirst !== this.state.selected[0]) {
+                                this.selectFirst = '';
+                            }
+                            this.props.onSelect([this.state.focused], null, isDouble);
+                        }
+                        else {
+                            this.props.onSelect([], '');
+                        }
+                    }
+                });
             }
             else if (this.props.onSelect) {
-                this.props.onSelect([], '');
+                if (this.state.focused && this.props.allowNonObjects) {
+                    // remove a task to select the pre-selected item if now we want to see another object
+                    if (this.selectFirst && this.selectFirst !== this.state.selected[0]) {
+                        this.selectFirst = '';
+                    }
+                    this.props.onSelect([this.state.focused], null, isDouble);
+                }
+                else {
+                    this.props.onSelect([], '');
+                }
             }
         }
     }
@@ -2992,7 +3025,7 @@ export class ObjectBrowserClass extends Component {
                     React.createElement(IconClose, null)))) : null));
     }
     getFilterSelectRole() {
-        return this.getFilterSelect('role', this.info.roles);
+        return this.getFilterSelect('role', this.info.roles.map(it => it.role));
     }
     getFilterSelectRoom() {
         const rooms = this.info.roomEnums.map(id => ({
@@ -4071,7 +4104,7 @@ export class ObjectBrowserClass extends Component {
         }
         if (this.state.roleDialog && this.props.objectBrowserEditRole) {
             const ObjectBrowserEditRole = this.props.objectBrowserEditRole;
-            return (React.createElement(ObjectBrowserEditRole, { key: "objectBrowserEditRole", id: this.state.roleDialog, socket: this.props.socket, t: this.props.t, roles: this.info.roles, onClose: (obj) => {
+            return (React.createElement(ObjectBrowserEditRole, { key: "objectBrowserEditRole", id: this.state.roleDialog, socket: this.props.socket, t: this.props.t, roleArray: this.info.roles, commonType: this.info.objects[this.state.roleDialog]?.common?.type, onClose: (obj) => {
                     if (obj) {
                         this.info.objects[this.state.roleDialog] = obj;
                     }
@@ -5522,7 +5555,7 @@ export class ObjectBrowserClass extends Component {
             return null;
         }
         const ObjectBrowserAliasEditor = this.props.objectBrowserAliasEditor;
-        return (React.createElement(ObjectBrowserAliasEditor, { key: "editAlias", obj: this.objects[this.state.showAliasEditor], objects: this.objects, socket: this.props.socket, t: this.props.t, onClose: () => this.setState({ showAliasEditor: '' }), onRedirect: (id, timeout) => setTimeout(() => this.onSelect(id, false, () => this.expandAllSelected(() => {
+        return (React.createElement(ObjectBrowserAliasEditor, { key: "editAlias", obj: this.objects[this.state.showAliasEditor], roleArray: this.info.roles, objects: this.objects, socket: this.props.socket, t: this.props.t, onClose: () => this.setState({ showAliasEditor: '' }), onRedirect: (id, timeout) => setTimeout(() => this.onSelect(id, false, () => this.expandAllSelected(() => {
                 this.scrollToItem(id);
                 setTimeout(() => this.setState({
                     editObjectDialog: id,