Browse Source

refactor(theme-shared): change imports from ng.core

pull/1612/head
TheDiaval 7 years ago
parent
commit
96c11740aa
  1. 6
      npm/ng-packs/packages/theme-shared/src/lib/components/button/button.component.ts
  2. 14
      npm/ng-packs/packages/theme-shared/src/lib/components/loader-bar/loader-bar.component.ts

6
npm/ng-packs/packages/theme-shared/src/lib/components/button/button.component.ts

@ -1,4 +1,4 @@
import { LoaderStart, LoaderStop } from '@abp/ng.core';
import { StartLoader, StopLoader } from '@abp/ng.core';
import { Component, Input, OnInit } from '@angular/core';
import { Actions, ofActionSuccessful } from '@ngxs/store';
import { filter } from 'rxjs/operators';
@ -40,8 +40,8 @@ export class ButtonComponent implements OnInit {
if (this.requestType || this.requestURLContainSearchValue) {
this.actions
.pipe(
ofActionSuccessful(LoaderStart, LoaderStop),
filter((event: LoaderStart | LoaderStop) => {
ofActionSuccessful(StartLoader, StopLoader),
filter((event: StartLoader | StopLoader) => {
let condition = true;
if (this.requestType) {
if (!Array.isArray(this.requestType)) this.requestType = [this.requestType];

14
npm/ng-packs/packages/theme-shared/src/lib/components/loader-bar/loader-bar.component.ts

@ -1,9 +1,9 @@
import { Component, OnInit, Input, OnDestroy } from '@angular/core';
import { StartLoader, StopLoader } from '@abp/ng.core';
import { Component, Input, OnDestroy } from '@angular/core';
import { NavigationEnd, NavigationStart, Router } from '@angular/router';
import { takeUntilDestroy } from '@ngx-validate/core';
import { Actions, ofActionSuccessful } from '@ngxs/store';
import { LoaderStart, LoaderStop } from '@abp/ng.core';
import { filter } from 'rxjs/operators';
import { Router, NavigationStart, NavigationEnd } from '@angular/router';
import { takeUntilDestroy } from '@ngx-validate/core';
@Component({
selector: 'abp-loader-bar',
@ -25,7 +25,7 @@ export class LoaderBarComponent implements OnDestroy {
isLoading: boolean = false;
@Input()
filter = (action: LoaderStart | LoaderStop) => action.payload.url.indexOf('openid-configuration') < 0;
filter = (action: StartLoader | StopLoader) => action.payload.url.indexOf('openid-configuration') < 0;
progressLevel: number = 0;
@ -34,12 +34,12 @@ export class LoaderBarComponent implements OnDestroy {
constructor(private actions: Actions, private router: Router) {
actions
.pipe(
ofActionSuccessful(LoaderStart, LoaderStop),
ofActionSuccessful(StartLoader, StopLoader),
filter(this.filter),
takeUntilDestroy(this),
)
.subscribe(action => {
if (action instanceof LoaderStart) this.startLoading();
if (action instanceof StartLoader) this.startLoading();
else this.stopLoading();
});

Loading…
Cancel
Save