@inseefr/lunatic 2.4.5 → 2.4.6-declaInSeq

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

@@ -1,5 +1,5 @@
 /// <reference types="react" />
 import './sequence.scss';
 import { LunaticBaseProps } from '../../type';
-declare const _default: import("react").ComponentType<Pick<LunaticBaseProps<string>, "label" | "style" | "id">>;
+declare const _default: import("react").ComponentType<Pick<LunaticBaseProps<string>, "label" | "style" | "id" | "description">>;
 export default _default;

package/lib/src/components/sequence/lunatic-sequence.d.ts

@@ -1,3 +1,3 @@
 import { LunaticComponentProps } from '../type';
-declare function LunaticSequence({ declarations, label, id, style, questionContext, questionInformation, }: LunaticComponentProps<'Sequence'>): import("react/jsx-runtime").JSX.Element;
+declare function LunaticSequence({ declarations, label, id, style }: LunaticComponentProps<'Sequence'>): import("react/jsx-runtime").JSX.Element;
 export default LunaticSequence;

package/lib/src/components/suggester/idb-suggester/suggester-notification.d.ts

@@ -1,7 +1,5 @@
-import React from 'react';
-import { PropsWithChildren } from 'react';
+import React, { PropsWithChildren, ReactNode } from 'react';
 import { SuggesterStatus } from '../../../use-lunatic/use-suggesters';
