Merge pull request #584 from iyilm4z/unwanted-modal-delay-on-closing

Fixes unwanted modal delay on closing

Author: ismcagdas

angular/src/account/tenant/tenant-change-dialog.component.ts

@@ -1,5 +1,4 @@
 import { Component, Injector } from '@angular/core';
-import { finalize } from 'rxjs/operators';
 import { BsModalRef } from 'ngx-bootstrap/modal';
 import { AppComponentBase } from '@shared/app-component-base';
 import { AccountServiceProxy } from '@shared/service-proxies/service-proxies';
@@ -36,14 +35,8 @@ export class TenantChangeDialogComponent extends AppComponentBase {
     input.tenancyName = this.tenancyName;
 
     this.saving = true;
-    this._accountService
-      .isTenantAvailable(input)
-      .pipe(
-        finalize(() => {
-          this.saving = false;
-        })
-      )
-      .subscribe((result: IsTenantAvailableOutput) => {
+    this._accountService.isTenantAvailable(input).subscribe(
+      (result: IsTenantAvailableOutput) => {
         switch (result.state) {
           case AppTenantAvailabilityState.Available:
             abp.multiTenancy.setTenantIdCookie(result.tenantId);
@@ -58,6 +51,10 @@ export class TenantChangeDialogComponent extends AppComponentBase {
             );
             break;
         }
-      });
+      },
+      () => {
+        this.saving = false;
+      }
+    );
   }
 }

angular/src/app/roles/create-role/create-role-dialog.component.ts

@@ -5,7 +5,6 @@ import {
   EventEmitter,
   Output,
 } from '@angular/core';
-import { finalize } from 'rxjs/operators';
 import { BsModalRef } from 'ngx-bootstrap/modal';
 import { AppComponentBase } from '@shared/app-component-base';
 import {
@@ -84,15 +83,15 @@ export class CreateRoleDialogComponent extends AppComponentBase
 
     this._roleService
       .create(role)
-      .pipe(
-        finalize(() => {
+      .subscribe(
+        () => {
+          this.notify.info(this.l('SavedSuccessfully'));
+          this.bsModalRef.hide();
+          this.onSave.emit();
+        },
+        () => {
           this.saving = false;
-        })
-      )
-      .subscribe(() => {
-        this.notify.info(this.l('SavedSuccessfully'));
-        this.bsModalRef.hide();
-        this.onSave.emit();
-      });
+        }
+      );
   }
 }

angular/src/app/roles/edit-role/edit-role-dialog.component.ts

@@ -5,7 +5,6 @@ import {
   EventEmitter,
   Output,
 } from '@angular/core';
-import { finalize } from 'rxjs/operators';
 import { BsModalRef } from 'ngx-bootstrap/modal';
 import { forEach as _forEach, includes as _includes, map as _map } from 'lodash-es';
 import { AppComponentBase } from '@shared/app-component-base';
@@ -84,17 +83,15 @@ export class EditRoleDialogComponent extends AppComponentBase
     role.init(this.role);
     role.grantedPermissions = this.getCheckedPermissions();
 
-    this._roleService
-      .update(role)
-      .pipe(
-        finalize(() => {
-          this.saving = false;
-        })
-      )
-      .subscribe(() => {
+    this._roleService.update(role).subscribe(
+      () => {
         this.notify.info(this.l('SavedSuccessfully'));
         this.bsModalRef.hide();
         this.onSave.emit();
-      });
+      },
+      () => {
+        this.saving = false;
+      }
+    );
   }
 }

angular/src/app/tenants/create-tenant/create-tenant-dialog.component.ts

@@ -5,7 +5,6 @@ import {
   Output,
   EventEmitter
 } from '@angular/core';
-import { finalize } from 'rxjs/operators';
 import { BsModalRef } from 'ngx-bootstrap/modal';
 import { AppComponentBase } from '@shared/app-component-base';
 import {
@@ -38,17 +37,15 @@ export class CreateTenantDialogComponent extends AppComponentBase
   save(): void {
     this.saving = true;
 
-    this._tenantService
-      .create(this.tenant)
-      .pipe(
-        finalize(() => {
-          this.saving = false;
-        })
-      )
-      .subscribe(() => {
+    this._tenantService.create(this.tenant).subscribe(
+      () => {
         this.notify.info(this.l('SavedSuccessfully'));
         this.bsModalRef.hide();
         this.onSave.emit();
-      });
+      },
+      () => {
+        this.saving = false;
+      }
+    );
   }
 }

