Merge branch 'release/v1.1.4'

.env.example

@@ -1,4 +1,4 @@
 HOST="rms.witel.ir"
-NEXT_PUBLIC_VERSION="1.1.3"
+NEXT_PUBLIC_VERSION="1.1.4"
 NEXT_PUBLIC_API_URL="https://rms.witel.ir"
 NEXT_PUBLIC_MAPTILE_ENDPOINT="https://rmsmap.rmto.ir/141map"

src/components/dashboard/roadSafety/operator/OperatorList.jsx

@@ -490,7 +490,7 @@ const OperatorList = () => {
                     table_name={"roadSafetyOperatorList"}
                     TableToolbar={Toolbar}
                     enableRowActions
-                    positionActionsColumn={"last"}
+                    positionActionsColumn={"first"}
                     RowActions={RowActions}
                 />
             </Box>

src/components/dashboard/roadSafety/supervisor/SupervisorList.jsx

@@ -596,7 +596,7 @@ const SupervisorList = () => {
                     table_name={"roadSafetyOperatorList"}
                     TableToolbar={Toolbar}
                     enableRowActions
-                    positionActionsColumn={"last"}
+                    positionActionsColumn={"first"}
                     RowActions={RowActions}
                 />
             </Box>

src/components/layouts/dashboard/headerWithLogo/HaederBottom/index.jsx

@@ -25,15 +25,17 @@ const HeaderBottom = () => {
                     <Typography sx={{ color: (theme) => theme.palette.primary2.contrastText }}>rms.rmto.ir</Typography>
                 </Stack>
             </Stack>
-            <Stack sx={{ display: { xs: 'none', sm: 'flex' } }}>
+            <Stack sx={{ display: { xs: "none", sm: "flex" } }}>
-                <Box sx={{
+                <Box
-                    p: 1,
+                    sx={{
-                    background: "#fff",
+                        p: 1,
-                    border: 2,
+                        background: "#fff",
-                    borderColor: (theme) => theme.palette.primary.main,
+                        border: 2,
-                    borderRadius: 2,
+                        borderColor: (theme) => theme.palette.primary.main,
-                    borderStyle: "dashed",
+                        borderRadius: 2,
-                }}>
+                        borderStyle: "dashed",
+                    }}
+                >
                     <Image alt="" priority src={HeaderLogo.src} width={140} height={32} />
                 </Box>
             </Stack>

src/components/layouts/dashboard/headerWithSidebar/Sidebar/SidebarListItems.jsx

@@ -1,5 +1,15 @@
 import { ExpandLess, ExpandMore } from "@mui/icons-material";
-import { Collapse, List, ListItem, ListItemButton, ListItemIcon, ListItemText, Stack, useMediaQuery, useTheme } from "@mui/material";
+import {
+    Collapse,
+    List,
+    ListItem,
+    ListItemButton,
+    ListItemIcon,
+    ListItemText,
+    Stack,
+    useMediaQuery,
+    useTheme,
+} from "@mui/material";
 import Link from "next/link";
 import SidebarBadge from "./SidebarBadge";
 import SidebarSubitems from "./SidebarSubitems";
@@ -21,7 +31,7 @@ const SidebarListItems = ({ menuItem, dispatch, handleDrawerClose }) => {
                             dispatch({ type: "COLLAPSE_MENU", id: menuItem.id });
                         } else {
                             if (isMobile) {
-                                handleDrawerClose()
+                                handleDrawerClose();
                             }
                         }
                     }}
@@ -62,7 +72,14 @@ const SidebarListItems = ({ menuItem, dispatch, handleDrawerClose }) => {
                         }}
                     >
                         {menuItem.Subitems.map((subitem, index) => {
-                            return <SidebarSubitems handleDrawerClose={handleDrawerClose} key={index} dispatch={dispatch} subitem={subitem} />;
+                            return (
+                                <SidebarSubitems
+                                    handleDrawerClose={handleDrawerClose}
+                                    key={index}
+                                    dispatch={dispatch}
+                                    subitem={subitem}
+                                />
+                            );
                         })}
                     </List>
                 ) : null}

src/components/layouts/dashboard/headerWithSidebar/Sidebar/SidebarMenu.jsx

@@ -54,16 +54,16 @@ function reducer(state, action) {
             return state.map((item) =>
                 item.hasSubitems
                     ? {
-                        ...item,
+                          ...item,
-                        Subitems: item.Subitems.map((subitem) =>
+                          Subitems: item.Subitems.map((subitem) =>
-                            subitem.hasSubitems
+                              subitem.hasSubitems
-                                ? {
+                                  ? {
-                                    ...subitem,
+                                        ...subitem,
-                                    Subitems: toggleSubitems(subitem.Subitems, action.id),
+                                        Subitems: toggleSubitems(subitem.Subitems, action.id),
-                                }
+                                    }
-                                : subitem
+                                  : subitem
-                        ),
+                          ),
-                    }
+                      }
                     : item
             );
 
