From 89466ea02684d177d514cd49a49e634716c8d05f Mon Sep 17 00:00:00 2001
From: Mailine Nguyen <64129348+MailineN@users.noreply.github.com>
Date: Fri, 20 Dec 2024 09:54:50 +0100
Subject: [PATCH] feat: move and rename 'scope' component (#890)

* feat: move and rename 'scope' component in external and calculated variable form
---
 src/constants/dictionary.js                          |  2 +-
 src/model/transformations/external-variable.spec.jsx |  3 +--
 .../components/variables/calculated-variables.jsx    | 12 ++++++------
 .../components/variables/external-variables.jsx      | 12 ++++++------
 4 files changed, 14 insertions(+), 15 deletions(-)

diff --git a/src/constants/dictionary.js b/src/constants/dictionary.js
index 1f343328e..6c38bcc42 100644
--- a/src/constants/dictionary.js
+++ b/src/constants/dictionary.js
@@ -149,7 +149,7 @@ const dictionary = {
   },
   Scope: {
     en: 'Scope',
-    fr: 'Portée',
+    fr: 'Niveau de calcul',
   },
   question: {
     en: 'Question',
diff --git a/src/model/transformations/external-variable.spec.jsx b/src/model/transformations/external-variable.spec.jsx
index 3d8b45666..c3351029f 100644
--- a/src/model/transformations/external-variable.spec.jsx
+++ b/src/model/transformations/external-variable.spec.jsx
@@ -1,8 +1,7 @@
 import { describe, expect, it } from 'vitest';
 
-import { remoteToStore, storeToRemote } from './external-variable';
-
 import { DATATYPE_NAME } from '../../constants/pogues-constants';
+import { remoteToStore, storeToRemote } from './external-variable';
 
 const { TEXT, NUMERIC } = DATATYPE_NAME;
 
diff --git a/src/widgets/component-new-edit/components/variables/calculated-variables.jsx b/src/widgets/component-new-edit/components/variables/calculated-variables.jsx
index 4cd149fde..e0180367e 100644
--- a/src/widgets/component-new-edit/components/variables/calculated-variables.jsx
+++ b/src/widgets/component-new-edit/components/variables/calculated-variables.jsx
@@ -86,6 +86,12 @@ const CalculatedVariables = ({
           required
           setDisableValidation={setDisableValidation}
         />
+        <Field name="scope" component={Select} label={Dictionary.Scope}>
+          <GenericOption key="" value="">
+            {Dictionary.selectScope}
+          </GenericOption>
+          {scopes}
+        </Field>
         <SelectorView
           label={Dictionary.responseType}
           selectorPath={selectorPath}
@@ -105,12 +111,6 @@ const CalculatedVariables = ({
           </View>
           <View key={BOOLEAN} value={BOOLEAN} label={Dictionary.BOOLEAN} />
         </SelectorView>
-        <Field name="scope" component={Select} label={Dictionary.Scope}>
-          <GenericOption key="" value="">
-            {Dictionary.selectScope}
-          </GenericOption>
-          {scopes}
-        </Field>
       </ListWithInputPanel>
     </FormSection>
   );
diff --git a/src/widgets/component-new-edit/components/variables/external-variables.jsx b/src/widgets/component-new-edit/components/variables/external-variables.jsx
index 5c3ca8e1c..6fd397aa6 100644
--- a/src/widgets/component-new-edit/components/variables/external-variables.jsx
+++ b/src/widgets/component-new-edit/components/variables/external-variables.jsx
@@ -76,6 +76,12 @@ function ExternalVariables({
           label={Dictionary.name}
           required
         />
+        <Field name="scope" component={Select} label={Dictionary.Scope}>
+          <GenericOption key="" value="">
+            {Dictionary.selectScope}
+          </GenericOption>
+          {scopes}
+        </Field>
         <SelectorView
           label={Dictionary.responseType}
           selectorPath={selectorPath}
@@ -95,12 +101,6 @@ function ExternalVariables({
           </View>
           <View key={BOOLEAN} value={BOOLEAN} label={Dictionary.BOOLEAN} />
         </SelectorView>
-        <Field name="scope" component={Select} label={Dictionary.Scope}>
-          <GenericOption key="" value="">
-            {Dictionary.selectScope}
-          </GenericOption>
-          {scopes}
-        </Field>
       </ListWithInputPanel>
     </FormSection>
   );