From b1e63d46b23103cfbaab72e6d0abac839cd9222b Mon Sep 17 00:00:00 2001
From: John Duprey <jwd@johnwduprey.com>
Date: Wed, 28 Feb 2024 16:51:49 -0500
Subject: [PATCH 1/2] CippDatatable - refetch

---
 src/components/tables/CippDatatable.jsx | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/components/tables/CippDatatable.jsx b/src/components/tables/CippDatatable.jsx
index 188c44542c82..ab0bf372f76c 100644
--- a/src/components/tables/CippDatatable.jsx
+++ b/src/components/tables/CippDatatable.jsx
@@ -6,13 +6,13 @@ import { CippTablePropTypes } from 'src/components/tables/CippTable'
 import { CCallout } from '@coreui/react'
 
 export default function CippDatatable({ path, params, ...rest }) {
-  const [refreshGuid, setRefreshGuid] = React.useState('')
   const [graphFilter, setGraphFilter] = React.useState(params?.Parameters?.$filter)
   const {
     data = [],
     isFetching,
     error,
-  } = useListDatatableQuery({ path, params: { refreshGuid, $filter: graphFilter, ...params } })
+    refetch,
+  } = useListDatatableQuery({ path, params: { $filter: graphFilter, ...params } })
 
   var defaultFilterText = ''
   if (params?.Parameters?.$filter) {
@@ -27,7 +27,7 @@ export default function CippDatatable({ path, params, ...rest }) {
         isFetching={isFetching}
         error={error}
         defaultFilterText={defaultFilterText}
-        refreshFunction={setRefreshGuid}
+        refreshFunction={() => refetch()}
         graphFilterFunction={setGraphFilter}
       />
     </>

From ee6aa125426e3c733c46047b84aba2b9f77a59e2 Mon Sep 17 00:00:00 2001
From: John Duprey <jwd@johnwduprey.com>
Date: Wed, 28 Feb 2024 17:13:57 -0500
Subject: [PATCH 2/2] CippTable fix

Fix addColumn for omitted cols
---
 src/components/tables/CippTable.jsx | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/components/tables/CippTable.jsx b/src/components/tables/CippTable.jsx
index ddac4bbcb71a..1a8f020d150e 100644
--- a/src/components/tables/CippTable.jsx
+++ b/src/components/tables/CippTable.jsx
@@ -202,7 +202,9 @@ export default function CippTable({
 
   // eslint-disable-next-line react-hooks/exhaustive-deps
   const addColumn = (columnname) => {
-    let alreadyInArray = updatedColumns.some((o) => o.exportSelector === columnname)
+    let alreadyInArray = updatedColumns.some(
+      (o) => o.exportSelector === columnname && o?.omit !== true,
+    )
     let newColumns = [...updatedColumns]
     const actionsColumn = newColumns.length > 0 ? newColumns.pop() : null