fix(frontend): resolve file conflicts

This commit is contained in:
yassinedorbozgithub
2025-02-08 10:58:35 +01:00
21 changed files with 1009 additions and 907 deletions

View File

@@ -22,16 +22,20 @@ export const FormDialog = ({
...rest
}: FormDialogProps) => {
const onCancel = () => rest.onClose?.({}, "backdropClick");
const dialogActions =
rest.hasButtons === false ? null : (
<DialogActions style={{ padding: "0.5rem" }}>
<DialogFormButtons
{...{ onSubmit, onCancel, confirmButtonProps, cancelButtonProps }}
/>
</DialogActions>
);
return (
<Dialog fullWidth {...rest}>
<DialogTitle onClose={onCancel}>{title}</DialogTitle>
<DialogContent>{children}</DialogContent>
<DialogActions>
<DialogFormButtons
{...{ onSubmit, onCancel, confirmButtonProps, cancelButtonProps }}
/>
</DialogActions>
{dialogActions}
</Dialog>
);
};

View File

@@ -1,178 +0,0 @@
/*
* Copyright © 2025 Hexastack. All rights reserved.
*
* Licensed under the GNU Affero General Public License v3.0 (AGPLv3) with the following additional terms:
* 1. The name "Hexabot" is a trademark of Hexastack. You may not use this name in derivative works without express written permission.
* 2. All derivative works must include clear attribution to the original creator and software, Hexastack and Hexabot, in a prominent location (e.g., in the software's "About" section, documentation, and README file).
*/
import AddIcon from "@mui/icons-material/Add";
import { Button, Dialog, DialogActions, DialogContent } from "@mui/material";
import { FC, useEffect } from "react";
import { useFieldArray, useForm } from "react-hook-form";
import DialogButtons from "@/app-components/buttons/DialogButtons";
import { DialogTitle } from "@/app-components/dialogs/DialogTitle";
import { ContentContainer } from "@/app-components/dialogs/layouts/ContentContainer";
import { ContentItem } from "@/app-components/dialogs/layouts/ContentItem";
import { Input } from "@/app-components/inputs/Input";
import { useCreate } from "@/hooks/crud/useCreate";
import { useUpdate } from "@/hooks/crud/useUpdate";
import { DialogControlProps } from "@/hooks/useDialog";
import { useToast } from "@/hooks/useToast";
import { useTranslate } from "@/hooks/useTranslate";
import { EntityType } from "@/services/types";
import { ContentFieldType, IContentType } from "@/types/content-type.types";
import { FieldInput } from "./components/FieldInput";
import { FIELDS_FORM_DEFAULT_VALUES, READ_ONLY_FIELDS } from "./constants";
export type ContentTypeDialogProps = DialogControlProps<IContentType>;
export const ContentTypeDialog: FC<ContentTypeDialogProps> = ({
open,
data,
closeDialog,
}) => {
const { toast } = useToast();
const { t } = useTranslate();
const {
handleSubmit,
register,
control,
reset,
setValue,
formState: { errors },
} = useForm<Partial<IContentType>>({
defaultValues: {
name: data?.name || "",
fields: data?.fields || FIELDS_FORM_DEFAULT_VALUES,
},
});
const { append, fields, remove } = useFieldArray({
name: "fields",
control,
});
const closeAndReset = () => {
closeDialog();
reset({
name: "",
fields: FIELDS_FORM_DEFAULT_VALUES,
});
};
const { mutate: createContentType } = useCreate(EntityType.CONTENT_TYPE, {
onError: (error) => {
toast.error(error.message || t("message.internal_server_error"));
},
onSuccess: () => {
closeDialog();
toast.success(t("message.success_save"));
},
});
const { mutate: updateContentType } = useUpdate(EntityType.CONTENT_TYPE, {
onError: (error) => {
toast.error(error.message || t("message.internal_server_error"));
},
onSuccess: () => {
closeDialog();
toast.success(t("message.success_save"));
},
});
const onSubmitForm = async (params) => {
const labelCounts: Record<string, number> = params.fields.reduce(
(acc, field) => {
if (!field.label.trim()) return acc;
acc[field.label] = (acc[field.label] || 0) + 1;
return acc;
},
{} as Record<string, number>,
);
const hasDuplicates = Object.values(labelCounts).some(
(count: number) => count > 1,
);
if (hasDuplicates) {
toast.error(t("message.duplicate_labels_not_allowed"));
return;
}
if (data) {
updateContentType({ id: data.id, params });
} else {
createContentType(params);
}
};
useEffect(() => {
if (open) reset();
}, [open, reset]);
useEffect(() => {
if (data) {
reset({
name: data.name,
fields: data.fields || FIELDS_FORM_DEFAULT_VALUES,
});
} else {
reset({ name: "", fields: FIELDS_FORM_DEFAULT_VALUES });
}
}, [data, reset]);
return (
<Dialog open={open} fullWidth onClose={closeAndReset}>
<form onSubmit={handleSubmit(onSubmitForm)}>
<DialogTitle onClose={closeAndReset}>
{data ? t("title.edit_content_type") : t("title.new_content_type")}
</DialogTitle>
<DialogContent>
<ContentContainer>
<ContentItem>
<Input
label={t("label.name")}
error={!!errors.name}
{...register("name", {
required: t("message.name_is_required"),
})}
helperText={errors.name ? errors.name.message : null}
required
autoFocus
/>
</ContentItem>
{fields.map((f, index) => (
<ContentItem
key={f.id}
display="flex"
justifyContent="space-between"
gap={2}
>
<FieldInput
setValue={setValue}
control={control}
remove={remove}
index={index}
disabled={READ_ONLY_FIELDS.includes(f.label as any)}
/>
</ContentItem>
))}
<ContentItem>
<Button
startIcon={<AddIcon />}
variant="contained"
onClick={() =>
append({ label: "", name: "", type: ContentFieldType.TEXT })
}
>
{t("button.add")}
</Button>
</ContentItem>
</ContentContainer>
</DialogContent>
<DialogActions>
<DialogButtons closeDialog={closeAndReset} />
</DialogActions>
</form>
</Dialog>
);
};

