Commit bd8a80a3 authored by Alish's avatar Alish
Browse files

fix: bugs related with Rxjs #1094

parent 93f40e1e

packages/admin-web-angular/src/app/@shared/product/categories/categories-table/categories-table.component.ts

+1 −4
Original line number Diff line number Diff line
@@ -65,10 +65,7 @@ export class CategoriesTableComponent implements OnInit, OnDestroy { 
		private readonly _modalService: NgbModal,

		private readonly _notifyService: NotifyService,

		private readonly modalService: NgbModal

	) {

		this._translateService.setDefaultLang('en');

		this._translateService.use('en');

	}

	) {}



	get hasSelectedCategories(): boolean {

		return this._selectedCategories.length > 0;

packages/admin-web-angular/src/app/@shared/product/categories/category-create/category-create.component.ts

+1 −4
Original line number Diff line number Diff line
@@ -28,10 +28,7 @@ export class CategoryCreateComponent implements OnDestroy { 
		private readonly _translateService: TranslateService,

		private readonly _notifyService: NotifyService,

		private readonly _productsCategoryService: ProductsCategoryService

	) {

		this._translateService.setDefaultLang('en');

		this._translateService.use('en');

	}

	) {}



	ngOnDestroy() {

		this._ngDestroy$.next();

packages/admin-web-angular/src/app/pages/+carriers/+carrier/carrier-orders-history/carrier-orders-history.component.ts

+1 −1
Original line number Diff line number Diff line
@@ -17,7 +17,7 @@ import Warehouse from '@modules/server.common/entities/Warehouse'; 
import _ from 'lodash';

import { forkJoin, Observable, Subscription } from 'rxjs';

import { LocalDataSource } from 'ng2-smart-table';

import { Subject } from 'rxjs/Rx';

import { Subject } from 'rxjs';

import { TranslateService } from '@ngx-translate/core';

import { CreatedComponent } from '../../../../@shared/render-component/created/created.component';

import { CarriersOrdersService } from '@app/@core/data/carriers-orders.service';

packages/admin-web-angular/src/app/pages/+carriers/carriers.component.ts

+1 −1
Original line number Diff line number Diff line
@@ -2,7 +2,7 @@ import { Component, OnDestroy, ViewChild, AfterViewInit } from '@angular/core'; 


import { CarriersService } from '../../@core/data/carriers.service';

import { CarrierMutationComponent } from '../../@shared/carrier/carrier-mutation';

import { Subject } from 'rxjs/Rx';

import { Subject } from 'rxjs';

import { ToasterService } from 'angular2-toaster';

import { NgbModal } from '@ng-bootstrap/ng-bootstrap';

import _ from 'lodash';

packages/admin-web-angular/src/app/pages/+customers/+customer/customer.component.ts

+6 −4
Original line number Diff line number Diff line
@@ -3,7 +3,7 @@ import { ActivatedRoute, Router } from '@angular/router'; 
import { UsersService } from '../../../@core/data/users.service';

import User from '@modules/server.common/entities/User';

import { Observable, Subject } from 'rxjs';

import { first, takeUntil } from 'rxjs/operators';

import { first, takeUntil, switchMap } from 'rxjs/operators';



@Component({

	selector: 'ea-customer',
@@ -24,9 +24,11 @@ export class CustomerComponent implements OnInit, OnDestroy { 
	) {}



	ngOnInit() {

		this.user$ = this._router.params.switchMap((p) => {

		this.user$ = this._router.params.pipe(

			switchMap((p) => {

				return this._userService.getUserById(p.id);

		});

			})

		);



		(async () => {

			return this.loadUsers();