-import { ReactNode } from 'react';
 type Props = PropsWithChildren<{
     status: SuggesterStatus;
     storeName: string;

package/lib/src/components/type.d.ts

@@ -36,8 +36,6 @@ export type LunaticBaseProps<ValueType = unknown> = {
     executeExpression: LunaticState['executeExpression'];
     features?: string[];
     componentType?: string;
-    questionContext?: ReactNode;
-    questionInformation?: ReactNode;
 };
 export type SuggesterOption = {
     children?: string[];
@@ -69,8 +67,9 @@ type ComponentPropsByType = {
             name: string;
         };
     };
-    Sequence: Pick<LunaticBaseProps<string>, 'id' | 'declarations' | 'label' | 'style' | 'questionContext' | 'questionInformation'>;
+    Sequence: Pick<LunaticBaseProps<string>, 'id' | 'declarations' | 'label' | 'style'>;
     Subsequence: Pick<LunaticBaseProps<string>, 'id' | 'declarations' | 'label'>;
+    Question: Pick<LunaticBaseProps<unknown>, 'label' | 'description'>;
     ComponentSet: LunaticBaseProps<unknown> & {
         components: LunaticComponentDefinition[];
         value: Record<string, unknown>;

package/lib/src/hooks/use-ref-sync.d.ts

@@ -2,4 +2,4 @@
 /**
  * useRef, but keep the value in sync on every render
  */
-export declare function useRefSync<T extends unknown>(value: T): import("react").MutableRefObject<T>;
+export declare function useRefSync<T>(value: T): import("react").MutableRefObject<T>;

package/lib/src/use-lunatic/reducer/commons/resize-array-variable.d.ts

@@ -1,5 +1,5 @@
 /**
  * Cast the variable into an array and adjust the length if necessary
  */
-declare function resizeArrayVariable<T extends unknown = unknown>(array: unknown, length: number, defaultValue?: T): T[];
+declare function resizeArrayVariable<T = unknown>(array: unknown, length: number, defaultValue?: T): T[];
 export default resizeArrayVariable;

package/lib/src/utils/logger.d.ts

@@ -0,0 +1,6 @@
+export declare class Logger {
+    static info(...args: unknown[]): void;
+    static error(...args: unknown[]): void;
+    static log(...args: unknown[]): void;
+    static warn(...args: unknown[]): void;
+}

package/lib/stories/component-set/data2.json

@@ -1,5 +1,12 @@
 {
 	"COLLECTED": {
+    "NB_HAB": {
+			"EDITED": null,
+			"FORCED": null,
+			"INPUTED": null,
+			"PREVIOUS": null,
+			"COLLECTED": 2
+		},
 		"PRENOM": {
 			"EDITED": [null],
 			"FORCED": [null],

package/lib/stories/component-set/source2.json

@@ -115,41 +115,11 @@
           "depth": 1,
           "conditionFilter": { "value": "true", "type": "VTL" },
           "label": {
-            "value": "\"## Who are you? <- this is inside a roundabout ->\"", 
+            "value": "\"## Who are you?\"", 
             "type":"VTL|MD"
           },
           "description": { "value": "\"This is your opportunity to tell me about yourself!\"", "type": "VTL|MD" },
           "components": [
-            {
-              "id": "color",
-              "componentType": "Input",
-              "mandatory": false,
-              "maxLength": 20,
-              "label": {
-                "value": "\"Favourite Color?\"))",
-                "type": "VTL|MD"
-              },
-              "conditionFilter": {
-                "value": "true",
-                "type": "VTL"
-              },
-              "controls": [
-                {
-                  "criticality": "WARN",
-                  "errorMessage": {
-                    "type": "VTL",
-                    "value": "\"booleen pas coché et on affiche un message un peu long histoire de tester le truc \""
-                  },
-                  "typeOfControl": "CONSISTENCY",
-                  "control": {
-                    "type": "VTL",
-                    "value": "false"
-                  },
-                  "id": "kfxmjupm-CI-0"
-                }
-              ],
-              "response": { "name": "COLOR" }
-            },
             {
               "id": "sexe",
               "componentType": "Radio",
@@ -173,6 +143,36 @@
               ],
               "response": { "name": "SEXE" }
             },
+            {
+              "id": "color",
+              "componentType": "Input",
+              "mandatory": false,
+              "maxLength": 20,
+              "label": {
+                "value": "\"Favourite Color?\"))",
+                "type": "VTL|MD"
+              },
+              "conditionFilter": {
+                "value": "not(isnull(SEXE))",
+                "type": "VTL"
+              },
+              "controls": [
+                {
+                    "id": "j4nw5cqz",
+                    "typeOfControl": "CONSISTENCY",
+                    "criticality": "WARN",
+                    "control": {
+                        "value": "COLOR <> \"Green\"",
+                        "type": "VTL"
+                    },
+                    "errorMessage": {
+                        "value": "\"Green is the worst colour!!!\"",
+                        "type": "VTL|MD"
+                    }
+                }
+              ],
+              "response": { "name": "COLOR" }
+            },
             {
               "id": "j4nw5cqz",
               "componentType": "Dropdown",

package/lib/stories/custom-mui/suggester-mui/suggester-mui.js

@@ -258,7 +258,6 @@ function SuggesterMui(_ref7) {
   var onChangeEx = (0, _react.useCallback)(function (e) {
     onChange(e.target.value);
     setSearch(e.target.value);
-    console.log(e.target.value);
   }, [onChange]);
   var onDelete = (0, _react.useCallback)(function () {
     setSearch('');

package/lib/stories/input/input.stories.js

@@ -3,10 +3,11 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports["default"] = exports.Default = void 0;
+exports["default"] = exports.WithQuestion = exports.Default = void 0;
 var _react = _interopRequireDefault(require("react"));
 var _orchestrator = _interopRequireDefault(require("../utils/orchestrator"));
 var _source = _interopRequireDefault(require("./source"));
+var _sourceWithQuestion = _interopRequireDefault(require("./source-with-question"));
 var _data = _interopRequireDefault(require("./data"));
 var _defaultArgTypes = _interopRequireDefault(require("../utils/default-arg-types"));
 var _jsxRuntime = require("react/jsx-runtime");
@@ -33,4 +34,11 @@ Default.args = {
   id: 'input',
   source: _source["default"],
   data: _data["default"]
+};
+var WithQuestion = Template.bind({});
+exports.WithQuestion = WithQuestion;
+WithQuestion.args = {
+  id: 'input',
+  source: _sourceWithQuestion["default"],
+  data: _data["default"]
 };

package/lib/stories/input/source-with-question.json

@@ -0,0 +1,74 @@
+{
+	"components": [
+		{
+			"componentType": "QuestionInformation",
+			"label": { "value": "\"Question Information\"", "type": "VTL|MD" },
+      "description": { "value": "\"Question Information description\"", "type": "VTL|MD" },
+			"page": "1"
+		},
+		{
+			"componentType": "Input",
+			"label": {
+				"value": "\"Prénom de l'occupant principal.\"",
+				"type": "VTL|MD"
+			},
+			"conditionFilter": { "value": "true", "type": "VTL" },
+			"maxLength": 30,
+			"id": "name",
+			"response": {
+				"name": "PRENOM"
+			},
+			"page": "1"
+		},
+		{
+			"componentType": "QuestionContext",
+			"label": { "value": "\"Question Context\"", "type": "VTL|MD" },
+      "description": { "value": "\"Question Context description\"", "type": "VTL|MD" },
+      "page": "1"
+		},
+		{
+			"componentType": "Input",
+			"label": {
+				"value": "\"Nom de l'occupant principal.\"",
+				"type": "VTL|MD"
+			},
+			"conditionFilter": { "value": "true", "type": "VTL" },
+			"maxLength": 30,
+			"id": "surname",
+			"description": {
+				"value": "\"For example, Bob.\"",
+				"type": "VTL|MD"
+			},
+			"response": {
+				"name": "NOM"
+			},
+			"page": "1"
+		}
+	],
+	"variables": [
+		{
+			"variableType": "COLLECTED",
+			"name": "NOM",
+			"componentRef": "name",
+			"values": {
+				"PREVIOUS": null,
+				"COLLECTED": null,
+				"FORCED": null,
+				"EDITED": null,
+				"INPUTED": null
+			}
+		},
+		{
+			"variableType": "COLLECTED",
+			"name": "PRENOM",
+			"componentRef": "name",
+			"values": {
+				"PREVIOUS": null,
+				"COLLECTED": null,
+				"FORCED": null,
+				"EDITED": null,
+				"INPUTED": null
+			}
+		}
+	]
+}

package/lib/stories/questionnaires/simpsons/simpsons.stories.js

@@ -10,6 +10,7 @@ var _defaultArgTypes = _interopRequireDefault(require("../../utils/default-arg-t
 var _e2e = require("../../../../tests/utils/e2e");
 var _source = _interopRequireDefault(require("./source"));
 var _timer = require("../../../../tests/utils/timer");
+var _logger = require("../../../utils/logger");
 var _jsxRuntime = require("react/jsx-runtime");
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
 function _typeof(obj) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (obj) { return typeof obj; } : function (obj) { return obj && "function" == typeof Symbol && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; }, _typeof(obj); }
@@ -535,7 +536,7 @@ With_Missing.args = {
   pagination: true,
   missing: true,
   missingStrategy: function missingStrategy() {
-    console.log('your strategy has been applied');
+    _logger.Logger.info('your strategy has been applied');
   },
   dontKnowButton: 'I dunno',
   refusedButton: 'Oh no!',

package/lib/stories/sequence/afterInSeq.json

@@ -0,0 +1,293 @@
+{
+  "cleaning": {},
+  "variables": [
+    {
+      "variableType": "COLLECTED",
+      "values": {
+        "COLLECTED": null,
+        "EDITED": null,
+        "INPUTED": null,
+        "FORCED": null,
+        "PREVIOUS": null
+      },
+      "name": "COMMENT_QE"
+    },
+    {
+      "variableType": "COLLECTED",
+      "values": {
+        "COLLECTED": null,
+        "EDITED": null,
+        "INPUTED": null,
+        "FORCED": null,
+        "PREVIOUS": null
+      },
+      "name": "Q1"
+    },
+    {
+      "variableType": "COLLECTED",
+      "values": {
+        "COLLECTED": null,
+        "EDITED": null,
+        "INPUTED": null,
+        "FORCED": null,
+        "PREVIOUS": null
+      },
+      "name": "Q2"
+    },
+    {
+      "variableType": "COLLECTED",
+      "values": {
+        "COLLECTED": null,
+        "EDITED": null,
+        "INPUTED": null,
+        "FORCED": null,
+        "PREVIOUS": null
+      },
+      "name": "Q3"
+    },
+    {
+      "variableType": "COLLECTED",
+      "values": {
+        "COLLECTED": null,
+        "EDITED": null,
+        "INPUTED": null,
+        "FORCED": null,
+        "PREVIOUS": null
+      },
+      "name": "Q4"
+    },
+    {
+      "variableType": "COLLECTED",
+      "values": {
+        "COLLECTED": null,
+        "EDITED": null,
+        "INPUTED": null,
+        "FORCED": null,
+        "PREVIOUS": null
+      },
+      "name": "Q5"
+    },
+    {
+      "variableType": "COLLECTED",
+      "values": {
+        "COLLECTED": null,
+        "EDITED": null,
+        "INPUTED": null,
+        "FORCED": null,
+        "PREVIOUS": null
+      },
+      "name": "Q6"
+    },
+    {
+      "variableType": "COLLECTED",
+      "values": {
+        "COLLECTED": null,
+        "EDITED": null,
+        "INPUTED": null,
+        "FORCED": null,
+        "PREVIOUS": null
+      },
+      "name": "Q7"
+    },
+    {
+      "variableType": "COLLECTED",
+      "values": {
+        "COLLECTED": null,
+        "EDITED": null,
+        "INPUTED": null,
+        "FORCED": null,
+        "PREVIOUS": null
+      },
+      "name": "Q8"
+    },
+    {
+      "variableType": "COLLECTED",
+      "values": {
+        "COLLECTED": null,
+        "EDITED": null,
+        "INPUTED": null,
+        "FORCED": null,
+        "PREVIOUS": null
+      },
+      "name": "Q9"
+    },
+    {
+      "variableType": "COLLECTED",
+      "values": {
+        "COLLECTED": null,
+        "EDITED": null,
+        "INPUTED": null,
+        "FORCED": null,
+        "PREVIOUS": null
+      },
+      "name": "Q10"
+    },
+    {
+      "variableType": "COLLECTED",
+      "values": {
+        "COLLECTED": null,
+        "EDITED": null,
+        "INPUTED": null,
+        "FORCED": null,
+        "PREVIOUS": null
+      },
+      "name": "MIX1"
+    },
+    {
+      "variableType": "COLLECTED",
+      "values": {
+        "COLLECTED": null,
+        "EDITED": null,
+        "INPUTED": null,
+        "FORCED": null,
+        "PREVIOUS": null
+      },
+      "name": "MIX2"
+    },
+    {
+      "variableType": "COLLECTED",
+      "values": {
+        "COLLECTED": null,
+        "EDITED": null,
+        "INPUTED": null,
+        "FORCED": null,
+        "PREVIOUS": null
+      },
+      "name": "MIX3"
+    },
+    {
+      "variableType": "COLLECTED",
+      "values": {
+        "COLLECTED": null,
+        "EDITED": null,
+        "INPUTED": null,
+        "FORCED": null,
+        "PREVIOUS": null
+      },
+      "name": "MIX4"
+    },
+    {
+      "variableType": "CALCULATED",
+      "expression": { "type": "VTL", "value": "true" },
+      "name": "FILTER_RESULT_Q1",
+      "inFilter": "false"
+    },
+    {
+      "variableType": "CALCULATED",
+      "expression": { "type": "VTL", "value": "true" },
+      "name": "FILTER_RESULT_Q2",
+      "inFilter": "false"
+    },
+    {
+      "variableType": "CALCULATED",
+      "expression": { "type": "VTL", "value": "true" },
+      "name": "FILTER_RESULT_Q3",
+      "inFilter": "false"
+    },
+    {
+      "variableType": "CALCULATED",
+      "expression": { "type": "VTL", "value": "true" },
+      "name": "FILTER_RESULT_Q4",
+      "inFilter": "false"
+    },
+    {
+      "variableType": "CALCULATED",
+      "expression": { "type": "VTL", "value": "true" },
+      "name": "FILTER_RESULT_Q5",
+      "inFilter": "false"
+    },
+    {
+      "variableType": "CALCULATED",
+      "expression": { "type": "VTL", "value": "true" },
+      "name": "FILTER_RESULT_Q6",
+      "inFilter": "false"
+    },
+    {
+      "variableType": "CALCULATED",
+      "expression": { "type": "VTL", "value": "true" },
+      "name": "FILTER_RESULT_Q7",
+      "inFilter": "false"
+    },
+    {
+      "variableType": "CALCULATED",
+      "expression": { "type": "VTL", "value": "true" },
+      "name": "FILTER_RESULT_Q8",
+      "inFilter": "false"
+    },
+    {
+      "variableType": "CALCULATED",
+      "expression": { "type": "VTL", "value": "true" },
+      "name": "FILTER_RESULT_Q9",
+      "inFilter": "false"
+    },
+    {
+      "variableType": "CALCULATED",
+      "expression": { "type": "VTL", "value": "true" },
+      "name": "FILTER_RESULT_Q10",
+      "inFilter": "false"
+    },
+    {
+      "variableType": "CALCULATED",
+      "expression": { "type": "VTL", "value": "true" },
+      "name": "FILTER_RESULT_MIX1",
+      "inFilter": "false"
+    },
+    {
+      "variableType": "CALCULATED",
+      "expression": { "type": "VTL", "value": "true" },
+      "name": "FILTER_RESULT_MIX2",
+      "inFilter": "false"
+    },
+    {
+      "variableType": "CALCULATED",
+      "expression": { "type": "VTL", "value": "true" },
+      "name": "FILTER_RESULT_MIX3",
+      "inFilter": "false"
+    },
+    {
+      "variableType": "CALCULATED",
+      "expression": { "type": "VTL", "value": "true" },
+      "name": "FILTER_RESULT_MIX4",
+      "inFilter": "false"
+    }
+  ],
+  "components": [
+    {
+      "componentType": "Sequence",
+      "hierarchy": {
+        "sequence": {
+          "id": "kanya0cm",
+          "page": "1",
+          "label": {
+            "type": "VTL|MD",
+            "value": "\"I - \" || \"Séquence - questions comportant des déclarations de différents types\""
+          }
+        }
+      },
+      "conditionFilter": { "type": "VTL", "value": "true" },
+      "id": "kanya0cm",
+      "page": "1",
+      "label": {
+        "type": "VTL|MD",
+        "value": "\"I - \" || \"Séquence - questions comportant des déclarations de différents types\""
+      },
+      "declarations": [
+        {
+          "declarationType": "INSTRUCTION",
+          "id": "kanya0cm-kanzilet",
+          "label": {
+            "type": "VTL|MD",
+            "value": "\"consigne de séquence cawi\""
+          },
+          "position": "AFTER_QUESTION_TEXT"
+        },
+        {
+          "declarationType": "HELP",
+          "id": "kanya0cm-kzfdtx2b",
+          "label": { "type": "VTL|MD", "value": "\"aide de séquence cawi\"" },
+          "position": "AFTER_QUESTION_TEXT"
+        }
+      ]
+    }
+  ]
+}

package/lib/stories/sequence/sequence.stories.js

@@ -3,11 +3,11 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports["default"] = exports.WithQuestions = exports.WithDeclarations = void 0;
+exports["default"] = exports.afterSeq = exports.WithDeclarations = void 0;
 var _react = _interopRequireDefault(require("react"));
 var _orchestrator = _interopRequireDefault(require("../utils/orchestrator"));
 var _sourceDeclarations = _interopRequireDefault(require("./source-declarations.json"));
-var _sourceQuestions = _interopRequireDefault(require("./source-questions.json"));
+var _afterInSeq = _interopRequireDefault(require("./afterInSeq.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 }; }
@@ -16,7 +16,7 @@ function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (O
 function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
 function _defineProperty(obj, key, value) { key = _toPropertyKey(key); if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
 function _toPropertyKey(arg) { var key = _toPrimitive(arg, "string"); return _typeof(key) === "symbol" ? key : String(key); }
-function _toPrimitive(input, hint) { if (_typeof(input) !== "object" || input === null) return input; var prim = input[Symbol.toPrimitive]; if (prim !== undefined) { var res = prim.call(input, hint || "default"); if (_typeof(res) !== "object") return res; throw new TypeError("@@toPrimitive must return a primitive value."); } return (hint === "string" ? String : Number)(input); }
+function _toPrimitive(input, hint) { if (_typeof(input) !== "object" || input === null) return input; var prim = input[Symbol.toPrimitive]; if (prim !== undefined) { var res = prim.call(input, hint || "default"); if (_typeof(res) !== "object") return res; throw new TypeError("@@toPrimitive must return a primitive value."); } return (hint === "string" ? String : Number)(input); } // import sourceQuestions from './source-questions.json';
 var stories = {
   title: 'Components/Sequence',
   component: _orchestrator["default"],
@@ -33,9 +33,13 @@ WithDeclarations.args = {
   id: 'sequence-declarations',
   source: _sourceDeclarations["default"]
 };
-var WithQuestions = Template.bind({});
-exports.WithQuestions = WithQuestions;
-WithQuestions.args = {
-  id: 'sequence-questions',
-  source: _sourceQuestions["default"]
+
+// export const WithQuestions = Template.bind({});
+// WithQuestions.args = { id: 'sequence-questions', source: sourceQuestions };
+
+var afterSeq = Template.bind({});
+exports.afterSeq = afterSeq;
+afterSeq.args = {
+  id: 'sequence-after',
+  source: _afterInSeq["default"]
 };

package/lib/stories/sequence/source-declarations.json

@@ -16,6 +16,15 @@
 						"type": "VTL|MD"
 					}
 				},
+				{
+					"id": "kb9hi4j0-krnoclfe",
+					"declarationType": "INSTRUCTION",
+					"position": "AFTER_QUESTION_TEXT",
+					"label": {
+						"value": "\"Déclaration AFTER\"",
+						"type": "VTL|MD"
+					}
+				},
 				{
 					"id": "kb9hi4j0-krnoclfe",
 					"declarationType": "HELP",