Merge pull request #1 from ever-co/develop

fix: bugs related with Rxjs ever-co#1094
morggansoft · May 15, 2020 · 7c20be1 · 7c20be1
2 parents c49d55b + bd8a80a
commit 7c20be1
Show file tree

Hide file tree

Showing 7 changed files with 19 additions and 20 deletions.
diff --git a/...angular/src/app/@shared/product/categories/categories-table/categories-table.component.ts b/...angular/src/app/@shared/product/categories/categories-table/categories-table.component.ts
@@ -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;

diff --git a/...b-angular/src/app/@shared/product/categories/category-create/category-create.component.ts b/...b-angular/src/app/@shared/product/categories/category-create/category-create.component.ts
@@ -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();

diff --git a/...c/app/pages/+carriers/+carrier/carrier-orders-history/carrier-orders-history.component.ts b/...c/app/pages/+carriers/+carrier/carrier-orders-history/carrier-orders-history.component.ts
@@ -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';

diff --git a/packages/admin-web-angular/src/app/pages/+carriers/carriers.component.ts b/packages/admin-web-angular/src/app/pages/+carriers/carriers.component.ts
@@ -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';

diff --git a/packages/admin-web-angular/src/app/pages/+customers/+customer/customer.component.ts b/packages/admin-web-angular/src/app/pages/+customers/+customer/customer.component.ts
@@ -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) => {
-			return this._userService.getUserById(p.id);
-		});
+		this.user$ = this._router.params.pipe(
+			switchMap((p) => {
+				return this._userService.getUserById(p.id);
+			})
+		);
 
 		(async () => {
 			return this.loadUsers();

diff --git a/packages/admin-web-angular/src/app/pages/+customers/customers.component.ts b/packages/admin-web-angular/src/app/pages/+customers/customers.component.ts
@@ -11,7 +11,7 @@ import { TranslateService } from '@ngx-translate/core';
 import { Observable, forkJoin } from 'rxjs';
 import _ from 'lodash';
 import { NgbModal } from '@ng-bootstrap/ng-bootstrap';
-import { Subject } from 'rxjs/Rx';
+import { Subject } from 'rxjs';
 import { takeUntil, first } from 'rxjs/operators';
 import { getCountryName } from '@modules/server.common/entities/GeoLocation';
 import { CountryRenderComponent } from './+invites/country-render/country-render.component';

diff --git a/...admin-web-angular/src/app/pages/+products/+product/product-edit/product-edit.component.ts b/...admin-web-angular/src/app/pages/+products/+product/product-edit/product-edit.component.ts
@@ -5,7 +5,7 @@ import Product from '@modules/server.common/entities/Product';
 import { Observable, Subject } from 'rxjs';
 import { ActivatedRoute, Router } from '@angular/router';
 import { ProductsService } from '../../../../@core/data/products.service';
-import { takeUntil, first } from 'rxjs/operators';
+import { takeUntil, first, switchMap } from 'rxjs/operators';
 import { ToasterService } from 'angular2-toaster';
 import { ProductsCategoryService } from '../../../../@core/data/productsCategory.service';
 import 'rxjs/add/operator/switchMap';
@@ -29,7 +29,7 @@ export class ProductEditComponent implements OnInit, OnDestroy {
 
 	public readonly basicInfo = this.form.get('basicInfo') as FormControl;
 
-	protected product$: Observable<Product>;
+	protected product$: any;
 	protected status;
 	product: any;
 
@@ -46,9 +46,12 @@ export class ProductEditComponent implements OnInit, OnDestroy {
 		private location: Location
 	) {
 		this.loadProductCategories();
-		this.product$ = this.activatedRoute.params.switchMap((p) => {
-			return this.productsService.getProductById(p.id);
-		});
+
+		this.product$ = this.activatedRoute.params.pipe(
+			switchMap((p) => {
+				return this.productsService.getProductById(p.id);
+			})
+		);
 	}
 
 	public get isProductValid() {