@inseefr/lunatic 0.3.7-experimental → 0.3.8-experimental

package/package.json

@@ -1,7 +1,7 @@
 {
 	"name": "@inseefr/lunatic",
-	"version": "0.3.7-experimental",
-	"workersVersion": "0.2.1-experimental",
+	"version": "0.3.8-experimental",
+	"workersVersion": "0.2.4-experimental",
 	"description": "Library of questionnaire components",
 	"repository": {
 		"type": "git",
@@ -50,7 +50,7 @@
 		"library"
 	],
 	"dependencies": {
-		"@inseefr/trevas": "^0.1.12",
+		"@inseefr/trevas": "^0.1.14",
 		"array-flat-polyfill": "^1.0.1",
 		"date-fns": "^2.25.0",
 		"lodash.camelcase": "^4.3.0",

package/src/components/index.js

@@ -1,5 +1,5 @@
-import 'array-flat-polyfill';
-
-export * from './components';
-export { default as Table } from './table';
-export * from '../utils/to-expose';
+import 'array-flat-polyfill';
+
+export * from './components';
+export { default as Table } from './table';
+export * from '../utils/to-expose';

package/src/stories/questionnaire/loop-and-controls.json

@@ -0,0 +1,481 @@
+{
+	"variables": [
+		{
+			"variableType": "COLLECTED",
+			"values": {
+				"COLLECTED": null,
+				"EDITED": null,
+				"INPUTED": null,
+				"FORCED": null,
+				"PREVIOUS": null
+			},
+			"name": "COMMENT_QE",
+			"componentRef": "COMMENT-QUESTION"
+		},
+		{
+			"variableType": "COLLECTED",
+			"values": {
+				"COLLECTED": null,
+				"EDITED": null,
+				"INPUTED": null,
+				"FORCED": null,
+				"PREVIOUS": null
+			},
+			"name": "NB",
+			"componentRef": "kwupqy19"
+		},
+		{
+			"variableType": "COLLECTED",
+			"values": {
+				"COLLECTED": [null],
+				"EDITED": [null],
+				"INPUTED": [null],
+				"FORCED": [null],
+				"PREVIOUS": [null]
+			},
+			"name": "PRENOM",
+			"componentRef": "kx06be0c"
+		},
+		{
+			"variableType": "COLLECTED",
+			"values": {
+				"COLLECTED": [null],
+				"EDITED": [null],
+				"INPUTED": [null],
+				"FORCED": [null],
+				"PREVIOUS": [null]
+			},
+			"name": "AGE",
+			"componentRef": "kx06be0c"
+		},
+		{
+			"variableType": "COLLECTED",
+			"values": {
+				"COLLECTED": null,
+				"EDITED": null,
+				"INPUTED": null,
+				"FORCED": null,
+				"PREVIOUS": null
+			},
+			"name": "Q1",
+			"componentRef": "kx05sq4y"
+		},
+		{
+			"variableType": "COLLECTED",
+			"values": {
+				"COLLECTED": null,
+				"EDITED": null,
+				"INPUTED": null,
+				"FORCED": null,
+				"PREVIOUS": null
+			},
+			"name": "Q2",
+			"componentRef": "kx06v7yq"
+		},
+		{
+			"variableType": "CALCULATED",
+			"expression": "true",
+			"name": "FILTER_RESULT_NB",
+			"inFilter": "false"
+		},
+		{
+			"variableType": "CALCULATED",
+			"expression": "true",
+			"name": "FILTER_RESULT_PRENOM",
+			"inFilter": "false",
+			"shapeFrom": "PRENOM"
+		},
+		{
+			"variableType": "CALCULATED",
+			"expression": "true",
+			"name": "FILTER_RESULT_AGE",
+			"inFilter": "false",
+			"shapeFrom": "PRENOM"
+		},
+		{
+			"variableType": "CALCULATED",
+			"bindingDependencies": ["AGE"],
+			"expression": "if (cast(nvl(AGE,\"15\"),integer) < 14) then 0 else 1",
+			"name": "A1",
+			"inFilter": "false",
+			"shapeFrom": "PRENOM"
+		},
+		{
+			"variableType": "CALCULATED",
+			"bindingDependencies": ["AGE"],
+			"expression": "if (cast(nvl(AGE,\"0\"),integer) < 18) then \"0\" else \"1\"",
+			"name": "A2",
+			"inFilter": "false",
+			"shapeFrom": "PRENOM"
+		},
+		{
+			"variableType": "CALCULATED",
+			"expression": "true",
+			"name": "FILTER_RESULT_Q1",
+			"inFilter": "false"
+		},
+		{
+			"variableType": "CALCULATED",
+			"expression": "true",
+			"name": "FILTER_RESULT_Q2",
+			"inFilter": "false"
+		},
+		{
+			"variableType": "CALCULATED",
+			"bindingDependencies": ["A1", "AGE"],
+			"expression": "sum(A1)",
+			"name": "B1",
+			"inFilter": "false"
+		},
+		{
+			"variableType": "CALCULATED",
+			"bindingDependencies": ["A2", "AGE"],
+			"expression": "sum(cast(A2,integer))",
+			"name": "B2",
+			"inFilter": "false"
+		},
+		{
+			"variableType": "CALCULATED",
+			"bindingDependencies": ["B1", "AGE"],
+			"expression": "\"Nb de majeurs\" || cast(B1,string)",
+			"name": "DEC1",
+			"inFilter": "false"
+		},
+		{
+			"variableType": "CALCULATED",
+			"bindingDependencies": ["B2", "AGE"],
+			"expression": "\"Nb de majeurs\" || cast(B2,string)",
+			"name": "DEC2",
+			"inFilter": "false"
+		}
+	],
+	"components": [
+		{
+			"componentType": "Sequence",
+			"hierarchy": {
+				"sequence": {
+					"id": "kwupyhsh",
+					"page": "1",
+					"label": "\"I - \" || \"S1\""
+				}
+			},
+			"conditionFilter": {
+				"value": "true"
+			},
+			"id": "kwupyhsh",
+			"page": "1",
+			"label": "\"I - \" || \"S1\""
+		},
+		{
+			"componentType": "InputNumber",
+			"max": 100,
+			"hierarchy": {
+				"sequence": {
+					"id": "kwupyhsh",
+					"page": "1",
+					"label": "\"I - \" || \"S1\""
+				}
+			},
+			"conditionFilter": {
+				"value": "true"
+			},
+			"label": "\"➡ 1. \" || \"NB \"",
+			"mandatory": false,
+			"declarations": [
+				{
+					"declarationType": "HELP",
+					"id": "kwupqy19-kx09g78a",
+					"label": "\"affiche\" || cast(nvl(NB,\"\"),string)",
+					"position": "AFTER_QUESTION_TEXT"
+				}
+			],
+			"bindingDependencies": ["NB"],
+			"min": 0,
+			"response": {
+				"name": "NB"
+			},
+			"decimals": 0,
+			"id": "kwupqy19",
+			"page": "2"
+		},
+		{
+			"componentType": "Sequence",
+			"hierarchy": {
+				"sequence": {
+					"id": "kx06a9lq",
+					"page": "3",
+					"label": "\"II - \" || \"S2\""
+				}
+			},
+			"conditionFilter": {
+				"value": "true"
+			},
+			"id": "kx06a9lq",
+			"page": "3",
+			"label": "\"II - \" || \"S2\""
+		},
+		{
+			"paginatedLoop": false,
+			"componentType": "Loop",
+			"components": [
+				{
+					"componentType": "Subsequence",
+					"goToPage": "4",
+					"hierarchy": {
+						"sequence": {
+							"id": "kx06a9lq",
+							"page": "3",
+							"label": "\"II - \" || \"S2\""
+						},
+						"subSequence": {
+							"id": "kx061cac",
+							"page": "4",
+							"label": "SS1"
+						}
+					},
+					"conditionFilter": {
+						"value": "true"
+					},
+					"id": "kx061cac",
+					"page": "4",
+					"label": "SS1"
+				},
+				{
+					"componentType": "Input",
+					"bindingDependencies": ["PRENOM"],
+					"response": {
+						"name": "PRENOM"
+					},
+					"hierarchy": {
+						"sequence": {
+							"id": "kx06a9lq",
+							"page": "3",
+							"label": "\"II - \" || \"S2\""
+						},
+						"subSequence": {
+							"id": "kx061cac",
+							"page": "4",
+							"label": "SS1"
+						}
+					},
+					"conditionFilter": {
+						"value": "true"
+					},
+					"id": "kwupruv2",
+					"page": "4",
+					"label": "\"➡ 2. \" || \"PRENOM \"",
+					"mandatory": false,
+					"maxLength": 249
+				},
+				{
+					"componentType": "InputNumber",
+					"max": 99,
+					"hierarchy": {
+						"sequence": {
+							"id": "kx06a9lq",
+							"page": "3",
+							"label": "\"II - \" || \"S2\""
+						},
+						"subSequence": {
+							"id": "kx061cac",
+							"page": "4",
+							"label": "SS1"
+						}
+					},
+					"conditionFilter": {
+						"value": "true"
+					},
+					"label": "\"➡ 3. \" || \"AGE \"",
+					"mandatory": false,
+					"declarations": [
+						{
+							"declarationType": "HELP",
+							"id": "kx05rmm0-kx07vkyq",
+							"label": "\"affiche\" || cast(A1,string)",
+							"position": "AFTER_QUESTION_TEXT"
+						},
+						{
+							"declarationType": "HELP",
+							"id": "kx05rmm0-kx07pza5",
+							"label": "\"affiche\" || cast(A2,string)",
+							"position": "AFTER_QUESTION_TEXT"
+						}
+					],
+					"bindingDependencies": ["A1", "A2", "AGE"],
+					"min": 0,
+					"response": {
+						"name": "AGE"
+					},
+					"decimals": 0,
+					"id": "kx05rmm0",
+					"page": "4"
+				}
+			],
+			"bindingDependencies": ["A1", "A2", "PRENOM", "AGE"],
+			"depth": 1,
+			"hierarchy": {
+				"sequence": {
+					"id": "kx06a9lq",
+					"page": "3",
+					"label": "\"II - \" || \"S2\""
+				}
+			},
+			"conditionFilter": {
+				"value": "true"
+			},
+			"id": "kx06be0c",
+			"page": "4",
+			"lines": {
+				"min": "2",
+				"max": "2"
+			}
+		},
+		{
+			"componentType": "Sequence",
+			"hierarchy": {
+				"sequence": {
+					"id": "kx06mitx",
+					"page": "5",
+					"label": "\"III - \" || \"CONTROLE\""
+				}
+			},
+			"conditionFilter": {
+				"value": "true"
+			},
+			"id": "kx06mitx",
+			"page": "5",
+			"label": "\"III - \" || \"CONTROLE\""
+		},
+		{
+			"componentType": "Input",
+			"bindingDependencies": ["DEC1", "DEC2", "Q1"],
+			"response": {
+				"name": "Q1"
+			},
+			"hierarchy": {
+				"sequence": {
+					"id": "kx06mitx",
+					"page": "5",
+					"label": "\"III - \" || \"CONTROLE\""
+				}
+			},
+			"conditionFilter": {
+				"value": "true"
+			},
+			"id": "kx05sq4y",
+			"page": "6",
+			"label": "\"➡ 4. \" || \"Q1 \"",
+			"mandatory": false,
+			"maxLength": 249,
+			"declarations": [
+				{
+					"declarationType": "HELP",
+					"id": "kx05sq4y-kx06gnt7",
+					"label": "DECLA",
+					"position": "AFTER_QUESTION_TEXT"
+				},
+				{
+					"declarationType": "HELP",
+					"id": "kx05sq4y-kx07lqnt",
+					"label": "DEC1",
+					"position": "AFTER_QUESTION_TEXT"
+				},
+				{
+					"declarationType": "HELP",
+					"id": "kx05sq4y-kx07mx14",
+					"label": "DEC2",
+					"position": "AFTER_QUESTION_TEXT"
+				}
+			]
+		},
+		{
+			"componentType": "Input",
+			"bindingDependencies": ["B1", "B2", "Q2"],
+			"response": {
+				"name": "Q2"
+			},
+			"hierarchy": {
+				"sequence": {
+					"id": "kx06mitx",
+					"page": "5",
+					"label": "\"III - \" || \"CONTROLE\""
+				}
+			},
+			"conditionFilter": {
+				"value": "true"
+			},
+			"id": "kx06v7yq",
+			"page": "7",
+			"label": "\"➡ 5. \" || \"Q2 \"",
+			"mandatory": false,
+			"maxLength": 249,
+			"declarations": [
+				{
+					"declarationType": "HELP",
+					"id": "kx06v7yq-kx072jlc",
+					"label": "\"Nb de majeurs\" || cast(B1,string)",
+					"position": "AFTER_QUESTION_TEXT"
+				},
+				{
+					"declarationType": "HELP",
+					"id": "kx06v7yq-kx070ql4",
+					"label": "DECLA",
+					"position": "AFTER_QUESTION_TEXT"
+				},
+				{
+					"declarationType": "HELP",
+					"id": "kx06v7yq-kx06xp0o",
+					"label": "\"Nb de majeurs\" || cast(B2,string)",
+					"position": "AFTER_QUESTION_TEXT"
+				}
+			]
+		},
+		{
+			"componentType": "Sequence",
+			"hierarchy": {
+				"sequence": {
+					"id": "COMMENT-SEQ",
+					"page": "8",
+					"label": "\"Commentaire\""
+				}
+			},
+			"conditionFilter": {
+				"value": "true"
+			},
+			"id": "COMMENT-SEQ",
+			"page": "8",
+			"label": "\"Commentaire\""
+		},
+		{
+			"componentType": "Textarea",
+			"bindingDependencies": ["COMMENT_QE"],
+			"response": {
+				"name": "COMMENT_QE"
+			},
+			"hierarchy": {
+				"sequence": {
+					"id": "COMMENT-SEQ",
+					"page": "8",
+					"label": "\"Commentaire\""
+				}
+			},
+			"conditionFilter": {
+				"value": "true"
+			},
+			"id": "COMMENT-QUESTION",
+			"page": "9",
+			"label": "\"Avez-vous des remarques concernant l'enquête ou des commentaires ?\"",
+			"mandatory": false,
+			"maxLength": 2000
+		}
+	],
+	"pagination": "question",
+	"lunaticModelVersion": "2.2.8",
+	"modele": "TESTANNE",
+	"enoCoreVersion": "2.3.2",
+	"generatingDate": "10-12-2021 12:37:32",
+	"missing": false,
+	"id": "kwupldxm",
+	"label": "test Anne",
+	"maxPage": "9"
+}

package/src/stories/questionnaire/questionnaire.stories.js

@@ -10,6 +10,7 @@ import logementS2 from './logement-s2';
 import logementSequence from './logement-sequence';
 import dataLogement from './data-logement';
 import simpsons from './simpsons';
+import loopAndControls from './loop-and-controls.json';
 import arithmetic from './arithmetic';
 import kish from './kish';
 import arithmeticManagement from './arithmetic-management';
@@ -192,6 +193,24 @@ const other = storiesOf('Questionnaire/Other', module).addDecorator(
 	}
 );
 
+other.addWithJSX('Controls', () => (
+	<Orchestrator
+		id="props"
+		modalForControls={true}
+		source={loopAndControls}
+		missing={boolean('Missing', false)}
+		activeGoNextForMissing={boolean('Active go next for missing', false)}
+		missingShortcut={{ dontKnow: 'f2', refused: 'f4' }}
+		shortcut
+		features={select('Features', featuresOptions, ['VTL', 'MD'])}
+		positioning={select('Items positioning', positioningOptions, 'DEFAULT')}
+		disabled={boolean('Disabled', false)}
+		focused={boolean('Focused', false)}
+		management={boolean('Management', false)}
+		pagination
+	/>
+));
+
 other.addWithJSX('Update external', () => {
 	const [addExternal, setAddExternal] = useState(null);
 	return (

package/src/stories/suggester/bailleurs-sociaux-2021/fetch-bailleurs.js

@@ -0,0 +1,12 @@
+const FILE_NAME = 'bailleurs-sociaux-2021.json';
+
+async function fetchBailleurs(path = '') {
+	const sbPath =
+		process.env.NODE_ENV === 'development'
+			? `${path}/${FILE_NAME}`
+			: `/Lunatic/storybook/${FILE_NAME}`;
+	const response = await fetch(sbPath);
+	return response.json();
+}
+
+export default fetchBailleurs;

package/src/stories/suggester/bailleurs-sociaux-2021/index.js

@@ -0,0 +1 @@
+export { default as fetch } from './fetch-bailleurs';

package/src/stories/suggester/data.json

@@ -61,7 +61,26 @@
 			"stopWords": ["de", "la", "les", "du", "et", "au", "aux", "en"],
 			"max": 12,
 			"version": "1"
-		}
+		},{
+			"name": "bailleurs-sociaux-2021",
+			"fields": [
+			  {
+				"name": "label",
+				"rules": ["[\\w]+"],
+				"stemmer": true,
+				"synonyms": [{ "source": "saint", "target": ["st"] }]
+			  },
+	  
+			  { "name": "id" }
+			],
+			"max": 12,
+			"stopWords": ["de", "la", "les", "du", "et", "au", "aux", "en"],
+			"queryParser": {
+			  "type": "tokenized",
+			  "params": { "language": "French", "min": 1, "pattern": "[\\w]+" }
+			},
+			"version": "1"
+		  }
 	],
 	"components": [
 		{
@@ -96,6 +115,17 @@
 			"response": {
 				"name": "BAILLEURS"
 			}
+		},
+		{
+			"id": "bailleurs-sociaux-2021",
+			"componentType": "Suggester",
+			"mandatory": false,
+			"label": "Bailleurs sociaux 2021",
+			"path": "data/bailleurs-2021",
+			"storeName": "bailleurs-sociaux-2021",
+			"response": {
+				"name": "BAILLEURS"
+			}
 		}
 	],
 	"variables": [

package/src/stories/suggester/suggester-workers.stories.js

@@ -15,6 +15,10 @@ function fetchNaf() {
 	return fetch('naf-rev2.json').then((r) => r.json());
 }
 
+function fetchBailleurs2021() {
+	return fetch('bailleurs-sociaux-2021.json').then((r) => r.json());
+}
+
 async function fetchBailleurs(path = '') {
 	const response = await fetch('/bailleurs-sociaux.json');
 	const naf = await response.json();
@@ -86,6 +90,27 @@ const infoNaf = {
 	version: '1',
 };
 
+const infoBailleurs2021 = {
+	name: 'bailleurs-sociaux-2021',
+	fields: [
+		{
+			name: 'label',
+			rules: ['[\\w]+'],
+			stemmer: false,
+			synonyms: [{ source: 'saint', target: ['st'] }],
+		},
+
+		{ name: 'id' },
+	],
+	max: 12,
+	stopWords: ['de', 'la', 'les', 'du', 'et', 'au', 'aux', 'en'],
+	queryParser: {
+		type: 'tokenized',
+		params: { language: 'French', min: 1, pattern: '[\\w]+' },
+	},
+	version: '1',
+};
+
 async function loadCog() {
 	const { name } = infoCog;
 	const communes = await fetchCog();
@@ -106,6 +131,16 @@ async function loadBailleurs() {
 	await insertEntity(db, CONSTANTES.STORE_INFO_NAME, bailleursSociaux);
 }
 
+async function loadBailleurs2021() {
+	const { name } = infoBailleurs2021;
+	const bailleurs = await fetchBailleurs2021();
+	const db = await openOnCreateDb(name);
+	await clearDb(db, CONSTANTES.STORE_DATA_NAME);
+	await clearDb(db, CONSTANTES.STORE_INFO_NAME);
+	await append(infoBailleurs2021, '1', bailleurs, console.log);
+	await insertEntity(db, CONSTANTES.STORE_INFO_NAME, infoBailleurs2021);
+}
+
 async function loadNaf() {
 	const { name } = infoNaf;
 	const rubriques = await fetchNaf();
@@ -176,6 +211,15 @@ stories.addWithJSX('Default', () => {
 					/>
 					<Search storeInfo={bailleursSociaux} defaultValue="123" />
 				</li>
+
+				<li>
+					<input
+						type="button"
+						value="load bailleurs sociaux 2021"
+						onClick={loadBailleurs2021}
+					/>
+					<Search storeInfo={infoBailleurs2021} defaultValue="" />
+				</li>
 			</ul>
 		</>
 	);

package/src/stories/suggester/suggester.stories.js

@@ -13,6 +13,7 @@ import { SuggesterLoaderWidget } from 'components';
 import * as NAF from './naf-rev2';
 import * as COG from './cog-communes';
 import * as BAILLEURS from './bailleurs-sociaux';
+import * as BAILLEURS2021 from './bailleurs-sociaux-2021';
 
 /**
  *
@@ -24,6 +25,8 @@ function getSuggesterInfo(name) {
 		return { optionRenderer: COG.OptionRenderer, idbVersion: '1' };
 	} else if (name === 'bailleurs-sociaux') {
 		return { optionRenderer: BAILLEURS.OptionRenderer, idbVersion: '1' };
+	} else if (name === 'bailleurs-sociaux-2021') {
+		return { idbVersion: '1' };
 	}
 	console.warn(`Unknown store : ${name}`);
 	return {};
@@ -39,6 +42,8 @@ function getWidgetLoaderInfo(name) {
 		return { fetch: COG.fetch, idbVersion: '1' };
 	} else if (name === 'bailleurs-sociaux') {
 		return { fetch: BAILLEURS.fetch, idbVersion: '1' };
+	} else if (name === 'bailleurs-sociaux-2021') {
+		return { fetch: BAILLEURS2021.fetch, idbVersion: '1' };
 	}
 	console.warn(`Unknown store : ${name}`);
 	return {};