iobroker.webui 1.24.4 → 1.25.1

package/README.md

@@ -133,6 +133,13 @@ runtime.html?screenName=screen2
 	Placeholder for next versions:
 	### __WORK IN PROGRESS__
 -->
+### 1.25.1 (2025-01-24)
+- escape xml
+- switch to official selector package
+
+### 1.25.0 (2025-01-21)
+- fix bindings in custom controls
+
 ### 1.24.4 (2025-01-20)
 - switch again to old module shims (error in new one)
 

package/dist/importmaps/importmap-config.d.ts

@@ -31,6 +31,6 @@ declare const importMapConfig: {
         wunderbaum: string;
         "wunderbaum/": string;
         "toastify-js": string;
-        "iobroker-webcomponent-object-selector/": string;
+        "@iobroker/webcomponent-selectid-dialog/": string;
     };
 };

package/dist/importmaps/importmap-config.js

@@ -32,7 +32,7 @@ const importMapConfig = {
         "wunderbaum": "./node_modules/wunderbaum/dist/wunderbaum.esm.min.js",
         "wunderbaum/": "./node_modules/wunderbaum/",
         "toastify-js": "./node_modules/toastify-js/src/toastify-es.js",
-        "iobroker-webcomponent-object-selector/": "./node_modules/iobroker-webcomponent-object-selector/"
+        "@iobroker/webcomponent-selectid-dialog/": "./node_modules/@iobroker/webcomponent-selectid-dialog/"
     }
 };
 //@ts-ignore

package/gulpfile.mjs

@@ -68,9 +68,9 @@ function copyNodeFiles() {
         "toastify-js/src/toastify-es.js",
         "toastify-js/src/toastify.css",
         "dayjs/dayjs.min.js",
-        "iobroker-webcomponent-object-selector/dist/iobrokerSelectId.es.js",
-        "iobroker-webcomponent-object-selector/dist/selectIdHelper.js",
-        "iobroker-webcomponent-object-selector/dist/socket.iob.js"
+        "@iobroker/webcomponent-selectid-dialog/dist/iobrokerSelectId.es.js",
+        "@iobroker/webcomponent-selectid-dialog/dist/selectIdHelper.js",
+        "@iobroker/webcomponent-selectid-dialog/dist/socket.iob.js"
     ]
 
     runtimeModules = runtimeModules.map(x => './node_modules/' + x)

package/io-package.json

