@inseefr/lunatic 2.7.10 → 2.7.12

package/lib/components/loop/constant.js

@@ -7,4 +7,4 @@ exports.blockedInLoopComponents = void 0;
 /**
  * List of components blocked in non-paginated loop
  */
-var blockedInLoopComponents = exports.blockedInLoopComponents = ['RosterForLoop', 'Loop', 'PairwiseLinks', 'Roundabout', 'CheckboxGroup'];
+var blockedInLoopComponents = exports.blockedInLoopComponents = ['RosterForLoop', 'Loop', 'PairwiseLinks', 'Roundabout'];

package/lib/components/radio/html/radio-option.js

@@ -4,14 +4,16 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports["default"] = void 0;
-var _react = require("react");
 var _classnames = _interopRequireDefault(require("classnames"));
-var _commons = require("../../commons");
-var _icons = require("../../commons/icons");
+var _react = require("react");
 var _reactKeyboardEventHandler = _interopRequireDefault(require("react-keyboard-event-handler"));
 var _function = require("../../../utils/function");
+var _commons = require("../../commons");
+var _icons = require("../../commons/icons");
 var _jsxRuntime = require("react/jsx-runtime");
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
+/* eslint-disable jsx-a11y/role-supports-aria-props */
+
 function RadioOption(_ref) {
   var checked = _ref.checked,
     _ref$onClick = _ref.onClick,

package/lib/components/suggester/html/suggester.js

@@ -47,28 +47,33 @@ function Suggester(_ref) {
     _useState4 = _slicedToArray(_useState3, 2),
     options = _useState4[0],
     setOptions = _useState4[1];
+  var lastSearch = (0, _react.useRef)('');
   var handleSelect = (0, _react.useCallback)(function (id) {
     onSelect(id ? id : null);
   }, [onSelect]);
   var handleChange = (0, _react.useCallback)( /*#__PURE__*/function () {
     var _ref2 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(search) {
-      var _yield$searching, results;
+      var _yield$searching, results, previous;
       return _regeneratorRuntime().wrap(function _callee$(_context) {
         while (1) switch (_context.prev = _context.next) {
           case 0:
+            lastSearch.current = search !== null && search !== void 0 ? search : '';
             if (!(search && typeof searching === 'function')) {
               _context.next = 10;
               break;
             }
-            _context.next = 3;
+            _context.next = 4;
             return searching(search);
-          case 3:
+          case 4:
             _yield$searching = _context.sent;
             results = _yield$searching.results;
-            setOptions(results);
-            setSearch(search);
-            // if a user does not select an option in the list, their search term is saved
-            onSelect(search);
+            previous = _yield$searching.search;
+            if (previous === lastSearch.current) {
+              setOptions(results);
+              setSearch(search);
+              // if a user does not select an option in the list, their search term is saved
+              onSelect(search);
+            }
             _context.next = 13;
             break;
           case 10:

package/lib/components/summary/html/summary-responses.js

@@ -19,8 +19,7 @@ function ListResponses(_ref) {
   });
 }
 function Responses(_ref2) {
-  var values = _ref2.values,
-    sectionIndex = _ref2.sectionIndex;
+  var values = _ref2.values;
   if (!values) {
     return null;
   }
@@ -31,7 +30,7 @@ function Responses(_ref2) {
         id = _ref3.id;
       return /*#__PURE__*/(0, _jsxRuntime.jsxs)("li", {
         children: [label, " : ", value]
-      }, "".concat(id, "-").concat(sectionIndex));
+      }, "response-".concat(index));
     })
   });
 }
@@ -48,8 +47,7 @@ function SummaryResponses(_ref4) {
       return /*#__PURE__*/(0, _jsxRuntime.jsx)(ListResponses, {
         title: title,
         children: /*#__PURE__*/(0, _jsxRuntime.jsx)(Responses, {
-          values: values,
-          sectionIndex: index
+          values: values
         })
       }, "".concat(id, "-").concat(index));
     })

package/lib/src/components/suggester/html/suggester.d.ts

