Merge branch 'dev' into DynamicM365

Author: KelvinTegelaar

package.json

@@ -1,6 +1,6 @@
 {
   "name": "cipp",
-  "version": "7.1.3",
+  "version": "8.0.3",
   "author": "CIPP Contributors",
   "homepage": "https://cipp.app/",
   "bugs": {
@@ -112,4 +112,4 @@
     "eslint": "9.22.0",
     "eslint-config-next": "15.2.2"
   }
-}
+}

public/version.json

@@ -1,3 +1,3 @@
 {
-  "version": "8.0.1"
-}
+  "version": "8.0.3"
+}

src/components/CippComponents/CippAppPermissionBuilder.jsx

@@ -70,7 +70,14 @@ const CippAppPermissionBuilder = ({
     setExpanded(newExpanded ? panel : false);
   };
 
+  const deprecatedServicePrincipals = ["00000002-0000-0000-c000-000000000000"];
+
   const currentSelectedSp = useWatch({ control: formControl.control, name: "servicePrincipal" });
+
+  // Check if selected service principal is in the deprecated list
+  const isDeprecatedSp =
+    currentSelectedSp && deprecatedServicePrincipals.includes(currentSelectedSp.value);
+
   const {
     data: servicePrincipals = [],
     isSuccess: spSuccess,
@@ -739,22 +746,31 @@ const CippAppPermissionBuilder = ({
                 </Grid>
                 <Grid item>
                   <Stack direction="row" spacing={1}>
-                    <Tooltip title="Add Service Principal">
+                    <Tooltip
+                      title={
+                        isDeprecatedSp
+                          ? "This service principal is deprecated and cannot be added"
+                          : "Add Service Principal"
+                      }
+                    >
                       <div
                         onClick={(e) => {
-                          setSelectedApp([
-                            ...selectedApp,
-                            servicePrincipals?.Results?.find(
-                              (sp) => sp.appId === currentSelectedSp.value
-                            ),
-                          ]);
-                          formControl.setValue("servicePrincipal", null);
+                          // Only add if not deprecated
+                          if (!isDeprecatedSp) {
+                            setSelectedApp([
+                              ...selectedApp,
+                              servicePrincipals?.Results?.find(
+                                (sp) => sp.appId === currentSelectedSp.value
+                              ),
+                            ]);
+                            formControl.setValue("servicePrincipal", null);
+                          }
                         }}
                       >
                         <Button
                           variant="contained"
                           component={!currentSelectedSp?.value ? "span" : undefined}
-                          disabled={!currentSelectedSp?.value}
+                          disabled={!currentSelectedSp?.value || isDeprecatedSp}
                         >
                           <SvgIcon fontSize="small">
                             <PlusIcon />
@@ -894,6 +910,17 @@ const CippAppPermissionBuilder = ({
                 </Grid>
               )}
 
+              {isDeprecatedSp && (
+                <Grid container sx={{ my: 3 }}>
+                  <Grid size={{ xl: 8, xs: 12 }}>
+                    <Alert color="error" icon={<WarningAmberOutlined />}>
+                      {currentSelectedSp.label} is deprecated and cannot be added. Please select a
+                      different service principal.
+                    </Alert>
+                  </Grid>
+                </Grid>
+              )}
+
               {newPermissions?.MissingPermissions &&
                 newPermissions?.Type === "Table" &&
                 Object.keys(newPermissions?.MissingPermissions).length > 0 && (

src/components/CippComponents/CippMailboxPermissionsDialog.jsx

@@ -25,7 +25,7 @@ const CippMailboxPermissionsDialog = ({ formHook }) => {
   });
 
   return (
-    <Stack spacing={3} sx={{ mt: 1 }}>
+    <Stack spacing={2} sx={{ mt: 1 }}>
       <Box>
         <CippFormComponent
           type="autoComplete"
@@ -40,16 +40,17 @@ const CippMailboxPermissionsDialog = ({ formHook }) => {
             })) || []
           }
         />
-        {fullAccess && (
+      </Box>
+      {fullAccess?.length > 0 && (
+        <Box sx={{ pl: 0.5 }}>
           <CippFormComponent
             type="switch"
             label="Enable Automapping"
-            name="permissions.AutoMapping"
+            name="permissions.AutoMap"
             formControl={formHook}
-            sx={{ mt: 0.5, ml: 0.5 }}
           />
-        )}
-      </Box>
+        </Box>
+      )}
       <Box>
         <CippFormComponent
           type="autoComplete"

src/components/CippFormPages/CippExchangeSettingsForm.jsx

@@ -29,6 +29,31 @@ const CippExchangeSettingsForm = (props) => {
   const [expandedPanel, setExpandedPanel] = useState(null);
   const [relatedQueryKeys, setRelatedQueryKeys] = useState([]);
 
+  // Watch the Auto Reply State value
+  const autoReplyState = useWatch({
+    control: formControl.control,
+    name: "ooo.AutoReplyState",
+  });
+
+  // Calculate if date fields should be disabled
+  const areDateFieldsDisabled = autoReplyState?.value !== "Scheduled";
+  
+  useEffect(() => {
+    console.log('Auto Reply State changed:', {
+      autoReplyState,
+      areDateFieldsDisabled,
+      fullFormValues: formControl.getValues()
+    });
+  }, [autoReplyState]);
+
+  // Add debug logging for form values
+  useEffect(() => {
+    const subscription = formControl.watch((value, { name, type }) => {
+      console.log('Form value changed:', { name, type, value });
+    });
+    return () => subscription.unsubscribe();
+  }, [formControl]);
+
   const handleExpand = (panel) => {
     setExpandedPanel((prev) => (prev === panel ? null : panel));
   };
@@ -199,20 +224,36 @@ const CippExchangeSettingsForm = (props) => {
               />
             </Grid>
             <Grid item size={6}>
-              <CippFormComponent
-                type="datePicker"
-                label="Start Date/Time"
-                name="ooo.StartTime"
-                formControl={formControl}
-              />
+              <Tooltip 
+                title={areDateFieldsDisabled ? "Scheduling is only available when Auto Reply State is set to Scheduled" : ""}
+                placement="bottom"
+              >
+                <Box>
+                  <CippFormComponent
+                    type="datePicker"
+                    label="Start Date/Time"
+                    name="ooo.StartTime"
+                    formControl={formControl}
+                    disabled={areDateFieldsDisabled}
+                  />
+                </Box>
+              </Tooltip>
             </Grid>
             <Grid item size={6}>
-              <CippFormComponent
-                type="datePicker"
-                label="End Date/Time"
-                name="ooo.EndTime"
-                formControl={formControl}
-              />
+              <Tooltip 
+                title={areDateFieldsDisabled ? "Scheduling is only available when Auto Reply State is set to Scheduled" : ""}
+                placement="bottom"
+              >
+                <Box>
+                  <CippFormComponent
+                    type="datePicker"
+                    label="End Date/Time"
+                    name="ooo.EndTime"
+                    formControl={formControl}
+                    disabled={areDateFieldsDisabled}
+                  />
+                </Box>
+              </Tooltip>
             </Grid>
             <Grid item size={12}>
               <CippFormComponent

src/components/CippStandards/CippStandardAccordion.jsx

@@ -93,6 +93,7 @@ const CippStandardAccordion = ({
   handleRemoveStandard,
   handleAddMultipleStandard,
   formControl,
+  editMode = false,
 }) => {
   const [configuredState, setConfiguredState] = useState({});
   const [filter, setFilter] = useState("all");
@@ -188,46 +189,48 @@ const CippStandardAccordion = ({
 
   // Initialize when watchedValues are available
   useEffect(() => {
-    // Only run initialization if we have watchedValues and they contain data
-    if (!watchedValues || Object.keys(watchedValues).length === 0) {
-      return;
-    }
-
-    // Prevent re-initialization if we already have configuration state
-    const hasConfigState = Object.keys(configuredState).length > 0;
-    if (hasConfigState) {
-      return;
-    }
-
-    console.log("Initializing configuration state from template values");
-    const initial = {};
-    const initialConfigured = {};
-
-    // For each standard, get its current values and determine if it's configured
-    Object.keys(selectedStandards).forEach((standardName) => {
-      const currentValues = _.get(watchedValues, standardName);
-      if (!currentValues) return;
-
-      initial[standardName] = _.cloneDeep(currentValues);
+    if (editMode) {
+      // Only run initialization if we have watchedValues and they contain data
+      if (!watchedValues || Object.keys(watchedValues).length === 0) {
+        return;
+      }
 
-      const baseStandardName = standardName.split("[")[0];
-      const standard = providedStandards.find((s) => s.name === baseStandardName);
-      if (standard) {
-        initialConfigured[standardName] = isStandardConfigured(
-          standardName,
-          standard,
-          currentValues
-        );
+      // Prevent re-initialization if we already have configuration state
+      const hasConfigState = Object.keys(configuredState).length > 0;
+      if (hasConfigState) {
+        return;
       }
-    });
 
-    // Store both the initial values and set them as current saved values
-    setOriginalValues(initial);
-    setSavedValues(initial);
-    setConfiguredState(initialConfigured);
-    // Only depend on watchedValues and selectedStandards to avoid infinite loops
-    // eslint-disable-next-line react-hooks/exhaustive-deps
-  }, [watchedValues, selectedStandards]);
+      console.log("Initializing configuration state from template values");
+      const initial = {};
+      const initialConfigured = {};
+
+      // For each standard, get its current values and determine if it's configured
+      Object.keys(selectedStandards).forEach((standardName) => {
+        const currentValues = _.get(watchedValues, standardName);
+        if (!currentValues) return;
+
+        initial[standardName] = _.cloneDeep(currentValues);
+
+        const baseStandardName = standardName.split("[")[0];
+        const standard = providedStandards.find((s) => s.name === baseStandardName);
+        if (standard) {
+          initialConfigured[standardName] = isStandardConfigured(
+            standardName,
+            standard,
+            currentValues
+          );
+        }
+      });
+
+      // Store both the initial values and set them as current saved values
+      setOriginalValues(initial);
+      setSavedValues(initial);
+      setConfiguredState(initialConfigured);
+      // Only depend on watchedValues and selectedStandards to avoid infinite loops
+      // eslint-disable-next-line react-hooks/exhaustive-deps
+    }
+  }, [watchedValues, selectedStandards, editMode]);
 
   // Save changes for a standard
   const handleSave = (standardName, standard, current) => {
@@ -519,6 +522,9 @@ const CippStandardAccordion = ({
             // Get current values and check if they differ from saved values
             const current = _.get(watchedValues, standardName);
             const saved = _.get(savedValues, standardName) || {};
+            console.log(`Current values for ${standardName}:`, current);
+            console.log(`Saved values for ${standardName}:`, saved);
+
             const hasUnsaved = !_.isEqual(current, saved);
 
             // Check if all required fields are filled
@@ -609,7 +615,7 @@ const CippStandardAccordion = ({
             const canSave = hasAction && requiredFieldsFilled && hasUnsaved;
 
             console.log(
-              `Standard: ${standardName}, Action Required: ${actionRequired}, Has Action: ${hasAction}, Required Fields Filled: ${requiredFieldsFilled}, Can Save: ${canSave}`
+              `Standard: ${standardName}, Action Required: ${actionRequired}, Has Action: ${hasAction}, Required Fields Filled: ${requiredFieldsFilled}, Unsaved Changes: ${hasUnsaved}, Can Save: ${canSave}`
             );
 
             return (
@@ -760,7 +766,7 @@ const CippStandardAccordion = ({
                     </Grid>
                   </Box>
                   <Divider sx={{ mt: 2 }} />
-                  <Box sx={{ px: 3 , py: 2 }}>
+                  <Box sx={{ px: 3, py: 2 }}>
                     <Stack direction="row" justifyContent="flex-end" spacing={1}>
                       <Button
                         variant="outlined"

src/components/CippStandards/CippStandardsSideBar.jsx

@@ -64,11 +64,24 @@ const CippStandardsSideBar = ({
   formControl,
   createDialog,
   edit,
+  onSaveSuccess,
 }) => {
   const [currentStep, setCurrentStep] = useState(0);
   const [savedItem, setSavedItem] = useState(null);
   const dialogAfterEffect = (id) => {
     setSavedItem(id);
+    
+    // Reset form's dirty state to prevent unsaved changes warning
+    if (formControl && formControl.reset) {
+      // Get current values and reset the form with them to clear dirty state
+      const currentValues = formControl.getValues();
+      formControl.reset(currentValues);
+    }
+    
+    // Call the onSaveSuccess callback if provided
+    if (typeof onSaveSuccess === "function") {
+      onSaveSuccess();
+    }
   };
 
   const watchForm = useWatch({ control: formControl.control });
@@ -276,6 +289,7 @@ CippStandardsSideBar.propTypes = {
   ).isRequired,
   updatedAt: PropTypes.string,
   formControl: PropTypes.object.isRequired,
+  onSaveSuccess: PropTypes.func,
 };
 
 export default CippStandardsSideBar;

src/components/PrivateRoute.js

@@ -18,7 +18,11 @@ export const PrivateRoute = ({ children, routeType }) => {
   });
 
   // Check if the session is still loading before determining authentication status
-  if (session.isLoading || apiRoles.isLoading) {
+  if (
+    session.isLoading ||
+    apiRoles.isLoading ||
+    (apiRoles.isFetching && (apiRoles.data === null || apiRoles.data === undefined))
+  ) {
     return <LoadingPage />;
   }