From 0f80f46935ee01a7cfff9ad33bdae6230c518cde Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kristian=20Kj=C3=A6rg=C3=A5rd?= <kris6673@hotmail.com>
Date: Tue, 24 Jun 2025 20:42:45 +0200
Subject: [PATCH 1/3] feat: Enhance group editing functionality with initial
 value tracking and custom data formatting

- Added state to store initial values for comparison during form submission.
- Implemented a custom data formatter to only send changed values for 'allowExternal' and 'sendCopies'.
- Updated form reset logic to include initial values for better state management.
---
 .../identity/administration/groups/edit.jsx   | 32 +++++++++++++++++--
 1 file changed, 30 insertions(+), 2 deletions(-)

diff --git a/src/pages/identity/administration/groups/edit.jsx b/src/pages/identity/administration/groups/edit.jsx
index f9a6a42a9aa2..4453541ba4d7 100644
--- a/src/pages/identity/administration/groups/edit.jsx
+++ b/src/pages/identity/administration/groups/edit.jsx
@@ -18,6 +18,7 @@ const EditGroup = () => {
   const [groupIdReady, setGroupIdReady] = useState(false);
   const [showMembershipTable, setShowMembershipTable] = useState(false);
   const [combinedData, setCombinedData] = useState([]);
+  const [initialValues, setInitialValues] = useState({});
   const tenantFilter = useSettings().currentTenant;
 
   const groupInfo = ApiGetCall({
@@ -65,8 +66,8 @@ const EditGroup = () => {
         ];
         setCombinedData(combinedData);
 
-        // Reset the form with all values
-        formControl.reset({
+        // Create initial values object
+        const formValues = {
           tenantFilter: tenantFilter,
           mail: group.mail,
           mailNickname: group.mailNickname || "",
@@ -103,11 +104,37 @@ const EditGroup = () => {
           RemoveOwner: [],
           AddContact: [],
           RemoveContact: [],
+        };
+
+        // Store initial values for comparison
+        setInitialValues({
+          allowExternal: groupInfo?.data?.allowExternal,
+          sendCopies: groupInfo?.data?.sendCopies,
         });
+
+        // Reset the form with all values
+        formControl.reset(formValues);
       }
     }
   }, [groupInfo.isSuccess, router.query, groupInfo.isFetching]);
 
+  // Custom data formatter to only send changed values
+  const customDataFormatter = (formData) => {
+    const cleanedData = { ...formData };
+
+    // Only include allowExternal if it has changed from the initial value
+    if (formData.allowExternal === initialValues.allowExternal) {
+      delete cleanedData.allowExternal;
+    }
+
+    // Only include sendCopies if it has changed from the initial value
+    if (formData.sendCopies === initialValues.sendCopies) {
+      delete cleanedData.sendCopies;
+    }
+
+    return cleanedData;
+  };
+
   return (
     <>
       <CippFormPage
@@ -117,6 +144,7 @@ const EditGroup = () => {
         formPageType="Edit"
         backButtonTitle="Group Overview"
         postUrl="/api/EditGroup"
+        customDataformatter={customDataFormatter}
         titleButton={
           <>
             <Button

From 29f875ec7ec1958f3666a9e7adc39efc26fb35d1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kristian=20Kj=C3=A6rg=C3=A5rd?= <kris6673@hotmail.com>
Date: Thu, 26 Jun 2025 23:30:37 +0200
Subject: [PATCH 2/3] feat: Add 'Hide group mailbox from Outlook' option in
 group editing form

---
 .../identity/administration/groups/edit.jsx   | 20 +++++++++++++++++++
 1 file changed, 20 insertions(+)

diff --git a/src/pages/identity/administration/groups/edit.jsx b/src/pages/identity/administration/groups/edit.jsx
index 4453541ba4d7..be55679d0f52 100644
--- a/src/pages/identity/administration/groups/edit.jsx
+++ b/src/pages/identity/administration/groups/edit.jsx
@@ -73,6 +73,7 @@ const EditGroup = () => {
           mailNickname: group.mailNickname || "",
           allowExternal: groupInfo?.data?.allowExternal,
           sendCopies: groupInfo?.data?.sendCopies,
+          hideFromOutlookClients: groupInfo?.data?.hideFromOutlookClients,
           displayName: group.displayName,
           description: group.description || "",
           membershipRules: group.membershipRule || "",
@@ -110,6 +111,7 @@ const EditGroup = () => {
         setInitialValues({
           allowExternal: groupInfo?.data?.allowExternal,
           sendCopies: groupInfo?.data?.sendCopies,
+          hideFromOutlookClients: groupInfo?.data?.hideFromOutlookClients,
         });
 
         // Reset the form with all values
@@ -132,6 +134,11 @@ const EditGroup = () => {
       delete cleanedData.sendCopies;
     }
 
+    // Only include hideFromOutlookClients if it has changed from the initial value
+    if (formData.hideFromOutlookClients === initialValues.hideFromOutlookClients) {
+      delete cleanedData.hideFromOutlookClients;
+    }
+
     return cleanedData;
   };
 
@@ -359,6 +366,19 @@ const EditGroup = () => {
                   />
                 </Grid>
               )}
+
+              {groupType === "Microsoft 365" && (
+                <Grid size={{ xs: 12 }}>
+                  <CippFormComponent
+                    type="switch"
+                    label="Hide group mailbox from Outlook"
+                    name="hideFromOutlookClients"
+                    formControl={formControl}
+                    isFetching={groupInfo.isFetching}
+                    disabled={groupInfo.isFetching}
+                  />
+                </Grid>
+              )}
             </Grid>
           </Box>
         )}

From 481ffe00927eeea03979068ebd7822d1171170a8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kristian=20Kj=C3=A6rg=C3=A5rd?= <kris6673@hotmail.com>
Date: Thu, 26 Jun 2025 23:41:43 +0200
Subject: [PATCH 3/3] simplify with a loop

---
 .../identity/administration/groups/edit.jsx   | 20 +++++++------------
 1 file changed, 7 insertions(+), 13 deletions(-)

diff --git a/src/pages/identity/administration/groups/edit.jsx b/src/pages/identity/administration/groups/edit.jsx
index be55679d0f52..7b7dfe12e18f 100644
--- a/src/pages/identity/administration/groups/edit.jsx
+++ b/src/pages/identity/administration/groups/edit.jsx
@@ -124,20 +124,14 @@ const EditGroup = () => {
   const customDataFormatter = (formData) => {
     const cleanedData = { ...formData };
 
-    // Only include allowExternal if it has changed from the initial value
-    if (formData.allowExternal === initialValues.allowExternal) {
-      delete cleanedData.allowExternal;
-    }
-
-    // Only include sendCopies if it has changed from the initial value
-    if (formData.sendCopies === initialValues.sendCopies) {
-      delete cleanedData.sendCopies;
-    }
+    // Properties that should only be sent if they've changed from initial values
+    const changeDetectionProperties = ["allowExternal", "sendCopies", "hideFromOutlookClients"];
 
-    // Only include hideFromOutlookClients if it has changed from the initial value
-    if (formData.hideFromOutlookClients === initialValues.hideFromOutlookClients) {
-      delete cleanedData.hideFromOutlookClients;
-    }
+    changeDetectionProperties.forEach((property) => {
+      if (formData[property] === initialValues[property]) {
+        delete cleanedData[property];
+      }
+    });
 
     return cleanedData;
   };