fix odata type issue and From format in mbx rule

KelvinTegelaar · Jan 6, 2025 · 5eeb925 · 5eeb925
1 parent 1985001
commit 5eeb925
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 9 deletions.
diff --git a/src/components/CippTable/util-columnsFromAPI.js b/src/components/CippTable/util-columnsFromAPI.js
@@ -43,7 +43,7 @@ export const utilColumnsFromAPI = (dataArray) => {
           id: accessorKey,
           accessorFn: (row) => {
             let value;
-            if (accessorKey.startsWith("@odata")) {
+            if (accessorKey.includes("@odata")) {
               value = row[accessorKey];
             } else {
               value = accessorKey.split(".").reduce((acc, part) => acc && acc[part], row);
@@ -53,7 +53,7 @@ export const utilColumnsFromAPI = (dataArray) => {
           ...getCippFilterVariant(key),
           Cell: ({ row }) => {
             let value;
-            if (accessorKey.startsWith("@odata")) {
+            if (accessorKey.includes("@odata")) {
               value = row.original[accessorKey];
             } else {
               value = accessorKey.split(".").reduce((acc, part) => acc && acc[part], row.original);

diff --git a/src/utils/get-cipp-formatting.js b/src/utils/get-cipp-formatting.js
@@ -253,20 +253,26 @@ export const getCippFormatting = (data, cellName, type, canReceive) => {
     );
   }
 
-  if (cellName === "@odata.type") {
+  if (cellName.includes("@odata.type")) {
     if (data.startsWith("#microsoft.graph")) {
       data = data.replace("#microsoft.graph.", "");
+      return getCippTranslation(data, "@odata.type");
     }
-    return getCippTranslation(data, "@odata.type");
+    return data
   }
 
   // Handle From address
   if (cellName === "From") {
-    // split on ; , and create chips per email
-    const emails = data.split(/;|,/);
-    return isText
-      ? emails.join(", ")
-      : emails.map((email) => <CippCopyToClipBoard key={email} text={email} type="chip" />);
+    // if data is array
+    if (Array.isArray(data)) {
+      return isText ? data.join(", ") : data.join(", ");
+    } else {
+      // split on ; , and create chips per email
+      const emails = data.split(/;|,/);
+      return isText
+        ? emails.join(", ")
+        : emails.map((email) => <CippCopyToClipBoard key={email} text={email} type="chip" />);
+    }
   }
 
   // Handle proxyAddresses