MNPC/Rasadyar_FrontEnd
9
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix => search services inside guildes and stewards

Browse Source
This commit is contained in:
workashrafi77-web
2026-01-27 14:55:54 +03:30
parent 178e283143
commit 4b8fe4e42f
4 changed files with 67 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/features/province/components/create-guilds/components/PersonalInfoSection.js
View File

@@ -65,14 +65,14 @@ export const PersonalInfoSection = ({
pr={{ xs: 0, md: 3 }} pr={{ xs: 0, md: 3 }}
mb={2} mb={2}
> >
<Grid container direction="column" gap={SPACING.SMALL}> <Grid container gap={SPACING.SMALL}>
<Grid item xs={12}> <Grid item xs={12}>
<Typography variant="h6" gutterBottom> <Typography variant="h6" gutterBottom>
اطلاعات شخصی اطلاعات شخصی
</Typography> </Typography>
</Grid> </Grid>
<Grid container xs={12}> <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}> <Grid item xs={12}>
{guild || isAdmin ? ( {guild || isAdmin ? (
<TextField <TextField

29
src/features/province/components/manage-guilds-requests/ManageGuildsRequests.js
View File

@@ -109,22 +109,31 @@ export const ManageGuildsRequests = ({ userType }) => {
useEffect(() => { useEffect(() => {
fetchApiData(1); fetchApiData(1);
}, [dispatch, perPage]); }, []);
const handleSubmit = async (event) => { const handleSubmit = async (event) => {
event.preventDefault(); event.preventDefault();
dispatch(LOADING_START()); dispatch(LOADING_START());
setPage(1);
try { try {
const response = await dispatch( const response = await dispatch(
provinceGetTotalGuildsService({ IS_STEWARD
search: "filter", ? provinceGetTotalStewardsService({
value: textValue, search: "filter",
page: 1, value: textValue,
page_size: perPage, page: 1,
check: true, page_size: perPage,
state: "pending", check: true,
}) state: "pending",
})
: provinceGetTotalGuildsService({
search: "filter",
value: textValue,
page: 1,
page_size: perPage,
check: true,
state: "pending",
})
); );
setData(response.payload?.data?.results || []); setData(response.payload?.data?.results || []);
setTotalRows(response.payload?.data?.count || 0); setTotalRows(response.payload?.data?.count || 0);

37
src/features/province/components/manage-guilds/ManageGuilds.js
View File

@@ -230,19 +230,32 @@ export const ManageGuilds = ({ userType }) => {
const handleSubmit = async (e) => { const handleSubmit = async (e) => {
e.preventDefault(); e.preventDefault();
setPage(1);
const response = await dispatch( const response = await dispatch(
provinceGetTotalGuildsService({ IS_STEWARD
search: "filter", ? provinceGetTotalStewardsService({
value: textValue, search: "filter",
page: page, value: textValue,
page_size: perPage, page: 1,
steward: false, page_size: perPage,
active_state: activeState, active_state: activeState,
is_real_person: true, is_real_person: true,
role_key: checkPathStartsWith("province") role_key: checkPathStartsWith("province")
? selectedSubUser?.key || "" ? 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) { if (response.payload.error) {

31
src/features/province/components/province-legal-guilds-in-province/ProvinceLegalGuildsInProvince.js
View File

@@ -35,7 +35,7 @@ export const ProvinceLegalGuildsInProvince = ({ userType }) => {
? provinceGetTotalStewardsService({ ? provinceGetTotalStewardsService({
search: "filter", search: "filter",
value: textValue, value: textValue,
page: page, page: pageNum,
page_size: perPage, page_size: perPage,
is_real_person: false, is_real_person: false,
role_key: checkPathStartsWith("province") role_key: checkPathStartsWith("province")
@@ -122,15 +122,26 @@ export const ProvinceLegalGuildsInProvince = ({ userType }) => {
e.preventDefault(); e.preventDefault();
setPage(1); setPage(1);
const response = await dispatch( const response = await dispatch(
provinceGetTotalGuildsService({ IS_STEWARD
search: "filter", ? provinceGetTotalStewardsService({
value: textValue, search: "filter",
page: 1, value: textValue,
page_size: perPage, page: 1,
steward: false, page_size: perPage,
active_state: "all", is_real_person: false,
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) { if (response.payload.error) {