@acorex/modules 20.7.8 → 20.7.9

package/fesm2022/acorex-modules-data-management.mjs

@@ -7749,7 +7749,7 @@ class AXPMetaDataSelectorWidgetEditComponent extends AXPValueWidgetComponent {
      * Handle adding a new group
      */
     async handleAddGroupClick() {
-        const dialogRef = await this.layoutBuilder
+        await this.layoutBuilder
             .create()
             .dialog((dialog) => {
             dialog
@@ -7769,34 +7769,39 @@ class AXPMetaDataSelectorWidgetEditComponent extends AXPValueWidgetComponent {
             })
                 .setActions((actions) => {
                 actions.cancel('@general:actions.cancel.title').submit('@general:actions.save.title');
+            })
+                .onAction(async (dialogRef) => {
+                const context = dialogRef.context();
+                const action = dialogRef.action();
+                if (!context || action === 'cancel') {
+                    return;
+                }
+                const form = context;
+                if (form.title?.trim()) {
+                    const newGroup = {
+                        id: AXPDataGenerator.uuid(),
+                        name: generateKebabCase(form.title),
+                        title: form.title,
+                        description: form.description || undefined,
+                        order: this.designerState().groups.length,
+                        fields: [],
+                        isNewlyAdded: true,
+                    };
+                    this.designerState.update((state) => ({
+                        ...state,
+                        groups: [...state.groups, newGroup],
+                    }));
+                    this.syncStateToValue();
+                }
             });
         })
             .show();
-        const form = dialogRef.context();
-        const action = dialogRef.action();
-        if (action === 'submit' && form.title && form.title.trim()) {
-            const newGroup = {
-                id: AXPDataGenerator.uuid(),
-                name: generateKebabCase(form.title),
-                title: form.title,
-                description: form.description || undefined,
-                order: this.designerState().groups.length,
-                fields: [],
-                isNewlyAdded: true,
-            };
-            this.designerState.update((state) => ({
-                ...state,
-                groups: [...state.groups, newGroup],
-            }));
-            this.syncStateToValue();
-        }
-        dialogRef.close();
     }
     /**
      * Handle editing a group
      */
     async handleGroupEdit(group) {
-        const dialogRef = await this.layoutBuilder
+        await this.layoutBuilder
             .create()
             .dialog((dialog) => {
             dialog
@@ -7816,26 +7821,31 @@ class AXPMetaDataSelectorWidgetEditComponent extends AXPValueWidgetComponent {
             })
                 .setActions((actions) => {
                 actions.cancel('@general:actions.cancel.title').submit('@general:actions.save.title');
+            })
+                .onAction(async (dialogRef) => {
+                const context = dialogRef.context();
+                const action = dialogRef.action();
+                if (!context || action === 'cancel') {
+                    return;
+                }
+                const form = context;
+                if (form.title?.trim()) {
+                    this.designerState.update((state) => ({
+                        ...state,
+                        groups: state.groups.map((g) => g.id === group.id
+                            ? {
+                                ...g,
+                                name: generateKebabCase(form.title),
+                                title: form.title,
+                                description: form.description || undefined,
+                            }
+                            : g),
+                    }));
+                    this.syncStateToValue();
+                }
             });
         })
             .show();
-        const form = dialogRef.context();
-        const action = dialogRef.action();
-        if (action === 'submit' && form.title && form.title.trim()) {
-            this.designerState.update((state) => ({
-                ...state,
-                groups: state.groups.map((g) => g.id === group.id
-                    ? {
-                        ...g,
-                        name: generateKebabCase(form.title),
-                        title: form.title,
-                        description: form.description || undefined,
-                    }
-                    : g),
-            }));
-            this.syncStateToValue();
-        }
-        dialogRef.close();
     }
     /**
      * Handle removing a group
@@ -9039,7 +9049,7 @@ class ShowMetaDataFormPopupCommand {
             // Build dialog title
             const dialogTitle = title || metaDataFormExt.title || await this.translationService.translateAsync('@data-management:metadata-definitions.components.meta-data-form.title');
             // Open dialog with meta-data-form-editor widget
-            const dialogRef = await this.layoutBuilder
+            const result = await this.layoutBuilder
                 .create()
                 .dialog((dialog) => {
                 dialog
@@ -9068,31 +9078,28 @@ class ShowMetaDataFormPopupCommand {
                     actions
                         .cancel('@general:actions.cancel.title')
                         .submit('@general:actions.save.title');
+                })
+                    .onAction(async (dialogRef) => {
+                    const context = dialogRef.context();
+                    const action = dialogRef.action();
+                    if (!context || action === 'cancel') {
+                        return { success: false };
+                    }
+                    const updateData = {
+                        [field]: context[field],
+                    };
+                    const updated = await dataAccessor.update(finalId, updateData);
+                    return {
+                        success: true,
+                        data: updated,
+                        message: {
+                            text: await this.translationService.translateAsync('@general:messages.entity.updated'),
+                        },
+                    };
                 });
             })
                 .show();
-            // Wait for user interaction
-            const action = dialogRef.action();
-            const formData = dialogRef.context();
-            if (action === 'submit') {
-                // Update entity record with the meta data form value
-                const updateData = {
-                    [field]: formData[field],
-                };
-                const updated = await dataAccessor.update(finalId, updateData);
-                dialogRef.close();
-                return {
-                    success: true,
-                    data: updated,
-                    message: {
-                        text: await this.translationService.translateAsync('@general:messages.entity.updated'),
-                    },
-                };
-            }
-            dialogRef.close();
-            return {
-                success: false,
-            };
+            return result;
         }
         catch (error) {
             return {