From 07144fa760b1e10b55cffc614489a9f2d16e8cef Mon Sep 17 00:00:00 2001
From: Woody <2997336+MWGMorningwood@users.noreply.github.com>
Date: Fri, 12 Sep 2025 12:33:23 -0400
Subject: [PATCH 1/3] Create context7.json for project configuration

Context7 pulls up-to-date, version-specific documentation and code examples directly from the source, typically for usage in AI Pair Programming. This JSON file directs Context7 to inspect the `docs` branch for gathering markdown files.

Signed-off-by: Woody <2997336+MWGMorningwood@users.noreply.github.com>
---
 context7.json | 11 +++++++++++
 1 file changed, 11 insertions(+)
 create mode 100644 context7.json

diff --git a/context7.json b/context7.json
new file mode 100644
index 000000000000..3a0b7c321b31
--- /dev/null
+++ b/context7.json
@@ -0,0 +1,11 @@
+{
+  "$schema": "https://context7.com/schema/context7.json",
+  "projectTitle": "CIPP - Cyberdrain Improved Partner Portal",
+  "description": "The CyberDrain Improved Partner Portal is a portal to help manage administration for Microsoft Partners.",
+  "folders": [],
+  "excludeFolders": [],
+  "excludeFiles": [],
+  "rules": [],
+  "previousVersions": [],
+  "branch": "docs"
+}

From 0fd90ad38e393f592f032cba654bbe5a2d471be6 Mon Sep 17 00:00:00 2001
From: KelvinTegelaar <49186168+KelvinTegelaar@users.noreply.github.com>
Date: Sat, 13 Sep 2025 01:13:13 +0200
Subject: [PATCH 2/3] added extra null-saftey

---
 src/components/CippTable/util-columnsFromAPI.js | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/src/components/CippTable/util-columnsFromAPI.js b/src/components/CippTable/util-columnsFromAPI.js
index 407268873538..8d93ccc19c18 100644
--- a/src/components/CippTable/util-columnsFromAPI.js
+++ b/src/components/CippTable/util-columnsFromAPI.js
@@ -40,6 +40,10 @@ const getAtPath = (obj, path) => {
 const mergeKeys = (dataArray) => {
   return dataArray.reduce((acc, item) => {
     const mergeRecursive = (obj, base = {}) => {
+      // Add null/undefined check before calling Object.keys
+      if (!obj || typeof obj !== 'object') {
+        return base;
+      }
       Object.keys(obj).forEach((key) => {
         if (
           typeof obj[key] === "object" &&
@@ -62,11 +66,20 @@ const mergeKeys = (dataArray) => {
       return base;
     };
 
+    // Add null/undefined check before calling mergeRecursive
+    if (!item || typeof item !== 'object') {
+      return acc;
+    }
     return mergeRecursive(item, acc);
   }, {});
 };
 
 export const utilColumnsFromAPI = (dataArray) => {
+  // Add safety check for dataArray
+  if (!dataArray || !Array.isArray(dataArray) || dataArray.length === 0) {
+    return [];
+  }
+  
   const dataSample = mergeKeys(dataArray);
 
   const generateColumns = (obj, parentKey = "") => {

From 193ee5f89786fdc0cf9f6b3005638c7250c07963 Mon Sep 17 00:00:00 2001
From: KelvinTegelaar <49186168+KelvinTegelaar@users.noreply.github.com>
Date: Sat, 13 Sep 2025 20:20:31 +0200
Subject: [PATCH 3/3] up version

---
 public/version.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/public/version.json b/public/version.json
index f9d9abd8b211..a809230b8095 100644
--- a/public/version.json
+++ b/public/version.json
@@ -1,3 +1,3 @@
 {
-  "version": "8.4.0"
+  "version": "8.4.1"
 }