@inseefr/lunatic 2.0.0-v2 → 2.0.1-v2

package/lib/components/pairwise/links/pairwise-links.js

@@ -9,11 +9,11 @@ exports["default"] = void 0;
 
 var _react = _interopRequireWildcard(require("react"));
 
-var _linksOrchestrator = _interopRequireDefault(require("./links-orchestrator"));
+var _orchestrator = _interopRequireDefault(require("./orchestrator"));
 
 var _declarations = require("../../declarations");
 
-var _commons = require("../../commons");
+var _nothingToDisplay = _interopRequireDefault(require("../../commons/components/nothing-to-display"));
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
 
@@ -41,7 +41,7 @@ var PairwiseLinks = function PairwiseLinks(_ref) {
   var handleChangeLinks = (0, _react.useCallback)(function (response, value, args) {
     handleChange(response, value, args);
   }, [handleChange]);
-  if (nbRows > 0) return /*#__PURE__*/_react["default"].createElement(_react["default"].Fragment, null, /*#__PURE__*/_react["default"].createElement(_declarations.DeclarationsBeforeText, {
+  if (nbRows > 1) return /*#__PURE__*/_react["default"].createElement(_react["default"].Fragment, null, /*#__PURE__*/_react["default"].createElement(_declarations.DeclarationsBeforeText, {
     declarations: declarations,
     id: id,
     custom: custom
@@ -49,7 +49,7 @@ var PairwiseLinks = function PairwiseLinks(_ref) {
     declarations: declarations,
     id: id,
     custom: custom
-  }), /*#__PURE__*/_react["default"].createElement(_linksOrchestrator["default"], {
+  }), /*#__PURE__*/_react["default"].createElement(_orchestrator["default"], {
     id: id,
     components: components,
     handleChange: handleChangeLinks,
@@ -67,10 +67,8 @@ var PairwiseLinks = function PairwiseLinks(_ref) {
     declarations: declarations,
     id: id,
     custom: custom
-  }), /*#__PURE__*/_react["default"].createElement(_commons.Errors, {
-    errors: errors
   }));
-  return null;
+  return /*#__PURE__*/_react["default"].createElement(_nothingToDisplay["default"], null);
 };
 
 var _default = PairwiseLinks;

package/lib/components/radio/lunatic-radio-group.js

@@ -31,11 +31,12 @@ function LunaticRadioGroup(props) {
     checkboxStyle: checkboxStyle,
     custom: custom
   }), /*#__PURE__*/_react["default"].createElement(_commons.Errors, {
-    errors: errors
+    errors: errors,
+    activeId: id
   }));
 }
 
-var _default = (0, _commons.createLunaticComponent)(LunaticRadioGroup, {
+var _default = (0, _commons.createLunaticComponent)((0, _commons.createCustomizableLunaticField)(LunaticRadioGroup), {
   // set it to true if you want to display a fieldset + legend on a component
   fieldset: true,
   inputId: 'lunatic-radio-group'

package/lib/components/radio/radio-group.js

@@ -37,11 +37,9 @@ function Radio(_ref) {
       onClick: onClick,
       value: valueOption,
       onKeyDown: onKeyDown,
-      checkboxStyle: checkboxStyle
-    }), /*#__PURE__*/_react["default"].createElement(_commons.Label, {
-      id: labelId,
-      htmlFor: radioId
-    }, label));
+      checkboxStyle: checkboxStyle,
+      label: label
+    }));
   });
 }
 

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

@@ -44,7 +44,8 @@ function RadioOption(_ref) {
       onKeyDown = _ref.onKeyDown,
       index = _ref.index,
       labelledBy = _ref.labelledBy,
-      checkboxStyle = _ref.checkboxStyle;
+      checkboxStyle = _ref.checkboxStyle,
+      label = _ref.label;
   var spanEl = (0, _react.useRef)();
   var Icon = getIcon(checked, checkboxStyle);
   var tabIndex = checked ? '0' : '-1';
@@ -83,7 +84,10 @@ function RadioOption(_ref) {
     onKeyDown: handleKeyDown,
     "aria-labelledby": labelledBy,
     ref: spanEl
-  }, /*#__PURE__*/_react["default"].createElement(Icon, null)));
+  }, /*#__PURE__*/_react["default"].createElement(Icon, null), /*#__PURE__*/_react["default"].createElement("span", {
+    id: labelledBy,
+    htmlFor: id
+  }, label)));
 }
 
 var _default = RadioOption;