@@ -105,7 +105,14 @@ const SidebarMenu = ({ handleDrawerClose }) => {
             {userPermissions && (
                 <List sx={{ overflow: "auto", flex: 1 }} disablePadding dense>
                     {menuItems.map((menuItem) => {
-                        return <SidebarListItems handleDrawerClose={handleDrawerClose} dispatch={dispatch} key={menuItem.id} menuItem={menuItem} />;
+                        return (
+                            <SidebarListItems
+                                handleDrawerClose={handleDrawerClose}
+                                dispatch={dispatch}
+                                key={menuItem.id}
+                                menuItem={menuItem}
+                            />
+                        );
                     })}
                 </List>
             )}

src/components/layouts/dashboard/headerWithSidebar/Sidebar/SidebarSubitems.jsx

@@ -1,5 +1,16 @@
 import { ExpandLess, ExpandMore } from "@mui/icons-material";
-import { Box, Collapse, List, ListItem, ListItemButton, ListItemIcon, ListItemText, Stack, useMediaQuery, useTheme } from "@mui/material";
+import {
+    Box,
+    Collapse,
+    List,
+    ListItem,
+    ListItemButton,
+    ListItemIcon,
+    ListItemText,
+    Stack,
+    useMediaQuery,
+    useTheme,
+} from "@mui/material";
 import Link from "next/link";
 import SidebarBadge from "./SidebarBadge";
 
@@ -20,7 +31,7 @@ const SidebarSubitems = ({ subitem, dispatch, handleDrawerClose }) => {
                             dispatch({ type: "COLLAPSE_SUB_ITEMS", id: subitem.id });
                         } else {
                             if (isMobile) {
-                                handleDrawerClose()
+                                handleDrawerClose();
                             }
                         }
                     }}
@@ -71,7 +82,14 @@ const SidebarSubitems = ({ subitem, dispatch, handleDrawerClose }) => {
                         }}
                     >
                         {subitem.Subitems.map((subSubitem, index) => {
-                            return <SidebarSubitems handleDrawerClose={handleDrawerClose} key={index} dispatch={dispatch} subitem={subSubitem} />;
+                            return (
+                                <SidebarSubitems
+                                    handleDrawerClose={handleDrawerClose}
+                                    key={index}
+                                    dispatch={dispatch}
+                                    subitem={subSubitem}
+                                />
+                            );
                         })}
                     </List>
                 ) : null}

src/core/utils/routes.js

@@ -146,12 +146,16 @@ export const REJECT_ROAD_SAFETY_BY_SUPERVISOR = api + "/api/v3/safety_and_privac
 
 export const DESERIALIZE_JUDICIARY_DOCUMENT = api + "/api/v3/safety_and_privacy/deserialize";
 export const GET_SAFETY_AND_PRIVACY_ITEM = api + "/api/v3/safety_and_privacy/sub_items";
-export const GET_ROAD_SAFETY_PROVINCE_ACTIVITY_REPORT = api + "/api/v3/safety_and_privacy_report/operator/country_activity";
+export const GET_ROAD_SAFETY_PROVINCE_ACTIVITY_REPORT =
-export const GET_ROAD_SAFETY_CITY_ACTIVITY_REPORT = api + "/api/v3/safety_and_privacy_report/operator/province_activity";
+    api + "/api/v3/safety_and_privacy_report/operator/country_activity";
+export const GET_ROAD_SAFETY_CITY_ACTIVITY_REPORT =
+    api + "/api/v3/safety_and_privacy_report/operator/province_activity";
 export const GET_ROAD_SAFETY_REPORT_MAP = api + "/api/v3/safety_and_privacy/map";
 export const GET_ROAD_SAFETY_DETAILS = api + "/api/v3/safety_and_privacy/operator";
-export const EXPORT_COUNTRY_ROAD_SAFETY_REPORT = api + "/api/v3/safety_and_privacy_report/operator/country_excel_activity";
+export const EXPORT_COUNTRY_ROAD_SAFETY_REPORT =
-export const EXPORT_PROVINCE_ROAD_SAFETY_REPORT = api + "/api/v3/safety_and_privacy_report/operator/province_excel_activity";
+    api + "/api/v3/safety_and_privacy_report/operator/country_excel_activity";
+export const EXPORT_PROVINCE_ROAD_SAFETY_REPORT =
+    api + "/api/v3/safety_and_privacy_report/operator/province_excel_activity";
 
 // permission table
 export const GET_PERMISSION_TABLE_LIST = api + "/api/v3/permissions";