From aba0abf6c8a45a9a2a40dc78b185e8b8e9bab761 Mon Sep 17 00:00:00 2001 From: Sinan997 Date: Wed, 5 Jul 2023 10:14:14 +0300 Subject: [PATCH] fixed lint error on async pipe --- .../services/internet-connection-service.ts | 47 +++---------------- .../internet-connection-status.component.ts | 15 ++---- 2 files changed, 11 insertions(+), 51 deletions(-) diff --git a/npm/ng-packs/packages/core/src/lib/services/internet-connection-service.ts b/npm/ng-packs/packages/core/src/lib/services/internet-connection-service.ts index 952752d1f8..a6ca923dd1 100644 --- a/npm/ng-packs/packages/core/src/lib/services/internet-connection-service.ts +++ b/npm/ng-packs/packages/core/src/lib/services/internet-connection-service.ts @@ -1,6 +1,5 @@ import { Injectable } from '@angular/core'; -import { InternalStore } from '../utils/internal-store-utils'; -import { fromEvent, merge, of, Subscription } from 'rxjs'; +import { fromEvent, merge, of } from 'rxjs'; import { map } from 'rxjs/operators'; export interface InternetConnectionState{ @@ -11,43 +10,9 @@ export interface InternetConnectionState{ providedIn: 'root', }) export class InternetConnectionService{ - private store = new InternalStore({ status: true }); - networkStatus$: Subscription = Subscription.EMPTY; - - constructor() { - this.init() - } - - private init(): void { - this.checkNetworkStatus(); - } - - private checkNetworkStatus() { - this.networkStatus$ = merge( - of(null), - fromEvent(window, 'offline'), - fromEvent(window, 'online') - ) - .pipe(map(() => navigator.onLine)) - .subscribe(status => { - this.setStatus(status) - }); - } - - getStatus(){ - return this.store.state.status - } - - getStatus$(){ - return this.store.sliceState(({ status }) => status); - } - - updateStatus$() { - return this.store.sliceUpdate(({ status }) => status); - } - - setStatus(status: boolean){ - this.store.patch({ status }) - } - + networkStatus$ = merge( + of(null), + fromEvent(window, 'offline'), + fromEvent(window, 'online') + ).pipe(map(() => navigator.onLine)) } diff --git a/npm/ng-packs/packages/theme-shared/src/lib/components/internet-connection-status/internet-connection-status.component.ts b/npm/ng-packs/packages/theme-shared/src/lib/components/internet-connection-status/internet-connection-status.component.ts index 2a75d8c8b7..7582c24afc 100644 --- a/npm/ng-packs/packages/theme-shared/src/lib/components/internet-connection-status/internet-connection-status.component.ts +++ b/npm/ng-packs/packages/theme-shared/src/lib/components/internet-connection-status/internet-connection-status.component.ts @@ -1,6 +1,6 @@ -import { Component, OnInit, inject } from '@angular/core'; +import { Component, inject } from '@angular/core'; import { CommonModule } from '@angular/common' -import { of } from 'rxjs'; +import { map } from 'rxjs'; import { InternetConnectionService, LocalizationModule } from '@abp/ng.core'; @Component({ @@ -8,7 +8,7 @@ import { InternetConnectionService, LocalizationModule } from '@abp/ng.core'; standalone: true, imports:[CommonModule,LocalizationModule], template: ` -
+
@@ -41,12 +41,7 @@ import { InternetConnectionService, LocalizationModule } from '@abp/ng.core'; } `] }) -export class InternetConnectionStatusComponent implements OnInit{ - internetConnection$ = of(true); +export class InternetConnectionStatusComponent{ internetConnectionService = inject(InternetConnectionService) - - ngOnInit(): void { - this.internetConnection$ = this.internetConnectionService.getStatus$() - } - + isOffline$ = this.internetConnectionService.networkStatus$.pipe(map((val) => !val)); }