package/lib/components/radio/radio.scss

@@ -59,6 +59,8 @@
 }
 
 .lunatic-radio-group-option {
-	display: flex;
 	align-items: center;
 }
+.lunatic-input-radio {
+	display: flex;
+}

package/lib/components/sequence/sequence.js

@@ -11,6 +11,8 @@ var _declarations = require("../declarations");
 
 require("./sequence.scss");
 
+var _commons = require("../commons");
+
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
 
 function Sequence(_ref) {
@@ -34,5 +36,6 @@ function Sequence(_ref) {
   }));
 }
 
-var _default = Sequence;
+var _default = (0, _commons.createCustomizableLunaticField)(Sequence);
+
 exports["default"] = _default;

package/lib/components/subsequence/subsequence.js

@@ -9,6 +9,8 @@ var _react = _interopRequireDefault(require("react"));
 
 var _declarations = require("../declarations");
 
+var _commons = require("../commons");
+
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
 
 function Subsequence(_ref) {
@@ -31,5 +33,6 @@ function Subsequence(_ref) {
   }));
 }
 
-var _default = Subsequence;
+var _default = (0, _commons.createCustomizableLunaticField)(Subsequence);
+
 exports["default"] = _default;

package/lib/components/suggester/check-store.js

@@ -142,12 +142,7 @@ function CheckStore(_ref) {
 
   return /*#__PURE__*/_react["default"].createElement("div", {
     className: "lunatic-suggester-unvailable"
-  }, "Le store ", storeName, " n'est pas disponible.", /*#__PURE__*/_react["default"].createElement("button", {
-    disabled: disabled,
-    onClick: function onClick() {
-      return setRefresh(true);
-    }
-  }, "Refresh"));
+  }, "La suggestion sur liste n'est pas possible sur votre navigateur, vous pouvez passer la question en appuyant sur Enregistrer et Continuer");
 }
 
 var _default = CheckStore;

package/lib/components/suggester/lunatic-suggester.js

@@ -51,7 +51,8 @@ function LunaticSuggester(props) {
     value: value,
     custom: custom
   }), /*#__PURE__*/_react["default"].createElement(_commons.Errors, {
-    errors: errors
+    errors: errors,
+    activeId: id
   }));
 }
 

package/lib/components/table/lunatic-table.js

@@ -69,9 +69,12 @@ function LunaticTable(_ref) {
     handleChange: handleChange,
     iteration: iteration,
     nbRows: nbRows,
-    valueMap: value
-  })), /*#__PURE__*/_react["default"].createElement(_commons.Errors, {
+    valueMap: value //TODO propagate
+    ,
     errors: errors
+  })), /*#__PURE__*/_react["default"].createElement(_commons.Errors, {
+    errors: errors,
+    activeId: id
   }));
 }
 

package/lib/components/textarea/lunatic-textarea.js

@@ -25,8 +25,10 @@ var LunaticTextarea = function LunaticTextarea(_ref) {
   var errors = _ref.errors,
       props = _objectWithoutProperties(_ref, _excluded);
 
+  var id = props.id;
   return /*#__PURE__*/_react["default"].createElement(_react["default"].Fragment, null, /*#__PURE__*/_react["default"].createElement(_textarea["default"], props), /*#__PURE__*/_react["default"].createElement(_commons.Errors, {
-    errors: errors
+    errors: errors,
+    activeId: id
   }));
 };
 

package/lib/stories/pairwise/data.json

@@ -0,0 +1,13 @@
+{
+	"COLLECTED": {
+		"PRENOM": { "COLLECTED": ["Dad", "Mom", "Unknow"] },
+		"AGE": { "COLLECTED": [30, 29, 5] },
+		"LINKS": {
+			"COLLECTED": [
+				[null, "1", "16"],
+				["1", null, "16"],
+				["16", "16", null]
+			]
+		}
+	}
+}

