Merge branch 'interface-rewrite' of https://github.com/KelvinTegelaar/CIPP into interface-rewrite

Author: KelvinTegelaar

src/layouts/index.js

@@ -134,6 +134,9 @@ export const Layout = (props) => {
       if (userSettingsAPI.data.offboardingDefaults?.user) {
         delete userSettingsAPI.data.offboardingDefaults.user;
       }
+      if (userSettingsAPI?.data?.currentTheme) {
+        delete userSettingsAPI.data.currentTheme;
+      }
       settings.handleUpdate(userSettingsAPI.data);
       setUserSettingsComplete(true);
     }

src/pages/identity/administration/devices/index.js

@@ -68,8 +68,6 @@ const Page = () => {
       actions={actions}
       offCanvas={offCanvas}
       simpleColumns={[
-        "Tenant",
-        "CippStatus",
         "displayName",
         "accountEnabled",
         "recipientType",

src/pages/identity/administration/risky-users/index.js

@@ -49,7 +49,6 @@ const Page = () => {
       actions={actions}
       offCanvas={offCanvas}
       simpleColumns={[
-        "id",
         "userDisplayName",
         "userPrincipalName",
         "riskLevel",

src/utils/get-cipp-formatting.js

@@ -335,18 +335,15 @@ export const getCippFormatting = (data, cellName, type, canReceive) => {
     );
   }
 
-  // Handle riskLevel
-  if (cellName === "riskLevel") {
-    return getCippTranslation(data);
-  }
-
-  // Handle riskState
-  if (cellName === "riskState") {
-    return getCippTranslation(data);
-  }
+  const translateProps = [
+    "riskLevel",
+    "riskState",
+    "riskDetail",
+    "enrollmentType",
+    "profileType",
+  ];
 
-  // Handle riskDetail
-  if (cellName === "riskDetail") {
+  if (translateProps.includes(cellName)) {
     return getCippTranslation(data);
   }