trithuc-mvc-react 2.8.3 → 2.8.5

package/components/DataManagement/DataTable.jsx

@@ -1,4 +1,4 @@
-import { Grid, Table, TableBody, TableCell, TableContainer, TableRow, Typography, useMediaQuery, useTheme } from "@mui/material";
+import { Grid2, Table, TableBody, TableCell, TableContainer, TableRow, Typography, useMediaQuery, useTheme } from "@mui/material";
 import TablePaginationCustom from "../table/TablePagination";
 import { useEffect, useMemo, useState } from "react";
 

package/components/DataManagement/DataTableSM.jsx

@@ -1,4 +1,4 @@
-import { Grid, Table, TableBody, TableCell, TableContainer, TableRow, Typography, useMediaQuery, useTheme } from "@mui/material";
+import { Grid2, Table, TableBody, TableCell, TableContainer, TableRow, Typography, useMediaQuery, useTheme } from "@mui/material";
 import TablePaginationCustom from "../table/TablePagination";
 import { useEffect, useMemo, useState } from "react";
 

package/components/DataManagement/TableRowRenderSM.jsx

@@ -1,12 +1,12 @@
-import { Checkbox, IconButton, Switch, TableCell, TableRow, Tooltip, Toolbar, useMediaQuery, Box, Grid } from "@mui/material";
-import DeleteOutlineIcon from "@mui/icons-material/DeleteOutline";
 import { EditOutlined } from "@mui/icons-material";
-import { useDataTable } from "./hooks";
+import DeleteOutlineIcon from "@mui/icons-material/DeleteOutline";
 import RemoveRedEyeOutlinedIcon from "@mui/icons-material/RemoveRedEyeOutlined";
-import { usePermission } from "../../hooks";
+import { Box, IconButton, Switch, TableCell, TableRow, Toolbar, Tooltip, useMediaQuery } from "@mui/material";
 import { styled, useTheme } from "@mui/material/styles";
-import MoreMenu from "../MoreMenu";
 import { useMemo } from "react";
+import { usePermission } from "../../hooks";
+import MoreMenu from "../MoreMenu";
+import { useDataTable } from "./hooks";
 
 export const TableRowRenderSM = ({
   index,

package/components/form/DynamicForm.jsx

@@ -1,18 +1,16 @@
-import { Box } from "@mui/material";
-import { FormProvider, useForm } from "react-hook-form";
-import Grid from "@mui/material/Unstable_Grid2"; // Grid version 2
+import { Box,Grid2 }  from "@mui/material";
+
 import PropTypes from "prop-types";
+import { FormProvider, useForm } from "react-hook-form";
 
 import moment from "moment/moment";
 
-
-import FormField from "./FormField";
 import { yupResolver } from "@hookform/resolvers/yup";
+import FormField from "./FormField";
 DynamicForm.propTypes = {
   fields: PropTypes.array
 };
 function DynamicForm({ fields, elementSize = "medium", submitRef, validationSchema, onSubmit }) {
-
   const methods = useForm({ defaultValues: {}, resolver: yupResolver(validationSchema) });
 
   const handleSubmit = (data) => {
@@ -30,8 +28,8 @@ function DynamicForm({ fields, elementSize = "medium", submitRef, validationSche
           data[keyValueLabel] = datas.find((item) => item[keyValue] == data[field])?.[keyLabel];
         }
       });
-      
-      onSubmit(data);
+
+    onSubmit(data);
   };
 
   return (
@@ -81,11 +79,11 @@ function DynamicForm({ fields, elementSize = "medium", submitRef, validationSche
                     size={elementSize}
                     required={required}
                   />
-                </Grid>
+                </Grid2>
               );
             }
           )}
-        </Grid>
+        </Grid2>
         <button ref={submitRef} type="submit" style={{ display: "none" }} />
       </Box>
     </FormProvider>

package/components/form/FormField.jsx

@@ -12,15 +12,14 @@ import {
   Switch,
   TextField
 } from "@mui/material";
-import { Controller,  useFormContext } from "react-hook-form";
-// Grid version 2
-import PropTypes from "prop-types";
+import { Controller, useFormContext } from "react-hook-form";
+
 import { DatePicker } from "@mui/x-date-pickers";
-import { useCallback, useEffect, } from "react";
 import moment from "moment/moment";
+import PropTypes from "prop-types";
+import { useCallback, useEffect } from "react";
 import { DEFAULT_DATE_FORMAT } from "../../constants";
 
-
 FormField.propTypes = {
   datas: PropTypes.array,
   loading: PropTypes.bool
@@ -57,7 +56,6 @@ function FormField({
     }
   }, []);
 
-
   switch (type) {
     case "textarea":
       return (
@@ -130,7 +128,9 @@ function FormField({
                 value={getValueObject(value)}
                 fullWidth
                 getOptionLabel={(option) => option[keyLabel]}
-                renderInput={(params) => <TextField {...params} label={label} error={Boolean(error)} helperText={error?.message} />}
+                renderInput={(params) => (
+                  <TextField {...params} label={label} error={Boolean(error)} helperText={error?.message} />
+                )}
               />
             );
           }}
@@ -218,18 +218,17 @@ function FormField({
                 format={DEFAULT_DATE_FORMAT}
                 slotProps={{
                   textField: {
-                    fullWidth: true, error: Boolean(error),
+                    fullWidth: true,
+                    error: Boolean(error),
                     helperText: error?.message
                   },
                   popper: {
                     disablePortal: false,
                     popperOptions: {
-                      strategy: 'fixed'
-                    },
+                      strategy: "fixed"
+                    }
                   }
                 }}
-
-
               />
             );
           }}

package/package.json

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