trithuc-mvc-react 3.4.1 → 3.4.2

package/components/DataManagement/DataTable.jsx

@@ -16,6 +16,7 @@ import TableToolbar from "./TableToolbar";
 import { useDataTable } from "./hooks";
 import DeleteConfirmationDialog from "./DeleteConfirmationDialog";
 import DeleteMultipleConfirmationDialog from "./DeleteMultipleConfirmationDialog";
+import { storeGetUser } from "../../utils/storage";
 const defaultQueryOptions = {
   staleTime: 1000 * 60 * 1, // Thời gian dữ liệu có thể sử dụng lại trước khi gọi lại API
   cacheTime: 1000 * 60 * 30, // Thời gian dữ liệu được lưu trong cache trước khi bị xóa
@@ -36,7 +37,8 @@ const DataTable = ({ multipleActions = [], page, setPage = () => {}, disableEdit
     hasTabpanel,
     defaultRowsPerPage = 5
   } = useDataTable();
-
+  const user = storeGetUser();
+  const userId = user?.UserId;
   const { set: setPermission } = usePermission(tableName);
   const queryClient = useQueryClient();
   const confirm = useConfirm();
@@ -81,11 +83,19 @@ const DataTable = ({ multipleActions = [], page, setPage = () => {}, disableEdit
       }),
     defaultQueryOptions,
     // keepPreviousData: true,
-    onSuccess: ({ PermissionModel, status }) => {
+    onSuccess: ({ PermissionModel, CountTrangThai, status }) => {
       if (dataSearch?.TrangThaiXuLy !== undefined) {
         PermissionModel.TrangThaiXuLy = dataSearch?.TrangThaiXuLy;
       }
       setPermission(PermissionModel);
+
+      if (CountTrangThai) {
+        const keyCounter = `${tableName}_${userId}_TrangThaiXuLyCounter`;
+        localStorage.setItem(keyCounter, JSON.stringify(CountTrangThai));
+        // 👉 Invalidate query để Tab reload ngay
+        queryClient.invalidateQueries({ queryKey: [tableName, "CountAllTrangThaiXuly"] });
+      }
+
       if (status) {
         // console.log("LOAD LAI PermissionModel");
         // Cuộn lên đầu trang khi tải dữ liệu thành công

package/components/DataManagement/DataTableSM.jsx

@@ -15,6 +15,7 @@ import TableToolbar from "./TableToolbar";
 import { useDataTable } from "./hooks";
 import DeleteConfirmationDialog from "./DeleteConfirmationDialog";
 import DeleteMultipleConfirmationDialog from "./DeleteMultipleConfirmationDialog";
+import { storeGetUser } from "../../utils/storage";
 const defaultQueryOptions = {
   staleTime: 1000 * 60 * 1, // Thời gian dữ liệu có thể sử dụng lại trước khi gọi lại API
   cacheTime: 1000 * 60 * 30, // Thời gian dữ liệu được lưu trong cache trước khi bị xóa
@@ -35,7 +36,8 @@ const DataTableSM = ({ multipleActions = [], page, setPage = () => {}, disableEd
     hasTabpanel,
     defaultRowsPerPage = 5
   } = useDataTable();
-
+  const user = storeGetUser();
+  const userId = user?.UserId;
   const { set: setPermission } = usePermission(tableName);
   const queryClient = useQueryClient();
   const confirm = useConfirm();
@@ -80,11 +82,19 @@ const DataTableSM = ({ multipleActions = [], page, setPage = () => {}, disableEd
       }),
     defaultQueryOptions,
     // keepPreviousData: true,
-    onSuccess: ({ PermissionModel, status }) => {
+    onSuccess: ({ PermissionModel, CountTrangThai, status }) => {
       if (dataSearch?.TrangThaiXuLy !== undefined) {
         PermissionModel.TrangThaiXuLy = dataSearch?.TrangThaiXuLy;
       }
       setPermission(PermissionModel);
+
+      if (CountTrangThai) {
+        const keyCounter = `${tableName}_${userId}_TrangThaiXuLyCounter`;
+        localStorage.setItem(keyCounter, JSON.stringify(CountTrangThai));
+        // 👉 Invalidate query để Tab reload ngay
+        queryClient.invalidateQueries({ queryKey: [tableName, "CountAllTrangThaiXuly"] });
+      }
+
       if (status) {
         // console.log("LOAD LAI PermissionModel");
         // Cuộn lên đầu trang khi tải dữ liệu thành công

package/components/DataManagement/index.jsx

@@ -120,7 +120,7 @@ function DataManagement({
   const [selectedEditItem, setSelectedEditItem] = useState(null);
   const [openViewDialog, setOpenViewDialog] = useState(false);
 
-  const { permission, canCreate, canThongKe, canBieuDo } = usePermission(apiUrl || tableName);
+  const { permission, canCreate, canExportData, canThongKe, canBieuDo } = usePermission(apiUrl || tableName);
 
   // console.log(">>> permission from hook:", permission);
   // console.log(">>> canCreate:", canCreate);
@@ -389,7 +389,7 @@ function DataManagement({
                     <div key={index}>{button}</div>
                   ))}
 
-                  <ExportExcelButton tableName={tableName} data={dataSearch} size={elementSize} />
+                  {canExportData && <ExportExcelButton tableName={tableName} data={dataSearch} size={elementSize} />}
 
                   {canCreate && !disableAdd && (
                     <Button

package/hooks/usePermission.js

@@ -51,6 +51,7 @@ const usePermission = (tableName) => {
     canAction: false,
     canView: false,
     canImport: false,
+    canExportData: false,
     canExportWord: false,
     canPayment: false,
     canThongKe: false,
@@ -86,6 +87,7 @@ const usePermission = (tableName) => {
       canAction: source.Action ?? false,
       canView: source.View ?? false,
       canImport: source.ImportFile ?? false,
+      canExportData: source.ExportData ?? false,
       canExportWord: source.ExportWord ?? false,
       canPayment: source.Payment ?? false,
       canThongKe: source.ThongKe ?? false,

package/package.json

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

package/utils/storage.js

@@ -289,3 +289,26 @@ export const storeGetlanguageSystemKey = (TypeKey, SystemKey, TypeLanguage) => {
       ?.Description || ""
   );
 };
+// ---------------- Storage helpers ----------------
+export const storeSetKey = (Key, data) => {
+  if (!data) return;
+  const encryptedData = encryptData(data);
+  localStorage.setItem(Key, encryptedData);
+};
+
+export const storeGetKey = (key) => {
+  const encryptedData = localStorage.getItem(key);
+  if (!encryptedData) return null;
+  return decryptData(encryptedData);
+};
+
+// ---------------- Utility so sánh dữ liệu ----------------
+export const isDataChanged = (oldData, newData) => {
+  if (!oldData) return true;
+  try {
+    return JSON.stringify(oldData) !== JSON.stringify(newData);
+  } catch (error) {
+    console.error("Error comparing data:", error);
+    return true; // nếu có lỗi thì coi như thay đổi
+  }
+};