LFFE-1 user management structure enhancement

This commit is contained in:
2023-10-31 16:07:24 +03:30
parent 37e595ab26
commit df34dd24ad
5 changed files with 48 additions and 50 deletions

View File

@@ -156,7 +156,6 @@ function DashboardPassengerOfficeComponent() {
],
[]
);
return (
<DashboardLayouts>
<Box sx={{px: 3}}>

View File

@@ -105,7 +105,7 @@ const ConfirmContent = ({rowId, fetchUrl, mutate, setOpenConfirmDialog}) => {
{t("ConfirmDialog.button-cancel")}
</Button>
<Button onClick={formik.handleSubmit} variant="contained" color="primary"
disabled={formik.isSubmitting}>
disabled={formik.isSubmitting || !formik.dirty || !formik.isValid}>
{t("ConfirmDialog.button-confirm")}
</Button>
</DialogActions>

View File

@@ -1,37 +1,19 @@
import {useTranslations} from "next-intl";
import {useState} from "react";
import {
Button,
Dialog,
DialogActions,
DialogContent,
DialogTitle,
FormControl,
FormHelperText,
IconButton,
InputLabel,
MenuItem,
Select,
Stack,
TextField,
Tooltip
} from "@mui/material";
import {useFormik} from "formik";
import EditIcon from '@mui/icons-material/Edit';
import {UPDATE_USER_MANAGEMENT} from "@/core/data/apiRoutes";
import useRequest from "@/lib/app/hooks/useRequest";
import { UPDATE_USER_MANAGEMENT } from "@/core/data/apiRoutes";
import useNotification from "@/lib/app/hooks/useNotification";
import useRequest from "@/lib/app/hooks/useRequest";
import { Button, DialogActions, DialogContent, FormControl, FormHelperText, InputLabel, MenuItem, Select, Stack, TextField } from "@mui/material"
import { useFormik } from "formik";
import { useTranslations } from "next-intl";
import * as Yup from "yup";
const UpdateForm = ({row, fetchUrl, mutate}) => {
const UpdateContent = ({row, fetchUrl, mutate, setOpenConfirmDialog}) => {
const t = useTranslations();
const [openConfirmDialog, setOpenConfirmDialog] = useState(false);
const requestServer = useRequest({auth: true})
const {update_notification} = useNotification()
const validationSchema = Yup.object().shape({
phone_number: Yup.mixed().test("is-number", `${t("AddDialog.phone_number_number")}`, (value) => !isNaN(value)).test("positive", `${t("AddDialog.phone_number_positive")}`, (value) => value >= 0)
.test("max", `${t("AddDialog.phone_number_max")}`, (value) => value.length <= 11)
.test("max", `${t("AddDialog.phone_number_max")}`, (value) => value.length == 11)
.required(t("AddDialog.phone_number_error")),
national_id: Yup.mixed().test("is-number", `${t("AddDialog.national_id_number")}`, (value) => !isNaN(value)).test("positive", `${t("AddDialog.national_id_positive")}`, (value) => value >= 0)
.test("max", `${t("AddDialog.national_id_max")}`, (value) => value.length <= 10)
@@ -49,7 +31,7 @@ const UpdateForm = ({row, fetchUrl, mutate}) => {
phone_number: row.getValue("phone_number"),
national_id: row.getValue("national_id"),
type_id: row.original.type_id,
navgan_id: row.getValue("navgan_id"),
navgan_id:row.original.type_id === 1 ? row.getValue("navgan_id") : '',
}, validationSchema, onSubmit: (values, {setSubmitting}) => {
const formData = new FormData();
formData.append("phone_number", values.phone_number);
@@ -67,21 +49,8 @@ const UpdateForm = ({row, fetchUrl, mutate}) => {
});
},
});
return (<>
<Tooltip title={t("UpdateDialog.update-tooltip")}>
<IconButton
color="primary"
onClick={() => {
setOpenConfirmDialog(true)
}}
>
<EditIcon/>
</IconButton>
</Tooltip>
<Dialog fullWidth 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'}}}>
<DialogTitle>{t("UpdateDialog.update")}</DialogTitle>
return(
<>
<DialogContent>
<Stack spacing={2}>
<Stack>
@@ -168,11 +137,11 @@ const UpdateForm = ({row, fetchUrl, mutate}) => {
{t("UpdateDialog.button-cancel")}
</Button>
<Button onClick={formik.handleSubmit} variant="contained" color="primary"
disabled={formik.isSubmitting}>
disabled={formik.isSubmitting || !formik.dirty || !formik.isValid}>
{t("UpdateDialog.button-update")}
</Button>
</DialogActions>
</Dialog>
</>);
};
export default UpdateForm;
</>
)
}
export default UpdateContent

View File

@@ -0,0 +1,30 @@
import { Dialog, DialogTitle, IconButton, Tooltip } from "@mui/material"
import EditIcon from '@mui/icons-material/Edit';
import { useTranslations } from "next-intl";
import { useState } from "react";
import UpdateContent from "./UpdateContent";
const Update = ({row, fetchUrl, mutate}) => {
const t = useTranslations();
const [openConfirmDialog, setOpenConfirmDialog] = useState(false);
return (
<>
<Tooltip title={t("UpdateDialog.update-tooltip")}>
<IconButton
color="primary"
onClick={() => {
setOpenConfirmDialog(true)
}}
>
<EditIcon/>
</IconButton>
</Tooltip>
<Dialog fullWidth 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'}}}>
<DialogTitle>{t("UpdateDialog.update")}</DialogTitle>
<UpdateContent row={row} fetchUrl={fetchUrl} mutate={mutate} setOpenConfirmDialog={setOpenConfirmDialog} />
</Dialog>
</>
)
}
export default Update

View File

@@ -1,12 +1,12 @@
import {Box} from "@mui/material";
import DeleteForm from "./Form/DeleteForm"
import UpdateForm from "./Form/UpdateForm"
import Update from "./Form/UpdateForm";
const TableRowActions = ({row, mutate, fetchUrl}) => {
return (
<Box sx={{display: "flex", flexWrap: "nowrap", gap: "8px"}}>
<UpdateForm
<Update
row={row}
mutate={mutate}
fetchUrl={fetchUrl}