Change delete operation to use Id instead of object.

DeborahK · DeborahK · commit af4617c20f43 · 2018-06-04T18:16:52.000-07:00
diff --git a/APM-Demo4/src/app/products/product-edit/product-edit.component.ts b/APM-Demo4/src/app/products/product-edit/product-edit.component.ts
@@ -128,7 +128,7 @@ export class ProductEditComponent implements OnInit, OnDestroy {
   deleteProduct(): void {
     if (this.product && this.product.id) {
       if (confirm(`Really delete the product: ${this.product.productName}?`)) {
-        this.store.dispatch(new productActions.DeleteProduct(this.product));
+        this.store.dispatch(new productActions.DeleteProduct(this.product.id));
       }
     } else {
       // No need to delete, it was never saved
diff --git a/APM-Demo4/src/app/products/state/product.actions.ts b/APM-Demo4/src/app/products/state/product.actions.ts
@@ -98,13 +98,13 @@ export class CreateProductFail implements Action {
 export class DeleteProduct implements Action {
   readonly type = ProductActionTypes.DeleteProduct;
 
-  constructor(public payload: Product) { }
+  constructor(public payload: number) { }
 }
 
 export class DeleteProductSuccess implements Action {
   readonly type = ProductActionTypes.DeleteProductSuccess;
 
-  constructor(public payload: Product) { }
+  constructor(public payload: number) { }
 }
 
 export class DeleteProductFail implements Action {
diff --git a/APM-Demo4/src/app/products/state/product.effects.ts b/APM-Demo4/src/app/products/state/product.effects.ts
@@ -46,7 +46,7 @@ export class ProductEffects {
     map((action: productActions.CreateProduct) => action.payload),
     mergeMap((product: Product) =>
       this.productService.createProduct(product).pipe(
-        map(updatedProduct => (new productActions.CreateProductSuccess(updatedProduct))),
+        map(newProduct => (new productActions.CreateProductSuccess(newProduct))),
         catchError(err => of(new productActions.CreateProductFail(err)))
       )
     )
@@ -56,9 +56,9 @@ export class ProductEffects {
   deleteProduct$: Observable<Action> = this.actions$.pipe(
     ofType(productActions.ProductActionTypes.DeleteProduct),
     map((action: productActions.DeleteProduct) => action.payload),
-    mergeMap((product: Product) =>
-      this.productService.deleteProduct(product.id).pipe(
-        map(() => (new productActions.DeleteProductSuccess(product))),
+    mergeMap((productId: number) =>
+      this.productService.deleteProduct(productId).pipe(
+        map(() => (new productActions.DeleteProductSuccess(productId))),
         catchError(err => of(new productActions.DeleteProductFail(err)))
       )
     )
diff --git a/APM-Demo4/src/app/products/state/product.reducer.ts b/APM-Demo4/src/app/products/state/product.reducer.ts
@@ -144,7 +144,7 @@ export function reducer(state = initialState, action: ProductActions): ProductSt
     case ProductActionTypes.DeleteProductSuccess:
       return {
         ...state,
-        products: state.products.filter(product => product.id !== action.payload.id),
+        products: state.products.filter(product => product.id !== action.payload),
         currentProductId: null,
         error: ''
       };
diff --git a/APM-Demo5/src/app/products/containers/product-shell/product-shell.component.ts b/APM-Demo5/src/app/products/containers/product-shell/product-shell.component.ts
@@ -39,7 +39,7 @@ export class ProductShellComponent implements OnInit {
   }
 
   deleteProduct(product: Product): void {
-    this.store.dispatch(new productActions.DeleteProduct(product));
+    this.store.dispatch(new productActions.DeleteProduct(product.id));
   }
 
   clearProduct(): void {
diff --git a/APM-Demo5/src/app/products/state/index.ts b/APM-Demo5/src/app/products/state/index.ts
@@ -48,4 +48,4 @@ export const getProducts = createSelector(
 export const getError = createSelector(
     getProductFeatureState,
     state => state.error
-);
+);
diff --git a/APM-Demo5/src/app/products/state/product.actions.ts b/APM-Demo5/src/app/products/state/product.actions.ts
@@ -62,49 +62,49 @@ export class LoadFail implements Action {
 export class UpdateProduct implements Action {
   readonly type = ProductActionTypes.UpdateProduct;
 
-  constructor(public payload: Product) {}
+  constructor(public payload: Product) { }
 }
 
 export class UpdateProductSuccess implements Action {
   readonly type = ProductActionTypes.UpdateProductSuccess;
 
-  constructor(public payload: Product) {}
+  constructor(public payload: Product) { }
 }
 
 export class UpdateProductFail implements Action {
   readonly type = ProductActionTypes.UpdateProductFail;
 
-  constructor(public payload: string) {}
+  constructor(public payload: string) { }
 }
 
 export class CreateProduct implements Action {
   readonly type = ProductActionTypes.CreateProduct;
 
-  constructor(public payload: Product) {}
+  constructor(public payload: Product) { }
 }
 
 export class CreateProductSuccess implements Action {
   readonly type = ProductActionTypes.CreateProductSuccess;
 
-  constructor(public payload: Product) {}
+  constructor(public payload: Product) { }
 }
 
 export class CreateProductFail implements Action {
   readonly type = ProductActionTypes.CreateProductFail;
 
-  constructor(public payload: string) {}
+  constructor(public payload: string) { }
 }
 
 export class DeleteProduct implements Action {
   readonly type = ProductActionTypes.DeleteProduct;
 
-  constructor(public payload: Product) {}
+  constructor(public payload: number) { }
 }
 
 export class DeleteProductSuccess implements Action {
   readonly type = ProductActionTypes.DeleteProductSuccess;
 
-  constructor(public payload: Product) {}
+  constructor(public payload: number) { }
 }
 
 export class DeleteProductFail implements Action {
diff --git a/APM-Demo5/src/app/products/state/product.effects.ts b/APM-Demo5/src/app/products/state/product.effects.ts
@@ -46,7 +46,7 @@ export class ProductEffects {
     map((action: productActions.CreateProduct) => action.payload),
     mergeMap((product: Product) =>
       this.productService.createProduct(product).pipe(
-        map(updatedProduct => (new productActions.CreateProductSuccess(updatedProduct))),
+        map(newProduct => (new productActions.CreateProductSuccess(newProduct))),
         catchError(err => of(new productActions.CreateProductFail(err)))
       )
     )
@@ -56,9 +56,9 @@ export class ProductEffects {
   deleteProduct$: Observable<Action> = this.actions$.pipe(
     ofType(productActions.ProductActionTypes.DeleteProduct),
     map((action: productActions.DeleteProduct) => action.payload),
-    mergeMap((product: Product) =>
-      this.productService.deleteProduct(product.id).pipe(
-        map(() => (new productActions.DeleteProductSuccess(product))),
+    mergeMap((productId: number) =>
+      this.productService.deleteProduct(productId).pipe(
+        map(() => (new productActions.DeleteProductSuccess(productId))),
         catchError(err => of(new productActions.DeleteProductFail(err)))
       )
     )
diff --git a/APM-Demo5/src/app/products/state/product.reducer.ts b/APM-Demo5/src/app/products/state/product.reducer.ts
@@ -57,7 +57,7 @@ export function reducer(state = initialState, action: ProductActions): ProductSt
         error: action.payload
       };
 
-    case ProductActionTypes.UpdateProductSuccess: 
+    case ProductActionTypes.UpdateProductSuccess:
       const updatedProducts = state.products.map(
         item => action.payload.id === item.id ? action.payload : item);
       return {
@@ -67,7 +67,7 @@ export function reducer(state = initialState, action: ProductActions): ProductSt
         error: ''
       };
 
-    case ProductActionTypes.UpdateProductFail: 
+    case ProductActionTypes.UpdateProductFail:
       return {
         ...state,
         error: action.payload
@@ -82,7 +82,7 @@ export function reducer(state = initialState, action: ProductActions): ProductSt
         error: ''
       };
 
-    case ProductActionTypes.CreateProductFail: 
+    case ProductActionTypes.CreateProductFail:
       return {
         ...state,
         error: action.payload
@@ -92,7 +92,7 @@ export function reducer(state = initialState, action: ProductActions): ProductSt
     case ProductActionTypes.DeleteProductSuccess:
       return {
         ...state,
-        products: state.products.filter(product => product.id !== action.payload.id),
+        products: state.products.filter(product => product.id !== action.payload),
         currentProductId: null,
         error: ''
       };
diff --git a/APM-Demo5/src/app/user/state/index.ts b/APM-Demo5/src/app/user/state/index.ts
@@ -18,4 +18,4 @@ export const getCurentUser = createSelector(
 export const getMaskUserName = createSelector(
   getProductFeatureState,
   state => state.maskUserName
-);
+);

Original file line number	Diff line number	Diff line change
`@@ -128,7 +128,7 @@ export class ProductEditComponent implements OnInit, OnDestroy {`
`128`	`128`	`deleteProduct(): void {`
`129`	`129`	`if (this.product && this.product.id) {`
`130`	`130`	if (confirm(`Really delete the product: ${this.product.productName}?`)) {
`131`		`- this.store.dispatch(new productActions.DeleteProduct(this.product));`
	`131`	`+ this.store.dispatch(new productActions.DeleteProduct(this.product.id));`
`132`	`132`	`}`
`133`	`133`	`} else {`
`134`	`134`	`// No need to delete, it was never saved`
Original file line number	Diff line number	Diff line change
`@@ -98,13 +98,13 @@ export class CreateProductFail implements Action {`
`98`	`98`	`export class DeleteProduct implements Action {`
`99`	`99`	`readonly type = ProductActionTypes.DeleteProduct;`
`100`	`100`
`101`		`- constructor(public payload: Product) { }`
	`101`	`+ constructor(public payload: number) { }`
`102`	`102`	`}`
`103`	`103`
`104`	`104`	`export class DeleteProductSuccess implements Action {`
`105`	`105`	`readonly type = ProductActionTypes.DeleteProductSuccess;`
`106`	`106`
`107`		`- constructor(public payload: Product) { }`
	`107`	`+ constructor(public payload: number) { }`
`108`	`108`	`}`
`109`	`109`
`110`	`110`	`export class DeleteProductFail implements Action {`
Original file line number	Diff line number	Diff line change
`@@ -46,7 +46,7 @@ export class ProductEffects {`
`46`	`46`	`map((action: productActions.CreateProduct) => action.payload),`
`47`	`47`	`mergeMap((product: Product) =>`
`48`	`48`	`this.productService.createProduct(product).pipe(`
`49`		`- map(updatedProduct => (new productActions.CreateProductSuccess(updatedProduct))),`
	`49`	`+ map(newProduct => (new productActions.CreateProductSuccess(newProduct))),`
`50`	`50`	`catchError(err => of(new productActions.CreateProductFail(err)))`
`51`	`51`	`)`
`52`	`52`	`)`
`@@ -56,9 +56,9 @@ export class ProductEffects {`
`56`	`56`	`deleteProduct$: Observable<Action> = this.actions$.pipe(`
`57`	`57`	`ofType(productActions.ProductActionTypes.DeleteProduct),`
`58`	`58`	`map((action: productActions.DeleteProduct) => action.payload),`
`59`		`- mergeMap((product: Product) =>`
`60`		`- this.productService.deleteProduct(product.id).pipe(`
`61`		`- map(() => (new productActions.DeleteProductSuccess(product))),`
	`59`	`+ mergeMap((productId: number) =>`
	`60`	`+ this.productService.deleteProduct(productId).pipe(`
	`61`	`+ map(() => (new productActions.DeleteProductSuccess(productId))),`
`62`	`62`	`catchError(err => of(new productActions.DeleteProductFail(err)))`
`63`	`63`	`)`
`64`	`64`	`)`
Original file line number	Diff line number	Diff line change
`@@ -39,7 +39,7 @@ export class ProductShellComponent implements OnInit {`
`39`	`39`	`}`
`40`	`40`
`41`	`41`	`deleteProduct(product: Product): void {`
`42`		`- this.store.dispatch(new productActions.DeleteProduct(product));`
	`42`	`+ this.store.dispatch(new productActions.DeleteProduct(product.id));`
`43`	`43`	`}`
`44`	`44`
`45`	`45`	`clearProduct(): void {`
Original file line number	Diff line number	Diff line change
`@@ -62,49 +62,49 @@ export class LoadFail implements Action {`
`62`	`62`	`export class UpdateProduct implements Action {`
`63`	`63`	`readonly type = ProductActionTypes.UpdateProduct;`
`64`	`64`
`65`		`- constructor(public payload: Product) {}`
	`65`	`+ constructor(public payload: Product) { }`
`66`	`66`	`}`
`67`	`67`
`68`	`68`	`export class UpdateProductSuccess implements Action {`
`69`	`69`	`readonly type = ProductActionTypes.UpdateProductSuccess;`
`70`	`70`
`71`		`- constructor(public payload: Product) {}`
	`71`	`+ constructor(public payload: Product) { }`
`72`	`72`	`}`
`73`	`73`
`74`	`74`	`export class UpdateProductFail implements Action {`
`75`	`75`	`readonly type = ProductActionTypes.UpdateProductFail;`
`76`	`76`
`77`		`- constructor(public payload: string) {}`
	`77`	`+ constructor(public payload: string) { }`
`78`	`78`	`}`
`79`	`79`
`80`	`80`	`export class CreateProduct implements Action {`
`81`	`81`	`readonly type = ProductActionTypes.CreateProduct;`
`82`	`82`
`83`		`- constructor(public payload: Product) {}`
	`83`	`+ constructor(public payload: Product) { }`
`84`	`84`	`}`
`85`	`85`
`86`	`86`	`export class CreateProductSuccess implements Action {`
`87`	`87`	`readonly type = ProductActionTypes.CreateProductSuccess;`
`88`	`88`
`89`		`- constructor(public payload: Product) {}`
	`89`	`+ constructor(public payload: Product) { }`
`90`	`90`	`}`
`91`	`91`
`92`	`92`	`export class CreateProductFail implements Action {`
`93`	`93`	`readonly type = ProductActionTypes.CreateProductFail;`
`94`	`94`
`95`		`- constructor(public payload: string) {}`
	`95`	`+ constructor(public payload: string) { }`
`96`	`96`	`}`
`97`	`97`
`98`	`98`	`export class DeleteProduct implements Action {`
`99`	`99`	`readonly type = ProductActionTypes.DeleteProduct;`
`100`	`100`
`101`		`- constructor(public payload: Product) {}`
	`101`	`+ constructor(public payload: number) { }`
`102`	`102`	`}`
`103`	`103`
`104`	`104`	`export class DeleteProductSuccess implements Action {`
`105`	`105`	`readonly type = ProductActionTypes.DeleteProductSuccess;`
`106`	`106`
`107`		`- constructor(public payload: Product) {}`
	`107`	`+ constructor(public payload: number) { }`
`108`	`108`	`}`
`109`	`109`
`110`	`110`	`export class DeleteProductFail implements Action {`