trithuc-mvc-react 2.6.4 → 2.6.6

package/components/DataManagement/DataTable.jsx

@@ -13,6 +13,7 @@ import { TableRowRender } from "./TableRowRender";
 import TableToolbar from "./TableToolbar";
 import { useDataTable } from "./hooks";
 import { usePermission } from "../../hooks";
+import { URL_APPLICATION ,URL_APPLICATION_API } from "@/constants";
 const DataTable = ({ multipleActions = [],page, setPage = () => { }, disableEdit, disableDelete  }) => {
   const {
     tableName,
@@ -46,14 +47,18 @@ const DataTable = ({ multipleActions = [],page, setPage = () => { }, disableEdit
     // keepPreviousData: true,
     onSuccess: ({ PermissionModel, status }) => {
       if (status) {
-        // setPermission(PermissionModel);
+        setPermission(PermissionModel);
         // console.log("LOAD LAI PermissionModel");
       }
     }
   });
   const changeStatusMutation = useMutation(changeStatusDataToTable, {
-    onSuccess: () => {
-      toast.success("Thay đổi trạng thái thành công !");
+    onSuccess: ({ status = false, message = " Có lỗi xảy ra !" }) => {
+      if (URL_APPLICATION_API) {
+        toast.success(message);
+      }else{
+        toast.success("Thay đổi trạng thái thành công !");
+      }
       queryClient.invalidateQueries({ queryKey: [tableName] });
     },
     onError: () => {
@@ -61,9 +66,13 @@ const DataTable = ({ multipleActions = [],page, setPage = () => { }, disableEdit
     }
   });
   const deleteMutation = useMutation(deleteDataFromTable, {
-    onSuccess: ({ status }) => {
-      if (status) {
-        toast.success("Xóa thành công !");
+    onSuccess: ({ status = false, message = " Có lỗi xảy ra !" }) => {
+      if (status) {        
+        if (URL_APPLICATION_API) {
+          toast.success(message);
+        }else{
+          toast.success("Xóa thành công !");
+        }
       } else {
         toast.error(" Có lỗi xảy ra !");
       }
@@ -75,8 +84,12 @@ const DataTable = ({ multipleActions = [],page, setPage = () => { }, disableEdit
     }
   });
   const deleteMultipleMutation = useMutation(deleteMultipleDataFromTable, {
-    onSuccess: () => {
-      toast.success("Xóa thành công !");
+    onSuccess: ({ status = false, message = " Có lỗi xảy ra !" }) => {
+      if (URL_APPLICATION_API) {
+        toast.success(message);
+      }else{
+        toast.success("Xóa thành công !");
+      }
       setSelectedItems([]);
       queryClient.invalidateQueries({ queryKey: [tableName] });
     },

package/components/DataManagement/EditorForm.jsx

@@ -11,6 +11,7 @@ import { saveDataToTable } from "../../api";
 import { toast } from "react-toastify";
 import { useDataTable } from "./hooks";
 import FormField from "./FormField";
+import { URL_APPLICATION ,URL_APPLICATION_API } from "@/constants";
 import { yupResolver } from "@hookform/resolvers/yup";
 EditorForm.propTypes = {
   fields: PropTypes.array
@@ -61,7 +62,14 @@ function EditorForm({ fields, submitRef }) {
           } catch (e) {
             fileValue = [];
           }
-          setValue(field, fileValue);
+          setValue(field, URL_APPLICATION + fileValue);
+        } else if (type === "imageavatar") {
+          try {
+            let fileValue = selectedEditItem[field];
+            setValue(field, URL_APPLICATION + fileValue);
+          } catch (error) {
+            console.log(error);
+          }
         } else {
           setValue(field, selectedEditItem[field]);
         }
@@ -84,13 +92,18 @@ function EditorForm({ fields, submitRef }) {
   }, [selectedEditItem]);
 
   const saveMutation = useMutation(saveDataToTable, {
-    onSuccess: ({ status = false }, { data: { Id } }) => {
+    onSuccess: ({ status = false, message = " Có lỗi xảy ra !" }, { data: { Id } }) => {
       if (status) {
-        toast.success(Id == 0 ? "Thêm thành công!" : "Cập nhật thành công!");
+        if (URL_APPLICATION_API) {
+          toast.success(message);
+        }else{
+          toast.success(Id == 0 ? "Thêm thành công!" : "Cập nhật thành công!");
+        }
         queryClient.invalidateQueries(tableName);
         setOpenEditorDialog(false);
       } else {
-        toast.error(" Có lỗi xảy ra !");
+        console.log(status, Id);
+        toast.error(message);
       }
     },
     onError: () => {
@@ -115,10 +128,16 @@ function EditorForm({ fields, submitRef }) {
         if (data[field]) {
           data[field] = JSON.stringify(data[field]);
         }
-      } else if (type == "avatar") {
+      } else if (type === "avatar") {
         if (data[field]?.urlFile) {
           data[field] = data[field].urlFile;
         }
+      } else if (type === "imageavatar") {
+        if (data[field]?.urlFile) {
+          data[field] = data[field]?.urlFile?.replaceAll(URL_APPLICATION, "");
+        } else if (data[field]) {
+          data[field] = data[field]?.replaceAll(URL_APPLICATION, "");
+        }
       }
       return data;
     }, data);

package/components/DataManagement/FormField.jsx

@@ -372,6 +372,21 @@ function FormField({
           }}
         />
       );
+    case "imageavatar":
+      return (
+        <Controller
+          name={name}
+          control={control}
+          disabled={disabled}
+          render={({ field, fieldState: { error } }) => {
+            return (
+              <>
+                <RhfUploadAvatar name={name} disabled={disabled} />
+              </>
+            );
+          }}
+        />
+      );
   }
 }
 

package/components/DataManagement/index.jsx

@@ -37,6 +37,7 @@ DataManagement.propTypes = {
   disableStatus: PropTypes.bool,
   disableAdd: PropTypes.bool,
   disableCellThaoTac: PropTypes.bool,
+  reserPage: PropTypes.string,
   statusKey: PropTypes.string,
   tableActions: PropTypes.array,
   disableEditor: PropTypes.bool,
@@ -52,6 +53,7 @@ const getDefaultValues = (filters = []) => {
   return defaultValues;
 };
 function DataManagement({
+  reserPage = false,
   sttLuyKe = false,
   columns = [],
   title,
@@ -87,7 +89,7 @@ function DataManagement({
   const [selectedEditItem, setSelectedEditItem] = useState(null);
   const [openViewDialog, setOpenViewDialog] = useState(false);
 
-  const { canCreate } = usePermission(apiUrl?apiUrl:tableName);
+  const { canCreate } = usePermission(apiUrl ? apiUrl : tableName);
   const { defaults, filters } = useMemo(() => {
     const filters = tableFilters.filter(({ type }) => type !== "default");
     const defaultFilters = tableFilters.filter(({ type }) => type === "default");
@@ -113,9 +115,16 @@ function DataManagement({
   const [dataSearch, setDataSearch] = useState({ ...defaults, ...getDefaultValues(filters) });
   const [page, setPage] = useState(0);
 
+  useEffect(() => {
+    if (reserPage) {
+      setPage(0);
+    }
+  }, [reserPage]);
+
   const values = useMemo(() => {
     const hasTabpanel = !!tabPanel;
     return {
+      reserPage,
       sttLuyKe,
       apiUrl,
       tableName,
@@ -140,6 +149,7 @@ function DataManagement({
       defaultRowsPerPage
     };
   }, [
+    reserPage,
     sttLuyKe,
     apiUrl,
     tableName,
@@ -215,7 +225,13 @@ function DataManagement({
             {tabPanel}
             <FilterGod filters={filters} elementSize={elementSize} setPage={setPage} />
             {backParentNavigator}
-            <DataTable multipleActions={multipleActions} page={page} setPage={setPage} disableEdit={disableEdit} disableDelete = {disableDelete}/>
+            <DataTable
+              multipleActions={multipleActions}
+              page={page}
+              setPage={setPage}
+              disableEdit={disableEdit}
+              disableDelete={disableDelete}
+            />
           </Card>
         </FormProvider>
 

package/components/DataManagement/upload/RhfUploadAvatar.jsx

@@ -1,6 +1,7 @@
 import { useCallback } from "react";
 import { uploadFile } from "@/apis/index";
-import UploadAvatar from './UploadAvatar'
+import { URL_APPLICATION } from "@/constants";
+import UploadAvatar from "./UploadAvatar";
 import { FormHelperText, Typography } from "@mui/material/index";
 import bytesToSize from "@/utils/bytesToSize";
 import { Controller, useFormContext } from "react-hook-form";
@@ -14,7 +15,6 @@ const RhfUploadAvatar = ({ name, disabled }) => {
       const formData = new FormData();
       formData.append("file", file);
       const data = await uploadFile(formData);
-
       if (file) {
         setValue(name, {
           ...file,
@@ -35,7 +35,7 @@ const RhfUploadAvatar = ({ name, disabled }) => {
             accept="image/*"
             file={value}
             maxSize={31457280}
-            onDrop={!disabled ? handleDrop : () => { }}
+            onDrop={!disabled ? handleDrop : () => {}}
             error={Boolean(error)}
             helperText={error?.message}
             caption={

package/package.json

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