From 4b8fe4e42fe37c52fd607e6de807ab47906a697e Mon Sep 17 00:00:00 2001
From: workashrafi77-web <work.ashrafi77@gmail.com>
Date: Tue, 27 Jan 2026 14:55:54 +0330
Subject: [PATCH] fix => search services inside guildes and stewards

---
 .../components/PersonalInfoSection.js         |  4 +-
 .../ManageGuildsRequests.js                   | 29 ++++++++++-----
 .../components/manage-guilds/ManageGuilds.js  | 37 +++++++++++++------
 .../ProvinceLegalGuildsInProvince.js          | 31 +++++++++++-----
 4 files changed, 67 insertions(+), 34 deletions(-)

diff --git a/src/features/province/components/create-guilds/components/PersonalInfoSection.js b/src/features/province/components/create-guilds/components/PersonalInfoSection.js
index 8ecf523..63f0bdf 100644
--- a/src/features/province/components/create-guilds/components/PersonalInfoSection.js
+++ b/src/features/province/components/create-guilds/components/PersonalInfoSection.js
@@ -65,14 +65,14 @@ export const PersonalInfoSection = ({
       pr={{ xs: 0, md: 3 }}
       mb={2}
     >
-      <Grid container direction="column" gap={SPACING.SMALL}>
+      <Grid container gap={SPACING.SMALL}>
         <Grid item xs={12}>
           <Typography variant="h6" gutterBottom>
             اطلاعات شخصی
           </Typography>
         </Grid>
         <Grid container xs={12}>
-          <Grid container xs={12} md={6} gap={SPACING.SMALL} px={SPACING.TINY}>
+          <Grid container xs={12} md={6} gap={SPACING.TINY} px={SPACING.TINY}>
             <Grid item xs={12}>
               {guild || isAdmin ? (
                 <TextField
diff --git a/src/features/province/components/manage-guilds-requests/ManageGuildsRequests.js b/src/features/province/components/manage-guilds-requests/ManageGuildsRequests.js
index 4563a2a..b2dcbf8 100644
--- a/src/features/province/components/manage-guilds-requests/ManageGuildsRequests.js
+++ b/src/features/province/components/manage-guilds-requests/ManageGuildsRequests.js
@@ -109,22 +109,31 @@ export const ManageGuildsRequests = ({ userType }) => {
 
   useEffect(() => {
     fetchApiData(1);
-  }, [dispatch, perPage]);
+  }, []);
 
   const handleSubmit = async (event) => {
     event.preventDefault();
     dispatch(LOADING_START());
-
+    setPage(1);
     try {
       const response = await dispatch(
-        provinceGetTotalGuildsService({
-          search: "filter",
-          value: textValue,
-          page: 1,
-          page_size: perPage,
-          check: true,
-          state: "pending",
-        })
+        IS_STEWARD
+          ? provinceGetTotalStewardsService({
+              search: "filter",
+              value: textValue,
+              page: 1,
+              page_size: perPage,
+              check: true,
+              state: "pending",
+            })
+          : provinceGetTotalGuildsService({
+              search: "filter",
+              value: textValue,
+              page: 1,
+              page_size: perPage,
+              check: true,
+              state: "pending",
+            })
       );
       setData(response.payload?.data?.results || []);
       setTotalRows(response.payload?.data?.count || 0);
diff --git a/src/features/province/components/manage-guilds/ManageGuilds.js b/src/features/province/components/manage-guilds/ManageGuilds.js
index f5e539f..92f3abf 100644
--- a/src/features/province/components/manage-guilds/ManageGuilds.js
+++ b/src/features/province/components/manage-guilds/ManageGuilds.js
@@ -230,19 +230,32 @@ export const ManageGuilds = ({ userType }) => {
 
   const handleSubmit = async (e) => {
     e.preventDefault();
+    setPage(1);
     const response = await dispatch(
-      provinceGetTotalGuildsService({
-        search: "filter",
-        value: textValue,
-        page: page,
-        page_size: perPage,
-        steward: false,
-        active_state: activeState,
-        is_real_person: true,
-        role_key: checkPathStartsWith("province")
-          ? selectedSubUser?.key || ""
-          : "",
-      })
+      IS_STEWARD
+        ? provinceGetTotalStewardsService({
+            search: "filter",
+            value: textValue,
+            page: 1,
+            page_size: perPage,
+            active_state: activeState,
+            is_real_person: true,
+            role_key: checkPathStartsWith("province")
+              ? selectedSubUser?.key || ""
+              : "",
+          })
+        : provinceGetTotalGuildsService({
+            search: "filter",
+            value: textValue,
+            page: 1,
+            page_size: perPage,
+            steward: false,
+            active_state: activeState,
+            is_real_person: true,
+            role_key: checkPathStartsWith("province")
+              ? selectedSubUser?.key || ""
+              : "",
+          })
     );
 
     if (response.payload.error) {
diff --git a/src/features/province/components/province-legal-guilds-in-province/ProvinceLegalGuildsInProvince.js b/src/features/province/components/province-legal-guilds-in-province/ProvinceLegalGuildsInProvince.js
index 8ee90bc..e538ad0 100644
--- a/src/features/province/components/province-legal-guilds-in-province/ProvinceLegalGuildsInProvince.js
+++ b/src/features/province/components/province-legal-guilds-in-province/ProvinceLegalGuildsInProvince.js
@@ -35,7 +35,7 @@ export const ProvinceLegalGuildsInProvince = ({ userType }) => {
         ? provinceGetTotalStewardsService({
             search: "filter",
             value: textValue,
-            page: page,
+            page: pageNum,
             page_size: perPage,
             is_real_person: false,
             role_key: checkPathStartsWith("province")
@@ -122,15 +122,26 @@ export const ProvinceLegalGuildsInProvince = ({ userType }) => {
     e.preventDefault();
     setPage(1);
     const response = await dispatch(
-      provinceGetTotalGuildsService({
-        search: "filter",
-        value: textValue,
-        page: 1,
-        page_size: perPage,
-        steward: false,
-        active_state: "all",
-        is_real_person: false,
-      })
+      IS_STEWARD
+        ? provinceGetTotalStewardsService({
+            search: "filter",
+            value: textValue,
+            page: 1,
+            page_size: perPage,
+            is_real_person: false,
+            role_key: checkPathStartsWith("province")
+              ? selectedSubUser?.key || ""
+              : "",
+          })
+        : provinceGetTotalGuildsService({
+            search: "filter",
+            value: textValue,
+            page: 1,
+            page_size: perPage,
+            steward: false,
+            active_state: "all",
+            is_real_person: false,
+          })
     );
 
     if (response.payload.error) {