Merge pull request KelvinTegelaar#4352 from Zacgoose/contact-edit

Fix Add/Edit contacts and the automap setting for mailbox permissions

Author: JohnDuprey

src/components/CippComponents/CippMailboxPermissionsDialog.jsx

@@ -1,13 +1,24 @@
 import { Box, Stack } from "@mui/material";
+import { useEffect } from "react";
 import CippFormComponent from "./CippFormComponent";
 import { useWatch } from "react-hook-form";
 
-const CippMailboxPermissionsDialog = ({ formHook, combinedOptions, isUserGroupLoading }) => {
+const CippMailboxPermissionsDialog = ({ 
+  formHook, 
+  combinedOptions, 
+  isUserGroupLoading, 
+  defaultAutoMap = false 
+}) => {
   const fullAccess = useWatch({
     control: formHook.control,
     name: "permissions.AddFullAccess",
   });
 
+  // Set the default AutoMap value when component mounts
+  useEffect(() => {
+    formHook.setValue("permissions.AutoMap", defaultAutoMap);
+  }, [formHook, defaultAutoMap]);
+
   return (
     <Stack spacing={2} sx={{ mt: 1 }}>
       <Box>

src/pages/email/administration/contacts/add.jsx

@@ -2,6 +2,9 @@ import { useForm } from "react-hook-form";
 import { Layout as DashboardLayout } from "/src/layouts/index.js";
 import CippFormPage from "/src/components/CippFormPages/CippFormPage";
 import { useSettings } from "../../../../hooks/use-settings";
+import { Divider } from "@mui/material";
+import { Grid } from "@mui/system";
+import CippFormComponent from "/src/components/CippComponents/CippFormComponent";
 
 const AddContact = () => {
   const tenantDomain = useSettings().currentTenant;

src/pages/email/administration/contacts/edit.jsx

@@ -1,11 +1,14 @@
-import { useEffect, useMemo } from "react";
+import { useEffect, useMemo, useCallback } from "react";
 import { useRouter } from "next/router";
 import { useForm } from "react-hook-form";
 import { Layout as DashboardLayout } from "/src/layouts/index.js";
 import CippFormPage from "/src/components/CippFormPages/CippFormPage";
 import { useSettings } from "../../../../hooks/use-settings";
 import { ApiGetCall } from "../../../../api/ApiCall";
 import countryList from "/src/data/countryList.json";
+import { Grid } from "@mui/system";
+import CippFormComponent from "/src/components/CippComponents/CippFormComponent";
+import { Divider } from "@mui/material";
 
 const countryLookup = new Map(
   countryList.map(country => [country.Name, country.Code])

src/pages/email/tools/mailbox-restores/add.jsx

@@ -1,4 +1,4 @@
-import React, { useEffect } from "react";
+import { useEffect } from "react";
 import { Grid } from "@mui/system";
 import { useForm, useWatch } from "react-hook-form";
 import { Layout as DashboardLayout } from "/src/layouts/index.js";

src/pages/identity/administration/users/user/exchange.jsx

@@ -979,17 +979,13 @@ const Page = () => {
         api={permissionsApiConfig}
         row={graphUserRequest.data?.[0]}
         allowResubmit={true}
-        defaultvalues={{
-          permissions: {
-            AutoMap: true,
-          },
-        }}
       >
         {({ formHook }) => (
           <CippMailboxPermissionsDialog
             formHook={formHook}
             combinedOptions={combinedOptions}
             isUserGroupLoading={isUserGroupLoading}
+            defaultAutoMap={true}
           />
         )}
       </CippApiDialog>