Merge branch 'master' into no-vis-1

ioBroker · Jan 23, 2025 · 8dc3e78 · 8dc3e78
2 parents a7a5176 + 43d312f
commit 8dc3e78
Show file tree

Hide file tree

Showing 11 changed files with 699 additions and 535 deletions.
diff --git a/packages/iobroker.vis-2/src-vis/public/widgets/basic/js/table.js b/packages/iobroker.vis-2/src-vis/public/widgets/basic/js/table.js
diff --git a/packages/iobroker.vis-2/src-vis/src/Editor.tsx b/packages/iobroker.vis-2/src-vis/src/Editor.tsx
@@ -1190,17 +1190,17 @@ class Editor extends Runtime<EditorProps, EditorState> {
             return;
         }
         this.setState({ selectedGroup: groupId });
-        this.setSelectedWidgets([]);
+        void this.setSelectedWidgets([]);
     };
 
     undo = async (): Promise<void> => {
-        this.setSelectedWidgets([]);
+        void this.setSelectedWidgets([]);
         await this.changeProject(this.state.history[this.state.historyCursor - 1], true);
         await this.setStateAsync({ historyCursor: this.state.historyCursor - 1 });
     };
 
     redo = async (): Promise<void> => {
-        this.setSelectedWidgets([]);
+        void this.setSelectedWidgets([]);
         await this.changeProject(this.state.history[this.state.historyCursor + 1], true);
         await this.setStateAsync({ historyCursor: this.state.historyCursor + 1 });
     };