package/lib/stories/pairwise/{links/links.json → links.json}

@@ -1,5 +1,5 @@
 {
-	"maxPage": "3",
+	"maxPage": "5",
 	"components": [
 		{
 			"id": "seq",
@@ -37,13 +37,33 @@
 				}
 			]
 		},
+		{
+			"id": "age-loop",
+			"componentType": "Loop",
+			"paginatedLoop": true,
+			"iterations": { "value": "count(PRENOM)", "type": "VTL" },
+			"page": "2",
+			"maxPage": "1",
+			"conditionFilter": { "value": "true", "type": "VTL" },
+			"loopDependencies": ["PRENOM"],
+			"components": [
+				{
+					"id": "age-quest",
+					"label": { "value": "\"Âge de \" || PRENOM", "type": "VTL|MD" },
+					"conditionFilter": { "type": "VTL", "value": "true" },
+					"componentType": "InputNumber",
+					"page": "2.1",
+					"response": { "name": "AGE" }
+				}
+			]
+		},
 		{
 			"id": "pariwise-links",
 			"componentType": "PairwiseLinks",
 			"conditionFilter": { "value": "true" },
 			"xAxisIterations": { "value": "count(PRENOM)", "type": "VTL" },
 			"yAxisIterations": { "value": "count(PRENOM)", "type": "VTL" },
-			"page": "2",
+			"page": "3",
 			"components": [
 				{
 					"componentType": "Dropdown",
@@ -57,44 +77,80 @@
 						"name": "LINKS"
 					},
 					"options": [
-						{ "value": "1", "label": "Conjoint" },
-						{ "value": "2", "label": "Mère, père" },
-						{ "value": "3", "label": "Fille, fils" },
+						{ "value": "1", "label": "\"Conjoint\"" },
+						{ "value": "2", "label": "\"Mère, père\"" },
+						{ "value": "3", "label": "\"Fille, fils\"" },
 						{
 							"value": "4",
-							"label": "Belle-mère, beau-père, conjoint du parent"
+							"label": "\"Belle-mère, beau-père, conjoint du parent\""
 						},
 						{
 							"value": "5",
-							"label": "Belle-mère, beau-père, parent du conjoint"
+							"label": "\"Belle-mère, beau-père, parent du conjoint\""
 						},
-						{ "value": "6", "label": "Enfant du conjoint" },
-						{ "value": "7", "label": "Conjoint d’un enfant" },
-						{ "value": "8", "label": "Sœur, frère (y compris demi et quasi)" },
-						{ "value": "9", "label": "Grand-parent" },
-						{ "value": "10", "label": "Petit-enfant" },
-						{ "value": "11", "label": "Tante, oncle" },
-						{ "value": "12", "label": "Cousin(e)" },
-						{ "value": "13", "label": "Nièce, neveu" },
-						{ "value": "14", "label": "Belle-sœur, beau-frère" },
-						{ "value": "15", "label": "Enfant placé" },
-						{ "value": "16", "label": "Autre" }
+						{ "value": "6", "label": "\"Enfant du conjoint\"" },
+						{ "value": "7", "label": "\"Conjoint d’un enfant\"" },
+						{
+							"value": "8",
+							"label": "\"Sœur, frère (y compris demi et quasi)\""
+						},
+						{ "value": "9", "label": "\"Grand-parent\"" },
+						{ "value": "10", "label": "\"Petit-enfant\"" },
+						{ "value": "11", "label": "\"Tante, oncle\"" },
+						{ "value": "12", "label": "\"Cousin(e)\"" },
+						{ "value": "13", "label": "\"Nièce, neveu\"" },
+						{ "value": "14", "label": "\"Belle-sœur, beau-frère\"" },
+						{ "value": "15", "label": "\"Enfant placé\"" },
+						{ "value": "16", "label": "\"Autre\"" }
 					]
 				}
 			]
 		},
 		{
 			"id": "pariwise-block",
-			"componentType": "PairwiseBlock",
-			"conditionFilter": { "value": "true" },
-			"page": "3"
-		}
+			"componentType": "Loop",
+			"paginatedLoop": true,
+			"iterations": { "value": "count(PRENOM)", "type": "VTL" },
+			"page": "4",
+			"maxPage": "1",
+			"conditionFilter": { "value": "true", "type": "VTL" },
+			"loopDependencies": ["PRENOM"],
+			"components": [
+				{
+					"componentType": "Textarea",
+					"page": "4.1",
+					"label": {
+						"value": "PRENOM || \", why do you live without your parents?\"",
+						"type": "VTL|MD"
+					},
+					"conditionFilter": {
+						"value": "\"3\" not_in LINKS and AGE < 18",
+						"type": "VTL"
+					},
+					"id": "why",
+					"response": {
+						"name": "WHY"
+					}
+				}
+			]
+		},
+		{ "componentType": "Sequence", "label": "\"END\"", "page": 5 }
 	],
 	"variables": [
 		{
 			"variableType": "COLLECTED",
 			"name": "PRENOM",
-			"componentRef": "loop-prenom",
+			"values": {
+				"PREVIOUS": [null],
+				"COLLECTED": [null],
+				"FORCED": [null],
+				"EDITED": [null],
+				"INPUTED": [null]
+			}
+		},
+		{
+			"variableType": "COLLECTED",
+			"name": "AGE",
 			"values": {
 				"PREVIOUS": [null],
 				"COLLECTED": [null],
@@ -106,7 +162,6 @@
 		{
 			"variableType": "COLLECTED",
 			"name": "LINKS",
-			"componentRef": "loop-prenom",
 			"values": {
 				"PREVIOUS": [[null]],
 				"COLLECTED": [[null]],
@@ -115,6 +170,17 @@
 				"INPUTED": [[null]]
 			}
 		},
+		{
+			"variableType": "COLLECTED",
+			"name": "WHY",
+			"values": {
+				"PREVIOUS": [null],
+				"COLLECTED": [null],
+				"FORCED": [null],
+				"EDITED": [null],
+				"INPUTED": [null]
+			}
+		},
 		{
 			"variableType": "CALCULATED",
 			"name": "xAxis",

package/lib/stories/pairwise/{links/pairwise-links.stories.js → pairwise-links.stories.js}

@@ -7,18 +7,18 @@ exports["default"] = exports.Default = void 0;
 
 var _react = _interopRequireDefault(require("react"));
 
-var _orchestrator = _interopRequireDefault(require("../../utils/orchestrator"));
+var _orchestrator = _interopRequireDefault(require("../utils/orchestrator"));
 
 var _links = _interopRequireDefault(require("./links"));
 
 var _data = _interopRequireDefault(require("./data"));
 
-var _defaultArgTypes = _interopRequireDefault(require("../../utils/default-arg-types"));
+var _defaultArgTypes = _interopRequireDefault(require("../utils/default-arg-types"));
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
 
 var stories = {
-  title: 'Pairwise/Links',
+  title: 'Components/PairwiseLinks',
   component: _orchestrator["default"],
   argTypes: _defaultArgTypes["default"]
 };

package/lib/stories/questionnaires-test/controls/V2_Controles_BouclesLiees_PasPageFin.json

@@ -120,19 +120,6 @@
 		{
 			"componentType": "InputNumber",
 			"controls": [
-				{
-					"criticality": "ERROR",
-					"errorMessage": {
-						"type": "VTL|MD",
-						"value": "\"Vous devez saisir un nombre.\""
-					},
-					"typeOfControl": "FORMAT",
-					"control": {
-						"type": "VTL",
-						"value": "not(not(isnull(Q1)) and not(isNaN(Q1)))"
-					},
-					"id": "l14vfucm-formatNumber"
-				},
 				{
 					"criticality": "ERROR",
 					"errorMessage": {
@@ -142,9 +129,9 @@
 					"typeOfControl": "FORMAT",
 					"control": {
 						"type": "VTL",
-						"value": "not(not(isnull(Q1)) and (1>Q1 or 5<Q1)))"
+						"value": "not(not(isnull(Q1)) and (1>Q1 or 5<Q1))"
 					},
-					"id": "l14vfucm-formatBorneInfSup"
+					"id": "l14vfucm-format-borne-inf-sup"
 				},
 				{
 					"criticality": "ERROR",
@@ -155,9 +142,9 @@
 					"typeOfControl": "FORMAT",
 					"control": {
 						"type": "VTL",
-						"value": "not(not(isnull(Q1)) and trunc(Q1,0)<>Q1)"
+						"value": "not(not(isnull(Q1))  and round(Q1,0)<>Q1)"
 					},
-					"id": "l14vfucm-formatDec"
+					"id": "l14vfucm-format-decimal"
 				},
 				{
 					"bindingDependencies": ["Q1"],
@@ -306,19 +293,6 @@
 				{
 					"componentType": "InputNumber",
 					"controls": [
-						{
-							"criticality": "ERROR",
-							"errorMessage": {
-								"type": "VTL|MD",
-								"value": "\"Vous devez saisir un nombre.\""
-							},
-							"typeOfControl": "FORMAT",
-							"control": {
-								"type": "VTL",
-								"value": "not(not(isnull(Q3)) and not(isNaN(Q3)))"
-							},
-							"id": "l5ggvqgj-formatNumber"
-						},
 						{
 							"criticality": "ERROR",
 							"errorMessage": {
@@ -328,9 +302,9 @@
 							"typeOfControl": "FORMAT",
 							"control": {
 								"type": "VTL",
-								"value": "not(not(isnull(Q3)) and (0>Q3 or 20<Q3)))"
+								"value": "not(not(isnull(Q3)) and (0>Q3 or 20<Q3))"
 							},
-							"id": "l5ggvqgj-formatBorneInfSup"
+							"id": "l5ggvqgj-format-borne-inf-sup"
 						},
 						{
 							"criticality": "ERROR",
@@ -341,9 +315,9 @@
 							"typeOfControl": "FORMAT",
 							"control": {
 								"type": "VTL",
-								"value": "not(not(isnull(Q3)) and trunc(Q3,0)<>Q3)"
+								"value": "not(not(isnull(Q3))  and round(Q3,0)<>Q3)"
 							},
-							"id": "l5ggvqgj-formatDec"
+							"id": "l5ggvqgj-format-decimal"
 						}
 					],
 					"max": 20,
@@ -375,19 +349,6 @@
 				{
 					"componentType": "InputNumber",
 					"controls": [
-						{
-							"criticality": "ERROR",
-							"errorMessage": {
-								"type": "VTL|MD",
-								"value": "\"Vous devez saisir un nombre.\""
-							},
-							"typeOfControl": "FORMAT",
-							"control": {
-								"type": "VTL",
-								"value": "not(not(isnull(Q4)) and not(isNaN(Q4)))"
-							},
-							"id": "l5ggzuuo-formatNumber"
-						},
 						{
 							"criticality": "ERROR",
 							"errorMessage": {
@@ -397,9 +358,9 @@
 							"typeOfControl": "FORMAT",
 							"control": {
 								"type": "VTL",
-								"value": "not(not(isnull(Q4)) and (0>Q4 or 20<Q4)))"
+								"value": "not(not(isnull(Q4)) and (0>Q4 or 20<Q4))"
 							},
-							"id": "l5ggzuuo-formatBorneInfSup"
+							"id": "l5ggzuuo-format-borne-inf-sup"
 						},
 						{
 							"criticality": "ERROR",
@@ -410,9 +371,9 @@
 							"typeOfControl": "FORMAT",
 							"control": {
 								"type": "VTL",
-								"value": "not(not(isnull(Q4)) and trunc(Q4,0)<>Q4)"
+								"value": "not(not(isnull(Q4))  and round(Q4,0)<>Q4)"
 							},
-							"id": "l5ggzuuo-formatDec"
+							"id": "l5ggzuuo-format-decimal"
 						},
 						{
 							"bindingDependencies": ["Q3", "Q4"],
@@ -565,7 +526,7 @@
 	"lunaticModelVersion": "2.2.14-rc",
 	"modele": "TESTCONTBOUCL",
 	"enoCoreVersion": "2.3.10-controls-type",
-	"generatingDate": "08-09-2022 12:16:00",
+	"generatingDate": "22-09-2022 11:21:08",
 	"missing": false,
 	"id": "l5gghitu",
 	"maxPage": "8"