View File

@@ -0,0 +1,160 @@
/*
* Copyright © 2025 Hexastack. All rights reserved.
*
* Licensed under the GNU Affero General Public License v3.0 (AGPLv3) with the following additional terms:
* 1. The name "Hexabot" is a trademark of Hexastack. You may not use this name in derivative works without express written permission.
* 2. All derivative works must include clear attribution to the original creator and software, Hexastack and Hexabot, in a prominent location (e.g., in the software's "About" section, documentation, and README file).
*/
import AddIcon from "@mui/icons-material/Add";
import { Button } from "@mui/material";
import { FC, Fragment, useEffect } from "react";
import { useFieldArray, useForm } from "react-hook-form";
import { ContentContainer, ContentItem } from "@/app-components/dialogs/";
import { Input } from "@/app-components/inputs/Input";
import { useCreate } from "@/hooks/crud/useCreate";
import { useUpdate } from "@/hooks/crud/useUpdate";
import { useToast } from "@/hooks/useToast";
import { useTranslate } from "@/hooks/useTranslate";
import { EntityType } from "@/services/types";
import { ComponentFormProps } from "@/types/common/dialogs.types";
import { ContentFieldType, IContentType } from "@/types/content-type.types";
import { FieldInput } from "./components/FieldInput";
import { FIELDS_FORM_DEFAULT_VALUES, READ_ONLY_FIELDS } from "./constants";
export const ContentTypeForm: FC<ComponentFormProps<IContentType>> = ({
data,
Wrapper = Fragment,
WrapperProps,
...rest
}) => {
const { toast } = useToast();
const { t } = useTranslate();
const {
reset,
control,
register,
setValue,
formState: { errors },
handleSubmit,
} = useForm<Partial<IContentType>>({
defaultValues: {
name: data?.name || "",
fields: data?.fields || FIELDS_FORM_DEFAULT_VALUES,
},
});
const { append, fields, remove } = useFieldArray({
name: "fields",
control,
});
const options = {
onError: (error: Error) => {
rest.onError?.();
toast.error(error.message || t("message.internal_server_error"));
},
onSuccess: () => {
rest.onSuccess?.();
toast.success(t("message.success_save"));
},
};
const { mutate: createContentType } = useCreate(
EntityType.CONTENT_TYPE,
options,
);
const { mutate: updateContentType } = useUpdate(
EntityType.CONTENT_TYPE,
options,
);
const onSubmitForm = (params) => {
const labelCounts: Record<string, number> = params.fields.reduce(
(acc, field) => {
if (!field.label.trim()) return acc;
acc[field.label] = (acc[field.label] || 0) + 1;
return acc;
},
{} as Record<string, number>,
);
const hasDuplicates = Object.values(labelCounts).some(
(count: number) => count > 1,
);
if (hasDuplicates) {
toast.error(t("message.duplicate_labels_not_allowed"));
return;
}
if (data) {
updateContentType({ id: data.id, params });
} else {
createContentType(params);
}
};
useEffect(() => {
if (data) {
reset({
name: data.name,
fields: data.fields || FIELDS_FORM_DEFAULT_VALUES,
});
} else {
reset({ name: "", fields: FIELDS_FORM_DEFAULT_VALUES });
}
}, [data, reset]);
return (
<Wrapper
open={!!WrapperProps?.open}
onSubmit={handleSubmit(onSubmitForm)}
{...WrapperProps}
>
<form onSubmit={handleSubmit(onSubmitForm)}>
<ContentContainer>
<ContentItem>
<Input
label={t("label.name")}
error={!!errors.name}
{...register("name", {
required: t("message.name_is_required"),
})}
helperText={errors.name ? errors.name.message : null}
required
autoFocus
/>
</ContentItem>
{fields.map((f, index) => (
<ContentItem
key={f.id}
display="flex"
justifyContent="space-between"
gap={2}
>
<FieldInput
setValue={setValue}
control={control}
remove={remove}
index={index}
disabled={READ_ONLY_FIELDS.includes(f.label as any)}
/>
</ContentItem>
))}
<ContentItem>
<Button
startIcon={<AddIcon />}
variant="contained"
onClick={() =>
append({ label: "", name: "", type: ContentFieldType.TEXT })
}
>
{t("button.add")}
</Button>
</ContentItem>
</ContentContainer>
</form>
</Wrapper>
);
};

View File

