Fix conflicts after rebase

1 files changed, 20 insertions, 5 deletions

diff --git a/server/sonar-web/src/main/js/apps/projectBaseline/utils.ts b/server/sonar-web/src/main/js/apps/projectBaseline/utils.ts
index 69b7cfabda0..99ee11e50dd 100644
--- a/server/sonar-web/src/main/js/apps/projectBaseline/utils.ts
+++ b/server/sonar-web/src/main/js/apps/projectBaseline/utils.ts
@@ -48,15 +48,30 @@ export function validateSetting(state: {
   currentSettingValue?: string;
   days: string;
   selected?: T.NewCodePeriodSettingType;
+  overrideGeneralSetting?: boolean;
 }) {
-  const { analysis = '', currentSetting, currentSettingValue, days, selected } = state;
+  const {
+    analysis = '',
+    currentSetting,
+    currentSettingValue,
+    days,
+    selected,
+    overrideGeneralSetting
+  } = state;
 
-  const isChanged =
-    selected !== currentSetting ||
-    (selected === 'NUMBER_OF_DAYS' && days !== currentSettingValue) ||
-    (selected === 'SPECIFIC_ANALYSIS' && analysis !== currentSettingValue);
+  let isChanged;
+  if (!currentSetting && overrideGeneralSetting !== undefined) {
+    isChanged = overrideGeneralSetting;
+  } else {
+    isChanged =
+      overrideGeneralSetting === false ||
+      selected !== currentSetting ||
+      (selected === 'NUMBER_OF_DAYS' && days !== currentSettingValue) ||
+      (selected === 'SPECIFIC_ANALYSIS' && analysis !== currentSettingValue);
+  }
 
   const isValid =
+    overrideGeneralSetting === false ||
     selected === 'PREVIOUS_VERSION' ||
     (selected === 'SPECIFIC_ANALYSIS' && analysis.length > 0) ||
     (selected === 'NUMBER_OF_DAYS' && validateDays(days));