Merge tag 'v1.6.2' into develop

v1.6.2
This commit is contained in:
AmirHossein Mahmoodi
2025-08-16 12:08:30 +03:30

View File

@@ -9,10 +9,9 @@ import FinishForm from "./FinishForm";
const RowActions = ({ row, mutate }) => { const RowActions = ({ row, mutate }) => {
const { data: userPermissions } = usePermissions(); const { data: userPermissions } = usePermissions();
const hasDeletePermission = userPermissions?.includes("delete-safety-and-privacy"); const hasDeletePermission = userPermissions?.includes("delete-safety-and-privacy");
const hasUpdatePermission = userPermissions?.includes("update-safety-and-privacy");
return ( return (
<Box sx={{ display: "flex", gap: 1 }}> <Box sx={{ display: "flex", gap: 1 }}>
{hasUpdatePermission && row.original?.axis_type_id == null && <EditAxisType mutate={mutate} row={row} />} {row.original?.axis_type_id == null && <EditAxisType mutate={mutate} row={row} />}
{!row.original.is_finished && ( {!row.original.is_finished && (
<> <>
{row.original?.step === 1 && <StepTwo mutate={mutate} rowId={row.getValue("id")} />} {row.original?.step === 1 && <StepTwo mutate={mutate} rowId={row.getValue("id")} />}