[pull] main from KelvinTegelaar:main

.github/workflows/azure-static-web-apps-red-stone-0d8c5ed03.yml

@@ -4,6 +4,7 @@ on:
   push:
     branches:
       - dev
+      - main
 
 jobs:
   build_and_deploy_job:
@@ -29,14 +30,3 @@ jobs:
           output_location: "/out" # Built app content directory - optional
           ###### End of Repository/Build Configurations ######
 
-  close_pull_request_job:
-    if: github.event_name == 'pull_request' && github.event.action == 'closed'
-    runs-on: ubuntu-latest
-    name: Close Pull Request Job
-    steps:
-      - name: Close Pull Request
-        id: closepullrequest
-        uses: Azure/static-web-apps-deploy@v1
-        with:
-          azure_static_web_apps_api_token: ${{ secrets.AZURE_STATIC_WEB_APPS_API_TOKEN_RED_STONE_0D8C5ED03 }}
-          action: "close"

package.json

@@ -1,6 +1,6 @@
 {
   "name": "cipp",
-  "version": "11.0.0",
+  "version": "11.0.1",
   "author": "CIPP Contributors",
   "homepage": "https://cipp.app/",
   "bugs": {

public/version.json

@@ -1,3 +1,3 @@
 {
-  "version": "11.0.0"
+  "version": "11.0.1"
 }

src/components/CippComponents/CippFormComponent.jsx

@@ -28,6 +28,7 @@ import React from "react";
 import { Stack } from "@mui/system";
 import countryList from "../../data/countryList";
 import languageList from "../../data/languageList";
+import GDAPRoles from "../../data/GDAPRoles";
 
 // ISO 3166-1 alpha-2 country/region codes (uppercase), used by the CountryCodeMultiSelect type.
 const countryCodeOptions = countryList
@@ -46,6 +47,13 @@ const languageCodeOptions = Object.values(
   }, {}),
 ).sort((a, b) => a.label.localeCompare(b.label));
 
+// Built-in Entra admin roles keyed by role template id, used by the AdminRolesMultiSelect type.
+// Static so the picker works without a tenant (template/baseline editors) and never hits Graph.
+const adminRoleOptions = GDAPRoles.map((role) => ({
+  label: role.Name,
+  value: role.ObjectId,
+}));
+
 // The tiptap / prosemirror / mui-tiptap editor tree is large and only used by `richText` fields.
 // Load it on demand via next/dynamic so it is code-split into an async chunk instead of being
 // pulled into the shared bundle that every page using CippFormComponent loads. See CippRichTextField.jsx.
@@ -660,6 +668,15 @@ export const CippFormComponent = (props) => {
         creatable: false,
       });
 
+    // Built-in Entra admin roles (e.g. EnableAppConsentRequests reviewer roles).
+    case "AdminRolesMultiSelect":
+      return renderAutoCompleteField({
+        ...other,
+        options: adminRoleOptions,
+        multiple: true,
+        creatable: false,
+      });
+
     // ISO 639-1 alpha-2 language code multiselect (e.g. Spam Filter LanguageBlockList).
     case "LanguageCodeMultiSelect":
       return renderAutoCompleteField({

src/components/CippSettings/CippLogRetentionSettings.jsx

@@ -4,18 +4,23 @@ import { ApiGetCall, ApiPostCall } from "../../api/ApiCall";
 import { CippApiResults } from "../CippComponents/CippApiResults";
 import { useState, useEffect } from "react";
 
-const CippLogRetentionSettings = () => {
+const CippLogRetentionSettings = ({
+  title = "Log Retention",
+  endpoint = "ExecLogRetentionConfig",
+  defaultDays = 90,
+  description = "Configure how long to keep CIPP log entries. Logs will be automatically deleted after this period.",
+}) => {
   const retentionSetting = ApiGetCall({
-    url: "/api/ExecLogRetentionConfig?List=true",
-    queryKey: "LogRetentionSettings",
+    url: `/api/${endpoint}?List=true`,
+    queryKey: `${endpoint}Settings`,
   });
 
   const retentionChange = ApiPostCall({
     datafromUrl: true,
-    relatedQueryKeys: "LogRetentionSettings",
+    relatedQueryKeys: `${endpoint}Settings`,
   });
 
-  const [retentionDays, setRetentionDays] = useState(90);
+  const [retentionDays, setRetentionDays] = useState(defaultDays);
   const [error, setError] = useState("");
 
   useEffect(() => {
@@ -39,9 +44,9 @@ const CippLogRetentionSettings = () => {
 
     setError("");
     retentionChange.mutate({
-      url: "/api/ExecLogRetentionConfig",
+      url: `/api/${endpoint}`,
       data: { RetentionDays: days },
-      queryKey: "LogRetentionPost",
+      queryKey: `${endpoint}Post`,
     });
   };
 
@@ -63,7 +68,7 @@ const CippLogRetentionSettings = () => {
 
   return (
     <CippButtonCard
-      title="Log Retention"
+      title={title}
       cardSx={{ display: "flex", flexDirection: "column", height: "100%" }}
       CardButton={
         <Box sx={{ display: "flex", gap: 1, alignItems: "flex-start" }}>
@@ -95,8 +100,7 @@ const CippLogRetentionSettings = () => {
       }
     >
       <Typography variant="body2">
-        Configure how long to keep CIPP log entries. Logs will be automatically deleted after this
-        period. Minimum retention is 7 days, maximum is 365 days, default is 90 days.
+        {description} Minimum retention is 7 days, maximum is 365 days, default is {defaultDays} days.
       </Typography>
       <CippApiResults apiObject={retentionChange} />
     </CippButtonCard>

src/data/sponsors.json

@@ -24,7 +24,7 @@
     "priority": 1
   },
   {
-    "link": "https://augmentt.com",
+    "link": "https://www.augmentt.com/?utm_source=cipp&utm_medium=referral&utm_campaign=cipp-sponsorship&utm_content=sidebar-logo",
     "imagesrcLight": "/sponsors/augmentt-light.png",
     "imagesrcDark": "/sponsors/augmentt-dark.png",
     "altText": "Augmentt",