Merge pull request #2181 from JohnDuprey/dev

Table fixes

Author: JohnDuprey

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) {
@@ -28,7 +28,7 @@ export default function CippDatatable({ path, params, ...rest }) {
         isFetching={isFetching}
         error={error}
         defaultFilterText={defaultFilterText}
-        refreshFunction={setRefreshGuid}
+        refreshFunction={() => refetch()}
         graphFilterFunction={setGraphFilter}
       />
     </>

src/components/tables/CippTable.jsx

@@ -204,7 +204,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