@iobroker/adapter-react-v5 6.1.10 → 7.0.2

package/Components/FileBrowser.js

@@ -420,7 +420,9 @@ class FileBrowserClass extends react_1.Component {
             const folder = key.substring(0, pos);
             console.log(`File changed ${key}[${size}]`);
             if (this.state.folders[folder]) {
-                this._tempTimeout[folder] && clearTimeout(this._tempTimeout[folder]);
+                if (this._tempTimeout[folder]) {
+                    clearTimeout(this._tempTimeout[folder]);
+                }
                 this._tempTimeout[folder] = setTimeout(() => {
                     delete this._tempTimeout[folder];
                     this.browseFolder(folder, null, false, true)
@@ -604,7 +606,9 @@ class FileBrowserClass extends react_1.Component {
         }
     }
     componentWillUnmount() {
-        this.supportSubscribes && this.props.socket.unsubscribeFiles('*', '*', this.onFileChange);
+        if (this.supportSubscribes) {
+            this.props.socket.unsubscribeFiles('*', '*', this.onFileChange);
+        }
         this.mounted = false;
         this.browseList = null;
         this.browseListRunning = false;
@@ -687,7 +691,9 @@ class FileBrowserClass extends react_1.Component {
                         item.reject = null;
                         item.adapter = null;
                         item.relPath = null;
-                        resolve && resolve(files);
+                        if (resolve) {
+                            resolve(files);
+                        }
                         this.browseListRunning = false;
                         if (this.browseList.length) {
                             if (level < 5) {
@@ -716,7 +722,9 @@ class FileBrowserClass extends react_1.Component {
                         item.reject = null;
                         item.adapter = null;
                         item.relPath = null;
-                        reject && reject(e);
+                        if (reject) {
+                            reject(e);
+                        }
                         this.browseListRunning = false;
                         if (this.browseList.length) {
                             if (level < 5) {
@@ -804,7 +812,9 @@ class FileBrowserClass extends react_1.Component {
                 });
                 _folders.sort((a, b) => (a.id > b.id ? 1 : (a.id < b.id ? -1 : 0)));
                 if (!this.limitToObjectID || this.limitToObjectID === USER_DATA) {
-                    userData && _folders.unshift(userData);
+                    if (userData) {
+                        _folders.unshift(userData);
+                    }
                 }
                 newFoldersNotNull[folderId || '/'] = _folders;
                 if (!_checkEmpty) {
@@ -815,7 +825,9 @@ class FileBrowserClass extends react_1.Component {
                 }
             }
             catch (e) {
-                this.initialReadFinished && window.alert(`Cannot read meta items: ${e}`);
+                if (this.initialReadFinished) {
+                    window.alert(`Cannot read meta items: ${e}`);
+                }
                 newFoldersNotNull[folderId || '/'] = [];
             }
             return newFoldersNotNull;
@@ -876,7 +888,9 @@ class FileBrowserClass extends react_1.Component {
             }
         }
         catch (e) {
-            this.initialReadFinished && window.alert(`Cannot read ${adapter}${relPath ? `/${relPath}` : ''}: ${e}`);
+            if (this.initialReadFinished) {
+                window.alert(`Cannot read ${adapter}${relPath ? `/${relPath}` : ''}: ${e}`);
+            }
             newFoldersNotNull[folderId] = [];
         }
         return newFoldersNotNull;
@@ -907,7 +921,9 @@ class FileBrowserClass extends react_1.Component {
         }
     }
     changeFolder(e, folder) {
-        e && e.stopPropagation();
+        if (e) {
+            e.stopPropagation();
+        }
         this.lastSelect = Date.now();
         let _folder = folder || getParentDir(this.state.currentDir);
         if (_folder === '/') {
@@ -935,7 +951,9 @@ class FileBrowserClass extends react_1.Component {
         }, () => this.props.onSelect && this.props.onSelect(''));
     }
     select(id, e, cb) {
-        e && e.stopPropagation();
+        if (e) {
+            e.stopPropagation();
+        }
         this.lastSelect = Date.now();
         this.localStorage.setItem('files.selected', id);
         this.setState({ selected: id, path: id, pathFocus: false }, () => {
@@ -950,7 +968,9 @@ class FileBrowserClass extends react_1.Component {
                     this.props.onSelect('');
                 }
             }
-            cb && cb();
+            if (cb) {
+                cb();
+            }
         });
     }
     getText(text) {
@@ -1236,7 +1256,7 @@ class FileBrowserClass extends react_1.Component {
                         !this.state.selected.startsWith(`${this.limitToPath}/`) &&
                         this.limitToPath !== this.state.selected), title: this.props.t('ra_Upload file'), style: styles.menuButton, color: "inherit", "aria-label": "upload file", onClick: () => this.setState({ uploadFile: true }), size: "small" },
                 react_1.default.createElement(icons_material_1.Publish, { fontSize: "small" })) : null,
-            this.props.showTypeSelector && IconType ? react_1.default.createElement(material_1.Tooltip, { title: this.props.t('ra_Filter files'), componentsProps: { popper: { sx: styles.tooltip } } },
+            this.props.showTypeSelector && IconType ? react_1.default.createElement(material_1.Tooltip, { title: this.props.t('ra_Filter files'), slotProps: { popper: { sx: styles.tooltip } } },
                 react_1.default.createElement(material_1.IconButton, { size: "small", onClick: e => this.setState({ showTypesMenu: e.target }) },
                     react_1.default.createElement(IconType, { fontSize: "small" }))) : null,
             this.state.showTypesMenu ? react_1.default.createElement(material_1.Menu, { open: !0, anchorEl: this.state.showTypesMenu, onClose: () => this.setState({ showTypesMenu: null }) }, Object.keys(FILE_TYPE_ICONS).map(type => {
@@ -1255,10 +1275,10 @@ class FileBrowserClass extends react_1.Component {
                         react_1.default.createElement(MyIcon, { fontSize: "small" })),
                     react_1.default.createElement(material_1.ListItemText, null, this.props.t(`ra_fileType_${type}`)));
             })) : null,
-            react_1.default.createElement(material_1.Tooltip, { title: this.props.t('ra_Background image'), componentsProps: { popper: { sx: styles.tooltip } } },
+            react_1.default.createElement(material_1.Tooltip, { title: this.props.t('ra_Background image'), slotProps: { popper: { sx: styles.tooltip } } },
                 react_1.default.createElement(material_1.IconButton, { color: "inherit", edge: "start", style: styles.menuButton, onClick: this.setStateBackgroundImage, size: "small" },
                     react_1.default.createElement(icons_material_1.Brightness6, { fontSize: "small" }))),
-            this.state.viewType !== TABLE && this.props.allowDelete ? react_1.default.createElement(material_1.Tooltip, { title: this.props.t('ra_Delete'), componentsProps: { popper: { sx: styles.tooltip } } },
+            this.state.viewType !== TABLE && this.props.allowDelete ? react_1.default.createElement(material_1.Tooltip, { title: this.props.t('ra_Delete'), slotProps: { popper: { sx: styles.tooltip } } },
                 react_1.default.createElement("span", null,
                     react_1.default.createElement(material_1.IconButton, { "aria-label": "delete", disabled: !this.state.selected ||
                             this.state.selected === 'vis.0/' ||
@@ -1327,7 +1347,9 @@ class FileBrowserClass extends react_1.Component {
         return null;
     }
     componentDidUpdate( /* prevProps , prevState, snapshot */) {
-        this.setOpacityTimer && clearTimeout(this.setOpacityTimer);
+        if (this.setOpacityTimer) {
+            clearTimeout(this.setOpacityTimer);
+        }
         this.setOpacityTimer = setTimeout(() => {
             this.setOpacityTimer = null;
             const items = window.document.getElementsByClassName('browserItem');
@@ -1545,7 +1567,9 @@ class FileBrowserClass extends react_1.Component {
             }
         });
         if (changed) {
-            this.cacheFoldersTimeout && clearTimeout(this.cacheFoldersTimeout);
+            if (this.cacheFoldersTimeout) {
+                clearTimeout(this.cacheFoldersTimeout);
+            }
             this.cacheFoldersTimeout = setTimeout(() => {
                 this.cacheFoldersTimeout = null;
                 const folders = this.cacheFolders || {};
@@ -1588,7 +1612,9 @@ class FileBrowserClass extends react_1.Component {
             : `/${this.state.currentDir}`.split('/');
         const p = [];
         return react_1.default.createElement(material_1.Breadcrumbs, { style: { paddingLeft: 8 } }, parts.map((part, i) => {
-            part && p.push(part);
+            if (part) {
+                p.push(part);
+            }
             const path = p.join('/');
             if (i < parts.length - 1) {
                 return react_1.default.createElement(material_1.Box, { component: "div", key: `${this.state.selected}_${i}`, sx: styles.pathDivBreadcrumbDir, onClick: e => this.changeFolder(e, path || '/') }, part || this.props.t('ra_Root'));

package/Components/ObjectBrowser.d.ts

@@ -331,6 +331,10 @@ interface ObjectBrowserState {
     showDescription: boolean;
     showContextMenu: {
         item: TreeItem;
+        position: {
+            left: number;
+            top: number;
+        };
         subItem?: string;
         subAnchor?: HTMLLIElement;
     } | null;
@@ -352,6 +356,8 @@ interface ObjectBrowserState {
         el: React.JSX.Element[];
         id: string;
     };
+    /** Show the menu with aliases for state */
+    aliasMenu: string;
 }
 export declare class ObjectBrowserClass extends Component<ObjectBrowserProps, ObjectBrowserState> {
     #private;
@@ -469,6 +475,7 @@ export declare class ObjectBrowserClass extends Component<ObjectBrowserProps, Ob
     onObjectChangeFromWorker: (events: ObjectEvent[]) => void;
     onObjectChange: (id: string, obj?: ioBroker.Object | null) => void;
     afterObjectUpdated(): void;
+    updateAliases(aliasId: string): void;
     /**
      * Processes a single element in regard to certain filters, columns for admin and updates object dict
      * @returns Returns an object containing the new state (if any) and whether the object was filtered.
@@ -537,6 +544,7 @@ export declare class ObjectBrowserClass extends Component<ObjectBrowserProps, Ob
      * Renders a custom value.
      */
     renderCustomValue(obj: ioBroker.Object, it: AdapterColumn, item: TreeItem): React.JSX.Element | null;
+    renderAliasLink(id: string, index?: number, customStyle?: Record<string, any>): React.JSX.Element | null;
     /**
      * Renders a leaf.
      */
@@ -582,6 +590,8 @@ export declare class ObjectBrowserClass extends Component<ObjectBrowserProps, Ob
     private renderViewObjectFileDialog;
     private renderAliasEditorDialog;
     showAddDataPointDialog(id: string, initialType: ioBroker.ObjectType, initialStateType?: ioBroker.CommonType): void;
+    /** Renders the aliases list for one state (if more than 2) */
+    private renderAliasMenu;
     /**
      * Renders the right mouse button context menu
      */