CRM/Frontend
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

CFE-4 check and set the api

Browse Source
This commit is contained in:
Amin Ghasempoor
2023-10-10 11:38:09 +03:30
parent 99b4128cd9
commit 9c74c18089
14 changed files with 94 additions and 62 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
public/locales/fa/app.json
View File

@@ -73,7 +73,8 @@
"Dashboard": {
"dashboard_page": "داشبورد",
"change_password": "تغییر رمز عبور",
"edit_profile": "ویرایش پروفایل"
"edit_profile": "ویرایش پروفایل",
"role_management_page": "مدیریت دسترسی"
},
"MuiDatePicker": {
"date_picker_birthday": "تاریخ"

6
src/components/dashboard/role-management/Form/CreateForm/CreateContent.jsx
View File

@@ -34,7 +34,7 @@ const CreateContent = ({mutate, fetchUrl, setOpenConfirmDialog}) => {
permissions: [],
}, validationSchema, onSubmit: (values, {setSubmitting}) => {
const formData = new FormData();
formData.append("name_en", values.name_en);
formData.append("name", values.name_en);
formData.append("name_fa", values.name_fa);
for (let i = 0; i < values.permissions.length; i++) {
formData.append(`permissions[${i}]`, values.permissions[i]);
@@ -42,7 +42,7 @@ const CreateContent = ({mutate, fetchUrl, setOpenConfirmDialog}) => {
requestServer(ADD_ROLE_MANAGEMENT, 'post', {
data: formData,
}).then((response) => {
}).then(() => {
setOpenConfirmDialog(false)
mutate(fetchUrl)
update_notification()
@@ -57,7 +57,7 @@ const CreateContent = ({mutate, fetchUrl, setOpenConfirmDialog}) => {
<>
<DialogTitle>{t("AddDialog.add")}</DialogTitle>
<DialogContent>
<Stack spacing={2}>
<Stack sx={{mt: 2}} spacing={2} sx={{mt: 1}}>
<Stack direction="row" spacing={2}>
<TextField
name="name_en"

20
src/components/dashboard/role-management/Form/DeleteForm/__test__/index.test.js
View File

@@ -1,29 +1,21 @@
import {fireEvent, render, screen} from "@testing-library/react";
import {fireEvent, render, screen, waitFor} from "@testing-library/react";
import MockAppWithProviders from "../../../../../../../mocks/AppWithProvider";
import DeleteForm from "@/components/dashboard/role-management/Form/DeleteForm";
import UpdateForm from "@/components/dashboard/role-management/Form/UpdateForm";
describe("Create Form Component from Role Management Component",()=> {
describe("Rendering", () => {
it('should see Dialog text', () => {
render(
<MockAppWithProviders>
<UpdateForm/>
</MockAppWithProviders>
)
const textElement = screen.queryByText("ویرایش")
expect(textElement).toBeInTheDocument()
});
it('should see Dialog text when mouse is over', async () => {
render(
<MockAppWithProviders>
<DeleteForm />
</MockAppWithProviders>
)
const textElement = screen.queryByText("حذف")
fireEvent.mouseOver(textElement);
const tooltipTextElement = screen.getByText("حذف");
expect(tooltipTextElement).toBeInTheDocument();
const textElement = screen.getByTestId("dialog_tooltip")
fireEvent.mouseOver(textElement)
await waitFor(()=>{
expect(screen.getByText("حذف")).toBeInTheDocument();
})
});
})
})

14
src/components/dashboard/role-management/Form/DeleteForm/index.jsx
View File

@@ -1,8 +1,7 @@
import {useTranslations} from "next-intl";
import {useState} from "react";
import {
Button,
Dialog,
Dialog, IconButton,
Tooltip,
} from "@mui/material";
import DeleteIcon from '@mui/icons-material/Delete';
@@ -16,18 +15,15 @@ const DeleteForm = ({rowId, fetchUrl, mutate}) => {
return (
<>
<Tooltip title={t("DeleteDialog.delete")}>
<Button
<IconButton
data-testid="dialog_tooltip"
color="primary"
variant="contained"
size="small"
sx={{textTransform: "unset", alignSelf: "center"}}
startIcon={<DeleteIcon/>}
onClick={() => {
setOpenConfirmDialog(true)
}}
>
{t("DeleteDialog.delete")}
</Button>
<DeleteIcon/>
</IconButton>
</Tooltip>
<Dialog maxWidth="sm" open={openConfirmDialog}
PaperProps={{sx: {boxShadow: 'rgba(60, 64, 67, 0.3) 0px 1px 16px 0px, rgba(60, 64, 67, 0.15) 0px 1px 10px 0px'}}}>

2
src/components/dashboard/role-management/Form/UpdateForm/UpdateContent.jsx
View File

@@ -59,7 +59,7 @@ const UpdateContent = ({mutate, row, fetchUrl, setOpenConfirmDialog}) => {
<>
<DialogTitle>{t("UpdateDialog.update")}</DialogTitle>
<DialogContent>
<Stack spacing={2}>
<Stack sx={{mt: 2}} spacing={2}>
<Stack direction="row" spacing={2} sx={{mt: 1}}>
<TextField
name="name_en"

22
src/components/dashboard/role-management/Form/UpdateForm/__test__/index.test.js
View File

@@ -1,30 +1,22 @@
import {fireEvent, render, screen} from "@testing-library/react";
import {fireEvent, render, screen, waitFor} from "@testing-library/react";
import MockAppWithProviders from "../../../../../../../mocks/AppWithProvider";
import UpdateContent from "@/components/dashboard/role-management/Form/UpdateForm/UpdateContent";
import UpdateForm from "@/components/dashboard/role-management/Form/UpdateForm";
import userEvent from "@testing-library/user-event";
describe("Create Form Component from Role Management Component",()=>{
describe("Rendering",()=>{
it('should see Dialog text', () => {
render(
<MockAppWithProviders>
<UpdateForm/>
</MockAppWithProviders>
)
const textElement = screen.queryByText("ویرایش")
expect(textElement).toBeInTheDocument()
});
it('should see Tooltip text when mouse over', () => {
it('should see Tooltip text when mouse over', async () => {
render(
<MockAppWithProviders>
<UpdateForm />
</MockAppWithProviders>
)
const buttonElement = screen.getByText("ویرایش");
const buttonElement = screen.getByTestId("dialog_tooltip");
fireEvent.mouseOver(buttonElement);
const tooltipTextElement = screen.getByText("ویرایش");
expect(tooltipTextElement).toBeInTheDocument();
await waitFor(()=>{
expect(screen.queryByText("ویرایش")).toBeVisible();
})
});
})
})

19
src/components/dashboard/role-management/Form/UpdateForm/index.jsx
View File

@@ -1,8 +1,8 @@
import {Button, Dialog, DialogTitle, Stack, Tooltip} from "@mui/material";
import DataSaverOnIcon from "@mui/icons-material/DataSaverOn";
import {Dialog, IconButton, Stack, Tooltip} from "@mui/material";
import {useTranslations} from "next-intl";
import {useState} from "react";
import UpdateContent from "@/components/dashboard/role-management/Form/UpdateForm/UpdateContent";
import EditIcon from "@mui/icons-material/Edit";
const UpdateForm = ({mutate, fetchUrl, row}) => {
const t = useTranslations();
@@ -10,19 +10,16 @@ const UpdateForm = ({mutate, fetchUrl, row}) => {
return (
<Stack direction={"row"} spacing={2}>
<Tooltip title={t("UpdateDialog.update")} arrow placement="right">
<Button
<Tooltip title={t("UpdateDialog.update")} arrow placement="right">
<IconButton
data-testid="dialog_tooltip"
color="primary"
variant="contained"
size="small"
sx={{textTransform: "unset", alignSelf: "center"}}
startIcon={<DataSaverOnIcon/>}
onClick={() => {
setOpenConfirmDialog(true)
setOpenConfirmDialog(true);
}}
>
{t("UpdateDialog.update")}
</Button>
<EditIcon />
</IconButton>
</Tooltip>
<Dialog maxWidth={"md"} open={openConfirmDialog}
PaperProps={{sx: {boxShadow: 'rgba(60, 64, 67, 0.3) 0px 1px 16px 0px, rgba(60, 64, 67, 0.15) 0px 1px 10px 0px'}}}>

2
src/components/dashboard/role-management/RoleManagementComponent.jsx
View File

@@ -1,12 +1,12 @@
import DataTable from "@/core/components/DataTable";
import {GET_ROLE_MANAGEMENT} from "@/core/data/apiRoutes";
import TableToolbar from "@/components/dashboard/role-management/TableToolbar";
import TableRowActions from "@/components/dashboard/role-management/TableRowActions";
import {Box, Typography} from "@mui/material";
import {useTranslations} from "next-intl";
import {useMemo} from "react";
import moment from "jalali-moment";
import MuiDatePicker from "@/core/components/MuiDatePicker";
import TableToolbar from "@/components/dashboard/role-management/TableToolbar";
const RoleManagementComponent = () => {
const t = useTranslations();

2
src/components/dashboard/role-management/TableToolbar.jsx
View File

@@ -1,5 +1,5 @@
import {useTranslations} from "next-intl";
import CreateForm from "./Form/CreateForm/index";
import CreateForm from "@/components/dashboard/role-management/Form/CreateForm";
function TableToolbar({mutate, fetchUrl}) {
const t = useTranslations();

53
src/components/dashboard/role-management/__test__/RoleManagementComponent.test.js Normal file
View File

@@ -0,0 +1,53 @@
import {render, screen} from "@testing-library/react";
import MockAppWithProviders from "../../../../../mocks/AppWithProvider";
import RoleManagementComponent from "@/components/dashboard/role-management/RoleManagementComponent";
describe("Role Management", ()=>{
describe("Rendering", ()=>{
it('should see id title of data table', () => {
render(
<MockAppWithProviders>
<RoleManagementComponent />
</MockAppWithProviders>
)
const idEelement = screen.queryByText("کد یکتا")
expect(idEelement).toBeInTheDocument()
});
it('should see name title of data table', () => {
render(
<MockAppWithProviders>
<RoleManagementComponent />
</MockAppWithProviders>
)
const nameEelement = screen.queryByText("نام انگلیسی")
expect(nameEelement).toBeInTheDocument()
});
it('should see name_fa title of data table', () => {
render(
<MockAppWithProviders>
<RoleManagementComponent />
</MockAppWithProviders>
)
const name_faEelement = screen.queryByText("نام فارسی")
expect(name_faEelement).toBeInTheDocument()
});
it('should see created at title of data table', () => {
render(
<MockAppWithProviders>
<RoleManagementComponent />
</MockAppWithProviders>
)
const createdEelement = screen.queryByText("تاریخ درخواست")
expect(createdEelement).toBeInTheDocument()
});
it('should see updated at title of data table', () => {
render(
<MockAppWithProviders>
<RoleManagementComponent />
</MockAppWithProviders>
)
const updateEelement = screen.queryByText("تاریخ بروزرسانی")
expect(updateEelement).toBeInTheDocument()
});
})
})

6
src/components/dashboard/role-management/index.jsx
View File

@@ -1,12 +1,12 @@
import DashboardLayouts from "@/layouts/dashboardLayouts";
import RoleManagementComponent from "@/components/dashboard/role-management/RoleManagementComponent";
import DashboardLayout from "@/layouts/DashboardLayout";
function DashboardRoleManagementComponent() {
return (
<DashboardLayouts>
<DashboardLayout>
<RoleManagementComponent />
</DashboardLayouts>
</DashboardLayout>
);
}

1
src/components/login-expert/__test__/LoginExpertComponent.test.js
View File

@@ -124,6 +124,7 @@ describe('Login expert component from login page', () => {
})
describe("validation", ()=>{
it("Disabled submit button until fields completed", async ()=> {
render(
<MockAppWithProviders>
<LoginExpertComponent/>

4
src/core/components/DataTable.jsx
View File

@@ -134,8 +134,8 @@ function DataTable(props) {
renderTopToolbarCustomActions={({table}) => (
<>
{props.enableCustomToolbar /* send condition */
? props.CustomToolbar /* send component */
: ""}
? <props.CustomToolbar fetchUrl={fetchUrl} mutate={mutate} /> /* send component */
: "<span></span>"}
</>
)}
renderBottomToolbarCustomActions={({table}) => (

2
src/core/data/apiRoutes.js
View File

@@ -23,5 +23,5 @@ export const DELETE_ROLE_MANAGEMENT =
BASE_URL + "/api/roles"
export const GET_PERMISSIONS_LIST =
BASE_URL + "/api/roles/list"
BASE_URL + "/api/permissions/list"
//role management