@@ -16,6 +16,7 @@ type Props = {
     id?: string;
     searching?: (s: string | null) => Promise<{
         results: ComboBoxOptionType[];
+        search: string;
     }>;
     label?: ReactNode;
     description?: ReactNode;

package/lib/src/components/suggester/searching/create-searching.d.ts

@@ -2,5 +2,6 @@ import type { ComboBoxOptionType } from '../../commons/components/combo-box/comb
 export declare function isWorkerCompatible(): boolean;
 declare function createSearching(name: string, version: string, workersBasePath?: string): (search: string | null) => Promise<{
     results: ComboBoxOptionType[];
+    search: string;
 }>;
 export default createSearching;

package/lib/stories/behaviour/cleaning/{test.stories.js → cleaning.stories.js}

@@ -3,11 +3,12 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports["default"] = exports.Default = void 0;
+exports["default"] = exports.Loop = exports.Default = void 0;
 var _react = _interopRequireDefault(require("react"));
-var _defaultArgTypes = _interopRequireDefault(require("../../utils/default-arg-types"));
 var _orchestrator = _interopRequireDefault(require("../../utils/orchestrator"));
 var _source = _interopRequireDefault(require("./source.json"));
+var _sourceLoop = _interopRequireDefault(require("./source-loop.json"));
+var _defaultArgTypes = _interopRequireDefault(require("../../utils/default-arg-types"));
 var _jsxRuntime = require("react/jsx-runtime");
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
 function _typeof(o) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (o) { return typeof o; } : function (o) { return o && "function" == typeof Symbol && o.constructor === Symbol && o !== Symbol.prototype ? "symbol" : typeof o; }, _typeof(o); }
@@ -77,7 +78,13 @@ var Template = function Template(args) {
 };
 var Default = exports.Default = Template.bind({});
 Default.args = {
-  id: 'resizing-default',
+  id: 'cleaning-default',
   pagination: true,
   source: _source["default"]
+};
+var Loop = exports.Loop = Template.bind({});
+Loop.args = {
+  id: 'cleaning-loop',
+  pagination: true,
+  source: _sourceLoop["default"]
 };

package/lib/stories/behaviour/cleaning/source-loop.json

@@ -0,0 +1,130 @@
+{
+	"resizing": {
+		"PRENOM": {
+			"variables": ["AGE", "HIDE_AGE"],
+			"size": "count(PRENOM)"
+		}
+	},
+	"cleaning": {
+		"HIDE_AGE": {
+			"AGE": "false"
+		}
+	},
+	"variables": [
+		{
+			"variableType": "COLLECTED",
+			"values": {
+				"COLLECTED": ["John", "Jane"],
+				"EDITED": null,
+				"INPUTED": null,
+				"FORCED": null,
+				"PREVIOUS": null
+			},
+			"name": "PRENOM"
+		},
+		{
+			"variableType": "COLLECTED",
+			"values": {
+				"COLLECTED": [null],
+				"EDITED": null,
+				"INPUTED": null,
+				"FORCED": null,
+				"PREVIOUS": null
+			},
+			"name": "AGE"
+		},
+		{
+			"variableType": "COLLECTED",
+			"values": {
+				"COLLECTED": [null],
+				"EDITED": null,
+				"INPUTED": null,
+				"FORCED": null,
+				"PREVIOUS": null
+			},
+			"name": "HIDE_AGE"
+		}
+	],
+	"components": [
+		{
+			"componentType": "Loop",
+			"id": "loop",
+			"label": "Ajouter",
+			"bindingDependencies": ["PRENOM"],
+			"lines": {
+				"min": { "value": 1, "type": "VTL" },
+				"max": { "value": 10, "type": "VTL" }
+			},
+			"page": "1",
+			"components": [
+				{
+					"componentType": "Input",
+					"label": "Prénom",
+					"bindingDependencies": ["PRENOM"],
+					"id": "prenom",
+					"response": {
+						"name": "PRENOM"
+					}
+				}
+			]
+		},
+		{
+			"componentType": "Loop",
+			"id": "loop2",
+			"paginatedLoop": true,
+			"bindingDependencies": ["PRENOM"],
+			"iterations": { "value": "count(PRENOM)", "type": "VTL" },
+			"page": "2",
+			"maxPage": "2",
+			"components": [
+				{
+					"componentType": "Input",
+					"label": {
+						"value": "\"Age de \" || PRENOM",
+						"type": "VTL"
+					},
+					"bindingDependencies": ["AGE"],
+					"id": "age",
+					"page": "2.1",
+					"response": {
+						"name": "AGE"
+					}
+				},
+				{
+					"componentType": "CheckboxBoolean",
+					"label": {
+						"value": "\"Masquer l'age de \" || PRENOM || \" ?\"",
+						"type": "VTL"
+					},
+					"bindingDependencies": ["HIDE_AGE"],
+					"id": "hideage",
+					"page": "2.2",
+					"response": {
+						"name": "HIDE_AGE"
+					}
+				}
+			]
+		},
+		{
+			"componentType": "Sequence",
+			"conditionFilter": {
+				"type": "VTL",
+				"value": "true"
+			},
+			"id": "ksyjs7vy",
+			"page": "3",
+			"label": {
+				"type": "VTL|MD",
+				"value": "\"END\""
+			}
+		}
+	],
+	"pagination": "question",
+	"lunaticModelVersion": "2.3.2-rc4",
+	"modele": "TESTSURSUM",
+	"enoCoreVersion": "2.4.1-pairwise",
+	"generatingDate": "14-04-2023 09:00:09",
+	"missing": false,
+	"id": "lb3ei722",
+	"maxPage": "3"
+}

