fix: do not allow arbitrary in table

InseeFr · Jan 10, 2025 · 8aaf8b8 · 8aaf8b8
1 parent bc7067e
commit 8aaf8b8
Show file tree

Hide file tree

Showing 4 changed files with 21 additions and 28 deletions.
diff --git a/src/model/formToState/component-new-edit/response-format-table.jsx b/src/model/formToState/component-new-edit/response-format-table.jsx
@@ -67,7 +67,6 @@ export const defaultMeasureState = {
       cloneDeep(CodesListDefaultState),
       { id: uuid() },
     ),
-    allowArbitrary: false,
     visHint: RADIO,
   },
 };
@@ -77,7 +76,6 @@ export const defaultMeasureForm = {
   type: SIMPLE,
   [SIMPLE]: defaultMeasureSimpleState,
   [SINGLE_CHOICE]: {
-    allowArbitrary: false,
     hasSpecialCode: false,
     specialLabel: '',
     specialCode: '',
@@ -174,17 +172,13 @@ export function formToStateMeasure(form, codesListMeasure) {
       [simpleType]: { ...simpleForm },
     };
   } else {
-    const {
-      allowArbitrary,
-      visHint,
-      [DEFAULT_CODES_LIST_SELECTOR_PATH]: codesListForm,
-    } = measureForm;
+    const { visHint, [DEFAULT_CODES_LIST_SELECTOR_PATH]: codesListForm } =
+      measureForm;
     const codesList = codesListMeasure
       ? codesListMeasure.formToStateComponent(codesListForm)
       : CodesListFactory().formToState(codesListForm);
 
     state[SINGLE_CHOICE] = {
-      allowArbitrary,
       visHint,
       [DEFAULT_CODES_LIST_SELECTOR_PATH]: codesList,
     };
@@ -259,7 +253,6 @@ export function stateToFormMeasure(
     type,
     [SIMPLE]: simpleState,
     [SINGLE_CHOICE]: {
-      allowArbitrary,
       visHint,
       [DEFAULT_CODES_LIST_SELECTOR_PATH]: codesListState,
     },
@@ -280,7 +273,6 @@ export function stateToFormMeasure(
     type,
     [SIMPLE]: simpleState,
     [SINGLE_CHOICE]: {
-      allowArbitrary,
       visHint,
       [DEFAULT_CODES_LIST_SELECTOR_PATH]: codesListForm,
     },
@@ -290,7 +282,6 @@ export function stateToFormMeasure(
 export function stateToFormMeasureList(currentState, codesListsStore) {
   const {
     [SINGLE_CHOICE]: {
-      allowArbitrary,
       visHint,
       [DEFAULT_CODES_LIST_SELECTOR_PATH]: codesListState,
     },
@@ -304,7 +295,6 @@ export function stateToFormMeasureList(currentState, codesListsStore) {
   return {
     ...currentState,
     [SINGLE_CHOICE]: {
-      allowArbitrary,
       visHint,
       [DEFAULT_CODES_LIST_SELECTOR_PATH]: codesListForm,
     },
@@ -387,7 +377,6 @@ const Factory = (initialState = {}, codesListsStore) => {
         state[SINGLE_CHOICE] = {
           [DEFAULT_CODES_LIST_SELECTOR_PATH]:
             codesListsStore[measureState[DEFAULT_CODES_LIST_SELECTOR_PATH].id],
-          allowArbitrary: measureState.allowArbitrary,
           visHint: measureState.visHint,
         };
       } else {

diff --git a/src/model/transformations/response-format-table.jsx b/src/model/transformations/response-format-table.jsx
@@ -318,7 +318,6 @@ function stateToResponseState(state) {
   } else {
     const {
       mandatory,
-      allowArbitrary,
       visHint,
       [DEFAULT_CODES_LIST_SELECTOR_PATH]: { id: codesListId },
     } = measureTypeState;
@@ -328,7 +327,6 @@ function stateToResponseState(state) {
       typeName: TEXT,
       maxLength: 1,
       pattern: '',
-      allowArbitrary,
       visHint,
     };
   }

diff --git a/src/widgets/component-new-edit/components/response-format/single/response-format-single.jsx b/src/widgets/component-new-edit/components/response-format/single/response-format-single.jsx
@@ -37,6 +37,7 @@ function ResponseFormatSingle({
   path,
   formName,
   allowPrecision,
+  disableSetArbitrary,
 }) {
   const selectorPath = responseFormatType;
 
@@ -170,19 +171,21 @@ function ResponseFormatSingle({
       {visHint === SUGGESTER ? (
         <>
           <SuggesterLists selectorPathParent={selectorPathComposed} />
-          <Field
-            name="allowArbitrary"
-            component={ListRadios}
-            label={Dictionary.allowArbitraryResponse}
-            required
-            // Convert string "true"/"false" to boolean true/false when storing in Redux form
-            parse={(value) => value === 'true'}
-            // Convert true/false/undefined to string "true"/"false" when displaying the form
-            format={(value) => (value === true ? 'true' : 'false')}
-          >
-            <GenericOption value="true">{Dictionary.yes}</GenericOption>
-            <GenericOption value="false">{Dictionary.no}</GenericOption>
-          </Field>
+          {!disableSetArbitrary && (
+            <Field
+              name="allowArbitrary"
+              component={ListRadios}
+              label={Dictionary.allowArbitraryResponse}
+              required
+              // Convert string "true"/"false" to boolean true/false when storing in Redux form
+              parse={(value) => value === 'true'}
+              // Convert true/false/undefined to string "true"/"false" when displaying the form
+              format={(value) => (value === true ? 'true' : 'false')}
+            >
+              <GenericOption value="true">{Dictionary.yes}</GenericOption>
+              <GenericOption value="false">{Dictionary.no}</GenericOption>
+            </Field>
+          )}
         </>
       ) : (
         <CodesLists
@@ -204,6 +207,7 @@ ResponseFormatSingle.propTypes = {
   path: PropTypes.string,
   formName: PropTypes.string,
   allowPrecision: PropTypes.bool,
+  disableSetArbitrary: PropTypes.bool,
 };
 
 ResponseFormatSingle.defaultProps = {
@@ -216,6 +220,7 @@ ResponseFormatSingle.defaultProps = {
   path: SINGLE_CHOICE,
   formName: DEFAULT_FORM_NAME,
   allowPrecision: true,
+  disableSetArbitrary: false,
 };
 
 const mapStateToProps = (state, { selectorPathParent, responseFormatType }) => {

diff --git a/src/widgets/component-new-edit/components/response-format/table/input-measure.jsx b/src/widgets/component-new-edit/components/response-format/table/input-measure.jsx
@@ -44,6 +44,7 @@ function InputMeasure({ selectorPath }) {
             selectorPathParent={selectorPath}
             showMandatory={false}
             allowPrecision={false}
+            disableSetArbitrary={true}
           />
         </View>
       </SelectorView>