Merge branch 'dev' of https://github.com/KelvinTegelaar/CIPP into dev

Author: KelvinTegelaar

.gitignore

@@ -27,4 +27,8 @@ yarn-error.log*
 
 # vscode debug logs
 debug.log
-app.log
+app.log
+
+# Cursor IDE
+.cursor/rules
+

src/components/CippComponents/CippAppPermissionBuilder.jsx

@@ -70,7 +70,11 @@ const CippAppPermissionBuilder = ({
     setExpanded(newExpanded ? panel : false);
   };
 
-  const deprecatedServicePrincipals = ["00000002-0000-0000-c000-000000000000"];
+  const deprecatedServicePrincipals = [
+    "00000002-0000-0000-c000-000000000000", // Windows Azure Active Directory
+    "a0c73c16-a7e3-4564-9a95-2bdf47383716", // Microsoft Exchange Online Remote PowerShell
+    "1b730954-1685-4b74-9bfd-dac224a7b894", // Azure Active Directory PowerShell
+  ];
 
   const currentSelectedSp = useWatch({ control: formControl.control, name: "servicePrincipal" });
 
@@ -901,7 +905,7 @@ const CippAppPermissionBuilder = ({
                 )}
               </CippOffCanvas>
               {calloutMessage && (
-                <Grid container sx={{ my: 3 }}>
+                <Grid container>
                   <Grid size={{ xl: 8, xs: 12 }}>
                     <Alert variant="outlined" color="info" onClose={() => setCalloutMessage(null)}>
                       {calloutMessage}
@@ -911,7 +915,7 @@ const CippAppPermissionBuilder = ({
               )}
 
               {isDeprecatedSp && (
-                <Grid container sx={{ my: 3 }}>
+                <Grid container>
                   <Grid size={{ xl: 8, xs: 12 }}>
                     <Alert color="error" icon={<WarningAmberOutlined />}>
                       {currentSelectedSp.label} is deprecated and cannot be added. Please select a

src/components/CippFormPages/CippAddGroupForm.jsx

@@ -6,6 +6,21 @@ import { CippFormCondition } from "/src/components/CippComponents/CippFormCondit
 import { CippFormDomainSelector } from "../CippComponents/CippFormDomainSelector";
 import { CippFormUserSelector } from "../CippComponents/CippFormUserSelector";
 
+const DynamicMembershipRules = ({ formControl }) => (
+  <Grid item size={{ xs: 12 }}>
+    <CippFormComponent
+      type="textField"
+      label="Dynamic Group Parameters"
+      name="membershipRules"
+      formControl={formControl}
+      placeholder="Enter dynamic group parameters syntax"
+      multiline
+      rows={4}
+      fullWidth
+    />
+  </Grid>
+);
+
 const CippAddGroupForm = (props) => {
   const { formControl } = props;
 
@@ -101,25 +116,17 @@ const CippAddGroupForm = (props) => {
           />
         </Grid>
       </CippFormCondition>
-      <CippFormCondition
-        formControl={formControl}
-        field="groupType"
-        compareType="contains"
-        compareValue="dynamic"
-      >
-        <Grid item size={{ xs: 12 }}>
-          <CippFormComponent
-            type="textField"
-            label="Dynamic Group Parameters"
-            name="membershipRules"
-            formControl={formControl}
-            placeholder="Enter dynamic group parameters syntax"
-            multiline
-            rows={4}
-            fullWidth
-          />
-        </Grid>
-      </CippFormCondition>
+      {["dynamic", "dynamicDistribution", "m365"].map((groupType) => (
+        <CippFormCondition
+          key={groupType}
+          formControl={formControl}
+          field="groupType"
+          compareType="is"
+          compareValue={groupType}
+        >
+          <DynamicMembershipRules formControl={formControl} />
+        </CippFormCondition>
+      ))}
     </Grid>
   );
 };