@smartbit4all/ng-client 3.0.32 → 3.0.34

package/fesm2020/smartbit4all-ng-client.mjs

@@ -2497,13 +2497,13 @@ class SmartViewContextDialogService {
         this.router = router;
     }
     createDialog(smartDialog, component) {
-        this.dialogData = smartDialog;
-        this.dialogRef = this.dialog.open(component, { data: this.dialogData });
-        this.dialogRef.afterClosed().subscribe((result) => {
+        let dialogData = smartDialog;
+        let dialogRef = this.dialog.open(component, { data: dialogData });
+        dialogRef.afterClosed().subscribe((result) => {
             this.handleAfterClosed(result);
-            this.closeDialog();
+            this.closeDialog(dialogRef, dialogData);
         });
-        return this.dialogRef;
+        return dialogRef;
     }
     createDialogRef(smartDialog, component) {
         const dialogRef = this.dialog.open(component, { data: smartDialog });
@@ -2527,15 +2527,15 @@ class SmartViewContextDialogService {
     openDialog() {
         throw new Error('openDialog function is not implemented!');
     }
-    async closeDialog() {
-        if (this.dialogData?.outlets) {
+    async closeDialog(dialogRef, dialogData) {
+        if (dialogData?.outlets) {
             await this.router.navigate([
                 {
-                    outlets: this.dialogData.outlets,
+                    outlets: dialogData.outlets,
                 },
             ]);
         }
-        this.dialogRef?.close();
+        dialogRef?.close();
     }
 }
 SmartViewContextDialogService.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "13.4.0", ngImport: i0, type: SmartViewContextDialogService, deps: [{ token: i1$2.MatDialog }, { token: i2.Router }], target: i0.ɵɵFactoryTarget.Injectable });
@@ -2725,31 +2725,34 @@ class SmartViewContextService {
             if (!viewHandler.component) {
                 throw new Error(`Component is undefined in SmartViewHandlerModel with name: ${view.viewName}`);
             }
-            let dialogRef = this.dialog.openComponentAsDialog(viewHandler.component, viewHandler.name);
-            let dialogDisableClose = true;
-            try {
-                dialogDisableClose = this.inject.get(DIALOG_DISABLE_CLOSE);
-            }
-            catch {
-                console.error('Error during reading DIALOG_DISABLE_CLOSE');
-            }
-            dialogRef.disableClose = dialogDisableClose;
-            // if (view.viewName === this.messageDialogname) {
-            //   if (view.message?.options && view.message.options.length) {
-            //   }
-            // }
-            if (!dialogDisableClose) {
-                dialogRef
-                    .afterClosed()
-                    .pipe(takeUntil(this._destroy$))
-                    .subscribe(() => {
-                    this.performAction(view.uuid, { code: DefaultUiActionCode_CLOSE, params: {} });
+            let refIsAlradyAdded = this.dialogRefs.some((ref) => ref.uuid === view.uuid);
+            if (!refIsAlradyAdded) {
+                let dialogRef = this.dialog.openComponentAsDialog(viewHandler.component, viewHandler.name);
+                let dialogDisableClose = true;
+                try {
+                    dialogDisableClose = this.inject.get(DIALOG_DISABLE_CLOSE);
+                }
+                catch {
+                    console.error('Error during reading DIALOG_DISABLE_CLOSE');
+                }
+                dialogRef.disableClose = dialogDisableClose;
+                // if (view.viewName === this.messageDialogname) {
+                //   if (view.message?.options && view.message.options.length) {
+                //   }
+                // }
+                if (!dialogDisableClose) {
+                    dialogRef
+                        .afterClosed()
+                        .pipe(takeUntil(this._destroy$))
+                        .subscribe(() => {
+                        this.performAction(view.uuid, { code: DefaultUiActionCode_CLOSE, params: {} });
+                    });
+                }
+                this.dialogRefs.push({
+                    uuid: view.uuid,
+                    dialogRef,
                 });
             }
-            this.dialogRefs.push({
-                uuid: view.uuid,
-                dialogRef,
-            });
         }
         else if (view.type === ViewType.Normal) {
             if (viewHandler.route === undefined) {