stable changes for adding to product but working on making it better...

src/core/components/DataTable/Main.js

@@ -26,6 +26,7 @@ const DataTable_Main = (props) => {
     } = props;
     const flatColumns = flattenArrayOfObjects(columns, "columns");
     const [pagination, setPagination] = useState({ pageIndex: 0, pageSize: 10 });
+    const [totalRowCount, setTotalRowCount] = useState(0);
     const flattenHideData = flattenObjectOfObjects(hideData);
     const onSortingChange = (event) => {
         setSortData(event);
@@ -51,6 +52,7 @@ const DataTable_Main = (props) => {
     const fetcher = async (url) => {
         try {
             const response = await request(url);
+            setTotalRowCount(response.data?.meta?.totalRowCount);
             if (specific_data) {
                 return specific_data(response.data);
             } else {
@@ -112,6 +114,7 @@ const DataTable_Main = (props) => {
         manualSorting: true,
         onPaginationChange: setPagination,
         onSortingChange: onSortingChange,
+        rowCount: totalRowCount,
         renderTopToolbarCustomActions: ({ table }) => <>{TableToolbar && <TableToolbar mutate={mutate} />}</>,
         renderRowActions: ({ row }) => <RowActions row={row} mutate={mutate} />,
         ...props,

src/core/components/DataTable/index.js

@@ -8,6 +8,7 @@ const DataTable = (props) => {
             page_name={props.page_name}
             table_name={props.table_name}
             columns={props.columns}
+            initialSort={props.sorting}
         >
             <DataTable_Main {...props} />
         </DataTableProvider>

src/core/utils/pageMenu.js

@@ -19,6 +19,7 @@ import ReportIcon from "@mui/icons-material/Report";
 import AssignmentLateIcon from "@mui/icons-material/AssignmentLate";
 import LineAxisIcon from "@mui/icons-material/LineAxis";
 import ScienceIcon from "@mui/icons-material/Science";
+import BiotechIcon from "@mui/icons-material/Biotech";
 
 export const pageMenu = [
     {
@@ -482,6 +483,14 @@ export const pageMenu = [
         type: "page",
         route: "/dashboard/azmayesh",
         icon: <ScienceIcon sx={{ width: "inherit", height: "inherit" }} />,
-        permissions: ["all"],
+        permissions: ["azmayesh-management"],
+    },
+    {
+        id: "azmayeshType",
+        label: "نوع آزمایشات",
+        type: "page",
+        route: "/dashboard/azmayesh_type",
+        icon: <BiotechIcon sx={{ width: "inherit", height: "inherit" }} />,
+        permissions: ["azmayesh-type-management"],
     },
 ];

src/core/utils/routes.js

@@ -14,7 +14,8 @@ export const GET_PREV_STATE_OPINION = "/v3/api/fake-prev-state-opinion";
 export const SUBMIT_ROAD_SAFETY_FORM = "/v3/api/fake-submit";
 export const CREATE_AZMAYESH = api + "/api/v3/azmayeshes/store";
 export const UPDATE_AZMAYESH = api + "/api/v3/azmayeshes/update";
-export const GET_AZMAYESH_TYPE_LIST = api + "/api/v3/azmayesh_types";
+export const GET_AZMAYESH_TYPE_LIST = api + "/api/v3/azmayesh_types/list";
+export const GET_AZMAYESH_TYPE_LIST_TABLE = api + "/api/v3/azmayesh_types";
 export const GET_AZMAYESH_LIST = api + "/api/v3/azmayeshes";
 export const DELETE_AZMAYESH = api + "/api/v3/azmayeshes/delete";
 export const GET_AZMAYESH_SAMPLE_FIELDS = api + "/api/v3/azmayesh_types/fields";
@@ -22,3 +23,6 @@ export const ADD_SAMPLE_TO_AZMAYESH = api + "/api/v3/azmayesh_samples/store";
 export const UPDATE_SAMPLE_OF_AZMAYESH = api + "/api/v3/azmayesh_samples/update";
 export const GET_SAMPLE_LIST = api + "/api/v3/azmayesh_samples";
 export const DELETE_SAMPLE_LIST = api + "/api/v3/azmayesh_samples/delete";
+export const DELETE_AZMAYESH_TYPE_LIST = api + "/api/v3/azmayesh_types/delete";
+export const ADD_AZMAYESH_TYPE = api + "/api/v3/azmayesh_types/store";
+export const UPDATE_AZMAYESH_TYPE = api + "/api/v3/azmayesh_types/update";