From 0a16c232d2318589c58d10dbeba0f220ffe9a48d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Danyi=20D=C3=A1vid?= Date: Mon, 12 Nov 2018 07:08:57 +0100 Subject: [PATCH] * rxjs update done --- package-lock.json | 5 ----- package.json | 3 +-- src/app/app.component.ts | 7 +++---- src/app/auth/auth.service.ts | 3 +-- .../confirm-expensive-fault.component.ts | 9 +++++---- .../confirm-fault/confirm-fault.component.ts | 13 ++++++------ .../fault-manager/fault-manager.service.ts | 4 ++-- .../fault-manager/fault-resolver.service.ts | 2 +- .../providers/error-category.service.ts | 3 +-- .../providers/error-origin.service.ts | 5 ++--- .../providers/facility-location.service.ts | 3 +-- .../solution-time-interval.service.ts | 5 ++--- .../readonly-display.component.ts | 6 ++++-- .../record-fault/record-fault.component.ts | 6 ++++-- .../repair-complete.component.ts | 10 ++++++---- .../repair-fault/repair-fault.component.ts | 20 ++++++++++--------- .../maintenance-manager.service.ts | 2 +- .../json-request-interceptor.service.ts | 2 +- src/app/user/profile-resolver.service.ts | 2 +- src/app/user/settings/settings.component.ts | 10 ++++++---- src/app/user/user.service.ts | 2 +- 21 files changed, 61 insertions(+), 61 deletions(-) diff --git a/package-lock.json b/package-lock.json index 0eca543..f0a6bb7 100644 --- a/package-lock.json +++ b/package-lock.json @@ -8331,11 +8331,6 @@ "tslib": "^1.9.0" } }, - "rxjs-compat": { - "version": "6.3.3", - "resolved": "https://registry.npmjs.org/rxjs-compat/-/rxjs-compat-6.3.3.tgz", - "integrity": "sha512-caGN7ixiabHpOofginKEquuHk7GgaCrC7UpUQ9ZqGp80tMc68msadOeP/2AKy2R4YJsT1+TX5GZCtxO82qWkyA==" - }, "safe-buffer": { "version": "5.1.2", "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz", diff --git a/package.json b/package.json index 546675f..291f2f7 100644 --- a/package.json +++ b/package.json @@ -26,8 +26,7 @@ "core-js": "^2.5.4", "jquery": "^3.3.1", "rxjs": "~6.3.3", - "zone.js": "~0.8.26", - "rxjs-compat": "^6.0.0-rc.0" + "zone.js": "~0.8.26" }, "devDependencies": { "@angular-devkit/build-angular": "~0.10.0", diff --git a/src/app/app.component.ts b/src/app/app.component.ts index 054c48e..d530f00 100644 --- a/src/app/app.component.ts +++ b/src/app/app.component.ts @@ -1,9 +1,8 @@ import { Component, OnDestroy, OnInit } from '@angular/core'; import { AuthService } from "./auth/auth.service"; -import { Subscription } from "rxjs/Subscription"; -import { TimerObservable } from "rxjs/observable/TimerObservable"; import { FaultManagerService } from "./fault-manager/fault-manager.service"; +import { Subscription, timer } from "rxjs"; // timers are in milliseconds const RENEW_TIMER_INITIAL = 300000; // 5min @@ -25,14 +24,14 @@ export class AppComponent implements OnInit, OnDestroy { private faultManager: FaultManagerService) {} ngOnInit(): void { - let authRenewObservable = TimerObservable.create(RENEW_TIMER_INITIAL, RENEW_TIMER_PERIOD); + const authRenewObservable = timer(RENEW_TIMER_INITIAL, RENEW_TIMER_PERIOD); this.authRenewTimer = authRenewObservable.subscribe(() => { if (this.authService.isLoggedIn) { this.authService.renew(); } }); - let faultReloadObservable = TimerObservable.create(FAULT_RELOAD_PERIOD, FAULT_RELOAD_PERIOD); + const faultReloadObservable = timer(FAULT_RELOAD_PERIOD, FAULT_RELOAD_PERIOD); this.faultReloadTimer = faultReloadObservable.subscribe(() => { if (this.authService.isLoggedIn) { this.faultManager.list().subscribe(faults => this.faultManager.faults = faults); diff --git a/src/app/auth/auth.service.ts b/src/app/auth/auth.service.ts index b925d3f..e0bf8a4 100644 --- a/src/app/auth/auth.service.ts +++ b/src/app/auth/auth.service.ts @@ -1,7 +1,6 @@ import { Injectable } from '@angular/core'; import { Router } from "@angular/router"; import { HttpClient } from "@angular/common/http"; -import 'rxjs/Rx'; import { JwtHelperService } from '@auth0/angular-jwt'; import { environment } from '../../environments/environment'; @@ -88,4 +87,4 @@ export class AuthService { class AuthResponse { public message: string; public token: string; -} \ No newline at end of file +} diff --git a/src/app/fault-manager/confirm-expensive-fault/confirm-expensive-fault.component.ts b/src/app/fault-manager/confirm-expensive-fault/confirm-expensive-fault.component.ts index 171154d..42746f0 100644 --- a/src/app/fault-manager/confirm-expensive-fault/confirm-expensive-fault.component.ts +++ b/src/app/fault-manager/confirm-expensive-fault/confirm-expensive-fault.component.ts @@ -1,6 +1,7 @@ import { Component, OnInit } from '@angular/core'; import { Title } from "@angular/platform-browser"; import { ActivatedRoute, Router } from "@angular/router"; +import { finalize } from 'rxjs/operators'; import { environment } from "../../../environments/environment"; import { FaultManagerService } from "../fault-manager.service"; @@ -31,15 +32,15 @@ export class ConfirmExpensiveFaultComponent implements OnInit { public confirm() { this.submitInProgress = true; - this.faultManager.confirmFault(this.fault) - .finally(() => this.submitInProgress = false) + this.faultManager.confirmFault(this.fault).pipe( + finalize(() => this.submitInProgress = false)) .subscribe(() => this.router.navigate(['/hiba/feladat-lista'])); } public reject() { this.submitInProgress = true; - this.faultManager.reject(this.fault, 'rej', this.rejectReason) - .finally(() => this.submitInProgress = false) + this.faultManager.reject(this.fault, 'rej', this.rejectReason).pipe( + finalize(() => this.submitInProgress = false)) .subscribe(() => this.router.navigate(['/hiba/feladat-lista'])); } diff --git a/src/app/fault-manager/confirm-fault/confirm-fault.component.ts b/src/app/fault-manager/confirm-fault/confirm-fault.component.ts index 84ca7b8..e963a3e 100644 --- a/src/app/fault-manager/confirm-fault/confirm-fault.component.ts +++ b/src/app/fault-manager/confirm-fault/confirm-fault.component.ts @@ -1,6 +1,7 @@ import { Component, ElementRef, OnInit, ViewChild } from '@angular/core'; import { Title } from "@angular/platform-browser"; import { ActivatedRoute, Router } from "@angular/router"; +import { finalize } from 'rxjs/operators'; import { environment } from "../../../environments/environment"; import { FaultManagerService } from "../fault-manager.service"; @@ -61,16 +62,16 @@ export class ConfirmFaultComponent implements OnInit { public confirm() { this.submitInProgress = true; // this.fault.costEstimate = this.costEstimate; - this.faultManager.confirmFault(this.fault) - .finally(() => this.submitInProgress = false) + this.faultManager.confirmFault(this.fault).pipe( + finalize(() => this.submitInProgress = false)) .subscribe(() => this.router.navigate(['/hiba/feladat-lista'])); } public setHighExpenseFault() { this.submitInProgress = true; // this.fault.costEstimate = this.costEstimate; - this.faultManager.setHighExpenseFault(this.fault) - .finally(() => this.submitInProgress = false) + this.faultManager.setHighExpenseFault(this.fault).pipe( + finalize(() => this.submitInProgress = false)) .subscribe(fault => { this.faultManager.attachPdf(this.fault.id, this.pdfUpload.nativeElement.files).subscribe( attRes => this.router.navigate(['/hiba/feladat-lista']), @@ -81,8 +82,8 @@ export class ConfirmFaultComponent implements OnInit { public attachImages() { this.submitInProgress = true; - this.faultManager.attachImages(this.fault.id, this.photoUpload.nativeElement.files) - .finally(() => this.submitInProgress = false) + this.faultManager.attachImages(this.fault.id, this.photoUpload.nativeElement.files).pipe( + finalize(() => this.submitInProgress = false)) .subscribe( attRes => this.photoUpload.nativeElement.value = null, attErr => alert("Hiba történt a képfeltöltés közben.") diff --git a/src/app/fault-manager/fault-manager.service.ts b/src/app/fault-manager/fault-manager.service.ts index 02e26cd..dfe1bf2 100644 --- a/src/app/fault-manager/fault-manager.service.ts +++ b/src/app/fault-manager/fault-manager.service.ts @@ -1,6 +1,6 @@ import { Injectable } from '@angular/core'; -import { Observable } from "rxjs/Observable"; -import { HttpClient, HttpHeaders, HttpRequest } from "@angular/common/http"; +import { Observable } from "rxjs"; +import { HttpClient } from "@angular/common/http"; import { environment } from "../../environments/environment"; import { Fault } from "./shared/fault"; diff --git a/src/app/fault-manager/fault-resolver.service.ts b/src/app/fault-manager/fault-resolver.service.ts index adf58d5..0aade2e 100644 --- a/src/app/fault-manager/fault-resolver.service.ts +++ b/src/app/fault-manager/fault-resolver.service.ts @@ -1,7 +1,7 @@ import { Injectable } from '@angular/core'; import { ActivatedRouteSnapshot, Resolve, RouterStateSnapshot } from "@angular/router"; import { HttpClient } from "@angular/common/http"; -import { Observable } from "rxjs/Observable"; +import { Observable } from "rxjs"; import { Fault } from "./shared/fault"; import { environment } from "../../environments/environment"; diff --git a/src/app/fault-manager/providers/error-category.service.ts b/src/app/fault-manager/providers/error-category.service.ts index 4e86a7b..9cc81f3 100644 --- a/src/app/fault-manager/providers/error-category.service.ts +++ b/src/app/fault-manager/providers/error-category.service.ts @@ -1,8 +1,7 @@ import { Injectable } from '@angular/core'; import { ActivatedRouteSnapshot, Resolve } from "@angular/router"; import { HttpClient } from "@angular/common/http"; -import { Observable } from "rxjs/Observable"; -import 'rxjs/Rx'; +import { Observable } from "rxjs"; import { environment } from "../../../environments/environment"; import { ErrorCategory } from "../shared"; diff --git a/src/app/fault-manager/providers/error-origin.service.ts b/src/app/fault-manager/providers/error-origin.service.ts index 2749c0b..2bb1559 100644 --- a/src/app/fault-manager/providers/error-origin.service.ts +++ b/src/app/fault-manager/providers/error-origin.service.ts @@ -1,11 +1,10 @@ import { Injectable } from '@angular/core'; import { ActivatedRouteSnapshot, Resolve } from "@angular/router"; import { HttpClient } from "@angular/common/http"; -import { Observable } from "rxjs/Observable"; -import 'rxjs/Rx'; +import { Observable } from "rxjs"; import { environment } from "../../../environments/environment"; -import { ErrorOrigin } from "../shared/error-origin"; +import { ErrorOrigin } from "../shared"; @Injectable() export class ErrorOriginService implements Resolve> { diff --git a/src/app/fault-manager/providers/facility-location.service.ts b/src/app/fault-manager/providers/facility-location.service.ts index 7e37e8a..288771d 100644 --- a/src/app/fault-manager/providers/facility-location.service.ts +++ b/src/app/fault-manager/providers/facility-location.service.ts @@ -1,8 +1,7 @@ import { Injectable } from '@angular/core'; import { ActivatedRouteSnapshot, Resolve } from "@angular/router"; import { HttpClient } from "@angular/common/http"; -import { Observable } from "rxjs/Observable"; -import 'rxjs/Rx'; +import { Observable } from "rxjs"; import { environment } from "../../../environments/environment"; import { FacilityLocation } from "../shared"; diff --git a/src/app/fault-manager/providers/solution-time-interval.service.ts b/src/app/fault-manager/providers/solution-time-interval.service.ts index 1014a52..f8dcb23 100644 --- a/src/app/fault-manager/providers/solution-time-interval.service.ts +++ b/src/app/fault-manager/providers/solution-time-interval.service.ts @@ -1,11 +1,10 @@ import { Injectable } from '@angular/core'; import { ActivatedRouteSnapshot, Resolve } from "@angular/router"; import { HttpClient } from "@angular/common/http"; -import { Observable } from "rxjs/Observable"; -import 'rxjs/Rx'; +import { Observable } from "rxjs"; import { environment } from "../../../environments/environment"; -import { SolutionTimeInterval } from "../shared/solution-time-interval"; +import { SolutionTimeInterval } from "../shared"; @Injectable() export class SolutionTimeIntervalService implements Resolve> { diff --git a/src/app/fault-manager/readonly-display/readonly-display.component.ts b/src/app/fault-manager/readonly-display/readonly-display.component.ts index be470e7..213eb5c 100644 --- a/src/app/fault-manager/readonly-display/readonly-display.component.ts +++ b/src/app/fault-manager/readonly-display/readonly-display.component.ts @@ -1,3 +1,5 @@ + +import {finalize} from 'rxjs/operators'; import { Component, ElementRef, OnInit, ViewChild } from '@angular/core'; import { ActivatedRoute } from "@angular/router"; import { Title } from "@angular/platform-browser"; @@ -83,8 +85,8 @@ export class ReadonlyDisplayComponent implements OnInit { public attachImages() { this.submitInProgress = true; - this.faultManager.attachImages(this.fault.id, this.photoUpload.nativeElement.files) - .finally(() => this.submitInProgress = false) + this.faultManager.attachImages(this.fault.id, this.photoUpload.nativeElement.files).pipe( + finalize(() => this.submitInProgress = false)) .subscribe( attRes => this.photoUpload.nativeElement.value = null, attErr => alert("Hiba történt a képfeltöltés közben.") diff --git a/src/app/fault-manager/record-fault/record-fault.component.ts b/src/app/fault-manager/record-fault/record-fault.component.ts index 3496cd2..4376b75 100644 --- a/src/app/fault-manager/record-fault/record-fault.component.ts +++ b/src/app/fault-manager/record-fault/record-fault.component.ts @@ -1,3 +1,5 @@ + +import {finalize} from 'rxjs/operators'; import { AfterViewInit, Component, ElementRef, OnInit, ViewChild } from '@angular/core'; import { ActivatedRoute, Router } from "@angular/router"; import { ErrorCategory } from "../shared/error-category"; @@ -91,9 +93,9 @@ export class RecordFaultComponent implements OnInit, AfterViewInit { }; this.faultService.create(fault).subscribe(fault => { if (this.photoUpload.nativeElement.files.length > 0) { - this.faultService.attachImages(fault.id, this.photoUpload.nativeElement.files).finally( + this.faultService.attachImages(fault.id, this.photoUpload.nativeElement.files).pipe(finalize( () => this.submitInProgress = false - ).subscribe( + )).subscribe( attRes => this.router.navigate(['/hiba/feladat-lista']), attErr => { console.log("File upload error"); diff --git a/src/app/fault-manager/repair-complete/repair-complete.component.ts b/src/app/fault-manager/repair-complete/repair-complete.component.ts index 1c9dbae..1cf5f4e 100644 --- a/src/app/fault-manager/repair-complete/repair-complete.component.ts +++ b/src/app/fault-manager/repair-complete/repair-complete.component.ts @@ -1,3 +1,5 @@ + +import {finalize} from 'rxjs/operators'; import { Component, OnInit } from '@angular/core'; import { environment } from "../../../environments/environment"; import { Fault } from "../shared/fault"; @@ -30,15 +32,15 @@ export class RepairCompleteComponent implements OnInit { public confirm() { this.submitInProgress = true; - this.faultManager.acknowledgeRepair(this.fault) - .finally(() => this.submitInProgress = false) + this.faultManager.acknowledgeRepair(this.fault).pipe( + finalize(() => this.submitInProgress = false)) .subscribe(() => this.router.navigate(['/hiba/feladat-lista'])); } public reject() { this.submitInProgress = true; - this.faultManager.reject(this.fault, 'cnf', this.rejectReason) - .finally(() => this.submitInProgress = false) + this.faultManager.reject(this.fault, 'cnf', this.rejectReason).pipe( + finalize(() => this.submitInProgress = false)) .subscribe(() => this.router.navigate(['/hiba/feladat-lista'])); } diff --git a/src/app/fault-manager/repair-fault/repair-fault.component.ts b/src/app/fault-manager/repair-fault/repair-fault.component.ts index ddb97c8..9100fd7 100644 --- a/src/app/fault-manager/repair-fault/repair-fault.component.ts +++ b/src/app/fault-manager/repair-fault/repair-fault.component.ts @@ -1,3 +1,5 @@ + +import {finalize} from 'rxjs/operators'; import { Component, ElementRef, OnInit, ViewChild } from '@angular/core'; import { Title } from "@angular/platform-browser"; import { ActivatedRoute, Router } from "@angular/router"; @@ -78,8 +80,8 @@ export class RepairFaultComponent implements OnInit { public addComment() { this.submitInProgress = true; - this.faultManager.addComment(this.fault.id, this.comment.trim()) - .finally(() => this.submitInProgress = false) + this.faultManager.addComment(this.fault.id, this.comment.trim()).pipe( + finalize(() => this.submitInProgress = false)) .subscribe(fault => { this.fault = fault; this.comments = fault.comments.reverse(); @@ -89,8 +91,8 @@ export class RepairFaultComponent implements OnInit { public attachImages() { this.submitInProgress = true; - this.faultManager.attachImages(this.fault.id, this.photoUpload.nativeElement.files) - .finally(() => this.submitInProgress = false) + this.faultManager.attachImages(this.fault.id, this.photoUpload.nativeElement.files).pipe( + finalize(() => this.submitInProgress = false)) .subscribe( attRes => this.photoUpload.nativeElement.value = null, attErr => alert("Hiba történt a képfeltöltés közben.") @@ -99,8 +101,8 @@ export class RepairFaultComponent implements OnInit { public confirmRepair() { this.submitInProgress = true; - this.faultManager.repairDone(this.fault) - .finally(() => this.submitInProgress = false) + this.faultManager.repairDone(this.fault).pipe( + finalize(() => this.submitInProgress = false)) .subscribe(() => this.router.navigate(['/hiba/feladat-lista'])); } @@ -166,11 +168,11 @@ export class RepairFaultComponent implements OnInit { saveWorkData() { this.submitInProgress = true; - this.faultManager.update(this.fault) - .finally(() => { + this.faultManager.update(this.fault).pipe( + finalize(() => { this.submitInProgress = false; this.costChanged = false; - }) + })) .subscribe(fault => this.fault = fault); } diff --git a/src/app/maintenance/maintenance-manager.service.ts b/src/app/maintenance/maintenance-manager.service.ts index f2de1fa..daf2d78 100644 --- a/src/app/maintenance/maintenance-manager.service.ts +++ b/src/app/maintenance/maintenance-manager.service.ts @@ -1,5 +1,5 @@ import { Injectable } from '@angular/core'; -import { Observable } from "rxjs/Observable"; +import { Observable } from "rxjs"; import { HttpClient, HttpHeaders, HttpRequest } from "@angular/common/http"; import { environment } from "../../environments/environment"; diff --git a/src/app/shared/json-request-interceptor.service.ts b/src/app/shared/json-request-interceptor.service.ts index 07b97e0..28b9dcb 100644 --- a/src/app/shared/json-request-interceptor.service.ts +++ b/src/app/shared/json-request-interceptor.service.ts @@ -1,6 +1,6 @@ import { Injectable } from '@angular/core'; import { HttpEvent, HttpHandler, HttpInterceptor, HttpRequest } from "@angular/common/http"; -import { Observable } from "rxjs/Observable"; +import { Observable } from "rxjs"; @Injectable() export class JsonRequestInterceptorService implements HttpInterceptor { diff --git a/src/app/user/profile-resolver.service.ts b/src/app/user/profile-resolver.service.ts index 40564b9..bf95a8b 100644 --- a/src/app/user/profile-resolver.service.ts +++ b/src/app/user/profile-resolver.service.ts @@ -1,7 +1,7 @@ import { Injectable } from '@angular/core'; import { HttpClient } from "@angular/common/http"; import { ActivatedRouteSnapshot, Resolve, RouterStateSnapshot } from "@angular/router"; -import { Observable } from "rxjs/Observable"; +import { Observable } from "rxjs"; import { environment } from "../../environments/environment"; import { User } from "./shared/user"; diff --git a/src/app/user/settings/settings.component.ts b/src/app/user/settings/settings.component.ts index f633c2a..1cbe2e7 100644 --- a/src/app/user/settings/settings.component.ts +++ b/src/app/user/settings/settings.component.ts @@ -1,8 +1,10 @@ import { Component, OnInit } from '@angular/core'; -import { UserService } from "../user.service"; import { ActivatedRoute, Router } from "@angular/router"; import { Title } from "@angular/platform-browser"; +import { finalize } from 'rxjs/operators'; + import { User } from "../shared/user"; +import { UserService } from "../user.service"; @Component({ selector: 'app-settings', @@ -32,8 +34,8 @@ export class SettingsComponent implements OnInit { public changePassword() { this.submitInProgress=true; if (this.user.canChangePassword) { - this.userService.changeOwnPassword(this.oldPassword, this.newPassword) - .finally(()=>this.submitInProgress=false) + this.userService.changeOwnPassword(this.oldPassword, this.newPassword).pipe( + finalize(()=>this.submitInProgress=false)) .subscribe( ok => { if (ok) { @@ -54,7 +56,7 @@ export class SettingsComponent implements OnInit { this.submitInProgress=true; this.userService.changeSettings({ wantsEmail: this.user.wantsEmail - }).finally(()=>this.submitInProgress=false) + }).pipe(finalize(()=>this.submitInProgress=false)) .subscribe(okResult => this.router.navigate(['/'])); } diff --git a/src/app/user/user.service.ts b/src/app/user/user.service.ts index 42d8e4f..fcb1364 100644 --- a/src/app/user/user.service.ts +++ b/src/app/user/user.service.ts @@ -1,7 +1,7 @@ import { Injectable } from '@angular/core'; import { HttpClient } from "@angular/common/http"; import { ActivatedRouteSnapshot, Resolve, RouterStateSnapshot } from "@angular/router"; -import { Observable } from "rxjs/Observable"; +import { Observable } from "rxjs"; import { environment } from "../../environments/environment"; import { User } from "./shared/user";