@@ -1669,13 +1669,15 @@ class Editor extends Runtime<EditorProps, EditorState> {
         const project = deepClone(store.getState().visProject);
         const widget = project[this.state.selectedView].widgets[id];
         if (widget?.marketplace) {
-            const marketplace = deepClone(
+            const marketplace: MarketplaceWidgetRevision | null = deepClone(
                 store
                     .getState()
                     .visProject.___settings.marketplace.find(item => item.widget_id === widget.marketplace.widget_id),
             );
             await this.deleteWidgetsAction();
-            await this.addMarketplaceWidget(marketplace.id, null, null, id, widget.data, widget.style);
+            if (marketplace) {
+                await this.addMarketplaceWidget(marketplace.id, null, null, id, widget.data, widget.style);
+            }
         }
     };
 
@@ -2152,13 +2154,12 @@ class Editor extends Runtime<EditorProps, EditorState> {
                     name: view,
                     widgets: [],
                 };
-                Object.keys(store.getState().visProject[view].widgets).forEach((widget: AnyWidgetId) => {
+                const pWidgets = store.getState().visProject[view].widgets;
+                Object.keys(pWidgets).forEach((widget: AnyWidgetId) => {
                     if (
                         this.state.updateWidgetsDialog &&
-                        store.getState().visProject[view].widgets[widget].marketplace?.widget_id ===
-                            this.state.updateWidgetsDialog.widget_id &&
-                        store.getState().visProject[view].widgets[widget].marketplace?.version !==
-                            this.state.updateWidgetsDialog.version
+                        pWidgets[widget].marketplace?.widget_id === this.state.updateWidgetsDialog.widget_id &&
+                        pWidgets[widget].marketplace?.version !== this.state.updateWidgetsDialog.version
                     ) {
                         viewWidgets.widgets.push(widget);
                     }

diff --git a/packages/iobroker.vis-2/src-vis/src/Vis/Widgets/Basic/BasicImageGeneric.tsx b/packages/iobroker.vis-2/src-vis/src/Vis/Widgets/Basic/BasicImageGeneric.tsx
@@ -1,10 +1,10 @@
 import React from 'react';
 
 import { Icon } from '@iobroker/adapter-react-v5';
-import type { RxRenderWidgetProps, VisBaseWidgetProps } from '@iobroker/types-vis-2';
+import type { RxRenderWidgetProps, VisBaseWidgetProps, WidgetData } from '@iobroker/types-vis-2';
 import VisRxWidget from '@/Vis/visRxWidget';
 
-export interface RxDataBasicImageGeneric {
+export interface RxDataBasicImageGeneric extends WidgetData {
     stretch: boolean;
     refreshInterval: number;
     refreshOnWakeUp: boolean;

diff --git a/packages/iobroker.vis-2/src-vis/src/Vis/Widgets/Basic/BasicViewInWidget8.tsx b/packages/iobroker.vis-2/src-vis/src/Vis/Widgets/Basic/BasicViewInWidget8.tsx
@@ -17,10 +17,10 @@ import React, { type CSSProperties } from 'react';
 
 import { I18n } from '@iobroker/adapter-react-v5';
 
-import type { RxRenderWidgetProps, RxWidgetInfo, RxWidgetInfoGroup } from '@iobroker/types-vis-2';
+import type { RxRenderWidgetProps, RxWidgetInfo, RxWidgetInfoGroup, WidgetData } from '@iobroker/types-vis-2';
 import VisRxWidget from '../../visRxWidget';
 
-interface RxData {
+interface RxData extends WidgetData {
     oid: string;
     count: number;
     [key: `contains_view_${number}`]: string;

diff --git a/packages/iobroker.vis-2/src-vis/src/Vis/Widgets/JQui/JQuiSlider.tsx b/packages/iobroker.vis-2/src-vis/src/Vis/Widgets/JQui/JQuiSlider.tsx
@@ -19,16 +19,17 @@ import { FormControl, FormLabel, Slider, Stack, LinearProgress } from '@mui/mate
 
 import { Icon, type LegacyConnection } from '@iobroker/adapter-react-v5';
 
-import VisRxWidget, { type VisRxData, type VisRxWidgetState } from '../../visRxWidget';
+import VisRxWidget, { type VisRxWidgetState } from '../../visRxWidget';
 import type {
     RxRenderWidgetProps,
     RxWidgetInfo,
     RxWidgetInfoAttributesField,
     VisBaseWidgetProps,
+    WidgetData,
     Writeable,
 } from '@iobroker/types-vis-2';
 
-interface RxData extends VisRxData {
+interface RxData extends WidgetData {
     type: 'single' | 'range';
     oid: string;
     click_id: string;

diff --git a/packages/iobroker.vis-2/src-vis/src/Vis/Widgets/Swipe/Swipe.tsx b/packages/iobroker.vis-2/src-vis/src/Vis/Widgets/Swipe/Swipe.tsx
@@ -16,11 +16,11 @@
 import React from 'react';
 
 import { I18n } from '@iobroker/adapter-react-v5';
-import type { RxRenderWidgetProps, RxWidgetInfo } from '@iobroker/types-vis-2';
+import type { RxRenderWidgetProps, RxWidgetInfo, WidgetData } from '@iobroker/types-vis-2';
 import VisRxWidget from '../../visRxWidget';
 import InstallSwipe from './InstallSwipe';
 
-interface RxData {
+interface RxData extends WidgetData {
     left_nav_view: string;
     right_nav_view: string;
     hideIndication: boolean;

diff --git a/packages/iobroker.vis-2/src-vis/src/Vis/Widgets/Tabs/TabsSliderTabs.tsx b/packages/iobroker.vis-2/src-vis/src/Vis/Widgets/Tabs/TabsSliderTabs.tsx
@@ -18,10 +18,10 @@ import React from 'react';
 import { Tab, Tabs } from '@mui/material';
 import { Icon } from '@iobroker/adapter-react-v5';
 
-import type { RxRenderWidgetProps, RxWidgetInfo } from '@iobroker/types-vis-2';
+import type { RxRenderWidgetProps, RxWidgetInfo, WidgetData } from '@iobroker/types-vis-2';
 import VisRxWidget, { type VisRxWidgetState } from '../../visRxWidget';
 
-interface RxData {
+interface RxData extends WidgetData {
     show_tabs: number;
     vertical: boolean;
     variant: '' | 'centered' | 'fullWidth';