Merge pull request #599 from InseeFr/hot-fix-131

Hot fix : get back to old editors from 1.2.0 version (Xpath)

package.json

@@ -1,6 +1,6 @@
 {
   "name": "pogues",
-  "version": "1.3.0",
+  "version": "1.3.1",
   "description": "Outil de conception et de test de questionnaires.",
   "repository": {
     "type": "git",

src/forms/controls/control-with-suggestions/components/rich-editor.jsx

@@ -1,15 +1,16 @@
 import React from 'react';
 
 import VTLEditor from './vtl-editor';
-import TextareaWithSuggestions from './textarea-with-suggestions';
+import RichTextareaWithSuggestions from './rich-textarea-with-suggestions';
 
 import { FORMULA_LANGUAGE } from 'constants/pogues-constants';
 
 const { XPATH, VTL } = FORMULA_LANGUAGE;
 
 const RichEditor = ({ formulasLanguage, ...props }) => {
   if (formulasLanguage === VTL) return <VTLEditor {...props} />;
-  if (formulasLanguage === XPATH) return <TextareaWithSuggestions {...props} />;
+  if (formulasLanguage === XPATH)
+    return <RichTextareaWithSuggestions {...props} />;
   return null;
 };
 

src/forms/controls/control-with-suggestions/components/simple-editor.jsx

@@ -0,0 +1,16 @@
+import React from 'react';
+
+import VTLEditor from './vtl-editor';
+import TextareaWithSuggestions from './textarea-with-suggestions';
+
+import { FORMULA_LANGUAGE } from 'constants/pogues-constants';
+
+const { XPATH, VTL } = FORMULA_LANGUAGE;
+
+const SimpleEditor = ({ formulasLanguage, ...props }) => {
+  if (formulasLanguage === VTL) return <VTLEditor {...props} />;
+  if (formulasLanguage === XPATH) return <TextareaWithSuggestions {...props} />;
+  return null;
+};
+
+export default SimpleEditor;

src/forms/controls/control-with-suggestions/containers/control-with-suggestions-container.jsx

@@ -4,6 +4,7 @@ import InputWithSuggestions from '../components/input-with-suggestions';
 import TextareaWithSuggestions from '../components/textarea-with-suggestions';
 import RichTextareaWithSuggestions from '../components/rich-textarea-with-suggestions';
 import RichEditor from '../components/rich-editor';
+import SimpleEditor from '../components/simple-editor';
 
 export const InputWithSuggestionsContainer =
   withCurrentFormVariables(InputWithSuggestions);
@@ -15,3 +16,5 @@ export const RichTextareaWithSuggestionsContainer = withCurrentFormVariables(
 );
 
 export const RichEditorContainer = withCurrentFormVariables(RichEditor);
+
+export const SimpleEditorContainer = withCurrentFormVariables(SimpleEditor);

src/forms/controls/control-with-suggestions/index.js

@@ -3,4 +3,5 @@ export {
   TextareaWithSuggestionsContainer as TextareaWithVariableAutoCompletion,
   RichTextareaWithSuggestionsContainer as RichTextareaWithVariableAutoCompletion,
   RichEditorContainer as RichEditorWithVariable,
+  SimpleEditorContainer as SimpleEditorWithVariable,
 } from './containers/control-with-suggestions-container';

src/widgets/codes-lists/components/codes-lists.jsx

@@ -15,7 +15,7 @@ import ListRadios from 'forms/controls/list-radios';
 import Select from 'forms/controls/select';
 import GenericOption from 'forms/controls/generic-option';
 import { storeToArray, uuid } from 'utils/utils';
-import { RichEditorWithVariable } from 'forms/controls/control-with-suggestions';
+import { InputWithVariableAutoCompletion } from 'forms/controls/control-with-suggestions';
 
 import { SearchCodesLists } from 'widgets/search-codes-lists';
 import { ErrorsPanel } from 'widgets/errors-panel';
@@ -181,7 +181,7 @@ const CodesList = props => {
               <ErrorsPanel path={`${selectorPathParent}.${selectorPath}`} />
               <Field
                 name="label"
-                component={RichEditorWithVariable}
+                component={InputWithVariableAutoCompletion}
                 type="text"
                 label={Dictionary.newCl}
                 focusOnInit

src/widgets/component-new-edit/components/controls.jsx

@@ -7,7 +7,7 @@ import { defaultState } from 'model/formToState/component-new-edit/control';
 import Select from 'forms/controls/select';
 import GenericOption from 'forms/controls/generic-option';
 import Textarea from 'forms/controls/textarea';
-import { RichEditorWithVariable } from 'forms/controls/control-with-suggestions';
+import { SimpleEditorWithVariable } from 'forms/controls/control-with-suggestions';
 
 import { validateControlForm } from 'utils/validation/validate';
 import Dictionary from 'utils/dictionary/dictionary';
@@ -60,14 +60,14 @@ const Controls = ({ formName, selectorPath, errors, addErrors }) => {
         />
         <Field
           name="condition"
-          component={RichEditorWithVariable}
+          component={SimpleEditorWithVariable}
           label={Dictionary.expression}
           required
           setDisableValidation={setDisableValidation}
         />
         <Field
           name="message"
-          component={RichEditorWithVariable}
+          component={SimpleEditorWithVariable}
           label={Dictionary.control_message}
           required
           setDisableValidation={setDisableValidation}

src/widgets/component-new-edit/components/nestedFilter.jsx

@@ -10,7 +10,7 @@ import { WIDGET_COMPONENT_NEW_EDIT } from 'constants/dom-constants';
 import Dictionary from 'utils/dictionary/dictionary';
 import { uuid } from 'utils/utils';
 import * as rules from 'forms/validation-rules';
-import { RichEditorWithVariable } from 'forms/controls/control-with-suggestions';
+import { InputWithVariableAutoCompletion } from 'forms/controls/control-with-suggestions';
 
 const {
   COMPONENT_CLASS,
@@ -455,7 +455,7 @@ const NestedFilter = props => {
             </div>
           </div>
           <div>
-            <RichEditorWithVariable
+            <InputWithVariableAutoCompletion
               input={{
                 name: 'filter',
                 onChange,

src/widgets/component-new-edit/components/redirections.jsx

@@ -6,7 +6,7 @@ import { defaultState } from 'model/formToState/component-new-edit/redirection';
 
 import { ListWithInputPanel } from 'widgets/list-with-input-panel';
 import { GotoInput } from 'widgets/goto-input';
-import { RichEditorWithVariable } from 'forms/controls/control-with-suggestions';
+import { SimpleEditorWithVariable } from 'forms/controls/control-with-suggestions';
 import Textarea from 'forms/controls/textarea';
 import { validateRedirectionForm } from 'utils/validation/validate';
 
@@ -79,7 +79,7 @@ const Redirections = ({
         <Field
           type="text"
           name="condition"
-          component={RichEditorWithVariable}
+          component={SimpleEditorWithVariable}
           label={Dictionary.condition}
           required
           setDisableValidation={setDisableValidation}

src/widgets/component-new-edit/components/variables/calculated-variables.jsx

@@ -10,7 +10,7 @@ import {
 import { defaultState } from 'model/formToState/component-new-edit/calculated-variable';
 
 import Input from 'forms/controls/input';
-import { RichEditorWithVariable } from 'forms/controls/control-with-suggestions';
+import { SimpleEditorWithVariable } from 'forms/controls/control-with-suggestions';
 import { ListWithInputPanel } from 'widgets/list-with-input-panel';
 import { validateCalculatedVariableForm } from 'utils/validation/validate';
 import ResponseFormatDatatypeNumeric from 'widgets/component-new-edit/components/response-format/simple/simple-numeric';
@@ -90,7 +90,7 @@ const CalculatedVariables = ({
         <Field
           name="formula"
           type="text"
-          component={RichEditorWithVariable}
+          component={SimpleEditorWithVariable}
           label={Dictionary.formula}
           required
           setDisableValidation={setDisableValidation}