Merge branch 'release/v1.1.6'

2025-05-24 13:54:12 +03:30
parent 1f11543121 ae59b860cc
commit 7a1f3e8b91
4 changed files with 76 additions and 66 deletions
--- a/.env.example
+++ b/.env.example
@@ -1,4 +1,4 @@
 HOST="rms.witel.ir"
-NEXT_PUBLIC_VERSION="1.1.5"
+NEXT_PUBLIC_VERSION="1.1.6"
 NEXT_PUBLIC_API_URL="https://rms.witel.ir"
 NEXT_PUBLIC_MAPTILE_ENDPOINT="https://rmsmap.rmto.ir/141map"
--- a/src/components/dashboard/damages/operator/OperatorList.jsx
+++ b/src/components/dashboard/damages/operator/OperatorList.jsx
@@ -14,8 +14,14 @@ import ImageDialog from "./RowActions/ImageDialog";
 import LocationForm from "./RowActions/LocationForm";
 import ShowPlate from "./RowActions/ShowPlate";
 import Toolbar from "./Toolbar";
+import { usePermissions } from "@/lib/hooks/usePermissions";
+import { useAuth } from "@/lib/contexts/auth";

 const OperatorList = () => {
+    const { data: userPermissions } = usePermissions();
+    const hasCountryPermission = userPermissions?.includes("show-receipt");
+    const { user } = useAuth();
+
    const statusOptions = [
        { value: "", label: "همه وضعیت ها" },
        { value: 0, label: "بدون اقدام" },
@@ -26,6 +32,42 @@ const OperatorList = () => {
        { value: 5, label: "نامه پلیس راه صادر شده است" },
    ];
    const columns = useMemo(() => {
+        const provinceColumn = {
+            accessorKey: "province_id",
+            header: "استان",
+            id: "province_id",
+            enableColumnFilter: true,
+            datatype: "numeric",
+            filterMode: "equals",
+            grow: false,
+            size: 130,
+            ColumnSelectComponent: (props) => {
+                const { provinces, errorProvinces, loadingProvinces } = useProvinces();
+                const getColumnSelectOptions = useMemo(() => {
+                    if (loadingProvinces) {
+                        return [{ value: "loading", label: "در حال بارگذاری..." }];
+                    }
+                    if (errorProvinces) {
+                        return [{ value: "error", label: "خطا در بارگذاری" }];
+                    }
+                    return [
+                        { value: "", label: "کل کشور" },
+                        ...provinces.map((province) => ({
+                            value: province.id,
+                            label: province.name_fa,
+                        })),
+                    ];
+                }, [provinces, errorProvinces, loadingProvinces]);
+                return (
+                    <CustomSelectByDependency
+                        {...props}
+                        value={loadingProvinces ? "loading" : props.filterParameters.value}
+                        columnSelectOption={getColumnSelectOptions}
+                    />
+                );
+            },
+            Cell: ({ row }) => <>{row.original.province_fa}</>,
+        };
        return [
            {
                accessorKey: "id",
@@ -39,6 +81,25 @@ const OperatorList = () => {
                grow: false,
                size: 100,
            },
+            {
+                accessorKey: "status",
+                header: "وضعیت",
+                id: "status",
+                enableColumnFilter: true,
+                datatype: "numeric",
+                filterMode: "equals",
+                grow: false,
+                size: 100,
+                columnSelectOption: () => {
+                    return statusOptions.map((status) => ({
+                        value: status.value,
+                        label: status.label,
+                    }));
+                },
+                Cell: ({ row }) => {
+                    return <Typography variant={"body2"}>{row.original.status_fa}</Typography>;
+                },
+            },
            {
                header: "اطلاعات تصادف",
                id: "accidentInfo",
@@ -47,42 +108,7 @@ const OperatorList = () => {
                grow: false,
                size: 50,
                columns: [
-                    {
-                        accessorKey: "province_id",
-                        header: "استان",
-                        id: "province_id",
-                        enableColumnFilter: true,
-                        datatype: "numeric",
-                        filterMode: "equals",
-                        grow: false,
-                        size: 130,
-                        ColumnSelectComponent: (props) => {
-                            const { provinces, errorProvinces, loadingProvinces } = useProvinces();
-                            const getColumnSelectOptions = useMemo(() => {
-                                if (loadingProvinces) {
-                                    return [{ value: "loading", label: "در حال بارگذاری..." }];
-                                }
-                                if (errorProvinces) {
-                                    return [{ value: "error", label: "خطا در بارگذاری" }];
-                                }
-                                return [
-                                    { value: "", label: "کل کشور" },
-                                    ...provinces.map((province) => ({
-                                        value: province.id,
-                                        label: province.name_fa,
-                                    })),
-                                ];
-                            }, [provinces, errorProvinces, loadingProvinces]);
-                            return (
-                                <CustomSelectByDependency
-                                    {...props}
-                                    value={loadingProvinces ? "loading" : props.filterParameters.value}
-                                    columnSelectOption={getColumnSelectOptions}
-                                />
-                            );
-                        },
-                        Cell: ({ row }) => <>{row.original.province_fa}</>,
-                    },
+                    ...(hasCountryPermission ? [provinceColumn] : []),
                    {
                        accessorKey: "city_id",
                        header: "شهرستان", // Office
@@ -90,17 +116,19 @@ const OperatorList = () => {
                        enableColumnFilter: true,
                        datatype: "numeric",
                        filterMode: "equals",
-                        dependencyId: "province_id",
+                        dependencyId: hasCountryPermission ? "province_id" : null,
                        grow: false,
                        size: 120,
                        ColumnSelectComponent: (props) => {
                            const { cityList, loadingCityList, errorCityList } = useCities(
-                                props.dependencyFieldValue.value
+                                hasCountryPermission ? props.dependencyFieldValue.value : user.province_id
+                            );
+                            const [prevDependency, setPrevDependency] = useState(
+                                hasCountryPermission ? props.dependencyFieldValue.value : user.province_id
                            );
-                            const [prevDependency, setPrevDependency] = useState(props.dependencyFieldValue.value);

                            const getColumnSelectOptions = useMemo(() => {
-                                if (props.dependencyFieldValue.value === "") {
+                                if (hasCountryPermission && props.dependencyFieldValue.value === "") {
                                    return [{ value: "empty", label: "ابتدا استان را انتخاب کنید" }];
                                }
                                if (loadingCityList) {
@@ -118,10 +146,11 @@ const OperatorList = () => {
                                ];
                            }, [cityList, loadingCityList, errorCityList]);
                            useEffect(() => {
+                                if (hasCountryPermission) return;
                                if (prevDependency === props.dependencyFieldValue?.value) return;
                                props.handleChange({ ...props.filterParameters, value: "" });
                                setPrevDependency(props.dependencyFieldValue?.value);
-                            }, [props.dependencyFieldValue?.value]);
+                            }, [props.dependencyFieldValue?.value, hasCountryPermission]);
                            return (
                                <CustomSelectByDependency
                                    {...props}
@@ -422,25 +451,6 @@ const OperatorList = () => {
                grow: false,
                size: 100,
            },
-            {
-                accessorKey: "status",
-                header: "وضعیت",
-                id: "status",
-                enableColumnFilter: true,
-                datatype: "numeric",
-                filterMode: "equals",
-                grow: false,
-                size: 100,
-                columnSelectOption: () => {
-                    return statusOptions.map((status) => ({
-                        value: status.value,
-                        label: status.label,
-                    }));
-                },
-                Cell: ({ row }) => {
-                    return <Typography variant={"body2"}>{row.original.status_fa}</Typography>;
-                },
-            },
        ];
    }, []);

@@ -456,7 +466,7 @@ const OperatorList = () => {
                    sorting={[{ id: "id", desc: true }]}
                    TableToolbar={Toolbar}
                    enableRowActions
-                    positionActionsColumn={"last"}
+                    positionActionsColumn={"first"}
                    RowActions={RowActions}
                />
            </Box>
--- a/src/components/dashboard/roadSafety/operator/Learn/index.jsx
+++ b/src/components/dashboard/roadSafety/operator/Learn/index.jsx
@@ -14,7 +14,7 @@ const Learn = () => {
        document.body.appendChild(link);
        link.click();
        document.body.removeChild(link);
-    }
+    };

    return (
        <>
@@ -36,4 +36,4 @@ const Learn = () => {
        </>
    );
 };
-export default Learn;
+export default Learn;
--- a/src/components/dashboard/roadSafety/supervisor/Learn/index.jsx
+++ b/src/components/dashboard/roadSafety/supervisor/Learn/index.jsx
@@ -14,7 +14,7 @@ const Learn = () => {
        document.body.appendChild(link);
        link.click();
        document.body.removeChild(link);
-    }
+    };

    return (
        <>
@@ -36,4 +36,4 @@ const Learn = () => {
        </>
    );
 };
-export default Learn;
+export default Learn;