Merge pull request #123 from KelvinTegelaar/dev

[pull] dev from KelvinTegelaar:dev

src/components/CippComponents/CippApiDialog.jsx

@@ -274,19 +274,21 @@ export const CippApiDialog = (props) => {
   };
 
   // Handling link navigation
-  if (api.link) {
-    const linkWithRowData = api.link.replace(/\[([^\]]+)\]/g, (_, key) => {
-      return getNestedValue(row, key) || `[${key}]`;
-    });
+  useEffect(() => {
+    if (api.link && createDialog.open) {
+      const linkWithRowData = api.link.replace(/\[([^\]]+)\]/g, (_, key) => {
+        return getNestedValue(row, key) || `[${key}]`;
+      });
 
-    if (linkWithRowData.startsWith("/")) {
-      router.push(linkWithRowData, undefined, { shallow: true });
-    } else {
-      window.open(linkWithRowData, api.target || "_blank");
+      if (linkWithRowData.startsWith("/")) {
+        router.push(linkWithRowData, undefined, { shallow: true });
+      } else {
+        window.open(linkWithRowData, api.target || "_blank");
+      }
+      createDialog.handleClose();
     }
+  }, [api.link, createDialog.open]);
 
-    return null;
-  }
   useEffect(() => {
     if (api.noConfirm) {
       formHook.handleSubmit(onSubmit)(); // Submits the form on mount

src/data/standards.json

@@ -909,6 +909,33 @@
     "powershellEquivalent": "Graph API",
     "recommendedBy": []
   },
+  {
+    "name": "standards.UserPreferredLanguage",
+    "cat": "Entra (AAD) Standards",
+    "tag": [],
+    "helpText": "Sets the preferred language property for all users in the tenant. This will override the user's language settings.",
+    "docsDescription": "Sets the preferred language property for all users in the tenant. This will override the user's language settings.",
+    "addedComponent": [
+      {
+        "type": "autoComplete",
+        "multiple": false,
+        "creatable": false,
+        "name": "standards.UserPreferredLanguage.preferredLanguage",
+        "label": "Preferred Language",
+        "api": {
+          "url": "/languageList.json",
+          "labelField": "language",
+          "valueField": "tag"
+        }
+      }
+    ],
+    "label": "Preferred language for all users",
+    "impact": "High Impact",
+    "impactColour": "info",
+    "addedDate": "2025-02-26",
+    "powershellEquivalent": "Update-MgUser -UserId [email protected] -BodyParameter @{preferredLanguage='en-US'}",
+    "recommendedBy": []
+  },
   {
     "name": "standards.OutBoundSpamAlert",
     "cat": "Exchange Standards",
@@ -3206,7 +3233,8 @@
       {
         "type": "textField",
         "name": "standards.AutopilotStatusPage.ErrorMessage",
-        "label": "Custom Error Message"
+        "label": "Custom Error Message",
+        "required": false
       },
       {
         "type": "switch",

src/pages/cipp/preferences.js

@@ -9,11 +9,20 @@ import { useSettings } from "../../hooks/use-settings";
 import countryList from "../../data/countryList.json";
 import { CippSettingsSideBar } from "../../components/CippComponents/CippSettingsSideBar";
 import CippDevOptions from "/src/components/CippComponents/CippDevOptions";
+import { ApiGetCall } from "../../api/ApiCall";
+import { getCippFormatting } from "../../utils/get-cipp-formatting";
 
 const Page = () => {
   const settings = useSettings();
   const formcontrol = useForm({ mode: "onChange", defaultValues: settings });
 
+  const auth = ApiGetCall({
+    url: "/.auth/me",
+    queryKey: "authmecipp",
+    staleTime: 120000,
+    refetchOnWindowFocus: true,
+  });
+
   const addedAttributes = [
     { value: "consentProvidedForMinor", label: "consentProvidedForMinor" },
     { value: "employeeId", label: "employeeId" },
@@ -281,6 +290,17 @@ const Page = () => {
                 </Grid>
                 <Grid size={{ xs: 12, lg: 4 }}>
                   <Stack spacing={3}>
+                    <CippPropertyListCard
+                      title={`CIPP Roles for ${auth?.data?.clientPrincipal?.userDetails}`}
+                      propertyItems={(auth?.data?.clientPrincipal?.userRoles ?? [])
+                        .filter((role) => !['anonymous', 'authenticated'].includes(role))
+                        .map((role) => ({
+                          label: "",
+                          value: getCippFormatting(role,"role"),
+                        }))}
+                      showDivider={false}
+                    />
+
                     <CippSettingsSideBar formcontrol={formcontrol} />
                     <CippDevOptions />
                   </Stack>

src/pages/cipp/settings/tenants.js

@@ -21,6 +21,7 @@ const Page = () => {
       data: { value: "customerId" },
       confirmText: "Are you sure you want to exclude these tenants?",
       multiPost: false,
+      condition: (row) => row.displayName !== '*Partner Tenant',
     },
     {
       label: "Include Tenants",
@@ -30,13 +31,14 @@ const Page = () => {
       data: { value: "customerId" },
       confirmText: "Are you sure you want to include these tenants?",
       multiPost: false,
+      condition: (row) => row.displayName !== '*Partner Tenant',
     },
     {
       label: "Refresh CPV Permissions",
       type: "POST",
       url: `/api/ExecCPVPermissions`,
       icon: <PlayArrow />,
-      data: { TenantFilter: "customerId" },
+      data: { tenantFilter: "customerId" },
       confirmText: "Are you sure you want to refresh the CPV permissions for these tenants?",
       multiPost: false,
     },
@@ -45,10 +47,11 @@ const Page = () => {
       type: "POST",
       url: `/api/ExecCPVPermissions?&ResetSP=true`,
       icon: <RestartAlt />,
-      data: { TenantFilter: "customerId" },
+      data: { tenantFilter: "customerId" },
       confirmText:
         "Are you sure you want to reset the CPV permissions for these tenants? (This will delete the Service Principal and re-add it.)",
       multiPost: false,
+      condition: (row) => row.displayName !== '*Partner Tenant',
     },
     {
       label: "Remove Tenant",
@@ -58,6 +61,7 @@ const Page = () => {
       data: { TenantID: "customerId" },
       confirmText: "Are you sure you want to remove this tenant?",
       multiPost: false,
+      condition: (row) => row.displayName !== '*Partner Tenant',
     },
   ];
 

src/utils/get-cipp-formatting.js

@@ -219,7 +219,7 @@ export const getCippFormatting = (data, cellName, type, canReceive) => {
     }
   }
 
-  if (cellName === "ClientId") {
+  if (cellName === "ClientId" || cellName === "role") {
     return isText ? data : <CippCopyToClipBoard text={data} type="chip" />;
   }