+CAdminGoodsPageContainer ->actionAdminGoodsPage

src/actions/actionAdminGoodsPage.js

@@ -0,0 +1,10 @@
+import { actionFeedClear, actionFeedGoods, actionPromiseClear } from "../reducers";
+
+export const actionAdminGoodsPage =
+    ({ orderBy }) =>
+    async (dispatch, getState) => {
+        dispatch(actionFeedClear());
+        dispatch(actionPromiseClear("feedGoodsAll"));
+        dispatch(actionPromiseClear("goodUpsert"));
+        dispatch(actionFeedGoods({ skip: 0, orderBy }));
+    };

src/actions/actionAdminGoodsPageClear.js

@@ -0,0 +1,9 @@
+import { actionFeedClear, actionFeedGoods, actionPromiseClear } from "../reducers";
+
+export const actionAdminGoodsPageClear =
+    ({ orderBy }) =>
+    async (dispatch, getState) => {
+        dispatch(actionFeedClear());
+        dispatch(actionPromiseClear("feedGoodsAll"));
+        dispatch(actionPromiseClear("goodUpsert"));
+    };

src/components/admin/AdminLayoutPage/index.js

@@ -39,6 +39,8 @@ import { actionAdminCategoriesPage } from "../../../actions/actionAdminCategorie
 import { actionAdminCategoriesPageClear } from "../../../actions/actionAdminCategoriesPageClear";
 import { actionAdminCategoriesSearchPageClear } from "../../../actions/actionAdminCategoriesSearchPageClear";
 import { actionAdminCategoriesSearchPage } from "../../../actions/actionAdminCategoriesSearchPage";
+import { actionAdminGoodsPageClear } from "../../../actions/actionAdminGoodsPageClear";
+import { actionAdminGoodsPage } from "../../../actions/actionAdminGoodsPage";
 
 const AdminCategoryTreePageContainer = ({ onLoad, onUnmount }) => {
     useEffect(() => {
@@ -190,45 +192,46 @@ const AdminGoodPageContainer = () => {
     return <CAdminGoodPage />;
 };
 
-const AdminGoodsPageContainer = ({ goods }) => {
+const AdminGoodsPageContainer = ({ feed, goods, promiseStatus, onLoad, onUnmount }) => {
     const dispatch = useDispatch();
     const [searchParams] = useSearchParams();
     const orderBy = searchParams.get("orderBy") || "_id";
 
     useEffect(() => {
-        dispatch(actionFeedClear());
-        dispatch(actionPromiseClear("feedGoodsAll"));
-        dispatch(actionPromiseClear("goodUpsert"));
-        dispatch(actionFeedGoods({ skip: 0, orderBy }));
+        onLoad({ orderBy });
     }, [orderBy]);
 
     useEffect(() => {
         window.onscroll = (e) => {
             if (window.innerHeight + window.scrollY >= document.body.offsetHeight - 200) {
-                const {
-                    feed,
-                    promise: { feedGoodsAll },
-                } = store.getState();
-
-                if (feedGoodsAll.status !== "PENDING") {
-                    dispatch(actionFeedGoods({ skip: feed.payload?.length || 0, orderBy }));
+                if (promiseStatus !== "PENDING") {
+                    dispatch(actionFeedGoods({ skip: feed?.length || 0, orderBy }));
                 }
             }
         };
         return () => {
-            dispatch(actionFeedClear());
-            dispatch(actionPromiseClear("feedGoodsAll"));
-            dispatch(actionPromiseClear("goodUpsert"));
             window.onscroll = null;
         };
-    }, []);
+    }, [promiseStatus, feed]);
 
     useEffect(() => {
-        if (goods?.length) store.dispatch(actionFeedAdd(goods));
+        if (goods?.length) dispatch(actionFeedAdd(goods));
     }, [goods]);
     return <AdminGoodsPage orderBy={orderBy} />;
 };
 
+const CAdminGoodsPageContainer = connect(
+    (state) => ({
+        goods: state.promise?.feedGoodsAll?.payload || [],
+        feed: state.feed?.payload || [],
+        promiseStatus: state.promise?.feedGoodsAll?.status || null,
+    }),
+    {
+        onUnmount: () => actionAdminGoodsPageClear(),
+        onLoad: ({ orderBy }) => actionAdminGoodsPage({ orderBy }),
+    }
+)(AdminGoodsPageContainer);
+
 const AdminGoodsSearchPageContainer = () => {
     const goods = useSelector((state) => state.promise?.feedGoodsFind?.payload || []);
     const dispatch = useDispatch();
@@ -474,8 +477,6 @@ const AdminUserPageContainer = () => {
     return <CAdminUserPage />;
 };
 
-const CAdminGoodsPageContainer = connect((state) => ({ goods: state.promise?.feedGoodsAll?.payload || [] }))(AdminGoodsPageContainer);
-
 const CAdminOrdersPageContainer = connect((state) => ({ orders: state.promise?.feedOrdersAll?.payload || [] }))(AdminOrdersPageContainer);
 
 const CAdminUsersPageContainer = connect((state) => ({ users: state.promise?.feedUsersAll?.payload || [] }))(AdminUsersPageContainer);

src/reducers/feedReducer.js

@@ -27,7 +27,7 @@ const actionFeedClear = () => ({ type: "FEED_CLEAR" });
 const actionFeedGoods =
     ({ skip = 0, orderBy = "_id" }) =>
     async (dispatch, getState) => {
-        await dispatch(actionGoodsAll({ skip, limit: 15, promiseName: "feedGoodsAll", orderBy }));
+        await dispatch(actionGoodsAll({ skip, limit: 1, promiseName: "feedGoodsAll", orderBy }));
     };
 
 const actionFeedCategoryGoods =