@@ -1,7 +1,7 @@
 {
   "common": {
     "name": "webui",
-    "version": "1.24.4",
+    "version": "1.25.1",
     "titleLang": {
       "en": "webui",
       "de": "webui",
@@ -29,6 +29,32 @@
       "zh-cn": "使用万维网传送器的高锰用户接口"
     },
     "news": {
+      "1.25.1": {
+        "en": "escape xml\nswitch to official selector package",
+        "de": "entkommen xml\nwechsel zum offiziellen auswahlpaket",
+        "ru": "xml\nпереход на официальный пакет селектора",
+        "pt": "escapar xml\nmudar para o pacote seletor oficial",
+        "nl": "ontsnappen xml\nschakel over op officiële selectiepakket",
+        "fr": "évasion xml\npasser au sélecteur officiel",
+        "it": "fuga xml\npassare al pacchetto selettore ufficiale",
+        "es": "escape xml\ncambiar al paquete oficial selector",
+        "pl": "escape xml\nprzełączanie na oficjalny pakiet wyboru",
+        "uk": "втеча xml\nвимикач на офіційному пакеті selector",
+        "zh-cn": "越狱 xml\n切换到正式选择软件包"
+      },
+      "1.25.0": {
+        "en": "fix bindings in custom controls",
+        "de": "fixe bindungen in benutzerdefinierten steuerungen",
+        "ru": "фиксации в пользовательском контроле",
+        "pt": "corrigir ligações em controles personalizados",
+        "nl": "fix bindingen in aangepaste controles",
+        "fr": "fixer les fixations dans les contrôles personnalisés",
+        "it": "fissare i binding nei controlli personalizzati",
+        "es": "fijaciones en controles personalizados",
+        "pl": "naprawić wiązania w niestandardowych kontrolach",
+        "uk": "фіксувати прив'язки в користувацьких управліннях",
+        "zh-cn": "定制控制中的固定绑定"
+      },
       "1.24.4": {
         "en": "switch again to old module shims (error in new one)",
         "de": "wieder auf alte modul-shimmel wechseln (error in new one)",
@@ -93,32 +119,6 @@
         "pl": "czyszczenie dir www",
         "uk": "очищувач www dir",
         "zh-cn": "清理 www dir"
-      },
-      "1.23.2": {
-        "en": "one more fix in gulpfile",
-        "de": "noch eine fix in gulpfile",
-        "ru": "еще одно исправление в gulpfile",
-        "pt": "mais uma correção no gulpfile",
-        "nl": "nog een fix in gulpfile",
-        "fr": "une autre correction dans gulpfile",
-        "it": "un altro fix in gulpfile",
-        "es": "uno más se fijan en el archivo del gulp",
-        "pl": "jeszcze jeden fix w gulpfile",
-        "uk": "ще одна фіксація в gulpfile",
-        "zh-cn": "再加一个固醇"
-      },
-      "1.23.1": {
-        "en": "fix gulp should work again",
-        "de": "gulp sollte wieder funktionieren",
-        "ru": "исправить gulp должно работать снова",
-        "pt": "corrigir gulp deve funcionar novamente",
-        "nl": "fix gulp moet weer werken",
-        "fr": "réparer gulp devrait fonctionner à nouveau",
-        "it": "fissare gulp dovrebbe funzionare di nuovo",
-        "es": "arreglar golp debe trabajar de nuevo",
-        "pl": "fix gulp powinien działać ponownie",
-        "uk": "закріпити гельпом потрібно знову",
-        "zh-cn": "修补 gulp 应再次工作"
       }
     },
     "icon": "logo.png",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "iobroker.webui",
-  "version": "1.24.4",
+  "version": "1.25.1",
   "description": "ioBroker webui",
   "type": "module",
   "main": "dist/backend/main.js",
@@ -54,6 +54,7 @@
     "@blockly/zoom-to-fit": "^6.0.12",
     "@iobroker/socket-client": "^4.0.0",
     "@iobroker/testing": "^5.0.0",
+    "@iobroker/webcomponent-selectid-dialog": "^1.0.3",
     "@node-projects/base-custom-webcomponent": "0.27.8",
     "@node-projects/lean-he-esm": "^3.3.0",
     "@node-projects/node-html-parser-esm": "^6.2.0",
@@ -82,7 +83,6 @@
     "gulp": "^5.0.0",
     "gulp-git": "^2.11.0",
     "gulp-replace": "^1.1.4",
-    "iobroker-webcomponent-object-selector": "file:binary/iobroker-webcomponent-object-selector-0.0.1.tgz",
     "long": "^5.2.4",
     "mobile-drag-drop": "^3.0.0-rc.0",
     "mocha": "^11.0.1",

package/www/dist/frontend/config/IobrokerWebuiBindingsEditor.js

@@ -1,5 +1,5 @@
 import { BindingsEditor } from "@node-projects/web-component-designer-visualization-addons";
-import { openSelectIdDialog } from "iobroker-webcomponent-object-selector/dist/selectIdHelper.js";
+import { openSelectIdDialog } from "@iobroker/webcomponent-selectid-dialog/dist/selectIdHelper.js";
 //@ts-ignore
 export class IobrokerWebuiBindingsEditor extends BindingsEditor {
     static is = 'iobroker-webui-bindings-editor';

package/www/dist/frontend/config/IobrokerWebuiSignalPropertyEditor.js

@@ -1,5 +1,5 @@
 import { SignalPropertyEditor } from "@node-projects/web-component-designer-visualization-addons";
-import { openSelectIdDialog } from "iobroker-webcomponent-object-selector/dist/selectIdHelper.js";
+import { openSelectIdDialog } from "@iobroker/webcomponent-selectid-dialog/dist/selectIdHelper.js";
 export class IobrokerWebuiSignalPropertyEditor extends SignalPropertyEditor {
     constructor(property, shell) {
         super(property, shell);

package/www/dist/frontend/generated/Properties.json

@@ -39,7 +39,7 @@
                 "arguments",
                 "caller",
                 "name",
-                "__@hasInstance@5144"
+                "__@hasInstance@2369"
             ],
             "type": "object"
         },

package/www/dist/frontend/helper/XmlHelper.js

@@ -1,6 +1,18 @@
 export function escapeCData(text) {
     return text.replaceAll("]]>", "]]]]><![CDATA[>");
 }
+export function escapeXml(text) {
+    return text.replace(/[<>&'"]/g, c => {
+        switch (c) {
+            case '<': return '&lt;';
+            case '>': return '&gt;';
+            case '&': return '&amp;';
+            case '\'': return '&apos;';
+            case '"': return '&quot;';
+        }
+        return null;
+    });
+}
 export function parseXml(xml) {
     let doc = new DOMParser().parseFromString(xml, "text/xml");
     let obj = {};
@@ -67,7 +79,7 @@ export function convertToXml(type, screen) {
             if (screen.properties[p].type)
                 xml += ` type="${screen.properties[p].type}"`;
             if (screen.properties[p].default)
-                xml += ` default="${screen.properties[p].default}"`;
+                xml += ` default="${escapeXml(screen.properties[p].default)}"`;
             if (screen.properties[p].values)
                 xml += ` values="${screen.properties[p].values.join('|')}"`;
             if (screen.properties[p].internal)

package/www/dist/frontend/runtime/CustomControls.js

@@ -51,7 +51,7 @@ export class BaseCustomControl extends BaseCustomWebComponentConstructorAppend {
         for (let e of this.#eventListeners) {
             this.addEventListener(e[0], e[1]);
         }
-        this.#resizeObserver.observe(this);
+        this.#resizeObserver?.observe(this);
     }
     disconnectedCallback() {
         for (let e of this.#eventListeners) {
@@ -61,7 +61,7 @@ export class BaseCustomControl extends BaseCustomWebComponentConstructorAppend {
         for (const b of this.#bindings)
             b();
         this.#bindings = null;
-        this.#resizeObserver.unobserve(this);
+        this.#resizeObserver?.unobserve(this);
     }
     _assignEvent(event, callback) {
         const arrayEl = [event, callback];
@@ -133,6 +133,11 @@ export function generateCustomControl(name, control) {
             let instance = Reflect.construct(BaseCustomControl, [], window['IobrokerWebuiCustomControl' + name]);
             let currControl = window['IobrokerWebuiCustomControl' + name][webuiCustomControlSymbol].control;
             for (let p in currControl.properties) {
+                let backup = undefined;
+                if (p in instance) {
+                    backup = instance[p];
+                    delete instance[p];
+                }
                 Object.defineProperty(instance, p, {
                     get() {
                         return this['_' + p];
@@ -147,7 +152,10 @@ export function generateCustomControl(name, control) {
                     enumerable: true,
                     configurable: true,
                 });
-                if (currControl.properties[p].default) {
+                if (backup !== undefined) {
+                    instance[p] = backup;
+                }
+                else if (currControl.properties[p].default) {
                     instance['_' + p] = currControl.properties[p].default;
                 }
             }

package/www/dist/importmaps/importmap-config.js

@@ -32,7 +32,7 @@ const importMapConfig = {
         "wunderbaum": "./node_modules/wunderbaum/dist/wunderbaum.esm.min.js",
         "wunderbaum/": "./node_modules/wunderbaum/",
         "toastify-js": "./node_modules/toastify-js/src/toastify-es.js",
-        "iobroker-webcomponent-object-selector/": "./node_modules/iobroker-webcomponent-object-selector/"
+        "@iobroker/webcomponent-selectid-dialog/": "./node_modules/@iobroker/webcomponent-selectid-dialog/"
     }
 };
 //@ts-ignore

package/www/index.html

@@ -218,7 +218,7 @@
     </button>
     <button data-command="save" title="save" disabled><img src="./node_modules/@node-projects/web-component-designer/assets/icons/save.svg"></button>
     <div style="margin-left: 30px;">
-      webui - 1.24.4 - 12f122d
+      webui - 1.25.1 - b3caac3
     </div>
     <button style="margin-left: 30px;" data-command="paste" title="paste" disabled><img
         src="./node_modules/@node-projects/web-component-designer/assets/icons/paste.svg"></button>