package/lib/stories/behaviour/resizing/{test.stories.js → resizing.stories.js}

@@ -3,11 +3,12 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports["default"] = exports.Default = void 0;
+exports["default"] = exports.ResizingWithCleaning = exports.Default = void 0;
 var _react = _interopRequireDefault(require("react"));
 var _defaultArgTypes = _interopRequireDefault(require("../../utils/default-arg-types"));
 var _orchestrator = _interopRequireDefault(require("../../utils/orchestrator"));
 var _source = _interopRequireDefault(require("./source.json"));
+var _sourceResizingCleaning = _interopRequireDefault(require("./source-resizing-cleaning.json"));
 var _jsxRuntime = require("react/jsx-runtime");
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
 function _typeof(o) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (o) { return typeof o; } : function (o) { return o && "function" == typeof Symbol && o.constructor === Symbol && o !== Symbol.prototype ? "symbol" : typeof o; }, _typeof(o); }
@@ -80,4 +81,10 @@ Default.args = {
   id: 'resizing-default',
   pagination: true,
   source: _source["default"]
+};
+var ResizingWithCleaning = exports.ResizingWithCleaning = Template.bind({});
+ResizingWithCleaning.args = {
+  id: 'resizing-with-cleaning',
+  source: _sourceResizingCleaning["default"],
+  pagination: true
 };

package/lib/stories/behaviour/resizing/source-resizing-cleaning.json

