From 6d73b74803026d879cdd4c9431fefc863efe3386 Mon Sep 17 00:00:00 2001
From: Jason Chuang <jchuang@2fi-solutions.com.hk>
Date: Sun, 9 Aug 2026 00:06:03 +0800
Subject: [PATCH] CR023 - update gazette issue import

---
 src/components/FiDataGrid.js       |  6 +++---
 src/pages/GazetteIssue/DataGrid.js | 14 +-------------
 2 files changed, 4 insertions(+), 16 deletions(-)

diff --git a/src/components/FiDataGrid.js b/src/components/FiDataGrid.js
index dc917db..4470d9d 100644
--- a/src/components/FiDataGrid.js
+++ b/src/components/FiDataGrid.js
@@ -114,7 +114,7 @@ export function FiDataGrid({ rows, columns, sx, autoHeight = true,
             delete params.sort;
             delete params.direction;
         }
-        if (disablePagingOnGazetteIssue && hasGazetteIssueFilter(params)) {
+        if (!pagination || (disablePagingOnGazetteIssue && hasGazetteIssueFilter(params))) {
             delete params.start;
             delete params.limit;
         } else {
@@ -130,7 +130,7 @@ export function FiDataGrid({ rows, columns, sx, autoHeight = true,
         }
     };
 
-    const ignorePaging = disablePagingOnGazetteIssue && hasGazetteIssueFilter(_doLoad?.params);
+    const ignorePaging = !pagination || (disablePagingOnGazetteIssue && hasGazetteIssueFilter(_doLoad?.params));
     const effectivePagination = pagination && !ignorePaging;
 
     useEffect(() => {
@@ -216,7 +216,7 @@ export function FiDataGrid({ rows, columns, sx, autoHeight = true,
         if (_doLoad.params == undefined) return;
         if (_doLoad.params.searchCriteria !== undefined) return;
         if (_doLoad.params == null) _doLoad.params = {};
-        if (disablePagingOnGazetteIssue && hasGazetteIssueFilter(_doLoad.params)) {
+        if (!pagination || (disablePagingOnGazetteIssue && hasGazetteIssueFilter(_doLoad.params))) {
             delete _doLoad.params.start;
             delete _doLoad.params.limit;
         } else {
diff --git a/src/pages/GazetteIssue/DataGrid.js b/src/pages/GazetteIssue/DataGrid.js
index 9277dce..ede8e8c 100644
--- a/src/pages/GazetteIssue/DataGrid.js
+++ b/src/pages/GazetteIssue/DataGrid.js
@@ -68,18 +68,6 @@ export default function GazetteIssueTable({ searchCriteria, applyGridOnReady })
                 return <div style={{ margin: 4 }}>{dateStr(closingDate)}</div>
             },
         },
-        {
-            id: 'closingDateOff',
-            field: 'closingDateOff',
-            headerName: 'Closing Date Off',
-            flex: 2,
-            minWidth: 150,
-            renderCell: (params) => {
-                // console.log(params)
-                let closingDateOff = params.row.closingDateOff;
-                return <div style={{ margin: 4 }}>{dateStr(closingDateOff)}</div>
-            },
-        },
         {
             id: 'issueDesc',
             field: 'issueDesc',
@@ -97,7 +85,7 @@ export default function GazetteIssueTable({ searchCriteria, applyGridOnReady })
         <div style={{ height: "fit-content", width: '100%' }}>
             <FiDataGrid
                 columns={columns}
-                customPageSize={10}
+                pagination={false}
                 // onRowDoubleClick={handleRowDoubleClick}
                 getRowHeight={() => 'auto'}
                 applyGridOnReady={applyGridOnReady}