trithuc-mvc-react 2.6.7 → 2.6.9

package/api/index.js

@@ -77,11 +77,7 @@ export const getDataFromTable = async ({ tableName, id }) => {
       return res.data;
     } else {
       const url = `${getBaseUrl()}/${apiUrl}/${tableName}/${id}`;
-      const res = await api.get(url, {
-        params: {
-          id
-        }
-      });
+      const res = await api.get(url);
       return res.data;
     }
   } catch (error) {

package/components/DataManagement/DataTable.jsx

@@ -46,6 +46,9 @@ const DataTable = ({ multipleActions = [],page, setPage = () => { }, disableEdit
       }),
     // keepPreviousData: true,
     onSuccess: ({ PermissionModel, status }) => {
+      if(dataSearch?.TrangThaiXuLy !== undefined){
+        PermissionModel.TrangThaiXuLy = dataSearch?.TrangThaiXuLy;
+      }
       if (status) {
         setPermission(PermissionModel);
         // console.log("LOAD LAI PermissionModel");

package/hooks/usePermission.js

@@ -1,33 +1,62 @@
 import { useContext, useMemo } from "react";
 import { PermissionContext } from "../contexts";
 
-const usePermission = (apiUrl,tableName) => {
-  // if (!tableName && !apiUrl) {
-  //   throw new Error("api is required");
-  // }
+const usePermission = (tableName) => {
+  if (!tableName) {
+    throw new Error("api is required");
+  }
   const context = useContext(PermissionContext);
   if (!context) {
     throw new Error("usePermission must be used within a PermissionProvider");
   }
   const { permissionMap, setPermission } = context;
 
-  const permission = permissionMap[apiUrl?apiUrl:tableName];
+  const permission = permissionMap[tableName];
 
   const { canEdit, canDelete, canDeleteMulti, canSave, canCreate, canAction, canView, canImport } = useMemo(() => {
-    const canEdit = !permission || permission.Edit;
-    const canDelete = !permission || permission.Delete;
-    const canDeleteMulti = !permission || permission.DeleteMulti;
-    const canSave = !permission || permission.Save;
-    const canCreate = !permission || permission.Create;
-    const canAction = !permission || permission.Action;
-    const canView = !permission || permission.View;
-    const canImport = !permission || permission.ImportFile;
+    if (permission) {
+      if (permission.TrangThaiXuLy !== undefined && permission.ObjTrangThai) {
+        const status = permission.ObjTrangThai.find((t) => t.StatusId === permission.TrangThaiXuLy) || {};
 
-    return { canEdit, canDelete, canDeleteMulti, canSave, canCreate, canAction, canView, canImport };
+        return {
+          canEdit: status.Edit ?? false,
+          canDelete: status.Delete ?? false,
+          canDeleteMulti: status.DeleteMulti ?? false,
+          canSave: status.Save ?? false,
+          canCreate: status.Create ?? false,
+          canAction: status.Action ?? false,
+          canView: status.View ?? false,
+          canImport: status.ImportFile ?? false
+        };
+      } else {
+        return {
+          canEdit: permission.Edit ?? false,
+          canDelete: permission.Delete ?? false,
+          canDeleteMulti: permission.DeleteMulti ?? false,
+          canSave: permission.Save ?? false,
+          canCreate: permission.Create ?? false,
+          canAction: permission.Action ?? false,
+          canView: permission.View ?? false,
+          canImport: permission.ImportFile ?? false
+        };
+      }
+    } else {
+      // Trường hợp permission không tồn tại
+      return {
+        canEdit: false,
+        canDelete: false,
+        canDeleteMulti: false,
+        canSave: false,
+        canCreate: false,
+        canAction: false,
+        canView: false,
+        canImport: false
+      };
+    }
   }, [permission]);
 
   const set = (permission) => {
-    setPermission({ ...permissionMap, [apiUrl?apiUrl:tableName]: permission });
+    setPermission({ ...permissionMap, [tableName]: permission });
   };
 
   return { permission, set, canEdit, canDelete, canDeleteMulti, canSave, canCreate, canAction, canView, canImport };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "trithuc-mvc-react",
-  "version": "2.6.7",
+  "version": "2.6.9",
   "main": "index.js",
   "scripts": {
     "test": "echo \"Error: no test specified\" && exit 1"