@@ -0,0 +1,24 @@
/*
* Copyright © 2025 Hexastack. All rights reserved.
*
* Licensed under the GNU Affero General Public License v3.0 (AGPLv3) with the following additional terms:
* 1. The name "Hexabot" is a trademark of Hexastack. You may not use this name in derivative works without express written permission.
* 2. All derivative works must include clear attribution to the original creator and software, Hexastack and Hexabot, in a prominent location (e.g., in the software's "About" section, documentation, and README file).
*/
import { GenericFormDialog } from "@/app-components/dialogs";
import { ComponentFormDialogProps } from "@/types/common/dialogs.types";
import { IContentType } from "@/types/content-type.types";
import { ContentTypeForm } from "./ContentTypeForm";
export const ContentTypeFormDialog = <T extends IContentType = IContentType>(
props: ComponentFormDialogProps<T>,
) => (
<GenericFormDialog<T>
Form={ContentTypeForm}
addText="title.new_content_type"
editText="title.edit_content_type"
{...props}
/>
);

View File

@@ -6,13 +6,12 @@
* 2. All derivative works must include clear attribution to the original creator and software, Hexastack and Hexabot, in a prominent location (e.g., in the software's "About" section, documentation, and README file).
*/
import { faAlignLeft } from "@fortawesome/free-solid-svg-icons";
import AddIcon from "@mui/icons-material/Add";
import { Button, Grid, Paper } from "@mui/material";
import { useRouter } from "next/router";
import { DeleteDialog } from "@/app-components/dialogs";
import { ConfirmDialogBody } from "@/app-components/dialogs";
import { FilterTextfield } from "@/app-components/inputs/FilterTextfield";
import {
ActionColumnLabel,
@@ -22,7 +21,7 @@ import { renderHeader } from "@/app-components/tables/columns/renderHeader";
import { DataGrid } from "@/app-components/tables/DataGrid";
import { useDelete } from "@/hooks/crud/useDelete";
import { useFind } from "@/hooks/crud/useFind";
import { getDisplayDialogs, useDialog } from "@/hooks/useDialog";
import { useDialogs } from "@/hooks/useDialogs";
import { useHasPermission } from "@/hooks/useHasPermission";
import { useSearch } from "@/hooks/useSearch";
import { useToast } from "@/hooks/useToast";
@@ -33,16 +32,13 @@ import { IContentType } from "@/types/content-type.types";
import { PermissionAction } from "@/types/permission.types";
import { getDateTimeFormatter } from "@/utils/date";
import { ContentTypeDialog } from "./ContentTypeDialog";
import { ContentTypeFormDialog } from "./ContentTypeFormDialog";
export const ContentTypes = () => {
const { t } = useTranslate();
const { toast } = useToast();
const router = useRouter();
// Dialog Controls
const addDialogCtl = useDialog<IContentType>(false);
const deleteDialogCtl = useDialog<string>(false);
const fieldsDialogCtl = useDialog<IContentType>(false);
const dialogs = useDialogs();
// data fetching
const { onSearch, searchPayload } = useSearch<IContentType>({
$iLike: ["name"],
@@ -53,18 +49,14 @@ export const ContentTypes = () => {
params: searchPayload,
},
);
const { mutateAsync: deleteContentType } = useDelete(
EntityType.CONTENT_TYPE,
{
onSuccess: () => {
deleteDialogCtl.closeDialog();
toast.success(t("message.item_delete_success"));
},
onError: (error) => {
toast.error(error.message || t("message.internal_server_error"));
},
const { mutate: deleteContentType } = useDelete(EntityType.CONTENT_TYPE, {
onSuccess: () => {
toast.success(t("message.item_delete_success"));
},
);
onError: (error) => {
toast.error(error.message || t("message.internal_server_error"));
},
});
const hasPermission = useHasPermission();
const actionColumns = useActionColumns<IContentType>(
EntityType.CONTENT_TYPE,
@@ -75,12 +67,18 @@ export const ContentTypes = () => {
},
{
label: ActionColumnLabel.Edit,
action: (row) => fieldsDialogCtl.openDialog(row),
action: (row) => dialogs.open(ContentTypeFormDialog, row),
requires: [PermissionAction.UPDATE],
},
{
label: ActionColumnLabel.Delete,
action: (row) => deleteDialogCtl.openDialog(row.id),
action: async ({ id }) => {
const isConfirmed = await dialogs.confirm(ConfirmDialogBody);
if (isConfirmed) {
deleteContentType(id);
}
},
requires: [PermissionAction.DELETE],
},
],
@@ -106,7 +104,7 @@ export const ContentTypes = () => {
<Button
startIcon={<AddIcon />}
variant="contained"
onClick={() => addDialogCtl.openDialog()}
onClick={() => dialogs.open(ContentTypeFormDialog, null)}
sx={{ float: "right" }}
>
{t("button.add")}
@@ -117,15 +115,6 @@ export const ContentTypes = () => {
</PageHeader>
<Grid item xs={12}>
<Paper>
<ContentTypeDialog {...getDisplayDialogs(addDialogCtl)} />
<DeleteDialog
{...deleteDialogCtl}
callback={() => {
if (deleteDialogCtl?.data)
deleteContentType(deleteDialogCtl.data);
}}
/>
<ContentTypeDialog {...getDisplayDialogs(fieldsDialogCtl)} />
<Grid padding={2} container>
<Grid item width="100%">
<DataGrid

View File

@@ -0,0 +1,268 @@
/*
* Copyright © 2024 Hexastack. All rights reserved.
*
* Licensed under the GNU Affero General Public License v3.0 (AGPLv3) with the following additional terms:
* 1. The name "Hexabot" is a trademark of Hexastack. You may not use this name in derivative works without express written permission.
* 2. All derivative works must include clear attribution to the original creator and software, Hexastack and Hexabot, in a prominent location (e.g., in the software's "About" section, documentation, and README file).
*/
import AddIcon from "@mui/icons-material/Add";
import DeleteOutlinedIcon from "@mui/icons-material/DeleteOutlined";
import KeyboardArrowUpIcon from "@mui/icons-material/KeyboardArrowUp";
import {
Accordion,
AccordionDetails,
AccordionSummary,
Divider,
Grid,
MenuItem,
Paper,
Typography,
} from "@mui/material";
import { FC, Fragment, useEffect, useState } from "react";
import { IconButton } from "@/app-components/buttons/IconButton";
import { Input } from "@/app-components/inputs/Input";
import { useCreate } from "@/hooks/crud/useCreate";
import { useDelete } from "@/hooks/crud/useDelete";
import { useFind } from "@/hooks/crud/useFind";
import { useGetFromCache } from "@/hooks/crud/useGet";
import { useToast } from "@/hooks/useToast";
import { useTranslate } from "@/hooks/useTranslate";
import { EntityType, Format } from "@/services/types";
import { ComponentFormProps } from "@/types/common/dialogs.types";
import { IPermission, IPermissionAttributes } from "@/types/permission.types";
import { IRole } from "@/types/role.types";
const DEFAULT_PAYLOAD: IPermissionAttributes = {
action: "",
model: "",
relation: "",
role: "",
};
const AccordionModelHead = () => (
<Grid
container
direction="row"
minHeight="3rem"
alignContent="center"
bgcolor="#0001"
>
<Grid item width="6rem" m="0.2rem" />
<Grid item xs textAlign="left">
<Typography fontWeight={700} fontSize="body2.fontSize">
Action
</Typography>
</Grid>
<Grid item xs textAlign="left">
<Typography fontWeight={700} fontSize="body2.fontSize">
Relation
</Typography>
</Grid>
</Grid>
);
export const PermissionsBody: FC<ComponentFormProps<IRole>> = ({
data: role,
Wrapper = Fragment,
WrapperProps,
...rest
}) => {
const { t } = useTranslate();
const { toast } = useToast();
const { data: models, refetch: modelRefetch } = useFind(
{ entity: EntityType.MODEL, format: Format.FULL },
{
hasCount: false,
},
);
const getPermissionFromCache = useGetFromCache(EntityType.PERMISSION);
const options = {
onError: (error: Error) => {
toast.error(error.message || t("message.internal_server_error"));
},
onSuccess: () => {
modelRefetch();
toast.success(t("message.item_delete_success"));
},
};
const { mutate: createPermission } = useCreate(EntityType.PERMISSION, {
...options,
onError: (error: Error & { statusCode?: number }) => {
rest.onError?.();
if (error.statusCode === 409) {
toast.error(t("message.permission_already_exists"));
} else {
toast.error(t("message.internal_server_error"));
}
},
});
const { mutate: deletePermission } = useDelete(
EntityType.PERMISSION,
options,
);
const [expanded, setExpanded] = useState<string | undefined>();
const [payload, setPayload] =
useState<IPermissionAttributes>(DEFAULT_PAYLOAD);
const reset = () => setPayload(DEFAULT_PAYLOAD);
const handleChange = (panel: string) => () => {
setExpanded(panel === expanded ? "" : panel);
setPayload(DEFAULT_PAYLOAD);
};
useEffect(() => {
if (typeof expanded !== "string" && models?.[0]?.id) {
setExpanded(models[0].id);
}
}, [models]);
return (
<Wrapper open={!!WrapperProps?.open} onSubmit={() => {}} {...WrapperProps}>
<Typography fontWeight={700} sx={{ marginBottom: 2 }}>
{role?.name}
</Typography>
{models?.map((model) => (
<Accordion
key={model.id}
expanded={expanded === model.id}
onChange={handleChange(model.id)}
sx={{
marginTop: 1,
boxShadow: "none",
"&:before": {
display: "none",
},
}}
>
<AccordionSummary
expandIcon={<KeyboardArrowUpIcon />}
sx={{
backgroundColor: "background.default",
borderRadius: 1,
fontFamily: "inherit",
}}
>
<Typography>{model.name}</Typography>
</AccordionSummary>
<AccordionDetails sx={{ p: 0, m: 0 }}>
<Paper
sx={{
m: 2,
border: "1px solid #0002",
}}
>
<AccordionModelHead />
{model.permissions
?.map((p) => getPermissionFromCache(p))
?.filter(
(permission) => permission && permission.role === role?.id,
)
.map((p) => p as IPermission)
.map(({ id, action, relation }, index) => {
return (
<>
{index > 0 && <Divider />}
<Grid
container
key={id}
sx={{
borderRadius: 0.8,
padding: 1,
"&:hover": {
backgroundColor: "background.default",
},
}}
alignItems="center"
>
<Grid item width="6rem">
<IconButton
variant="text"
color="error"
onClick={() => deletePermission(id)}
size="small"
>
<DeleteOutlinedIcon fontSize="small" />
</IconButton>
</Grid>
<Grid item xs>
<Typography>{action}</Typography>
</Grid>
<Grid item xs>
<Typography sx={{ ml: "0.2rem" }}>
{relation}
</Typography>
</Grid>
</Grid>
</>
);
})}
<Grid
container
minHeight="2.5rem"
padding="1rem 0"
borderTop="1px solid #0002"
>
<Grid item width="6rem" alignContent="center" pl="0.6rem">
<IconButton
size="small"
color="primary"
variant="contained"
onClick={() => {
if (role?.id)
createPermission({
...payload,
role: role.id,
model: model.id,
});
reset();
}}
disabled={!payload.action || !payload.relation}
>
<AddIcon fontSize="small" />
</IconButton>
</Grid>
<Grid item xs alignContent="center">
<Input
select
sx={{ width: "6.875rem" }}
label="Action"
value={payload.action}
onChange={(e) => {
if (e.target.value)
setPayload((currentPayload) => ({
...currentPayload,
action: e.target.value,
}));
}}
>
<MenuItem value="create">{t("label.create")}</MenuItem>
<MenuItem value="read">{t("label.read")}</MenuItem>
<MenuItem value="update">{t("label.update")}</MenuItem>
<MenuItem value="delete">{t("label.delete")}</MenuItem>
</Input>
</Grid>
<Grid item xs alignContent="center">
<Input
select
sx={{ width: "6.875rem" }}
label={t("label.relation")}
value={payload.relation}
onChange={(e) => {
if (e.target.value)
setPayload((currentPayload) => ({
...currentPayload,
relation: e.target.value,
}));
}}
>
<MenuItem value="role">{t("label.role")}</MenuItem>
</Input>
</Grid>
</Grid>
</Paper>
</AccordionDetails>
</Accordion>
))}
</Wrapper>
);
};

View File

@@ -0,0 +1,23 @@
/*
* Copyright © 2025 Hexastack. All rights reserved.
*
* Licensed under the GNU Affero General Public License v3.0 (AGPLv3) with the following additional terms:
* 1. The name "Hexabot" is a trademark of Hexastack. You may not use this name in derivative works without express written permission.
* 2. All derivative works must include clear attribution to the original creator and software, Hexastack and Hexabot, in a prominent location (e.g., in the software's "About" section, documentation, and README file).
*/
import { GenericFormDialog } from "@/app-components/dialogs";
import { ComponentFormDialogProps } from "@/types/common/dialogs.types";
import { IRole } from "@/types/role.types";
import { PermissionsBody } from "./PermissionsBody";
export const PermissionBodyDialog = <T extends IRole = IRole>(
props: ComponentFormDialogProps<T>,
) => (
<GenericFormDialog<T>
Form={PermissionsBody}
editText="title.manage_permissions"
{...props}
/>
);

View File

@@ -1,278 +0,0 @@
/*
* Copyright © 2024 Hexastack. All rights reserved.
*
* Licensed under the GNU Affero General Public License v3.0 (AGPLv3) with the following additional terms:
* 1. The name "Hexabot" is a trademark of Hexastack. You may not use this name in derivative works without express written permission.
* 2. All derivative works must include clear attribution to the original creator and software, Hexastack and Hexabot, in a prominent location (e.g., in the software's "About" section, documentation, and README file).
*/
import AddIcon from "@mui/icons-material/Add";
import DeleteOutlinedIcon from "@mui/icons-material/DeleteOutlined";
import KeyboardArrowUpIcon from "@mui/icons-material/KeyboardArrowUp";
import {
Accordion,
AccordionDetails,
AccordionSummary,
Dialog,
Grid,
MenuItem,
Paper,
Typography,
DialogContent,
DialogActions,
Button,
Divider,
} from "@mui/material";
import { useState, FC, useEffect } from "react";
import { IconButton } from "@/app-components/buttons/IconButton";
import { DialogTitle } from "@/app-components/dialogs/DialogTitle";
import { Input } from "@/app-components/inputs/Input";
import { useCreate } from "@/hooks/crud/useCreate";
import { useDelete } from "@/hooks/crud/useDelete";
import { useFind } from "@/hooks/crud/useFind";
import { useGetFromCache } from "@/hooks/crud/useGet";
import { DialogControlProps } from "@/hooks/useDialog";
import { useToast } from "@/hooks/useToast";
import { useTranslate } from "@/hooks/useTranslate";
import { EntityType, Format } from "@/services/types";
import { IPermission, IPermissionAttributes } from "@/types/permission.types";
import { IRole } from "@/types/role.types";
export type PermissionsDialogProps = DialogControlProps<{
role: IRole;
}>;
const DEFAULT_PAYLOAD: IPermissionAttributes = {
action: "",
model: "",
relation: "",
role: "",
};
const AccordionModelHead = () => (
<Grid container direction="row" minHeight="35px" alignContent="center" mb={1}>
<Grid item width="96px" />
<Grid item xs textAlign="left">
<Typography fontWeight={700} fontSize="body2.fontSize">
Action
</Typography>
</Grid>
<Grid item xs textAlign="left">
<Typography fontWeight={700} fontSize="body2.fontSize">
Relation
</Typography>
</Grid>
</Grid>
);
export const PermissionsDialog: FC<PermissionsDialogProps> = ({
open,
data,
closeDialog: closeFunction,
}) => {
const { t } = useTranslate();
const { toast } = useToast();
const { data: models, refetch: modelRefetch } = useFind(
{ entity: EntityType.MODEL, format: Format.FULL },
{
hasCount: false,
},
);
const getPermisionFromCache = useGetFromCache(EntityType.PERMISSION);
const { mutateAsync: createPermission } = useCreate(EntityType.PERMISSION, {
onError: (error: Error & { statusCode?: number }) => {
if (error.statusCode === 409) {
toast.error(t("message.permission_already_exists"));
} else {
toast.error(t("message.internal_server_error"));
}
},
onSuccess: () => {
modelRefetch();
toast.success(t("message.success_save"));
},
});
const { mutateAsync: deletePermission } = useDelete(EntityType.PERMISSION, {
onError: () => {
toast.error(t("message.internal_server_error"));
},
onSuccess: () => {
modelRefetch();
toast.success(t("message.item_delete_success"));
},
});
const [expanded, setExpanded] = useState<string | false>(false);
const [payload, setPayload] =
useState<IPermissionAttributes>(DEFAULT_PAYLOAD);
const reset = () => setPayload(DEFAULT_PAYLOAD);
const handleChange =
(panel: string) => (event: React.SyntheticEvent, isExpanded: boolean) => {
setExpanded(isExpanded ? panel : false);
};
useEffect(() => {
if (expanded === false && models?.[0]?.id) setExpanded(models[0].id);
}, [models]);
return (
<Dialog
open={open}
fullWidth
onClose={closeFunction}
sx={{ maxWidth: "850px", margin: "auto" }}
maxWidth="md"
>
<DialogTitle onClose={closeFunction}>
{t("title.manage_permissions")}
</DialogTitle>
<DialogContent>
<Typography fontWeight={700} sx={{ marginBottom: 2 }}>
{data?.role.name}
</Typography>
{models?.map((model) => {
return (
<Accordion
key={model.id}
expanded={expanded === model.id}
onChange={handleChange(model.id)}
sx={{
marginTop: 1,
boxShadow: "none",
"&:before": {
display: "none",
},
}}
>
<AccordionSummary
expandIcon={<KeyboardArrowUpIcon />}
sx={{
backgroundColor: "background.default",
borderRadius: 1,
fontFamily: "inherit",
}}
>
<Typography>{model.name}</Typography>
</AccordionSummary>
<AccordionDetails sx={{ p: 0, m: 0 }}>
<Paper
sx={{
padding: 2,
}}
>
<AccordionModelHead />
{model.permissions
?.map((p) => getPermisionFromCache(p))
?.filter(
(permission) =>
permission && permission.role === data?.role.id,
)
.map((p) => p as IPermission)
.map(({ id, action, relation }, index) => {
return (
<>
{index > 0 && <Divider />}
<Grid
container
key={id}
sx={{
borderRadius: 0.8,
padding: 1,
"&:hover": {
backgroundColor: "background.default",
},
}}
alignItems="center"
>
<Grid item width="96px">
<IconButton
variant="text"
color="error"
onClick={() => {
deletePermission(id);
}}
size="small"
>
<DeleteOutlinedIcon fontSize="small" />
</IconButton>
</Grid>
<Grid item xs>
<Typography>{action}</Typography>
</Grid>
<Grid item xs>
<Typography>{relation}</Typography>
</Grid>
</Grid>
</>
);
})}
<Grid container minHeight="40px" padding={1}>
<Grid item width="96px" alignContent="center">
<IconButton
size="small"
color="primary"
variant="contained"
onClick={() => {
if (data?.role.id)
createPermission({
...payload,
model: model.id,
role: data.role.id,
});
reset();
}}
>
<AddIcon fontSize="small" />
</IconButton>
</Grid>
<Grid item xs alignContent="center">
<Input
select
sx={{ width: "110px" }}
label="Action"
value={payload.action}
onChange={(e) => {
if (e.target.value)
setPayload((currentPayload) => ({
...currentPayload,
action: e.target.value,
}));
}}
>
<MenuItem value="create">{t("label.create")}</MenuItem>
<MenuItem value="read">{t("label.read")}</MenuItem>
<MenuItem value="update">{t("label.update")}</MenuItem>
<MenuItem value="delete">{t("label.delete")}</MenuItem>
</Input>
</Grid>
<Grid item xs alignContent="center">
<Input
select
sx={{ width: "110px" }}
label={t("label.relation")}
value={payload.relation}
onChange={(e) => {
if (e.target.value)
setPayload((currentPayload) => ({
...currentPayload,
relation: e.target.value,
}));
}}
>
<MenuItem value="role">{t("label.role")}</MenuItem>
</Input>
</Grid>
</Grid>
</Paper>
</AccordionDetails>
</Accordion>
);
})}
</DialogContent>
<DialogActions>
<Button variant="outlined" onClick={closeFunction}>
{t("button.close")}
</Button>
</DialogActions>
</Dialog>
);
};

View File

@@ -1,114 +0,0 @@
/*
* Copyright © 2024 Hexastack. All rights reserved.
*
* Licensed under the GNU Affero General Public License v3.0 (AGPLv3) with the following additional terms:
* 1. The name "Hexabot" is a trademark of Hexastack. You may not use this name in derivative works without express written permission.
* 2. All derivative works must include clear attribution to the original creator and software, Hexastack and Hexabot, in a prominent location (e.g., in the software's "About" section, documentation, and README file).
*/
import { Dialog, DialogActions, DialogContent } from "@mui/material";
import { FC, useEffect } from "react";
import { useForm } from "react-hook-form";
import DialogButtons from "@/app-components/buttons/DialogButtons";
import { DialogTitle } from "@/app-components/dialogs/DialogTitle";
import { ContentContainer } from "@/app-components/dialogs/layouts/ContentContainer";
import { ContentItem } from "@/app-components/dialogs/layouts/ContentItem";
import { Input } from "@/app-components/inputs/Input";
import { useCreate } from "@/hooks/crud/useCreate";
import { useUpdate } from "@/hooks/crud/useUpdate";
import { DialogControlProps } from "@/hooks/useDialog";
import { useToast } from "@/hooks/useToast";
import { useTranslate } from "@/hooks/useTranslate";
import { EntityType } from "@/services/types";
import { IRole, IRoleAttributes } from "@/types/role.types";
export type RoleDialogProps = DialogControlProps<IRole>;
export const RoleDialog: FC<RoleDialogProps> = ({
open,
data,
closeDialog,
...rest
}) => {
const { t } = useTranslate();
const { toast } = useToast();
const { mutateAsync: createRole } = useCreate(EntityType.ROLE, {
onError: (error) => {
toast.error(error);
},
onSuccess() {
closeDialog();
toast.success(t("message.success_save"));
},
});
const { mutateAsync: updateRole } = useUpdate(EntityType.ROLE, {
onError: () => {
toast.error(t("message.internal_server_error"));
},
onSuccess() {
closeDialog();
toast.success(t("message.success_save"));
},
});
const {
handleSubmit,
reset,
register,
formState: { errors },
} = useForm<IRoleAttributes>({
defaultValues: { name: "" },
});
const validationRules = {
name: {
required: t("message.name_is_required"),
},
};
const onSubmitForm = async (params: IRoleAttributes) => {
if (data) {
updateRole({ id: data.id, params });
} else {
createRole(params);
}
};
useEffect(() => {
if (open) reset();
}, [open, reset]);
useEffect(() => {
if (data) {
reset({
name: data.name,
});
} else {
reset();
}
}, [data, reset]);
return (
<Dialog open={open} fullWidth onClose={closeDialog} {...rest}>
<form onSubmit={handleSubmit(onSubmitForm)}>
<DialogTitle onClose={closeDialog}>
{data ? t("title.edit_role") : t("title.new_role")}
</DialogTitle>
<DialogContent>
<ContentContainer>
<ContentItem>
<Input
label={t("placeholder.name")}
error={!!errors.name}
required
autoFocus
helperText={errors.name ? errors.name.message : null}
{...register("name", validationRules.name)}
/>
</ContentItem>
</ContentContainer>
</DialogContent>
<DialogActions>
<DialogButtons closeDialog={closeDialog} />
</DialogActions>
</form>
</Dialog>
);
};

View File

@@ -0,0 +1,94 @@
/*
* Copyright © 2025 Hexastack. All rights reserved.
*
* Licensed under the GNU Affero General Public License v3.0 (AGPLv3) with the following additional terms:
* 1. The name "Hexabot" is a trademark of Hexastack. You may not use this name in derivative works without express written permission.
* 2. All derivative works must include clear attribution to the original creator and software, Hexastack and Hexabot, in a prominent location (e.g., in the software's "About" section, documentation, and README file).
*/
import { FC, Fragment, useEffect } from "react";
import { useForm } from "react-hook-form";
import { ContentContainer, ContentItem } from "@/app-components/dialogs/";
import { Input } from "@/app-components/inputs/Input";
import { useCreate } from "@/hooks/crud/useCreate";
import { useUpdate } from "@/hooks/crud/useUpdate";
import { useToast } from "@/hooks/useToast";
import { useTranslate } from "@/hooks/useTranslate";
import { EntityType } from "@/services/types";
import { ComponentFormProps } from "@/types/common/dialogs.types";
import { IRole, IRoleAttributes } from "@/types/role.types";
export const RoleForm: FC<ComponentFormProps<IRole>> = ({
data,
Wrapper = Fragment,
WrapperProps,
...rest
}) => {
const { t } = useTranslate();
const { toast } = useToast();
const options = {
onError: (error: Error) => {
toast.error(error);
},
onSuccess() {
rest.onSuccess?.();
toast.success(t("message.success_save"));
},
};
const { mutate: createRole } = useCreate(EntityType.ROLE, options);
const { mutate: updateRole } = useUpdate(EntityType.ROLE, options);
const {
handleSubmit,
reset,
register,
formState: { errors },
} = useForm<IRoleAttributes>({
defaultValues: { name: "" },
});
const validationRules = {
name: {
required: t("message.name_is_required"),
},
};
const onSubmitForm = (params: IRoleAttributes) => {
if (data) {
updateRole({ id: data.id, params });
} else {
createRole(params);
}
};
useEffect(() => {
if (data) {
reset({
name: data.name,
});
} else {
reset();
}
}, [data, reset]);
return (
<Wrapper
open={!!WrapperProps?.open}
onSubmit={handleSubmit(onSubmitForm)}
{...WrapperProps}
>
<form onSubmit={handleSubmit(onSubmitForm)}>
<ContentContainer>
<ContentItem>
<Input
label={t("placeholder.name")}
error={!!errors.name}
required
autoFocus
helperText={errors.name ? errors.name.message : null}
{...register("name", validationRules.name)}
/>
</ContentItem>
</ContentContainer>
</form>
</Wrapper>
);
};

View File

@@ -0,0 +1,24 @@
/*
* Copyright © 2025 Hexastack. All rights reserved.
*
* Licensed under the GNU Affero General Public License v3.0 (AGPLv3) with the following additional terms:
* 1. The name "Hexabot" is a trademark of Hexastack. You may not use this name in derivative works without express written permission.
* 2. All derivative works must include clear attribution to the original creator and software, Hexastack and Hexabot, in a prominent location (e.g., in the software's "About" section, documentation, and README file).
*/
import { GenericFormDialog } from "@/app-components/dialogs";
import { ComponentFormDialogProps } from "@/types/common/dialogs.types";
import { IRole } from "@/types/role.types";
import { RoleForm } from "./RoleForm";
export const RoleFormDialog = <T extends IRole = IRole>(
props: ComponentFormDialogProps<T>,
) => (
<GenericFormDialog<T>
Form={RoleForm}
addText="title.new_role"
editText="title.edit_role"
{...props}
/>
);

View File

@@ -10,9 +10,8 @@ import { faUniversalAccess } from "@fortawesome/free-solid-svg-icons";
import AddIcon from "@mui/icons-material/Add";
import { Button, Grid, Paper } from "@mui/material";
import { GridColDef } from "@mui/x-data-grid";
import React from "react";
import { DeleteDialog } from "@/app-components/dialogs/DeleteDialog";
import { ConfirmDialogBody } from "@/app-components/dialogs";
import { FilterTextfield } from "@/app-components/inputs/FilterTextfield";
import {
ActionColumnLabel,
@@ -22,7 +21,7 @@ import { renderHeader } from "@/app-components/tables/columns/renderHeader";
import { DataGrid } from "@/app-components/tables/DataGrid";
import { useDelete } from "@/hooks/crud/useDelete";
import { useFind } from "@/hooks/crud/useFind";
import { getDisplayDialogs, useDialog } from "@/hooks/useDialog";
import { useDialogs } from "@/hooks/useDialogs";
import { useHasPermission } from "@/hooks/useHasPermission";
import { useSearch } from "@/hooks/useSearch";
import { useToast } from "@/hooks/useToast";
@@ -33,18 +32,13 @@ import { PermissionAction } from "@/types/permission.types";
import { IRole } from "@/types/role.types";
import { getDateTimeFormatter } from "@/utils/date";
import { PermissionsDialog } from "./PermissionsDialog";
import { RoleDialog } from "./RoleDialog";
import { PermissionBodyDialog } from "./PermissionsBodyDialog";
import { RoleFormDialog } from "./RoleFormDialog";
export const Roles = () => {
const { t } = useTranslate();
const { toast } = useToast();
const addDialogCtl = useDialog<IRole>(false);
const editDialogCtl = useDialog<IRole>(false);
const deleteDialogCtl = useDialog<string>(false);
const permissionDialogCtl = useDialog<{
role: IRole;
}>(false);
const dialogs = useDialogs();
const hasPermission = useHasPermission();
const { onSearch, searchPayload } = useSearch<IRole>({
$iLike: ["name"],
@@ -55,12 +49,11 @@ export const Roles = () => {
params: searchPayload,
},
);
const { mutateAsync: deleteRole } = useDelete(EntityType.ROLE, {
const { mutate: deleteRole } = useDelete(EntityType.ROLE, {
onError: (error) => {
toast.error(error);
},
onSuccess() {
deleteDialogCtl.closeDialog();
toast.success(t("message.item_delete_success"));
},
});
@@ -70,19 +63,25 @@ export const Roles = () => {
{
label: ActionColumnLabel.Permissions,
action: (row) =>
permissionDialogCtl.openDialog({
role: row,
dialogs.open(PermissionBodyDialog, row, {
hasButtons: false,
}),
},
{
label: ActionColumnLabel.Edit,
action: (row) => editDialogCtl.openDialog(row),
action: (row) => dialogs.open(RoleFormDialog, row),
requires: [PermissionAction.UPDATE],
},
{
label: ActionColumnLabel.Delete,
action: (row) => deleteDialogCtl.openDialog(row.id),
action: async ({ id }) => {
const isConfirmed = await dialogs.confirm(ConfirmDialogBody);
if (isConfirmed) {
deleteRole(id);
}
},
requires: [PermissionAction.DELETE],
},
],
@@ -125,17 +124,6 @@ export const Roles = () => {
return (
<Grid container gap={3} flexDirection="column">
{permissionDialogCtl.open ? (
<PermissionsDialog {...permissionDialogCtl} />
) : null}
<RoleDialog {...getDisplayDialogs(addDialogCtl)} />
<RoleDialog {...getDisplayDialogs(editDialogCtl)} />
<DeleteDialog
{...deleteDialogCtl}
callback={() => {
if (deleteDialogCtl.data) deleteRole(deleteDialogCtl.data);
}}
/>
<PageHeader title={t("title.roles")} icon={faUniversalAccess}>
<Grid
justifyContent="flex-end"
@@ -156,9 +144,7 @@ export const Roles = () => {
sx={{
float: "right",
}}
onClick={() => {
addDialogCtl.openDialog();
}}
onClick={() => dialogs.open(RoleFormDialog, null)}
>
{t("button.add")}
</Button>

View File

@@ -150,7 +150,8 @@ export interface DialogProviderProps {
// form dialog
export interface FormDialogProps
extends FormButtonsProps,
Omit<MuiDialogProps, "onSubmit"> {
Omit<MuiDialogProps, "onSubmit">,
DialogExtraOptions {
title?: string;
children?: React.ReactNode;
}