trithuc-mvc-react 1.2.0 → 1.3.0

package/components/DataManagement/index.jsx

@@ -1,6 +1,6 @@
 import { Button, IconButton, Stack, Tooltip, Typography } from "@mui/material";
 
-import { useMemo, useState } from "react";
+import { useEffect, useMemo, useState } from "react";
 
 import { DataTableContext, PermissionContext } from "./context";
 import PropTypes from "prop-types";
@@ -42,7 +42,7 @@ function DataManagement({
   title,
   tableName,
   selectedField = "Id",
-  filters,
+  filters : tableFilters = [],
   editorFields = [],
   validationSchema = {},
   statusKey = "Status",
@@ -55,9 +55,25 @@ function DataManagement({
 }) {
   const [openEditorDialog, setOpenEditorDialog] = useState(false);
   const [selectedEditItem, setSelectedEditItem] = useState(null);
-  const [dataSearch, setDataSearch] = useState({});
+ 
   const [Permission, setPermission] = useState(null);
 
+  const { defaults, filters } = useMemo(() => {
+    const filters = tableFilters.filter(({ type }) => type !== "default");
+    const defaultFilters = tableFilters.filter(({ type }) => type === "default");
+
+    const defaults = defaultFilters.reduce((prev, { field, value }) => {
+      prev[field] = value;
+      return prev;
+    }, {});
+    return { defaults, filters };
+
+  }, [tableFilters]);
+  useEffect(() => {
+    setDataSearch({ ...dataSearch,...defaults });
+
+  }, [filters]);
+  const [dataSearch, setDataSearch] = useState({ ...defaults });
   const values = useMemo(() => {
     return {
       tableName,
@@ -97,7 +113,7 @@ function DataManagement({
                     variant="outlined"
                     color="primary"
                     onClick={() => {
-                      setDataSearch({});
+                      setDataSearch({...defaults});
                       [...filters].forEach((filter) => {
                         filter?.onChange?.();
                       });

package/components/form/DynamicForm.jsx

@@ -3,19 +3,15 @@ import { FormProvider, useForm } from "react-hook-form";
 import Grid from "@mui/material/Unstable_Grid2"; // Grid version 2
 import PropTypes from "prop-types";
 
-import { useEffect } from "react";
 import moment from "moment/moment";
 
-import { useMutation, useQueryClient } from "react-query";
-import { saveDataToTable } from "../../api";
-import { toast } from "react-toastify";
 
 import FormField from "./FormField";
 import { yupResolver } from "@hookform/resolvers/yup";
-EditorForm.propTypes = {
+DynamicForm.propTypes = {
   fields: PropTypes.array
 };
-function EditorForm({ fields, elementSize = "medium", submitRef, validationSchema, onSubmit }) {
+function DynamicForm({ fields, elementSize = "medium", submitRef, validationSchema, onSubmit }) {
 
   const methods = useForm({ defaultValues: {}, resolver: yupResolver(validationSchema) });
 
@@ -96,4 +92,4 @@ function EditorForm({ fields, elementSize = "medium", submitRef, validationSchem
   );
 }
 
-export default EditorForm;
+export default DynamicForm;

package/package.json

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