Dev fix date range (#686)

* fix : date minimum and maximum were never validated * use Name from questionnaireList (recently added in pogues-back-office) * version: update version to 1.5.3
InseeFr · Jun 22, 2023 · f4cf8c6 · f4cf8c6
1 parent 7a968d5
commit f4cf8c6
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 15 deletions.
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "pogues",
-  "version": "1.5.2",
+  "version": "1.5.3",
   "description": "Outil de conception et de test de questionnaires.",
   "repository": {
     "type": "git",

diff --git a/src/layout/questionnaire-list/components/questionnaire-list.jsx b/src/layout/questionnaire-list/components/questionnaire-list.jsx
@@ -6,7 +6,7 @@ import Dropdown from 'widgets/dropdown';
 import Loader from 'layout/loader';
 import Dictionary from 'utils/dictionary/dictionary';
 import { formatDate, getState } from 'utils/component/component-utils';
-import { getStampsList, getQuestionnaire } from 'utils/remote-api';
+import { getStampsList } from 'utils/remote-api';
 import { getWeight } from 'utils/component/generic-input-utils';
 import { COMPONENT_TYPE, TCM } from 'constants/pogues-constants';
 
@@ -59,25 +59,20 @@ const QuestionnaireList = props => {
     [handleCloseNewQuestionnaire, mergeQuestionnaires, token],
   );
 
-  // function addQuestionnaireRef (checkedQuestionnaire)  {
-  const addQuestionnaireRef = async checkedQuestionnaire => {
+  function addQuestionnaireRef(checkedQuestionnaire) {
     const weight = selectedComponentId
       ? getWeight(componentsStore, selectedComponentId)
       : Object.values(componentsStore).filter(
           component =>
             (component.type === SEQUENCE && component.id !== 'idendquest') ||
             component.type === EXTERNAL_ELEMENT,
         ).length;
-    const externalQuestionnaire = await getQuestionnaire(
-      checkedQuestionnaire,
-      token,
-    );
-    /* const externalQuestionnaire = questionnaires.find(
+    const externalQuestionnaire = questionnaires.find(
       q => q.id === checkedQuestionnaire,
-    ); */
+    );
     const componentState = {
       id: checkedQuestionnaire,
-      name: externalQuestionnaire.name || externalQuestionnaire.Name,
+      name: externalQuestionnaire.name,
       parent: activeQuestionnaire.id,
       weight: weight,
       children: [],
@@ -87,7 +82,7 @@ const QuestionnaireList = props => {
       flowcontrol: [],
       redirections: {},
       dynamiqueSpecified: '',
-      label: externalQuestionnaire.label || externalQuestionnaire.Label[0],
+      label: externalQuestionnaire.label,
       type: EXTERNAL_ELEMENT,
     };
     createComponent(
@@ -101,7 +96,7 @@ const QuestionnaireList = props => {
       .then(orderComponents)
       .then(handleNewChildQuestionnaireRef(checkedQuestionnaire))
       .then(handleCloseNewQuestionnaire);
-  };
+  }
 
   const handleAction = (id, label) => {
     if (isComposition) return addQuestionnaireRef(id);

diff --git a/src/widgets/component-new-edit/components/response-format/simple/simple-date.jsx b/src/widgets/component-new-edit/components/response-format/simple/simple-date.jsx
@@ -58,7 +58,7 @@ function ResponseFormatDatatypeDate({
             component={Input}
             label={Dictionary.minimum}
             validate={date({
-              format: formatInit,
+              format: formatInit.toLowerCase(),
               message: Dictionary.formatDate ? Dictionary.formatDate : '',
               allowBlank: true,
             })}
@@ -71,7 +71,7 @@ function ResponseFormatDatatypeDate({
             component={Input}
             label={Dictionary.maximum}
             validate={date({
-              format: formatInit,
+              format: formatInit.toLowerCase(),
               message: Dictionary.formatDate ? Dictionary.formatDate : '',
               allowBlank: true,
             })}