@@ -0,0 +1,171 @@
+{
+	"id": "lfrzny8b",
+	"modele": "RP",
+	"enoCoreVersion": "2.4.1",
+	"lunaticModelVersion": "2.3.1",
+	"generatingDate": "28-03-2023 12:57:35",
+	"missing": false,
+	"pagination": "question",
+	"maxPage": "2",
+	"label": {
+		"value": "\"Resizing with cleaning\"",
+		"type": "VTL|MD"
+	},
+	"components": [
+		{
+			"page": "1",
+			"id": "lfwih8tj-habitants",
+			"componentType": "InputNumber",
+			"mandatory": false,
+			"min": 0,
+			"max": 25,
+			"label": {
+				"value": "\"Nombre d'habitant(s) \"",
+				"type": "VTL"
+			},
+			"declarations": [
+				{
+					"id": "kb9hi4j0-krnoclfe",
+					"declarationType": "HELP",
+					"position": "DETACHABLE",
+					"label": {
+						"value": "\"Changing this value should both clean and resize 'PRENOMS'\"",
+						"type": "VTL|MD"
+					}
+				}
+			],
+			"controls": [
+				{
+					"id": "lfwih8tj-habitants-CI-0",
+					"typeOfControl": "CONSISTENCY",
+					"criticality": "ERROR",
+					"control": {
+						"value": "not(isnull(NB))",
+						"type": "VTL"
+					},
+					"errorMessage": {
+						"value": "\"Veuillez entrer un nombre d'habitant(s)\"",
+						"type": "VTL"
+					}
+				},
+				{
+					"id": "lfwih8tj-habitants-CI-1",
+					"typeOfControl": "CONSISTENCY",
+					"criticality": "ERROR",
+					"control": {
+						"value": "isnull(NB) or NB >= 0",
+						"type": "VTL"
+					},
+					"errorMessage": {
+						"value": "\"Veuillez entrer un nombre d'habitant(s) valide\"",
+						"type": "VTL"
+					}
+				}
+			],
+			"conditionFilter": {
+				"value": "true",
+				"type": "VTL"
+			},
+			"response": {
+				"name": "NB"
+			}
+		},
+		{
+			"id": "lfwg2ny2-list-habitants",
+			"componentType": "Loop",
+			"loopDependencies": ["NB"],
+			"iterations": {
+				"value": "NB",
+				"type": "VTL"
+			},
+			"page": "2",
+			"maxPage": "4",
+			"depth": 1,
+			"paginatedLoop": true,
+			"conditionFilter": {
+				"value": "NB >= 1",
+				"type": "VTL"
+			},
+			"components": [
+				{
+					"id": "lfwg2ny2-prenoms",
+					"label": {
+						"value": "\"Prénom \"",
+						"type": "VTL"
+					},
+					"conditionFilter": {
+						"value": "true",
+						"type": "VTL"
+					},
+					"controls": [
+						{
+							"id": "lfwg2ny2-prenoms-CI-0",
+							"typeOfControl": "CONSISTENCY",
+							"criticality": "ERROR",
+							"control": {
+								"value": "not(nvl(PRENOMS, \"\") = \"\")",
+								"type": "VTL"
+							},
+							"errorMessage": {
+								"value": "\"Veuillez entrer un prénom\"",
+								"type": "VTL"
+							}
+						},
+						{
+							"id": "lfwg2ny2-prenoms-CI-1",
+							"typeOfControl": "CONSISTENCY",
+							"criticality": "ERROR",
+							"control": {
+								"value": "not(match_characters(PRENOMS, \"^[-'a-zA-ZÀ-ÿœ$*\\s]+$\") = false)",
+								"type": "VTL"
+							},
+							"errorMessage": {
+								"value": "\"Votre prénom ne peut pas comporter de chiffres ou caractères spéciaux.\"",
+								"type": "VTL"
+							}
+						}
+					],
+					"componentType": "Input",
+					"response": {
+						"name": "PRENOMS"
+					}
+				}
+			]
+		}
+	],
+	"variables": [
+		{
+			"variableType": "COLLECTED",
+			"name": "PRENOMS",
+			"values": {
+				"PREVIOUS": [null],
+				"COLLECTED": [null],
+				"FORCED": [null],
+				"EDITED": [null],
+				"INPUTED": [null]
+			}
+		},
+		{
+			"variableType": "COLLECTED",
+			"name": "NB",
+			"values": {
+				"PREVIOUS": null,
+				"COLLECTED": null,
+				"FORCED": null,
+				"EDITED": null,
+				"INPUTED": null
+			}
+		}
+	],
+	"cleaning": {
+		"NB": {
+			"PRENOMS": "false"
+		}
+	},
+	"resizing": {
+		"NB": {
+			"size": "cast(NB, integer)",
+			"variables": ["PRENOMS"]
+		}
+	}
+}

package/lib/stories/component-set/data-loop.json

