@hitsoft/e-donusum 100.1.10-Edo-Test → 100.1.11-Edo-Test

package/fesm2020/hitsoft-e-donusum.mjs

@@ -7020,26 +7020,52 @@ class HitParamsIntegratorComponent {
             this.valid.emit(false);
             return;
         }
-        this.formParamsIntegrator.controls.branchId.setValue(null);
         this.submitButtonDisabled = true;
-        const request = this.paramsIntegratorDtoWithNavigationPropertiesDto
+        try {
+            const saved = await this.saveParamsIntegrator();
+            if (!saved) {
+                this.valid.emit(false);
+                return;
+            }
+            const testResult = await this.runConnectionTest();
+            this.valid.emit(testResult);
+        }
+        finally {
+            this.submitButtonDisabled = false;
+        }
+    }
+    saveParamsIntegrator() {
+        this.formParamsIntegrator.controls.branchId.setValue(null);
+        const request$ = this.paramsIntegratorDtoWithNavigationPropertiesDto
             ? this.service.update(this.paramsIntegratorDtoWithNavigationPropertiesDto.paramsIntegrator.id, {
                 ...this.formParamsIntegrator.value,
             })
             : this.service.create(this.formParamsIntegrator.value);
-        request
-            .pipe(finalize$1(() => {
-            this.submitButtonDisabled = false;
-        }))
-            .subscribe(async () => {
-            await this.getParamsIntegrator(false, this.paramsIntegratorDtoWithNavigationPropertiesDto?.branch
-                ? this.paramsIntegratorDtoWithNavigationPropertiesDto.branch.id
-                : '00000000-0000-0000-0000-000000000000');
-            const testResult = await this.connectionTest();
-            this.valid.emit(testResult);
-        }, err => {
-            this.toasterService.error('eDonusum::TransactionUnsuccessful');
-            this.valid.emit(false);
+        return new Promise((resolve) => {
+            request$.subscribe(async () => {
+                await this.getParamsIntegrator(false, this.paramsIntegratorDtoWithNavigationPropertiesDto?.branch
+                    ? this.paramsIntegratorDtoWithNavigationPropertiesDto.branch.id
+                    : '00000000-0000-0000-0000-000000000000');
+                resolve(true);
+            }, () => {
+                this.toasterService.error('eDonusum::TransactionUnsuccessful');
+                resolve(false);
+            });
+        });
+    }
+    async runConnectionTest() {
+        const request = this.formParamsIntegrator.value;
+        return await this.hitEntegratorsService.connectionTest(request).then(data => {
+            if (data) {
+                this.toasterService.success('eDonusum::ConnectionSuccessful');
+                return true;
+            }
+            else {
+                this.toasterService.error(data?.message);
+                return false;
+            }
+        }).catch(() => {
+            return false;
         });
     }
     async getParamsIntegrator(buildForm = false, branchId) {
@@ -7075,24 +7101,16 @@ class HitParamsIntegratorComponent {
             return false;
         }
         this.connectionTestButtonDisabled = true;
-        if (this.formParamsIntegrator.controls.branchId?.value == '')
-            this.formParamsIntegrator.controls.branchId.setValue('00000000-0000-0000-0000-000000000000');
-        let request = this.formParamsIntegrator.value;
-        return await this.hitEntegratorsService.connectionTest(request).then(data => {
-            this.connectionTestButtonDisabled = false;
-            this.submitButtonDisabled = false;
-            if (data) {
-                this.toasterService.success('eDonusum::ConnectionSuccessful');
-                return true;
-            }
-            else {
-                this.toasterService.error(data.message);
+        try {
+            const saved = await this.saveParamsIntegrator();
+            if (!saved)
                 return false;
-            }
-        }).finally(() => {
+            return await this.runConnectionTest();
+        }
+        finally {
             this.connectionTestButtonDisabled = false;
             this.submitButtonDisabled = false;
-        });
+        }
     }
 }
 HitParamsIntegratorComponent.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "14.3.0", ngImport: i0, type: HitParamsIntegratorComponent, deps: [{ token: i1.ListService }, { token: i1.TrackByService }, { token: ParamsIntegratorService }, { token: i3.ConfirmationService }, { token: i4.FormBuilder }, { token: HitParamsIntegratorsService }, { token: i3.ToasterService }, { token: HitEntegratorsService }], target: i0.ɵɵFactoryTarget.Component });