From ed9f149b82f5ecefc0482649bd3496cfda459e1d Mon Sep 17 00:00:00 2001
From: Dev <dev@sharepoint-toolbox.local>
Date: Thu, 9 Apr 2026 12:31:46 +0200
Subject: [PATCH] feat(16-01): add MergePermissions property to both ViewModels
 and localization keys

- Added [ObservableProperty] _mergePermissions (defaults false) to UserAccessAuditViewModel
- Added [ObservableProperty] _mergePermissions (no-op placeholder) to PermissionsViewModel
- Added audit.grp.export and chk.merge.permissions keys to Strings.resx (EN)
- Added audit.grp.export and chk.merge.permissions keys to Strings.fr.resx (FR)
---
 SharepointToolbox/Localization/Strings.fr.resx                | 3 +++
 SharepointToolbox/Localization/Strings.resx                   | 3 +++
 SharepointToolbox/ViewModels/Tabs/PermissionsViewModel.cs     | 4 ++++
 SharepointToolbox/ViewModels/Tabs/UserAccessAuditViewModel.cs | 4 ++++
 4 files changed, 14 insertions(+)

diff --git a/SharepointToolbox/Localization/Strings.fr.resx b/SharepointToolbox/Localization/Strings.fr.resx
index e7cca73..59167df 100644
--- a/SharepointToolbox/Localization/Strings.fr.resx
+++ b/SharepointToolbox/Localization/Strings.fr.resx
@@ -409,4 +409,7 @@
   <data name="directory.col.department" xml:space="preserve"><value>D&#233;partement</value></data>
   <data name="directory.col.jobtitle" xml:space="preserve"><value>Poste</value></data>
   <data name="directory.col.type" xml:space="preserve"><value>Type</value></data>
+  <!-- Phase 16: Report Consolidation Toggle -->
+  <data name="audit.grp.export" xml:space="preserve"><value>Options d'exportation</value></data>
+  <data name="chk.merge.permissions" xml:space="preserve"><value>Fusionner les permissions en double</value></data>
 </root>
diff --git a/SharepointToolbox/Localization/Strings.resx b/SharepointToolbox/Localization/Strings.resx
index 907dea4..3e7fa42 100644
--- a/SharepointToolbox/Localization/Strings.resx
+++ b/SharepointToolbox/Localization/Strings.resx
@@ -409,4 +409,7 @@
   <data name="directory.col.department" xml:space="preserve"><value>Department</value></data>
   <data name="directory.col.jobtitle" xml:space="preserve"><value>Job Title</value></data>
   <data name="directory.col.type" xml:space="preserve"><value>Type</value></data>
+  <!-- Phase 16: Report Consolidation Toggle -->
+  <data name="audit.grp.export" xml:space="preserve"><value>Export Options</value></data>
+  <data name="chk.merge.permissions" xml:space="preserve"><value>Merge duplicate permissions</value></data>
 </root>
diff --git a/SharepointToolbox/ViewModels/Tabs/PermissionsViewModel.cs b/SharepointToolbox/ViewModels/Tabs/PermissionsViewModel.cs
index 5a070ac..b383da2 100644
--- a/SharepointToolbox/ViewModels/Tabs/PermissionsViewModel.cs
+++ b/SharepointToolbox/ViewModels/Tabs/PermissionsViewModel.cs
@@ -37,6 +37,10 @@ public partial class PermissionsViewModel : FeatureViewModelBase
     [ObservableProperty]
     private bool _scanFolders = true;
 
+    /// <summary>Placeholder for the Export Options toggle — no-op in PermissionsViewModel (reserved for future use).</summary>
+    [ObservableProperty]
+    private bool _mergePermissions;
+
     [ObservableProperty]
     private bool _includeSubsites;
 
diff --git a/SharepointToolbox/ViewModels/Tabs/UserAccessAuditViewModel.cs b/SharepointToolbox/ViewModels/Tabs/UserAccessAuditViewModel.cs
index d32b964..14b24a8 100644
--- a/SharepointToolbox/ViewModels/Tabs/UserAccessAuditViewModel.cs
+++ b/SharepointToolbox/ViewModels/Tabs/UserAccessAuditViewModel.cs
@@ -101,6 +101,10 @@ public partial class UserAccessAuditViewModel : FeatureViewModelBase
     [ObservableProperty]
     private string _directoryFilterText = string.Empty;
 
+    /// <summary>When true, the CSV export merges duplicate permission rows into consolidated entries.</summary>
+    [ObservableProperty]
+    private bool _mergePermissions;
+
     private CancellationTokenSource? _directoryCts = null;
 
     // ── Computed summary properties ─────────────────────────────────────────