angular/src/app/tenants/edit-tenant/edit-tenant-dialog.component.ts

@@ -5,7 +5,6 @@ import {
   Output,
   EventEmitter
 } from '@angular/core';
-import { finalize } from 'rxjs/operators';
 import { BsModalRef } from 'ngx-bootstrap/modal';
 import { AppComponentBase } from '@shared/app-component-base';
 import {
@@ -41,17 +40,15 @@ export class EditTenantDialogComponent extends AppComponentBase
   save(): void {
     this.saving = true;
 
-    this._tenantService
-      .update(this.tenant)
-      .pipe(
-        finalize(() => {
-          this.saving = false;
-        })
-      )
-      .subscribe(() => {
+    this._tenantService.update(this.tenant).subscribe(
+      () => {
         this.notify.info(this.l('SavedSuccessfully'));
         this.bsModalRef.hide();
         this.onSave.emit();
-      });
+      },
+      () => {
+        this.saving = false;
+      }
+    );
   }
 }

angular/src/app/users/create-user/create-user-dialog.component.ts

@@ -5,7 +5,6 @@ import {
   EventEmitter,
   Output
 } from '@angular/core';
-import { finalize } from 'rxjs/operators';
 import { BsModalRef } from 'ngx-bootstrap/modal';
 import { forEach as _forEach, map as _map } from 'lodash-es';
 import { AppComponentBase } from '@shared/app-component-base';
@@ -92,17 +91,15 @@ export class CreateUserDialogComponent extends AppComponentBase
 
     this.user.roleNames = this.getCheckedRoles();
 
-    this._userService
-      .create(this.user)
-      .pipe(
-        finalize(() => {
-          this.saving = false;
-        })
-      )
-      .subscribe(() => {
+    this._userService.create(this.user).subscribe(
+      () => {
         this.notify.info(this.l('SavedSuccessfully'));
         this.bsModalRef.hide();
         this.onSave.emit();
-      });
+      },
+      () => {
+        this.saving = false;
+      }
+    );
   }
 }

angular/src/app/users/edit-user/edit-user-dialog.component.ts

@@ -5,7 +5,6 @@ import {
   EventEmitter,
   Output
 } from '@angular/core';
-import { finalize } from 'rxjs/operators';
 import { BsModalRef } from 'ngx-bootstrap/modal';
 import { forEach as _forEach, includes as _includes, map as _map } from 'lodash-es';
 import { AppComponentBase } from '@shared/app-component-base';
@@ -78,17 +77,15 @@ export class EditUserDialogComponent extends AppComponentBase
 
     this.user.roleNames = this.getCheckedRoles();
 
-    this._userService
-      .update(this.user)
-      .pipe(
-        finalize(() => {
-          this.saving = false;
-        })
-      )
-      .subscribe(() => {
+    this._userService.update(this.user).subscribe(
+      () => {
         this.notify.info(this.l('SavedSuccessfully'));
         this.bsModalRef.hide();
         this.onSave.emit();
-      });
+      },
+      () => {
+        this.saving = false;
+      }
+    );
   }
 }

angular/src/app/users/reset-password/reset-password.component.ts

@@ -1,6 +1,5 @@
 import { Component, OnInit, Injector } from '@angular/core';
 import { AppComponentBase } from '@shared/app-component-base';
-import { finalize } from 'rxjs/operators';
 import {
   UserServiceProxy,
   ResetPasswordDto
@@ -37,16 +36,14 @@ export class ResetPasswordDialogComponent extends AppComponentBase
 
   public resetPassword(): void {
     this.isLoading = true;
-    this._userService
-      .resetPassword(this.resetPasswordDto)
-      .pipe(
-        finalize(() => {
-          this.isLoading = false;
-        })
-      )
-      .subscribe(() => {
+    this._userService.resetPassword(this.resetPasswordDto).subscribe(
+      () => {
         this.notify.info('Password Reset');
         this.bsModalRef.hide();
-      });
+      },
+      () => {
+        this.isLoading = false;
+      }
+    );
   }
 }