From 74cd4b2ff494edefb80e30add22ec059462415d2 Mon Sep 17 00:00:00 2001
From: sakshigupta12feb <sakshigupta12feb1@gmail.com>
Date: Mon, 3 Nov 2025 23:01:31 +0530
Subject: [PATCH] fixed the issue of ddm (#2239)

* fixed the issue of ddm

* fixed the ddm issue

* updated test and ploicyvaluebtdefault as true

* fixed test

---------

Co-authored-by: Sakshi Gupta <sakshig@microsoft.com>
---
 src/Explorer/Controls/Settings/SettingsComponent.tsx      | 8 ++++++--
 .../SettingsSubComponents/DataMaskingComponent.tsx        | 2 +-
 src/Explorer/Tree/Collection.ts                           | 2 +-
 3 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/src/Explorer/Controls/Settings/SettingsComponent.tsx b/src/Explorer/Controls/Settings/SettingsComponent.tsx
index 1185d190c..861980629 100644
--- a/src/Explorer/Controls/Settings/SettingsComponent.tsx
+++ b/src/Explorer/Controls/Settings/SettingsComponent.tsx
@@ -842,7 +842,7 @@ export class SettingsComponent extends React.Component<SettingsComponentProps, S
     const dataMaskingContent: DataModels.DataMaskingPolicy = {
       includedPaths: this.collection.dataMaskingPolicy?.()?.includedPaths || [],
       excludedPaths: this.collection.dataMaskingPolicy?.()?.excludedPaths || [],
-      isPolicyEnabled: this.collection.dataMaskingPolicy?.()?.isPolicyEnabled || false,
+      isPolicyEnabled: this.collection.dataMaskingPolicy?.()?.isPolicyEnabled ?? true,
     };
     const conflictResolutionPolicy: DataModels.ConflictResolutionPolicy =
       this.collection.conflictResolutionPolicy && this.collection.conflictResolutionPolicy();
@@ -1072,7 +1072,11 @@ export class SettingsComponent extends React.Component<SettingsComponentProps, S
       newCollection.vectorEmbeddingPolicy = this.state.vectorEmbeddingPolicy;
 
       newCollection.fullTextPolicy = this.state.fullTextPolicy;
-      newCollection.dataMaskingPolicy = this.state.dataMaskingContent;
+
+      // Only send data masking policy if it was modified (dirty)
+      if (this.state.isDataMaskingDirty && isCapabilityEnabled(Constants.CapabilityNames.EnableDynamicDataMasking)) {
+        newCollection.dataMaskingPolicy = this.state.dataMaskingContent;
+      }
 
       newCollection.indexingPolicy = this.state.indexingPolicyContent;
 
diff --git a/src/Explorer/Controls/Settings/SettingsSubComponents/DataMaskingComponent.tsx b/src/Explorer/Controls/Settings/SettingsSubComponents/DataMaskingComponent.tsx
index 2f35c572e..80314fe7c 100644
--- a/src/Explorer/Controls/Settings/SettingsSubComponents/DataMaskingComponent.tsx
+++ b/src/Explorer/Controls/Settings/SettingsSubComponents/DataMaskingComponent.tsx
@@ -33,7 +33,7 @@ const emptyDataMaskingPolicy: DataModels.DataMaskingPolicy = {
     },
   ],
   excludedPaths: [],
-  isPolicyEnabled: false,
+  isPolicyEnabled: true,
 };
 
 export class DataMaskingComponent extends React.Component<DataMaskingComponentProps, DataMaskingComponentState> {
diff --git a/src/Explorer/Tree/Collection.ts b/src/Explorer/Tree/Collection.ts
index d6df438bf..e4382de53 100644
--- a/src/Explorer/Tree/Collection.ts
+++ b/src/Explorer/Tree/Collection.ts
@@ -141,7 +141,7 @@ export default class Collection implements ViewModels.Collection {
     const defaultDataMaskingPolicy: DataModels.DataMaskingPolicy = {
       includedPaths: Array<{ path: string; strategy: string; startPosition: number; length: number }>(),
       excludedPaths: Array<string>(),
-      isPolicyEnabled: false,
+      isPolicyEnabled: true,
     };
     const observablePolicy = ko.observable(data.dataMaskingPolicy || defaultDataMaskingPolicy);
     observablePolicy.subscribe(() => {});