@@ -1,6 +1,6 @@
 {
 	"COLLECTED": {
-		"PRENOMS": {
+		"PRENOM": {
 			"EDITED": [null],
 			"FORCED": [null],
 			"INPUTED": [null],

package/lib/stories/roundabout/source.json

@@ -74,11 +74,11 @@
 					"type": "VTL"
 				},
 				"complete": {
-					"value": "not(isnull(KNOWREC)) and not(isnull(SEXE)) and not(isnull(SOMETHING))",
+					"value": "COMPLETE",
 					"type": "VTL"
 				},
 				"partial": {
-					"value": "not(isnull(KNOWREC)) or not(isnull(SEXE)) or not(isnull(SOMETHING))",
+					"value": "PARTIAL",
 					"type": "VTL"
 				},
 				"label": {
@@ -86,22 +86,7 @@
 					"type": "VTL"
 				}
 			},
-			"controls": [
-				{
-					"id": "roundabout-Carefull",
-					"criticality": "WARN",
-					"control": {
-						"value": "not(isnull(KNOWREC)) and not(isnull(SEXE)) and not(isnull(SOMETHING))",
-						"type": "VTL"
-					},
-					"type": "roundabout",
-					"iterations": { "value": "NB_HAB", "type": "VTL" },
-					"errorMessage": {
-						"value": "\"Le formulaire n'est pas complet pour \" || PRENOMS",
-						"type": "VTL|MD"
-					}
-				}
-			],
+			"controls": [],
 			"components": [
 				{
 					"id": "radio",
@@ -268,6 +253,28 @@
 			"expression": { "value": "first_value(PRENOMS over())", "type": "VTL" },
 			"bindingDependencies": ["PRENOMS"],
 			"inFilter": "true"
+		},
+		{
+			"variableType": "CALCULATED",
+			"name": "COMPLETE",
+			"expression": {
+				"value": "not(isnull(KNOWREC)) and not(isnull(SEXE)) and not(isnull(SOMETHING))",
+				"type": "VTL"
+			},
+			"bindingDependencies": ["KNOWREC", "SEXE", "SOMETHING"],
+			"shapeFrom": "PRENOMS",
+			"inFilter": "true"
+		},
+		{
+			"variableType": "CALCULATED",
+			"name": "PARTIAL",
+			"expression": {
+				"value": "not(isnull(KNOWREC)) or not(isnull(SEXE)) or not(isnull(SOMETHING))",
+				"type": "VTL"
+			},
+			"bindingDependencies": ["KNOWREC", "SEXE", "SOMETHING"],
+			"shapeFrom": "PRENOMS",
+			"inFilter": "true"
 		}
 	],
 	"resizing": {

package/lib/stories/suggester/simple.json

@@ -20,7 +20,10 @@
 		},
 		{
 			"name": "cog-communes",
-			"fields": [{ "name": "id", "rules": "soft" }],
+			"fields": [
+				{ "name": "id", "rules": "soft" },
+				{ "name": "label", "rules": "soft" }
+			],
 			"queryParser": { "type": "soft" },
 			"version": "1"
 		},
@@ -85,7 +88,7 @@
 				"name": "HELLO"
 			},
 			"missingResponse": { "name": "HELLO_MISSING" },
-			"page": "2"
+			"page": "1"
 		},
 		{
 			"id": "suggestions-inconnu",

package/lib/use-lunatic/commons/fill-components/fill-specific-expression.js

@@ -26,9 +26,8 @@ function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
  * - expressions, VTL that states the level of completion for each iteration
  */
 function fillRoundaboutProps(component, state) {
-  var iterations = component.iterations,
-    expressions = component.expressions;
-  var compiled = Object.entries(expressions).reduce(function (result, _ref) {
+  var iterations = component.iterations; // iterations is the result of an expression but we know it's a number
+  var compiled = Object.entries(component.expressions).reduce(function (result, _ref) {
     var _ref2 = _slicedToArray(_ref, 2),
       name = _ref2[0],
       expression = _ref2[1];

package/lib/use-lunatic/commons/variables/lunatic-variables-store.js

@@ -177,8 +177,8 @@ var LunaticVariablesStore = exports.LunaticVariablesStore = /*#__PURE__*/functio
       } finally {
         _iterator.f();
       }
-      (0, _resizingBehaviour.resizingBehaviour)(store, source.resizing);
       (0, _cleaningBehaviour.cleaningBehaviour)(store, source.cleaning, initialValues);
+      (0, _resizingBehaviour.resizingBehaviour)(store, source.resizing);
       (0, _missingBehaviour.missingBehaviour)(store, source.missingBlock);
       return store;
     }

package/lib/use-lunatic/hooks/use-page-has-response.js

@@ -91,6 +91,22 @@ function isSubComponentsEmpty(components, executeExpression) {
   try {
     for (_iterator2.s(); !(_step2 = _iterator2.n()).done;) {
       var component = _step2.value;
+      if ('responses' in component) {
+        var _iterator3 = _createForOfIteratorHelper(component.responses),
+          _step3;
+        try {
+          for (_iterator3.s(); !(_step3 = _iterator3.n()).done;) {
+            var response = _step3.value;
+            if (!isEmpty(executeExpression(response.response.name))) {
+              return false;
+            }
+          }
+        } catch (err) {
+          _iterator3.e(err);
+        } finally {
+          _iterator3.f();
+        }
+      }
       if ('response' in component && !isEmpty(executeExpression(component.response.name))) {
         return false;
       }