@iobroker/dm-utils 0.6.9 → 0.6.11

package/README.md

@@ -295,6 +295,14 @@ This method returns a promise that resolves to a `ProgressDialog` object.
 	### **WORK IN PROGRESS**
 -->
 ## Changelog
+### 0.6.11 (2024-12-11)
+
+* (@GermanBluefox) Do not close handler for progress
+
+### 0.6.10 (2024-12-10)
+
+* (@GermanBluefox) Export `BackEndCommandJsonFormOptions` type
+
 ### 0.6.9 (2024-11-22)
 
 * (@GermanBluefox) Added max-width option for form

package/build/ActionContext.d.ts

@@ -1,14 +1,9 @@
-import type { ActionButton, JsonFormData, JsonFormSchema } from '.';
+import type { BackEndCommandJsonFormOptions, JsonFormData, JsonFormSchema } from '.';
 import type { ProgressDialog } from './ProgressDialog';
 export interface ActionContext {
     showMessage(text: ioBroker.StringOrTranslated): Promise<void>;
     showConfirmation(text: ioBroker.StringOrTranslated): Promise<boolean>;
-    showForm(schema: JsonFormSchema, options?: {
-        data?: JsonFormData;
-        title?: ioBroker.StringOrTranslated;
-        buttons?: (ActionButton | 'apply' | 'cancel')[];
-        maxWidth?: 'xs' | 'sm' | 'md' | 'lg' | 'xl';
-    }): Promise<JsonFormData | undefined>;
+    showForm(schema: JsonFormSchema, options?: BackEndCommandJsonFormOptions): Promise<JsonFormData | undefined>;
     openProgress(title: string, options?: {
         indeterminate?: boolean;
         value?: number;

package/build/DeviceManagement.d.ts

@@ -42,7 +42,7 @@ export declare class MessageContext implements ActionContext {
     showForm(schema: JsonFormSchema, options?: {
         data?: JsonFormData;
         title?: ioBroker.StringOrTranslated;
-        buttons?: (ActionButton | 'apply' | 'cancel')[];
+        buttons?: (ActionButton | 'apply' | 'cancel' | 'close')[];
     }): Promise<JsonFormData | undefined>;
     openProgress(title: string, options?: {
         indeterminate?: boolean;

package/build/DeviceManagement.js

@@ -341,7 +341,7 @@ class MessageContext {
                 });
                 this.send('progress', {
                     progress: Object.assign(Object.assign(Object.assign({ title }, options), update), { open: true }),
-                });
+                }, true);
                 return promise;
             },
             close: () => {
@@ -362,7 +362,7 @@ class MessageContext {
         });
         this.send('progress', {
             progress: Object.assign(Object.assign({ title }, options), { open: true }),
-        });
+        }, true);
         return promise;
     }
     sendFinalResult(result) {
@@ -403,12 +403,15 @@ class MessageContext {
             throw new Error("Can't show another dialog while a progress dialog is open. Please call 'close()' on the dialog before opening another dialog.");
         }
     }
-    send(type, message) {
+    send(type, message, doNotClose) {
         if (!this.lastMessage) {
             throw new Error("No outstanding message, can't send a new one");
         }
         this.adapter.sendTo(this.lastMessage.from, this.lastMessage.command, Object.assign(Object.assign({}, message), { type, origin: this.lastMessage.message.origin || this.lastMessage._id }), this.lastMessage.callback);
-        this.lastMessage = undefined;
+        if (!doNotClose) {
+            // "progress" is exception. It will be closed with "close" flag
+            this.lastMessage = undefined;
+        }
     }
 }
 exports.MessageContext = MessageContext;

package/build/types/common.d.ts

@@ -103,6 +103,8 @@ export interface ConfigItem {
         ignoreOwnChanges?: boolean;
     };
     doNotSave?: boolean;
+    /** If the control should be shown ONLY in the expert mode */
+    expertMode?: boolean;
     noMultiEdit?: boolean;
     confirm?: ConfigItemConfirmData;
     icon?: ConfigIconType;
@@ -817,7 +819,7 @@ export type BackEndCommandType = 'nop' | 'refresh' | 'link' | 'message';
 export interface BackEndCommandGeneric {
     command: BackEndCommandType;
     /** New GUI schema */
-    schema?: ConfigItemPanel;
+    schema?: ConfigItemPanel | ConfigItemTabs;
     /** New GUI data */
     data?: Record<string, any>;
     refresh?: boolean;
@@ -849,6 +851,13 @@ export interface BackEndCommandMessage extends BackEndCommandGeneric {
     variant: 'popup' | 'dialog';
 }
 export type BackEndCommand = BackEndCommandMessage | BackEndCommandOpenLink | BackEndCommandRefresh;
+export type BackEndCommandJsonFormOptions = {
+    data?: JsonFormData;
+    title?: ioBroker.StringOrTranslated;
+    buttons?: (ActionButton | 'apply' | 'cancel' | 'close')[];
+    maxWidth?: 'xs' | 'sm' | 'md' | 'lg' | 'xl';
+    noTranslation?: boolean;
+};
 export type JsonFormSchema = ConfigItemPanel | ConfigItemTabs;
 export type JsonFormData = Record<string, any>;
 export interface DeviceDetails {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@iobroker/dm-utils",
-  "version": "0.6.9",
+  "version": "0.6.11",
   "description": "ioBroker Device Manager utilities for backend",
   "main": "build/index.js",
   "publishConfig": {
@@ -22,15 +22,15 @@
   "author": "UncleSamSwiss",
   "license": "MIT",
   "dependencies": {
-    "@iobroker/adapter-core": "^3.2.2"
+    "@iobroker/adapter-core": "^3.2.3"
   },
   "devDependencies": {
     "@alcalzone/release-script": "^3.8.0",
     "@alcalzone/release-script-plugin-license": "^3.7.0",
     "@iobroker/eslint-config": "^1.0.0",
-    "@types/node": "^22.9.1",
-    "axios": "^1.7.7",
-    "typescript": "^5.6.3"
+    "@types/node": "^22.10.2",
+    "axios": "^1.7.9",
+    "typescript": "^5.7.2"
   },
   "files": [
     "LICENSE",