From 16a0adea2e0b1f8e44df8f746c0536e42d868de7 Mon Sep 17 00:00:00 2001 From: GermanBluefox Date: Mon, 18 Mar 2024 00:23:47 +0800 Subject: [PATCH] Bump version --- README.md | 2 +- io-package.json | 13 ------------- src/package.json | 4 ++-- src/src/Utils.tsx | 5 ++++- src/src/Vis/Widgets/Basic/FiltersEditorDialog.tsx | 9 +++++---- src/src/Vis/Widgets/JQui/BulkEditor.tsx | 13 +++++++------ 6 files changed, 19 insertions(+), 27 deletions(-) diff --git a/README.md b/README.md index cf5d1f474..2c4eef395 100644 --- a/README.md +++ b/README.md @@ -264,7 +264,7 @@ E.g., if it was used in a menu and the menu is red, the circle would be red. ### **WORK IN PROGRESS** --> ## Changelog -### 2.9.43 (2024-03-17) +### **WORK IN PROGRESS** * (bluefox) Showed selected view in the view dialog * (bluefox) Added customization of loading screen * (bluefox) Respected the sentry disable flag in GUI diff --git a/io-package.json b/io-package.json index 9f38891f9..0b4bf3e53 100644 --- a/io-package.json +++ b/io-package.json @@ -3,19 +3,6 @@ "name": "vis-2", "version": "2.9.43", "news": { - "2.9.43": { - "en": "Showed selected view in the view dialog\nAdded customization of loading screen\nRespected the sentry disable flag in GUI", - "de": "Gezeigte ausgewählte Ansicht im Ansichtsdialog\nHinzugefügt Anpassung des Ladebildschirms\nRespected the sentry disable flag in GUI", - "ru": "Показать выбранный вид в диалоге просмотра\nДобавлена настройка экрана загрузки\nУважение отсылочного флага в GUI", - "pt": "Visualização selecionada na caixa de diálogo visualização\nAdicionado personalização da tela de carregamento\nRespeitado a bandeira de desativação de sentinela em GUI", - "nl": "Geselecteerde weergave tonen in het weergavevenster\nAanpassen van het laadscherm toegevoegd\nRespecteerde de wachtersvlag in GUI", - "fr": "Affichage de la vue sélectionnée dans la boîte de dialogue vue\nAjout de la personnalisation de l'écran de chargement\nRespecté le drapeau de désactivation de sentinelle dans GUI", - "it": "Mostrata la vista selezionata nella finestra di dialogo vista\nAggiunta personalizzazione dello schermo di caricamento\nRispettato la bandiera disattiva della sentinella GUI", - "es": "Visualización de la vista seleccionada en el diálogo de vista\nAñadido la personalización de la pantalla de carga\nRespetó la bandera desactiva del centinela en GUI", - "pl": "Pokazał zaznaczony widok w oknie widoku\nDodano dostosowanie ekranu ładowania\nUszanowana flaga Sentry wyłącza w GUI", - "uk": "Показати вибраний вигляд у діалоговому вікні перегляду\nДодано налаштування екрану завантаження\nУвімкніть прапор відправника в GUI", - "zh-cn": "在视图对话框中显示选中视图\n添加加载屏幕的定制\n遵守了图形界面中的监视禁用旗" - }, "2.9.42": { "en": "Allowed limiting the view size only on desktop\nChange word \"Filter\" to \"Search\"", "de": "Erlaubt, die Ansichtsgröße nur auf dem Desktop zu begrenzen\nWort \"Filter\" zu \"Search\" ändern", diff --git a/src/package.json b/src/package.json index 2c8d669b0..4cddb5242 100644 --- a/src/package.json +++ b/src/package.json @@ -8,7 +8,7 @@ "@devbookhq/splitter": "^1.4.2", "@emotion/react": "^11.11.4", "@emotion/styled": "^11.11.0", - "@iobroker/adapter-react-v5": "^4.11.1", + "@iobroker/adapter-react-v5": "^4.11.3", "@iobroker/type-detector": "^3.0.5", "@iobroker/types": "^5.0.19", "@iobroker/vis-2-widgets-react-dev": "^1.0.5", @@ -76,4 +76,4 @@ "not ie <= 11", "not op_mini all" ] -} \ No newline at end of file +} diff --git a/src/src/Utils.tsx b/src/src/Utils.tsx index c1e5b72b6..1a0cef842 100644 --- a/src/src/Utils.tsx +++ b/src/src/Utils.tsx @@ -3,7 +3,10 @@ import { usePreview } from 'react-dnd-preview'; import { Timer } from '@/types'; export const DndPreview = () => { - const { display, item, style } = usePreview(); + const preview = usePreview(); + const display = preview.display; + // TODO: How to fix this? + const { item, style } = (preview as unknown as {item: { preview: React.JSX.Element }; style: React.CSSProperties }); if (!display) { return null; } diff --git a/src/src/Vis/Widgets/Basic/FiltersEditorDialog.tsx b/src/src/Vis/Widgets/Basic/FiltersEditorDialog.tsx index 049242a07..6c9390efd 100644 --- a/src/src/Vis/Widgets/Basic/FiltersEditorDialog.tsx +++ b/src/src/Vis/Widgets/Basic/FiltersEditorDialog.tsx @@ -225,13 +225,14 @@ class FiltersEditorDialog extends Component { + onOk={selectedOrArray => { + let selected = selectedOrArray ? (Array.isArray(selectedOrArray) ? selectedOrArray[0] : selectedOrArray) : ''; const projectPrefix = `${this.props.context.adapterName}.${this.props.context.instance}/${this.props.context.projectName}/`; - if (selected.startsWith(projectPrefix)) { + if (selected?.startsWith(projectPrefix)) { selected = `_PRJ_NAME/${selected.substring(projectPrefix.length)}`; - } else if (selected.startsWith('/')) { + } else if (selected?.startsWith('/')) { selected = `..${selected}`; - } else if (!selected.startsWith('.')) { + } else if (selected && !selected.startsWith('.')) { selected = `../${selected}`; } const items = JSON.parse(JSON.stringify(this.state.items)); diff --git a/src/src/Vis/Widgets/JQui/BulkEditor.tsx b/src/src/Vis/Widgets/JQui/BulkEditor.tsx index ff2559371..a363a748e 100644 --- a/src/src/Vis/Widgets/JQui/BulkEditor.tsx +++ b/src/src/Vis/Widgets/JQui/BulkEditor.tsx @@ -435,18 +435,18 @@ class BulkEditor extends React.Component { value = value.replace('_PRJ_NAME/', `../${this.props.adapterName}.${this.props.instance}/${this.props.projectName}/`); } - const onChange = (selected: string, isClose: boolean) => { + const onChange = (selected: string | undefined, isClose: boolean) => { const projectPrefix = `${this.props.adapterName}.${this.props.instance}/${this.props.projectName}/`; - if (selected.startsWith(projectPrefix)) { + if (selected?.startsWith(projectPrefix)) { selected = `_PRJ_NAME/${selected.substring(projectPrefix.length)}`; - } else if (selected.startsWith('/')) { + } else if (selected?.startsWith('/')) { selected = `..${selected}`; - } else if (!selected.startsWith('.')) { + } else if (selected && !selected.startsWith('.')) { selected = `../${selected}`; } const images = [...this.state.images]; if (typeof this.state.imageDialog === 'number') { - images[this.state.imageDialog] = selected; + images[this.state.imageDialog] = selected || ''; } this.setState({ images }); @@ -468,7 +468,8 @@ class BulkEditor extends React.Component { imagePrefix="../" selected={value} filterByType="images" - onOk={(selected: string) => onChange(selected, true)} + onOk={(selectedOrArray: string | string[] | undefined) => + onChange(Array.isArray(selectedOrArray) ? selectedOrArray[0] : selectedOrArray, true)} socket={this.props.socket} />; }