[pull] dev from KelvinTegelaar:dev

.github/workflows/PR_Branch_Check.yml

@@ -16,13 +16,14 @@ permissions:
 
 jobs:
   check-branch:
+    if: github.event.repository.fork == false
     runs-on: ubuntu-latest
     steps:
       - name: Check and Comment on PR
         # Only process fork PRs with specific branch conditions
         # Must be a fork AND (source is main/master OR target is main/master)
         if: |
-          github.event.pull_request.head.repo.fork == true && 
+          github.event.pull_request.head.repo.fork == true &&
           ((github.event.pull_request.head.ref == 'main' || github.event.pull_request.head.ref == 'master') ||
           (github.event.pull_request.base.ref == 'main' || github.event.pull_request.base.ref == 'master'))
         uses: actions/github-script@v7
@@ -40,20 +41,20 @@ jobs:
             }
 
             // Check if PR is from a fork's main/master branch
-            if (context.payload.pull_request.head.repo.fork && 
+            if (context.payload.pull_request.head.repo.fork &&
                 (context.payload.pull_request.head.ref === 'main' || context.payload.pull_request.head.ref === 'master')) {
               message += '⚠️ This PR cannot be merged because it originates from your fork\'s main/master branch. If you are attempting to contribute code please PR from your dev branch or another non-main/master branch.\n\n';
             }
 
             message += '🔒 This PR will now be automatically closed due to the above violation(s).';
-            
+
             // Post the comment
             await github.rest.issues.createComment({
               ...context.repo,
               issue_number: context.issue.number,
               body: message
             });
-            
+
             // Close the PR
             await github.rest.pulls.update({
               ...context.repo,

.github/workflows/dev_deploy.yml

@@ -18,7 +18,7 @@ jobs:
         id: builddeploy
         uses: Azure/static-web-apps-deploy@v1
         with:
-          azure_static_web_apps_api_token: ${{ secrets.AZURE_STATIC_WEB_APPS_API_TOKEN_RW }} # change this to your repository secret name
+          azure_static_web_apps_api_token: ${{ secrets.AZURE_STATIC_WEB_APPS_API_TOKEN_AMBITIOUS_MOSS_0A047A40F }} # change this to your repository secret name
           repo_token: ${{ secrets.GITHUB_TOKEN }} # Used for Github integrations (i.e. PR comments)
           action: 'upload'
           ###### Repository/Build Configurations - These values can be configured to match your app requirements. ######
@@ -37,5 +37,5 @@ jobs:
         id: closepullrequest
         uses: Azure/static-web-apps-deploy@v1
         with:
-          azure_static_web_apps_api_token: ${{ secrets.AZURE_STATIC_WEB_APPS_API_TOKEN_RW }} # change this to your repository secret name
+          azure_static_web_apps_api_token: ${{ secrets.AZURE_STATIC_WEB_APPS_API_TOKEN_AMBITIOUS_MOSS_0A047A40F }} # change this to your repository secret name
           action: 'close'

src/components/CippComponents/CippLocationDialog.jsx

@@ -33,7 +33,7 @@ export const CippLocationDialog = ({ location }) => {
   return (
     <>
       <Button size="small" variant="outlined" onClick={handleOpen} startIcon={<LocationOn />}>
-        Show Map
+        {location.city}, {location.state}, {location.countryOrRegion}
       </Button>
       <Dialog fullWidth maxWidth="sm" onClose={handleClose} open={open}>
         <DialogTitle>Location Details</DialogTitle>

src/components/CippTable/CIPPTableToptoolbar.js

@@ -73,7 +73,10 @@ export const CIPPTableToptoolbar = ({
 
   //useEffect to set the column visibility to the preferred columns if they exist
   useEffect(() => {
-    if (settings?.columnDefaults?.[pageName]) {
+    if (
+      settings?.columnDefaults?.[pageName] &&
+      Object.keys(settings?.columnDefaults?.[pageName]).length > 0
+    ) {
       setColumnVisibility(settings?.columnDefaults?.[pageName]);
     }
   }, [settings?.columnDefaults?.[pageName], router, usedColumns]);
@@ -88,27 +91,42 @@ export const CIPPTableToptoolbar = ({
   });
 
   const resetToDefaultVisibility = () => {
-    setColumnVisibility({});
+    setColumnVisibility((prevVisibility) => {
+      const updatedVisibility = {};
+      for (const col in prevVisibility) {
+        if (Array.isArray(originalSimpleColumns)) {
+          updatedVisibility[col] = originalSimpleColumns.includes(col);
+        }
+      }
+      return updatedVisibility;
+    });
     settings.handleUpdate({
       columnDefaults: {
         ...settings?.columnDefaults,
         [pageName]: {},
       },
     });
+    columnPopover.handleClose();
   };
 
   const resetToPreferedVisibility = () => {
-    if (settings?.columnDefaults?.[pageName]) {
+    if (
+      settings?.columnDefaults?.[pageName] &&
+      Object.keys(settings?.columnDefaults?.[pageName]).length > 0
+    ) {
       setColumnVisibility(settings?.columnDefaults?.[pageName]);
     } else {
       setColumnVisibility((prevVisibility) => {
         const updatedVisibility = {};
         for (const col in prevVisibility) {
-          updatedVisibility[col] = originalSimpleColumns.includes(col);
+          if (Array.isArray(originalSimpleColumns)) {
+            updatedVisibility[col] = originalSimpleColumns.includes(col);
+          }
         }
         return updatedVisibility;
       });
     }
+    columnPopover.handleClose();
   };
 
   const saveAsPreferedColumns = () => {
@@ -118,6 +136,7 @@ export const CIPPTableToptoolbar = ({
         [pageName]: columnVisibility,
       },
     });
+    columnPopover.handleClose();
   };
 
   const mergeCaseInsensitive = (obj1, obj2) => {

src/components/CippTable/CippDataTable.js

@@ -248,6 +248,7 @@ export const CippDataTable = (props) => {
               table={table}
               api={api}
               queryKey={queryKey}
+              simpleColumns={simpleColumns}
               data={data}
               columnVisibility={columnVisibility}
               getRequestData={getRequestData}

src/components/CippTable/util-columnsFromAPI.js

@@ -2,12 +2,13 @@ import { getCippFilterVariant } from "../../utils/get-cipp-filter-variant";
 import { getCippFormatting } from "../../utils/get-cipp-formatting";
 import { getCippTranslation } from "../../utils/get-cipp-translation";
 
+const skipRecursion = ["location"];
 // Function to merge keys from all objects in the array
 const mergeKeys = (dataArray) => {
   return dataArray.reduce((acc, item) => {
     const mergeRecursive = (obj, base = {}) => {
       Object.keys(obj).forEach((key) => {
-        if (typeof obj[key] === "object" && obj[key] !== null && !Array.isArray(obj[key])) {
+        if (typeof obj[key] === "object" && obj[key] !== null && !Array.isArray(obj[key]) && !skipRecursion.includes(key)) {
           if (typeof base[key] === "boolean") {
             // Skip merging if base[key] is a boolean
             return;
@@ -30,7 +31,7 @@ const mergeKeys = (dataArray) => {
 
 export const utilColumnsFromAPI = (dataArray) => {
   const dataSample = mergeKeys(dataArray);
-  const skipRecursion = ["location"];
+
   const generateColumns = (obj, parentKey = "") => {
     return Object.keys(obj)
       .map((key) => {