fix double search api for data table

src/components/FiDataGrid.js

@@ -11,7 +11,7 @@ import { TablePagination, Typography } from '@mui/material';
 
 export function FiDataGrid({ rows, columns, sx, autoHeight,
     hideFooterSelectedRowCount, rowModesModel, editMode,
-    pageSizeOptions, filterItems, customPageSize, doLoad, onGridReady, ...props }) {
+    pageSizeOptions, filterItems, customPageSize, doLoad, ...props }) {
     const intl = useIntl();
     const [_rows, set_rows] = useState([]);
     const [_doLoad, set_doLoad] = useState({});
@@ -56,12 +56,6 @@ export function FiDataGrid({ rows, columns, sx, autoHeight,
         setLoading(true)
     }, [doLoad]);
 
-    useEffect(() => {
-        setPage(0);
-        set_doLoad(doLoad);
-        setLoading(true)
-    }, [onGridReady]);
-
     useEffect(() => {
         getDataList();
     }, [_doLoad, page]);
@@ -122,7 +116,12 @@ export function FiDataGrid({ rows, columns, sx, autoHeight,
 
 
     function getDataList() {
+        // console.log(Object.keys(_doLoad.params).length > 0)
+        // console.log(Object.keys(_doLoad.params).length > 0)
+
         if (_doLoad?.url == null) return;
+        if (_doLoad.params == undefined) return;
+        if (_doLoad.params.searchCriteria !== undefined) return;
         if (_doLoad.params == null) _doLoad.params = {};
         _doLoad.params.start = page * pageSize;
         _doLoad.params.limit = pageSize;

src/pages/Announcement/Search/DataGrid.js

@@ -73,10 +73,14 @@ export default function SearchPublicNoticeTable({ searchCriteria }) {
                 customPageSize={10}
                 getRowHeight={() => 'auto'}
                 onRowDoubleClick={handleRowDoubleClick}
-                doLoad={{
+                // doLoad={{
+                //     url: GET_ANNOUNCE_LIST,
+                //     params: _searchCriteria,
+                // }}
+                doLoad={React.useMemo(() => ({
                     url: GET_ANNOUNCE_LIST,
                     params: _searchCriteria,
-                }}
+                }), [_searchCriteria])}
             />
         </div>
     );

src/pages/Announcement/Search_Public/DataGrid.js

@@ -57,10 +57,14 @@ export default function SearchPublicNoticeTable({ searchCriteria }) {
                 columns={columns}
                 customPageSize={10}
                 getRowHeight={() => 'auto'}
-                doLoad={{
+                // doLoad={{
+                //     url: GET_ANNOUNCE_LIST,
+                //     params: _searchCriteria
+                // }}
+                doLoad={React.useMemo(() => ({
                     url: GET_ANNOUNCE_LIST,
-                    params: _searchCriteria
-                }}
+                    params: _searchCriteria,
+                }), [_searchCriteria])}
             />
         </div>
     );

src/pages/AuditLog/AuditLogTable.js

@@ -87,10 +87,14 @@ export default function AuditLogTable({searchCriteria}) {
                 columns={columns}
                 customPageSize={10}
                 getRowHeight={() => 'auto'}
-                doLoad={{
+                // doLoad={{
+                //     url: GET_AUDIT_LOG_LIST,
+                //     params: _searchCriteria
+                // }}
+                doLoad={React.useMemo(() => ({
                     url: GET_AUDIT_LOG_LIST,
-                    params: _searchCriteria
-                }}
+                    params: _searchCriteria,
+                }), [_searchCriteria])}
             />
         </div>
     );

src/pages/EmailTemplate/Search_GLD/DataGrid.js

@@ -97,10 +97,14 @@ export default function EmailTemplateTable({ responseData }) {
                 customPageSize={10}
                 onRowDoubleClick={handleRowDoubleClick}
                 getRowHeight={() => 'auto'}
-                doLoad={{
-                    url:GET_EMAIL_LIST,
-                    params: _responseData
-                }}
+                // doLoad={{
+                //     url:GET_EMAIL_LIST,
+                //     params: _responseData
+                // }}
+                doLoad={React.useMemo(() => ({
+                    url: GET_EMAIL_LIST,
+                    params: _responseData,
+                }), [_responseData])}
             />
         </div>
     );

src/pages/GazetteIssue/DataGrid.js

@@ -100,10 +100,14 @@ export default function GazetteIssueTable({ searchCriteria }) {
                 customPageSize={10}
                 // onRowDoubleClick={handleRowDoubleClick}
                 getRowHeight={() => 'auto'}
-                doLoad={{
+                // doLoad={{
+                //     url: GET_ISSUE,
+                //     params: _searchCriteria,
+                // }}
+                doLoad={React.useMemo(() => ({
                     url: GET_ISSUE,
                     params: _searchCriteria,
-                }}
+                }), [_searchCriteria])}
             />
         </div>
     );

src/pages/Organization/SearchPage/OrganizationTable.js

@@ -113,10 +113,14 @@ export default function OrganizationTable({ searchCriteria }) {
                 columns={columns}
                 customPageSize={10}
                 onRowDoubleClick={handleRowDoubleClick}
-                doLoad={{
+                // doLoad={{
+                //     url: GET_ORG_PATH,
+                //     params: _searchCriteria,
+                // }}
+                doLoad={React.useMemo(() => ({
                     url: GET_ORG_PATH,
                     params: _searchCriteria,
-                }}
+                }), [_searchCriteria])}
             />
         </div>
     );

src/pages/Payment/Search_GLD/DataGrid.js

@@ -96,10 +96,14 @@ export default function SearchPaymentTable({ searchCriteria }) {
                 columns={columns}
                 customPageSize={10}
                 onRowDoubleClick={handleEditClick}
-                doLoad={{
-                    url:PAYMENT_LIST,
-                    params:_searchCriteria,
-                }}
+                // doLoad={{
+                //     url:PAYMENT_LIST,
+                //     params:_searchCriteria,
+                // }}
+                doLoad={React.useMemo(() => ({
+                    url: PAYMENT_LIST,
+                    params: _searchCriteria,
+                }), [_searchCriteria])}
             />
         </div>
     );

src/pages/Payment/Search_Public/DataGrid.js

@@ -110,10 +110,14 @@ export default function SearchPublicNoticeTable({ searchCriteria }) {
                 columns={columns}
                 customPageSize={10}
                 onRowDoubleClick={handleEditDoubleClick}
-                doLoad={{
+                // doLoad={{
+                //     url: PAYMENT_LIST,
+                //     params: _searchCriteria,
+                // }}
+                doLoad={React.useMemo(() => ({
                     url: PAYMENT_LIST,
                     params: _searchCriteria,
-                }}
+                }), [_searchCriteria])}
             />
         </div>
     );

src/pages/Proof/Search_GLD/DataGrid.js

@@ -13,7 +13,7 @@ export default function SearchPublicNoticeTable({searchCriteria}) {
 
     const navigate = useNavigate()
 
-    const [_searchCriteria, set_searchCriteria] = React.useState({});
+    const [_searchCriteria, set_searchCriteria] = React.useState({searchCriteria});
 
     React.useEffect(() => {
         set_searchCriteria(searchCriteria);
@@ -119,12 +119,16 @@ export default function SearchPublicNoticeTable({searchCriteria}) {
             <FiDataGrid
                 columns={columns}
                 customPageSize={10}
-                onRowDoubleClick={handleRowDoubleClick}
                 getRowHeight={() => 'auto'}
-                doLoad={{
+                onRowDoubleClick={handleRowDoubleClick}
+                // doLoad={{
+                //     url: LIST_PROOF,
+                //     params: _searchCriteria,
+                // }}
+                doLoad={React.useMemo(() => ({
                     url: LIST_PROOF,
                     params: _searchCriteria,
-                }}
+                }), [_searchCriteria])}
             />
         </div>
     );

src/pages/Proof/Search_Public/DataGrid.js

@@ -191,10 +191,10 @@ export default function SearchPublicNoticeTable({ searchCriteria }) {
                 customPageSize={10}
                 getRowHeight={() => "auto"}
                 onRowDoubleClick={handleRowDoubleClick}
-                doLoad={{
+                doLoad={React.useMemo(() => ({
                     url: LIST_PROOF,
                     params: _searchCriteria,
-                }}
+                }), [_searchCriteria])}
             />
         </div>
     );

src/pages/PublicNotice/ListPanel/SearchPublicNoticeTable.js

@@ -133,10 +133,14 @@ export default function SearchPublicNoticeTable({ searchCriteria }) {
                 customPageSize={10}
                 onRowDoubleClick={handleRowDoubleClick}
                 getRowHeight={() => 'auto'}
-                doLoad={{
+                // doLoad={{
+                //     url: GET_PUBLIC_NOTICE_LIST,
+                //     params: _searchCriteria
+                // }}
+                doLoad={React.useMemo(() => ({
                     url: GET_PUBLIC_NOTICE_LIST,
-                    params: _searchCriteria
-                }}
+                    params: _searchCriteria,
+                }), [_searchCriteria])}
             />
         </div>
     );

src/pages/PublicNotice/Search_GLD/DataGrid.js

@@ -20,7 +20,7 @@ import { FormattedMessage, useIntl } from "react-intl";
 import * as utils from "auth/utils"
 // ==============================|| EVENT TABLE ||============================== //
 
-export default function SearchPublicNoticeTable({ searchCriteria, onGridReady }) {
+export default function SearchPublicNoticeTable({ searchCriteria }) {
 
     const [rows, setRows] = React.useState([]);
     const navigate = useNavigate()
@@ -184,7 +184,6 @@ export default function SearchPublicNoticeTable({ searchCriteria, onGridReady })
                 customPageSize={10}
                 getRowHeight={() => 'auto'}
                 onRowDoubleClick={handleRowDoubleClick}
-                onGridReady={onGridReady}
                 doLoad={React.useMemo(() => ({
                     url: GET_PUBLIC_NOTICE_LIST,
                     params: _searchCriteria,

src/pages/PublicNotice/Search_GLD/SearchForm.js

@@ -21,7 +21,7 @@ import {DemoItem} from "@mui/x-date-pickers/internals/demo";
 import {LocalizationProvider} from "@mui/x-date-pickers/LocalizationProvider";
 import {AdapterDayjs} from "@mui/x-date-pickers/AdapterDayjs";
 // ==============================|| DASHBOARD - DEFAULT ||============================== //
-const SearchPublicNoticeForm = ({ applySearch, orgComboData, searchCriteria, issueComboData, setSearchReady
+const SearchPublicNoticeForm = ({ applySearch, orgComboData, searchCriteria, issueComboData
 }) => {
 
     const [type, setType] = React.useState([]);
@@ -76,7 +76,7 @@ const SearchPublicNoticeForm = ({ applySearch, orgComboData, searchCriteria, iss
             groupNo: data.groupNo,
         };
         applySearch(temp);
-        setSearchReady(true)
+        // setSearchReady(true)
     };
 
     React.useEffect(() => {

src/pages/PublicNotice/Search_GLD/index.js

@@ -36,7 +36,7 @@ const UserSearchPage_Individual = () => {
         dateFrom: DateUtils.dateValue(new Date().setDate(new Date().getDate() - 14))
     });
     const [onReady, setOnReady] = React.useState(false);
-    const [onGridReady, setGridOnReady] = React.useState(false);
+    // const [onGridReady, setGridOnReady] = React.useState(false);
 
     React.useEffect(() => {
         getOrgCombo();
@@ -68,13 +68,13 @@ const UserSearchPage_Individual = () => {
     }
 
     function applySearch(input) {
-        setGridOnReady(false);
+        // setGridOnReady(false);
         setSearchCriteria(input);
     }
 
-    function setSearchReady(input) {
-        setGridOnReady(input);
-    }
+    // function setSearchReady(input) {
+    //     setGridOnReady(input);
+    // }
 
 
     return (
@@ -100,7 +100,7 @@ const UserSearchPage_Individual = () => {
                         orgComboData={orgCombo}
                         issueComboData={issueCombo}
                         searchCriteria={searchCriteria}
-                        setSearchReady={setSearchReady}
+                        // setSearchReady={setSearchReady}
                     />
                 </Grid>
                 {/*row 2*/}
@@ -112,7 +112,7 @@ const UserSearchPage_Individual = () => {
                     >
                         <EventTable
                             searchCriteria={searchCriteria}
-                            onGridReady={onGridReady}
+                            // onGridReady={onGridReady}
                     />
                     </MainCard>
                 </Grid>

src/pages/User/SearchPage/UserTable.js

@@ -137,10 +137,14 @@ export default function UserTable({searchCriteria}) {
                 customPageSize={10}
                 onRowDoubleClick={handleRowDoubleClick}
                 getRowHeight={() => 'auto'}
-                doLoad={{
+                // doLoad={{
+                //     url: GLD_USER_PATH,
+                //     params: _searchCriteria,
+                // }}
+                doLoad={React.useMemo(() => ({
                     url: GLD_USER_PATH,
                     params: _searchCriteria,
-                }}
+                }), [_searchCriteria])}
             />
         </div>
     );

src/pages/User/SearchPage_Individual/UserTable_Individual.js

@@ -152,10 +152,14 @@ export default function UserTable_Individual({ searchCriteria }) {
                 columns={columns}
                 customPageSize={10}
                 onRowDoubleClick={handleRowDoubleClick}
-                doLoad={{
+                // doLoad={{
+                //     url: GET_IND_USER_PATH,
+                //     params: _searchCriteria,
+                // }}
+                doLoad={React.useMemo(() => ({
                     url: GET_IND_USER_PATH,
                     params: _searchCriteria,
-                }}
+                }), [_searchCriteria])}
             />
         </div>
     );

src/pages/User/SearchPage_Organization/UserTable_Organization.js

@@ -147,10 +147,14 @@ export default function UserTable_Organization({searchCriteria}) {
                 columns={columns}
                 customPageSize={10}
                 onRowDoubleClick={handleRowDoubleClick}
-                doLoad={{
+                // doLoad={{
+                //     url: GET_ORG_USER_PATH,
+                //     params: _searchCriteria,
+                // }}
+                doLoad={React.useMemo(() => ({
                     url: GET_ORG_USER_PATH,
                     params: _searchCriteria,
-                }}
+                }), [_searchCriteria])}
             />
         </div>
     );

src/pages/pnspsUserGroupSearchPage/UserGroupTable.js

@@ -69,10 +69,14 @@ export default function UserGroupTable({searchCriteria}) {
                 customPageSize={10}
                 pageSizeOptions={[10, 15, 20]}
                 onRowDoubleClick={handleRowDoubleClick}
-                doLoad={{
+                // doLoad={{
+                //     url: GET_GROUP_LIST_PATH,
+                //     params: _searchCriteria,
+                // }}
+                doLoad={React.useMemo(() => ({
                     url: GET_GROUP_LIST_PATH,
                     params: _searchCriteria,
-                }}
+                }), [_searchCriteria])}
             />
         </div>
     );