updated all compnents to work with RxJs 6

ismcagdas · ismcagdas · commit dcbb2141e3f9 · 2018-06-29T16:11:22.000+03:00
diff --git a/angular/src/account/login/login.service.ts b/angular/src/account/login/login.service.ts
@@ -8,6 +8,7 @@ import { MessageService } from '@abp/message/message.service';
 import { LogService } from '@abp/log/log.service';
 import { TokenService } from '@abp/auth/token.service';
 import { UtilsService } from '@abp/utils/utils.service';
+import { finalize } from 'rxjs/operators';
 
 @Injectable()
 export class LoginService {
@@ -35,7 +36,7 @@ export class LoginService {
 
         this._tokenAuthService
             .authenticate(this.authenticateModel)
-            .finally(finallyCallback)
+            .pipe(finalize(() => { finallyCallback() }))
             .subscribe((result: AuthenticateResultModel) => {
                 this.processAuthenticateResult(result);
             });
diff --git a/angular/src/account/register/register.component.ts b/angular/src/account/register/register.component.ts
@@ -1,9 +1,10 @@
-﻿import { Component, Injector, ElementRef, AfterViewInit, ViewChild } from '@angular/core';
+import { Component, Injector, ElementRef, AfterViewInit, ViewChild } from '@angular/core';
 import { Router } from '@angular/router';
 import { AccountServiceProxy, RegisterInput, RegisterOutput } from '@shared/service-proxies/service-proxies'
 import { AppComponentBase } from '@shared/app-component-base';
 import { LoginService } from '../login/login.service';
 import { accountModuleAnimation } from '@shared/animations/routerTransition';
+import { finalize } from 'rxjs/operators';
 
 @Component({
     templateUrl: './register.component.html',
@@ -37,7 +38,7 @@ export class RegisterComponent extends AppComponentBase implements AfterViewInit
     save(): void {
         this.saving = true;
         this._accountService.register(this.model)
-            .finally(() => { this.saving = false; })
+            .pipe(finalize(() => { this.saving = false; }))
             .subscribe((result:RegisterOutput) => {
                 if (!result.canLogin) {
                     this.notify.success(this.l('SuccessfullyRegistered'));
diff --git a/angular/src/account/tenant/tenant-change-modal.component.ts b/angular/src/account/tenant/tenant-change-modal.component.ts
@@ -1,9 +1,10 @@
-﻿import { Component, OnInit, ViewChild, Injector, ElementRef } from '@angular/core';
+import { Component, OnInit, ViewChild, Injector, ElementRef } from '@angular/core';
 import { AppComponentBase } from '@shared/app-component-base';
 import { AccountServiceProxy } from '@shared/service-proxies/service-proxies';
-import { IsTenantAvailableInput } from '@shared/service-proxies/service-proxies';
+import { IsTenantAvailableInput, IsTenantAvailableOutput } from '@shared/service-proxies/service-proxies';
 import { AppTenantAvailabilityState } from '@shared/AppEnums';
 import { ModalDirective } from 'ngx-bootstrap';
+import { finalize } from 'rxjs/operators';
 
 @Component({
     selector: 'tenantChangeModal',
@@ -50,8 +51,8 @@ export class TenantChangeModalComponent extends AppComponentBase {
 
         this.saving = true;
         this._accountService.isTenantAvailable(input)
-            .finally(() => { this.saving = false; })
-            .subscribe((result) => {
+            .pipe(finalize(() => { this.saving = false; }))
+            .subscribe((result: IsTenantAvailableOutput) => {
                 switch (result.state) {
                     case AppTenantAvailabilityState.Available:
                         abp.multiTenancy.setTenantIdCookie(result.tenantId);
diff --git a/angular/src/app/roles/create-role/create-role.component.ts b/angular/src/app/roles/create-role/create-role.component.ts
@@ -1,7 +1,8 @@
-﻿import { Component, ViewChild, Injector, Output, EventEmitter, ElementRef, OnInit } from '@angular/core';
+import { Component, ViewChild, Injector, Output, EventEmitter, ElementRef, OnInit } from '@angular/core';
 import { ModalDirective } from 'ngx-bootstrap';
 import { RoleServiceProxy, CreateRoleDto, ListResultDtoOfPermissionDto } from '@shared/service-proxies/service-proxies';
 import { AppComponentBase } from '@shared/app-component-base';
+import { finalize } from 'rxjs/operators';
 
 @Component({
     selector: 'create-role-modal',
@@ -58,7 +59,7 @@ export class CreateRoleComponent extends AppComponentBase implements OnInit {
 
         this.saving = true;
         this._roleService.create(this.role)
-            .finally(() => { this.saving = false; })
+            .pipe(finalize(() => { this.saving = false; }))
             .subscribe(() => {
                 this.notify.info(this.l('SavedSuccessfully'));
                 this.close();
diff --git a/angular/src/app/roles/edit-role/edit-role.component.ts b/angular/src/app/roles/edit-role/edit-role.component.ts
@@ -1,7 +1,8 @@
-﻿import { Component, ViewChild, Injector, Output, EventEmitter, ElementRef, OnInit } from '@angular/core';
+import { Component, ViewChild, Injector, Output, EventEmitter, ElementRef, OnInit } from '@angular/core';
 import { ModalDirective } from 'ngx-bootstrap';
 import { RoleServiceProxy, RoleDto, ListResultDtoOfPermissionDto } from '@shared/service-proxies/service-proxies';
 import { AppComponentBase } from '@shared/app-component-base';
+import { finalize } from 'rxjs/operators';
 
 @Component({
     selector: 'edit-role-modal',
@@ -34,10 +35,10 @@ export class EditRoleComponent extends AppComponentBase implements OnInit {
 
     show(id: number): void {
         this._roleService.get(id)
-            .finally(() => {
+            .pipe(finalize(() => {
                 this.active = true;
                 this.modal.show();
-            })
+            }))
             .subscribe((result: RoleDto) => {
                 this.role = result;
             });
@@ -69,7 +70,7 @@ export class EditRoleComponent extends AppComponentBase implements OnInit {
         this.role.permissions = permissions;
         this.saving = true;
         this._roleService.update(this.role)
-            .finally(() => { this.saving = false; })
+            .pipe(finalize(() => { this.saving = false; }))
             .subscribe(() => {
                 this.notify.info(this.l('SavedSuccessfully'));
                 this.close();
diff --git a/angular/src/app/roles/roles.component.ts b/angular/src/app/roles/roles.component.ts
@@ -1,9 +1,10 @@
-﻿import { Component, Injector, ViewChild } from '@angular/core';
+import { Component, Injector, ViewChild } from '@angular/core';
 import { PagedListingComponentBase, PagedRequestDto } from "shared/paged-listing-component-base";
 import { RoleServiceProxy, RoleDto, PagedResultDtoOfRoleDto } from "shared/service-proxies/service-proxies";
 import { appModuleAnimation } from '@shared/animations/routerTransition';
 import { CreateRoleComponent } from "app/roles/create-role/create-role.component";
 import { EditRoleComponent } from "app/roles/edit-role/edit-role.component";
+import { finalize } from 'rxjs/operators';
 
 @Component({
   templateUrl: './roles.component.html',
@@ -24,10 +25,8 @@ export class RolesComponent extends PagedListingComponentBase<RoleDto> {
 	}
     
 	list(request: PagedRequestDto, pageNumber: number, finishedCallback: Function): void {
-		this.rolesService.getAll(request.skipCount, request.maxResultCount)
-			.finally( ()=> {
-				finishedCallback();
-			})
+        this.rolesService.getAll(request.skipCount, request.maxResultCount)
+            .pipe(finalize(() => { finishedCallback() }))
             .subscribe((result: PagedResultDtoOfRoleDto)=>{
 				this.roles = result.items;
 				this.showPaging(result, pageNumber);
@@ -41,11 +40,11 @@ export class RolesComponent extends PagedListingComponentBase<RoleDto> {
 			(result:boolean) =>{
 				if(result)
 				{
-					this.rolesService.delete(role.id)
-						.finally(() => {
-							abp.notify.info("Deleted Role: " + role.displayName );
-							this.refresh();
-						})
+                    this.rolesService.delete(role.id)
+                        .pipe(finalize(() => {
+                            abp.notify.info("Deleted Role: " + role.displayName);
+                            this.refresh();
+                        }))
 						.subscribe(() => { });
 				}
 			}
diff --git a/angular/src/app/tenants/create-tenant/create-tenant.component.ts b/angular/src/app/tenants/create-tenant/create-tenant.component.ts
@@ -2,6 +2,7 @@ import { Component, ViewChild, Injector, Output, EventEmitter, ElementRef } from
 import { ModalDirective } from 'ngx-bootstrap';
 import { TenantServiceProxy, CreateTenantDto } from '@shared/service-proxies/service-proxies';
 import { AppComponentBase } from '@shared/app-component-base';
+import { finalize } from 'rxjs/operators';
 
 @Component({
   selector: 'create-tenant-modal',
@@ -39,7 +40,7 @@ export class CreateTenantComponent extends AppComponentBase {
     save(): void {
         this.saving = true;
         this._tenantService.create(this.tenant)
-            .finally(() => { this.saving = false; })
+            .pipe(finalize(() => { this.saving = false; }))
             .subscribe(() => {
                 this.notify.info(this.l('SavedSuccessfully'));
                 this.close();
diff --git a/angular/src/app/tenants/edit-tenant/edit-tenant.component.ts b/angular/src/app/tenants/edit-tenant/edit-tenant.component.ts
@@ -2,6 +2,7 @@ import { Component, ViewChild, Injector, Output, EventEmitter, ElementRef} from
 import { ModalDirective } from 'ngx-bootstrap';
 import { TenantServiceProxy, TenantDto } from '@shared/service-proxies/service-proxies';
 import { AppComponentBase } from '@shared/app-component-base';
+import { finalize } from 'rxjs/operators';
 
 @Component({
   selector: 'edit-tenant-modal',
@@ -27,10 +28,10 @@ export class EditTenantComponent extends AppComponentBase{
 
     show(id:number): void {
 		this._tenantService.get(id)
-			.finally(()=>{
-				this.active = true;
-				this.modal.show();
-			})
+		    .pipe(finalize(() => {
+		        this.active = true;
+		        this.modal.show();
+		    }))
 			.subscribe((result: TenantDto)=>{
 				this.tenant = result;
 			});
@@ -43,7 +44,7 @@ export class EditTenantComponent extends AppComponentBase{
     save(): void {
         this.saving = true;
         this._tenantService.update(this.tenant)
-            .finally(() => { this.saving = false; })
+            .pipe(finalize(() => { this.saving = false; }))
             .subscribe(() => {
                 this.notify.info(this.l('SavedSuccessfully'));
                 this.close();
diff --git a/angular/src/app/tenants/tenants.component.ts b/angular/src/app/tenants/tenants.component.ts
@@ -1,10 +1,11 @@
-﻿import { Component, Injector, ViewChild } from '@angular/core';
+import { Component, Injector, ViewChild } from '@angular/core';
 import { appModuleAnimation } from '@shared/animations/routerTransition';
 import { TenantServiceProxy, TenantDto, PagedResultDtoOfTenantDto } from '@shared/service-proxies/service-proxies';
 
 import { PagedListingComponentBase, PagedRequestDto } from "shared/paged-listing-component-base";
 import { EditTenantComponent } from "app/tenants/edit-tenant/edit-tenant.component";
 import { CreateTenantComponent } from "app/tenants/create-tenant/create-tenant.component";
+import { finalize } from 'rxjs/operators';
 
 @Component({
     templateUrl: './tenants.component.html',
@@ -26,9 +27,7 @@ export class TenantsComponent extends PagedListingComponentBase<TenantDto> {
 
     list(request:PagedRequestDto, pageNumber:number, finishedCallback: Function): void {
         this._tenantService.getAll(request.skipCount, request.maxResultCount)
-            .finally(()=>{
-                finishedCallback();
-            })
+            .pipe(finalize(() => { finishedCallback() }))
             .subscribe((result:PagedResultDtoOfTenantDto)=>{
 				this.tenants = result.items;
 				this.showPaging(result, pageNumber);
@@ -40,11 +39,11 @@ export class TenantsComponent extends PagedListingComponentBase<TenantDto> {
 			"Delete tenant '"+ tenant.name +"'?",
 			(result:boolean) => {
 				if(result) {
-					this._tenantService.delete(tenant.id)
-						.finally(() => {
-					        abp.notify.info("Deleted tenant: " + tenant.name );
-							this.refresh();
-						})
+                    this._tenantService.delete(tenant.id)
+                        .pipe(finalize(() => {
+                            abp.notify.info("Deleted tenant: " + tenant.name);
+                            this.refresh();
+                        }))
 						.subscribe(() => { });
 				}
 			}
@@ -59,4 +58,4 @@ export class TenantsComponent extends PagedListingComponentBase<TenantDto> {
     editTenant(tenant:TenantDto): void{
         this.editTenantModal.show(tenant.id);
     }
-}
+}
diff --git a/angular/src/app/users/create-user/create-user.component.ts b/angular/src/app/users/create-user/create-user.component.ts
@@ -2,6 +2,7 @@ import { Component, ViewChild, Injector, Output, EventEmitter, ElementRef, OnIni
 import { ModalDirective } from 'ngx-bootstrap';
 import { UserServiceProxy, CreateUserDto, RoleDto } from '@shared/service-proxies/service-proxies';
 import { AppComponentBase } from '@shared/app-component-base';
+import { finalize } from 'rxjs/operators';
 
 @Component({
   selector: 'create-user-modal',
@@ -56,7 +57,7 @@ export class CreateUserComponent extends AppComponentBase implements OnInit {
         this.user.roleNames = roles;
         this.saving = true;
         this._userService.create(this.user)
-            .finally(() => { this.saving = false; })
+            .pipe(finalize(() => { this.saving = false; }))
             .subscribe(() => {
                 this.notify.info(this.l('SavedSuccessfully'));
                 this.close();
diff --git a/angular/src/app/users/edit-user/edit-user.component.ts b/angular/src/app/users/edit-user/edit-user.component.ts
@@ -2,6 +2,7 @@ import { Component, ViewChild, Injector, Output, EventEmitter, ElementRef } from
 import { ModalDirective } from 'ngx-bootstrap';
 import { UserServiceProxy, UserDto, RoleDto } from '@shared/service-proxies/service-proxies';
 import { AppComponentBase } from '@shared/app-component-base';
+import { finalize } from 'rxjs/operators';
 
 @Component({
     selector: 'edit-user-modal',
@@ -68,7 +69,7 @@ export class EditUserComponent extends AppComponentBase {
 
         this.saving = true;
         this._userService.update(this.user)
-            .finally(() => { this.saving = false; })
+            .pipe(finalize(() => { this.saving = false; }))
             .subscribe(() => {
                 this.notify.info(this.l('SavedSuccessfully'));
                 this.close();
diff --git a/angular/src/app/users/users.component.ts b/angular/src/app/users/users.component.ts
@@ -1,9 +1,10 @@
-﻿import { Component, Injector, ViewChild } from '@angular/core';
+import { Component, Injector, ViewChild } from '@angular/core';
 import { appModuleAnimation } from '@shared/animations/routerTransition';
 import { UserServiceProxy, UserDto, PagedResultDtoOfUserDto } from '@shared/service-proxies/service-proxies';
 import { PagedListingComponentBase, PagedRequestDto } from "shared/paged-listing-component-base";
 import { CreateUserComponent } from "app/users/create-user/create-user.component";
 import { EditUserComponent } from "app/users/edit-user/edit-user.component";
+import { finalize } from 'rxjs/operators';
 
 @Component({
     templateUrl: './users.component.html',
@@ -26,9 +27,9 @@ export class UsersComponent extends PagedListingComponentBase<UserDto> {
 
     protected list(request: PagedRequestDto, pageNumber: number, finishedCallback: Function): void {
         this._userService.getAll(request.skipCount, request.maxResultCount)
-            .finally(() => {
-                finishedCallback();
-            })
+            .pipe(finalize(() => {
+                 finishedCallback()
+            }))
             .subscribe((result: PagedResultDtoOfUserDto) => {
                 this.users = result.items;
                 this.showPaging(result, pageNumber);
@@ -58,4 +59,4 @@ export class UsersComponent extends PagedListingComponentBase<UserDto> {
     editUser(user: UserDto): void {
         this.editUserModal.show(user.id);
     }
-}
+}
diff --git a/angular/src/shared/service-proxies/service-proxies.ts b/angular/src/shared/service-proxies/service-proxies.ts
@@ -1,4 +1,4 @@
-/* tslint:disable */
+﻿/* tslint:disable */
 //----------------------
 // <auto-generated>
 //     Generated using the NSwag toolchain v11.17.14.0 (NJsonSchema v9.10.52.0 (Newtonsoft.Json v9.0.0.0)) (http://NSwag.org)
@@ -3175,4 +3175,4 @@ function blobToText(blob: any): Observable<string> {
             reader.readAsText(blob); 
         }
     });
-}
+}
diff --git a/angular/yarn.lock b/angular/yarn.lock
@@ -5314,10 +5314,6 @@ run-queue@^1.0.0, run-queue@^1.0.3:
   dependencies:
     aproba "^1.1.1"
 
-rxjs-compat@^6.0.0-rc.0:
-  version "6.2.1"
-  resolved "https://registry.yarnpkg.com/rxjs-compat/-/rxjs-compat-6.2.1.tgz#f5a5e4bd700db414e82aa7cb34e5c9222c6d3756"
-
 rxjs@^6.0.0, rxjs@^6.2.0:
   version "6.2.1"
   resolved "https://registry.yarnpkg.com/rxjs/-/rxjs-6.2.1.tgz#246cebec189a6cbc143a3ef9f62d6f4c91813ca1"
