From 0743d6c86fdb66266e4d8cbdf5fcdd8407a2a76a Mon Sep 17 00:00:00 2001 From: wixarm Date: Tue, 24 Feb 2026 12:12:40 +0330 Subject: [PATCH] add: domain in access and page --- src/partials/Admin/Access.tsx | 2 ++ src/partials/Admin/AddPage.tsx | 29 ++++++++++++++++++++++++++++- src/partials/Admin/Pages.tsx | 3 ++- src/partials/Admin/UnusedAccess.tsx | 3 ++- 4 files changed, 34 insertions(+), 3 deletions(-) diff --git a/src/partials/Admin/Access.tsx b/src/partials/Admin/Access.tsx index be67709..1a78d85 100644 --- a/src/partials/Admin/Access.tsx +++ b/src/partials/Admin/Access.tsx @@ -37,6 +37,7 @@ export default function Access() { pagesInfo.page === 1 ? i + 1 : i + pagesInfo.page_size * (pagesInfo.page - 1) + 1, + item?.domain?.fa_name || item?.page_data?.domain?.fa_name || "-", item?.name, item?.description, `${getFaPermissions(item?.page)} (${item?.page})`, @@ -119,6 +120,7 @@ export default function Access() { title="مدیریت دسترسی ها" columns={[ "ردیف", + "حوزه", "دسترسی", "توضیحات", "صفحه", diff --git a/src/partials/Admin/AddPage.tsx b/src/partials/Admin/AddPage.tsx index 0febfd4..493c2e0 100644 --- a/src/partials/Admin/AddPage.tsx +++ b/src/partials/Admin/AddPage.tsx @@ -3,14 +3,19 @@ import Button from "../../components/Button/Button"; import { Grid } from "../../components/Grid/Grid"; import Textfield from "../../components/Textfeild/Textfeild"; import { useForm, Controller } from "react-hook-form"; -import { zValidateEnglishString } from "../../data/getFormTypeErrors"; +import { + zValidateEnglishString, + zValidateNumber, +} from "../../data/getFormTypeErrors"; import { z } from "zod"; import { useApiMutation } from "../../utils/useApiRequest"; import { useToast } from "../../hooks/useToast"; import { useModalStore } from "../../context/zustand-store/appStore"; +import { FormApiBasedAutoComplete } from "../../components/FormItems/FormApiBasedAutoComplete"; const schema = z.object({ page: zValidateEnglishString("نام صفحه"), + domain: zValidateNumber("حوزه"), }); type AddPageProps = { @@ -27,11 +32,13 @@ export const AddPage = ({ getData, item }: AddPageProps) => { const { control, handleSubmit, + setValue, formState: { errors }, } = useForm({ resolver: zodResolver(schema), defaultValues: { page: item?.name || "", + domain: item?.domain?.id, }, }); @@ -45,6 +52,7 @@ export const AddPage = ({ getData, item }: AddPageProps) => { const payload = { name: data.page, code: data.page + ".view", + domain: data.domain, }; if (item) { @@ -83,6 +91,25 @@ export const AddPage = ({ getData, item }: AddPageProps) => { /> )} /> + ( + { + setValue("domain", value); + }} + /> + )} + /> diff --git a/src/partials/Admin/Pages.tsx b/src/partials/Admin/Pages.tsx index 7a16683..0600c93 100644 --- a/src/partials/Admin/Pages.tsx +++ b/src/partials/Admin/Pages.tsx @@ -32,6 +32,7 @@ export default function Pages() { ? i + 1 : i + pagesInfo.page_size * (pagesInfo.page - 1) + 1, getFaPermissions(item?.name), + item?.domain?.fa_name || "-", item?.name, item?.permissions?.map((option: any) => option.name)?.join(" - "), @@ -110,7 +111,7 @@ export default function Pages() { count={pagesData?.count || 10} isPaginated title="صفحات سامانه" - columns={["ردیف", "صفحه", "کلید", "دسترسی ها", "عملیات"]} + columns={["ردیف", "صفحه", "حوزه", "کلید", "دسترسی ها", "عملیات"]} rows={pagesTableData} /> diff --git a/src/partials/Admin/UnusedAccess.tsx b/src/partials/Admin/UnusedAccess.tsx index e5e3190..87be4d4 100644 --- a/src/partials/Admin/UnusedAccess.tsx +++ b/src/partials/Admin/UnusedAccess.tsx @@ -29,6 +29,7 @@ export default function UnusedAccess() { pagesInfo.page === 1 ? i + 1 : i + pagesInfo.page_size * (pagesInfo.page - 1) + 1, + item?.domain?.fa_name || item?.page_data?.domain?.fa_name || "-", item?.name, item?.description, `${getFaPermissions(item?.page)} (${item?.page})`, @@ -63,7 +64,7 @@ export default function UnusedAccess() { count={pagesData?.count || 10} isPaginated title="دسترسی های غیر فعال" - columns={["ردیف", "دسترسی", "توضیحات", "صفحه", "عملیات"]} + columns={["ردیف", "حوزه", "دسترسی", "توضیحات", "صفحه", "عملیات"]} rows={pagesTableData} />