Merge pull request #178 from KelvinTegelaar/dev

[pull] dev from KelvinTegelaar:dev

Author: pull[bot]

src/data/extensionDataMapping.json

@@ -35,9 +35,9 @@
     "type": "array",
     "targetObject": "user",
     "sourceMatchProperty": "Identity",
-    "destinationMatchProperty": "id",
+    "destinationMatchProperty": ["id", "mailNickname"],
     "storeAs": "json",
-    "select": "Identity,User,AccessRights,IsInherited,Deny,InheritanceType,UserSid,IsOwner"
+    "select": "User,AccessRights"
   },
   "CASMailbox": {
     "description": "List of CAS mailboxes mapped to their corresponding user via id. Properties can be mapped individually.",

src/pages/identity/administration/groups/edit.jsx

@@ -34,7 +34,7 @@ const EditGroup = () => {
   const formControl = useForm({
     mode: "onChange",
     defaultValues: {
-      tenantId: tenantFilter,
+      tenantFilter: tenantFilter,
     },
   });
 
@@ -57,7 +57,7 @@ const EditGroup = () => {
         setCombinedData(combinedData);
 
         formControl.reset({
-          tenantId: tenantFilter,
+          tenantFilter: tenantFilter,
           mail: group.mail,
           allowExternal: groupInfo?.data?.allowExternal,
           sendCopies: groupInfo?.data?.sendCopies,

src/pages/tenant/standards/compare/index.js

@@ -98,14 +98,34 @@ const Page = () => {
             );
 
             // Determine compliance status
-            const isCompliant =
-              currentTenantStandard &&
-              JSON.stringify(currentTenantStandard.value) === JSON.stringify(standardSettings);
+            let isCompliant = false;
+            
+            // Check if the standard is directly in the tenant object (like "standards.AuditLog": true)
+            const standardIdWithoutPrefix = standardId.replace('standards.', '');
+            const directStandardValue = currentTenantObj?.[standardId];
+            
+            // Special case for boolean standards that are true in the tenant
+            if (directStandardValue === true) {
+              // If the standard is directly in the tenant and is true, it's compliant
+              isCompliant = true;
+            } else if (directStandardValue !== undefined) {
+              // For non-boolean values, use strict equality
+              isCompliant = JSON.stringify(directStandardValue) === JSON.stringify(standardSettings);
+            } else if (currentTenantStandard) {
+              // Fall back to the previous logic if the standard is not directly in the tenant object
+              if (typeof standardSettings === 'boolean' && standardSettings === true) {
+                isCompliant = currentTenantStandard.value === true;
+              } else {
+                isCompliant = JSON.stringify(currentTenantStandard.value) === JSON.stringify(standardSettings);
+              }
+            }
 
+            // Use the direct standard value from the tenant object if it exists
+            
             allStandards.push({
               standardId,
               standardName: standardInfo?.label || standardKey,
-              currentTenantValue: currentTenantStandard?.value,
+              currentTenantValue: directStandardValue !== undefined ? directStandardValue : currentTenantStandard?.value,
               standardValue: standardSettings,
               complianceStatus: isCompliant ? "Compliant" : "Non-Compliant",
               complianceDetails: standardInfo?.docsDescription || standardInfo?.helpText || "",
@@ -375,8 +395,8 @@ const Page = () => {
                                     {key}:
                                   </Typography>
                                   <Typography variant="body2">
-                                    {typeof value === "object"
-                                      ? value.label || JSON.stringify(value)
+                                    {typeof value === "object" && value !== null
+                                      ? (value.label || JSON.stringify(value))
                                       : value === true
                                       ? "Enabled"
                                       : value === false
@@ -511,17 +531,23 @@ const Page = () => {
                               <Typography
                                 variant="body2"
                                 sx={{
-                                  color: isDifferent ? "error.main" : "inherit",
-                                  fontWeight: isDifferent ? "medium" : "inherit",
+                                  color: standard.complianceStatus === "Compliant"
+                                    ? "success.main"
+                                    : (isDifferent ? "error.main" : "inherit"),
+                                  fontWeight: standard.complianceStatus !== "Compliant" && isDifferent
+                                    ? "medium"
+                                    : "inherit",
                                 }}
                               >
-                                {typeof value === "object"
-                                  ? value.label || JSON.stringify(value)
-                                  : value === true
-                                  ? "Enabled"
-                                  : value === false
-                                  ? "Disabled"
-                                  : String(value)}
+                                {standard.complianceStatus === "Compliant" && value === true
+                                  ? "Compliant"
+                                  : (typeof value === "object" && value !== null
+                                      ? (value.label || JSON.stringify(value))
+                                      : value === true
+                                      ? "Enabled"
+                                      : value === false
+                                      ? "Disabled"
+                                      : String(value))}
                               </Typography>
                             </Box>
                           );
@@ -533,18 +559,20 @@ const Page = () => {
                         sx={{
                           whiteSpace: "pre-wrap",
                           color:
-                            standard.currentTenantValue !== standard.standardValue
-                              ? "error.main"
-                              : "inherit",
+                            standard.complianceStatus === "Compliant"
+                              ? "success.main"
+                              : "error.main",
                           fontWeight:
-                            standard.currentTenantValue !== standard.standardValue
+                            standard.complianceStatus !== "Compliant"
                               ? "medium"
                               : "inherit",
                         }}
                       >
-                        {standard.currentTenantValue !== undefined
-                          ? String(standard.currentTenantValue)
-                          : "Not configured"}
+                        {standard.complianceStatus === "Compliant" && standard.currentTenantValue === true
+                          ? "Compliant"
+                          : (standard.currentTenantValue !== undefined
+                              ? String(standard.currentTenantValue)
+                              : "Not configured")}
                       </Typography>
                     )}
                   </Box>

src/utils/get-cipp-formatting.js

@@ -323,6 +323,20 @@ export const getCippFormatting = (data, cellName, type, canReceive) => {
     );
   }
 
+  if (cellName === 'AccessRights') {
+    // Handle data as an array or string
+    const accessRights = Array.isArray(data)
+      ? data.flatMap((item) => (typeof item === "string" ? item.split(", ") : []))
+      : typeof data === "string"
+      ? data.split(", ")
+      : [];
+    return isText
+      ? accessRights.join(", ")
+      : accessRights.map((accessRight) => (
+          <CippCopyToClipBoard key={accessRight} text={accessRight} type="chip" />
+        ));
+  }
+
   // Handle null or undefined data
   if (data === null || data === undefined) {
     return isText ? (
@@ -519,6 +533,18 @@ export const getCippFormatting = (data, cellName, type, canReceive) => {
 
   // Handle arrays of strings
   if (Array.isArray(data) && data.every((item) => typeof item === "string")) {
+    // if string matches json format, parse it
+    if (data.every((item) => item.startsWith("{") || item.startsWith("["))) {
+      return isText ? (
+        JSON.stringify(data)
+      ) : (
+        <CippDataTableButton
+          data={data.map((item) => JSON.parse(item))}
+          tableTitle={getCippTranslation(cellName)}
+        />
+      );
+    }
+
     //if the array is empty, return "No data"
     return isText
       ? data.join(", ")

src/utils/get-cipp-translation.js

@@ -5,6 +5,15 @@ export const getCippTranslation = (field) => {
     return "No data";
   }
 
+  // special translations for extensions
+  if (field.startsWith("extension_")) {
+    field = field.split("_").pop();
+  }
+  // special translation for schema extensions
+  if (field.startsWith("ext") && field.includes("_")) {
+    field = field.split("_").pop();
+  }
+
   return (
     CippTranslations[field] ||
     field