refactor(products): remove payload

is only for actions
aneurysmjs · Sep 23, 2019 · 9c83ac0 · 9c83ac0
1 parent 0a6bd20
commit 9c83ac0
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 11 deletions.
diff --git a/src/app/pages/Home/Home.js b/src/app/pages/Home/Home.js
@@ -14,7 +14,7 @@ import './Home.scss';
 
 const Home = () => {
   const dispatch = useDispatch();
-  const { isLoading, payload, error }: ProductsType = useSelector(getProducts);
+  const { isLoading, products, error }: ProductsType = useSelector(getProducts);
 
   useEffect(() => {
     dispatch(fetchProducts(`/products`));
@@ -26,7 +26,7 @@ const Home = () => {
       <div className="row">
         { error ? (<span className="home__loader">{ error.message }</span>) : null}
         { isLoading ? (<span className="home__loader"><Spinner /></span>) : null}
-        { !isLoading ? payload.map((product) => (
+        { !isLoading ? products.map((product) => (
           <div
             // eslint-disable-next-line no-underscore-dangle
             key={product._id}

diff --git a/src/app/store/modules/products/reducers/products.js b/src/app/store/modules/products/reducers/products.js
@@ -12,7 +12,7 @@ import {
 const initialState = {
   error: null,
   isLoading: false,
-  payload: [],
+  products: [],
 };
 
 export default createReducer<ProductsType, ProductActionType>(initialState, {
@@ -31,7 +31,7 @@ export default createReducer<ProductsType, ProductActionType>(initialState, {
     return {
       ...state,
       isLoading: false,
-      payload: [...data],
+      products: [...data],
     };
   },
   [GET_PRODUCTS_FAILURE](state, action) {

diff --git a/src/app/store/types/ProductsType.js b/src/app/store/types/ProductsType.js
@@ -1,7 +1,7 @@
 // @flow strict
 import type { Action } from 'redux';
 
-import type { Response, ResponseError, Base } from '@/store/types/CommonType';
+import type { Response, ResponseError } from '@/store/types/CommonType';
 
 export type ProductType = {
   _id: string,
@@ -14,12 +14,13 @@ export type ProductType = {
   shop: string,
 };
 
-export type ProductsType = Base<Array<ProductType>>;
-// export type ProductsType = {
-//   isLoading: boolean,
-//   payload: Array<ProductType>,
-//   ...$Exact<ResponseError>,
-// };
+export type ProductsType = {
+  isLoading: boolean,
+  products: Array<ProductType>,
+  error: ?{
+    message: string
+  },
+};
 
 export type ProductActionType = {
   ...$Exact<Action<string>>,