@inseefr/lunatic 0.3.1-experimental → 0.3.5-experimental

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

@@ -1,6 +1,7 @@
 import React, { useState } from 'react';
 import { storiesOf } from '@storybook/react';
 import Orchestrator from '../utils/orchestrator';
+import OrchestratorSplit from '../utils/orchestrator-split';
 import { titleDecorator } from 'utils/lib';
 import calcVar from './calc-var';
 import logement from './logement';
@@ -10,6 +11,7 @@ import logementSequence from './logement-sequence';
 import dataLogement from './data-logement';
 import simpsons from './simpsons';
 import arithmetic from './arithmetic';
+import arithmeticManagement from './arithmetic-management';
 import updateExternalQuestionnaire from './update-external/questionnaire';
 import updateExternalData from './update-external/data';
 import { positioningOptions, featuresOptions } from '../utils/options';
@@ -35,26 +37,24 @@ def.addWithJSX('Calculated Variables', () => (
 	/>
 ));
 
-def.addWithJSX('Logement', () => (
+def.addWithJSX('Arithmetic', () => (
 	<Orchestrator
 		id="props"
-		source={logement}
-		missing={boolean('Missing', false)}
+		source={arithmetic}
 		features={select('Features', featuresOptions, ['VTL', 'MD'])}
 		positioning={select('Items positioning', positioningOptions, 'DEFAULT')}
 		disabled={boolean('Disabled', false)}
-		focused={boolean('Focused', false)}
-		management={boolean('Management', false)}
 	/>
 ));
 
-def.addWithJSX('Arithmetic', () => (
+def.addWithJSX('Arithmetic - Management', () => (
 	<Orchestrator
 		id="props"
-		source={arithmetic}
+		source={arithmeticManagement}
 		features={select('Features', featuresOptions, ['VTL', 'MD'])}
 		positioning={select('Items positioning', positioningOptions, 'DEFAULT')}
 		disabled={boolean('Disabled', false)}
+		management={boolean('Management', true)}
 	/>
 ));
 
@@ -93,7 +93,7 @@ paginated.addWithJSX('Calculated Variables', () => (
 ));
 
 paginated.addWithJSX('Logement', () => (
-	<Orchestrator
+	<OrchestratorSplit
 		id="props"
 		source={logement}
 		data={dataLogement}
@@ -110,11 +110,11 @@ paginated.addWithJSX('Logement', () => (
 ));
 
 paginated.addWithJSX('Logement - Queen', () => (
-	<Orchestrator
+	<OrchestratorSplit
 		id="props"
 		source={logementQueen}
 		data={dataLogement}
-		missing={boolean('Missing', false)}
+		missing={boolean('Missing', true)}
 		activeGoNextForMissing={boolean('Active go next for missing', false)}
 		features={select('Features', featuresOptions, ['VTL', 'MD'])}
 		positioning={select('Items positioning', positioningOptions, 'DEFAULT')}
@@ -126,7 +126,7 @@ paginated.addWithJSX('Logement - Queen', () => (
 ));
 
 paginated.addWithJSX('Logement - Sequence', () => (
-	<Orchestrator
+	<OrchestratorSplit
 		id="props"
 		source={logementSequence}
 		data={dataLogement}
@@ -142,7 +142,7 @@ paginated.addWithJSX('Logement - Sequence', () => (
 ));
 
 paginated.addWithJSX('Logement - S2', () => (
-	<Orchestrator
+	<OrchestratorSplit
 		id="props"
 		source={logementS2}
 		missing={boolean('Missing', false)}

package/src/stories/suggester/data.json

@@ -46,7 +46,10 @@
 					"name": "libelle2",
 					"rules": ["[\\w]+"],
 					"language": "French",
-					"synonyms": { "st": ["saint"] },
+					"synonyms": [
+						{ "source": "saint", "target": ["st"] },
+						{ "source": "oph", "target": ["renaud", "nicolas"] }
+					],
 					"stemmer": false
 				},
 				{ "name": "code" }

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

@@ -53,7 +53,10 @@ const bailleursSociaux = {
 			rules: ['[\\w]+'],
 			language: 'French',
 			stemmer: false,
-			synonyms: { saint: ['st'], sainte: ['ste'] },
+			synonyms: [
+				{ source: 'saint', target: ['st'] },
+				{ source: 'oph', target: ['renaud', 'nicolas'] },
+			],
 		},
 		{ name: 'code' },
 	],

package/src/stories/utils/orchestrator-split.js

@@ -0,0 +1,119 @@
+import React, { useEffect } from 'react';
+import * as lunatic from 'components';
+import './custom-lunatic.scss';
+
+function getStoreInfoRequired() {
+	return {};
+}
+
+const defaultFeatures = ['VTL'];
+
+const OrchestratorForStories = ({
+	source,
+	suggesters,
+	data,
+	management = false,
+	pagination = false,
+	modalForControls = false,
+	features = defaultFeatures,
+	bindings: initialBindings,
+	initialPage = '1',
+	getStoreInfo = getStoreInfoRequired,
+	missing = false,
+	shortcut = false,
+	activeGoNextForMissing = false,
+	suggesterFetcher,
+	autoSuggesterLoading,
+	addExternal,
+	...rest
+}) => {
+	const preferences = management
+		? ['COLLECTED', 'FORCED', 'EDITED']
+		: ['COLLECTED'];
+	const savingType = management ? 'EDITED' : 'COLLECTED';
+	const {
+		handleChange,
+		handleExternals,
+		components,
+		bindings,
+		pagination: {
+			goNext,
+			goPrevious,
+			page,
+			setPage,
+			maxPage,
+			isFirstPage,
+			isLastPage,
+			flow,
+		},
+	} = lunatic.useLunaticSplit(source, data, {
+		suggesters,
+		savingType,
+		preferences,
+		features,
+		management,
+		pagination,
+		modalForControls,
+		initialPage,
+		suggesterFetcher,
+		autoSuggesterLoading,
+	});
+
+	useEffect(() => {
+		handleExternals(addExternal);
+	}, [addExternal, handleExternals]);
+
+	const Button = lunatic.Button;
+
+	const missingStrategy = (b) => goNext(null, b);
+
+	return (
+		<div className="container">
+			<div className="components">
+				{components.map((q) => {
+					const { id, componentType } = q;
+					const Component = lunatic[componentType];
+					const { storeName } = q;
+
+					return (
+						<div className="lunatic lunatic-component" key={`component-${id}`}>
+							<Component
+								{...rest}
+								{...q}
+								{...getStoreInfo(storeName)}
+								handleChange={handleChange}
+								preferences={preferences}
+								savingType={savingType}
+								management={management}
+								features={features}
+								bindings={{ ...bindings, ...initialBindings }}
+								currentPage={page}
+								setPage={setPage}
+								flow={flow}
+								pagination={pagination}
+								missing={missing}
+								shortcut={shortcut}
+								missingStrategy={activeGoNextForMissing && missingStrategy}
+							/>
+						</div>
+					);
+				})}
+			</div>
+			{pagination && (
+				<>
+					<div className="pagination">
+						<Button
+							onClick={goPrevious}
+							disabled={isFirstPage}
+							value="Previous"
+						/>
+						<Button onClick={goNext} disabled={isLastPage} value="Next" />
+					</div>
+					<div>{`Page : ${page}/${maxPage}`}</div>
+				</>
+			)}
+		</div>
+	);
+};
+
+export default OrchestratorForStories;

package/src/stories/utils/orchestrator.js

@@ -6,14 +6,16 @@ function getStoreInfoRequired() {
 	return {};
 }
 
+const defaultFeatures = ['VTL'];
+
 const OrchestratorForStories = ({
 	source,
 	suggesters,
-	data = {},
+	data,
 	management = false,
 	pagination = false,
 	modalForControls = false,
-	features = ['VTL'],
+	features = defaultFeatures,
 	bindings: initialBindings,
 	initialPage = '1',
 	getStoreInfo = getStoreInfoRequired,

package/src/tests/utils/to-expose/handler/results/res-input-edited.json

@@ -1,158 +1,158 @@
-{
-	"components": [
-		{ "id": "1", "componentType": "Sequence", "depth": 1 },
-		{
-			"id": "2",
-			"componentType": "Input",
-			"response": {
-				"name": "inputOk",
-				"values": {
-					"PREVIOUS": null,
-					"COLLECTED": "My input",
-					"FORCED": null,
-					"EDITED": "My new input",
-					"INPUTED": null
-				}
-			},
-			"depth": 1
-		},
-		{
-			"id": "3",
-			"componentType": "CheckboxGroup",
-			"responses": [
-				{
-					"response": {
-						"name": "check1",
-						"values": {
-							"PREVIOUS": null,
-							"COLLECTED": true,
-							"FORCED": null,
-							"EDITED": null,
-							"INPUTED": null
-						}
-					}
-				},
-				{
-					"response": {
-						"name": "check2",
-						"values": {
-							"PREVIOUS": null,
-							"COLLECTED": false,
-							"FORCED": true,
-							"EDITED": null,
-							"INPUTED": null
-						}
-					}
-				}
-			],
-			"depth": 1
-		},
-		{
-			"id": "4",
-			"componentType": "Table",
-			"cells": [
-				[
-					{ "label": "label", "depth": 1 },
-					{
-						"componentType": "Radio",
-						"response": {
-							"name": "table11",
-							"values": {
-								"PREVIOUS": null,
-								"COLLECTED": "1",
-								"FORCED": null,
-								"EDITED": null,
-								"INPUTED": null
-							}
-						},
-						"depth": 1
-					}
-				]
-			],
-			"depth": 1
-		},
-		{
-			"id": "5",
-			"componentType": "RosterForLoop",
-			"components": [
-				{
-					"componentType": "Input",
-					"response": {
-						"name": "Roster",
-						"values": {
-							"PREVIOUS": [null],
-							"COLLECTED": ["ok"],
-							"FORCED": [null],
-							"EDITED": [null],
-							"INPUTED": [null]
-						}
-					},
-					"depth": 2
-				}
-			],
-			"depth": 1
-		}
-	],
-	"variables": {
-		"EXTERNAL": { "VAR_EXTERNAL": "Value VAR_EXTERNAL" },
-		"CALCULATED": {
-			"Test": {
-				"expression": "inputOk || \" ok\"",
-				"value": "My input ok",
-				"bindingDependencies": ["inputOk"]
-			}
-		},
-		"COLLECTED": {
-			"inputOk": {
-				"componentRef": "2",
-				"values": {
-					"PREVIOUS": null,
-					"COLLECTED": "My input",
-					"FORCED": null,
-					"EDITED": "My new input",
-					"INPUTED": null
-				}
-			},
-			"check1": {
-				"componentRef": "3",
-				"values": {
-					"PREVIOUS": null,
-					"COLLECTED": true,
-					"FORCED": null,
-					"EDITED": null,
-					"INPUTED": null
-				}
-			},
-			"check2": {
-				"componentRef": "3",
-				"values": {
-					"PREVIOUS": null,
-					"COLLECTED": false,
-					"FORCED": true,
-					"EDITED": null,
-					"INPUTED": null
-				}
-			},
-			"table11": {
-				"componentRef": "4",
-				"values": {
-					"PREVIOUS": null,
-					"COLLECTED": "1",
-					"FORCED": null,
-					"EDITED": null,
-					"INPUTED": null
-				}
-			},
-			"Roster": {
-				"componentRef": "5",
-				"values": {
-					"PREVIOUS": [null],
-					"COLLECTED": ["ok"],
-					"FORCED": [null],
-					"EDITED": [null],
-					"INPUTED": [null]
-				}
-			}
-		}
-	}
-}
+{
+	"components": [
+		{ "id": "1", "componentType": "Sequence", "depth": 1 },
+		{
+			"id": "2",
+			"componentType": "Input",
+			"response": {
+				"name": "inputOk",
+				"values": {
+					"PREVIOUS": null,
+					"COLLECTED": "My input",
+					"FORCED": null,
+					"EDITED": "My new input",
+					"INPUTED": null
+				}
+			},
+			"depth": 1
+		},
+		{
+			"id": "3",
+			"componentType": "CheckboxGroup",
+			"responses": [
+				{
+					"response": {
+						"name": "check1",
+						"values": {
+							"PREVIOUS": null,
+							"COLLECTED": true,
+							"FORCED": null,
+							"EDITED": null,
+							"INPUTED": null
+						}
+					}
+				},
+				{
+					"response": {
+						"name": "check2",
+						"values": {
+							"PREVIOUS": null,
+							"COLLECTED": false,
+							"FORCED": true,
+							"EDITED": null,
+							"INPUTED": null
+						}
+					}
+				}
+			],
+			"depth": 1
+		},
+		{
+			"id": "4",
+			"componentType": "Table",
+			"cells": [
+				[
+					{ "label": "label", "depth": 1 },
+					{
+						"componentType": "Radio",
+						"response": {
+							"name": "table11",
+							"values": {
+								"PREVIOUS": null,
+								"COLLECTED": "1",
+								"FORCED": null,
+								"EDITED": null,
+								"INPUTED": null
+							}
+						},
+						"depth": 1
+					}
+				]
+			],
+			"depth": 1
+		},
+		{
+			"id": "5",
+			"componentType": "RosterForLoop",
+			"components": [
+				{
+					"componentType": "Input",
+					"response": {
+						"name": "Roster",
+						"values": {
+							"PREVIOUS": [null],
+							"COLLECTED": ["ok"],
+							"FORCED": [null],
+							"EDITED": [null],
+							"INPUTED": [null]
+						}
+					},
+					"depth": 2
+				}
+			],
+			"depth": 1
+		}
+	],
+	"variables": {
+		"EXTERNAL": { "VAR_EXTERNAL": "Value VAR_EXTERNAL" },
+		"CALCULATED": {
+			"Test": {
+				"expression": "inputOk || \" ok\"",
+				"value": "My new input ok",
+				"bindingDependencies": ["inputOk"]
+			}
+		},
+		"COLLECTED": {
+			"inputOk": {
+				"componentRef": "2",
+				"values": {
+					"PREVIOUS": null,
+					"COLLECTED": "My input",
+					"FORCED": null,
+					"EDITED": "My new input",
+					"INPUTED": null
+				}
+			},
+			"check1": {
+				"componentRef": "3",
+				"values": {
+					"PREVIOUS": null,
+					"COLLECTED": true,
+					"FORCED": null,
+					"EDITED": null,
+					"INPUTED": null
+				}
+			},
+			"check2": {
+				"componentRef": "3",
+				"values": {
+					"PREVIOUS": null,
+					"COLLECTED": false,
+					"FORCED": true,
+					"EDITED": null,
+					"INPUTED": null
+				}
+			},
+			"table11": {
+				"componentRef": "4",
+				"values": {
+					"PREVIOUS": null,
+					"COLLECTED": "1",
+					"FORCED": null,
+					"EDITED": null,
+					"INPUTED": null
+				}
+			},
+			"Roster": {
+				"componentRef": "5",
+				"values": {
+					"PREVIOUS": [null],
+					"COLLECTED": ["ok"],
+					"FORCED": [null],
+					"EDITED": [null],
+					"INPUTED": [null]
+				}
+			}
+		}
+	}
+}

package/src/tests/utils/to-expose/state/state.spec.js

@@ -1,59 +1,59 @@
-import {
-	getState,
-	getCollectedState,
-	getCollectedStateByValueType,
-	getBindings,
-} from 'utils/to-expose/state';
-import questionnaire from './questionnaire';
-import * as R from './results';
-
-describe('state', () => {
-	describe('getState', () => {
-		it('should return empty object', () => {
-			expect(getState([])).toEqual({
-				COLLECTED: {},
-				CALCULATED: {},
-				EXTERNAL: {},
-			});
-		});
-		it('should return object', () => {
-			expect(getState(questionnaire)).toEqual(R.state);
-		});
-	});
-	describe('getCollectedState', () => {
-		it('should return empty object', () => {
-			expect(getCollectedState([])).toEqual({});
-		});
-		it('should return object', () => {
-			expect(getCollectedState(questionnaire)).toEqual(R.collectedState);
-		});
-	});
-	describe('getCollectedStateByValueType', () => {
-		it('should return empty object', () => {
-			expect(getCollectedStateByValueType([])('')).toEqual({});
-			expect(getCollectedStateByValueType(questionnaire)('')).toEqual({});
-		});
-		it('should return object', () => {
-			expect(getCollectedStateByValueType(questionnaire)('COLLECTED')).toEqual(
-				R.collectedStateCollected
-			);
-			expect(getCollectedStateByValueType(questionnaire)('FORCED')).toEqual(
-				R.collectedStateForced
-			);
-			expect(
-				getCollectedStateByValueType(questionnaire)('COLLECTED', true)
-			).toEqual(R.collectedStateCollectedWithNull);
-			expect(
-				getCollectedStateByValueType(questionnaire)('FORCED', true)
-			).toEqual(R.collectedStateForcedWithNull);
-		});
-	});
-	describe('getBindings', () => {
-		it('should return empty object', () => {
-			expect(getBindings([])).toEqual({});
-		});
-		it('should return object', () => {
-			expect(getBindings(questionnaire)).toEqual(R.bindingsResults);
-		});
-	});
-});
+import {
+	getState,
+	getCollectedState,
+	getCollectedStateByValueType,
+	getBindings,
+} from 'utils/to-expose/state';
+import questionnaire from './questionnaire';
+import * as R from './results';
+
+describe('state', () => {
+	describe('getState', () => {
+		it('should return empty object', () => {
+			expect(getState([])).toEqual({
+				COLLECTED: {},
+				CALCULATED: {},
+				EXTERNAL: {},
+			});
+		});
+		it('should return object', () => {
+			expect(getState(questionnaire)).toEqual(R.state);
+		});
+	});
+	describe('getCollectedState', () => {
+		it('should return empty object', () => {
+			expect(getCollectedState([])).toEqual({});
+		});
+		it('should return object', () => {
+			expect(getCollectedState(questionnaire)).toEqual(R.collectedState);
+		});
+	});
+	describe('getCollectedStateByValueType', () => {
+		it('should return empty object', () => {
+			expect(getCollectedStateByValueType([])('')).toEqual({});
+			expect(getCollectedStateByValueType(questionnaire)('')).toEqual({});
+		});
+		it('should return object', () => {
+			expect(getCollectedStateByValueType(questionnaire)('COLLECTED')).toEqual(
+				R.collectedStateCollected
+			);
+			expect(getCollectedStateByValueType(questionnaire)('FORCED')).toEqual(
+				R.collectedStateForced
+			);
+			expect(
+				getCollectedStateByValueType(questionnaire)('COLLECTED', true)
+			).toEqual(R.collectedStateCollectedWithNull);
+			expect(
+				getCollectedStateByValueType(questionnaire)('FORCED', true)
+			).toEqual(R.collectedStateForcedWithNull);
+		});
+	});
+	describe('getBindings', () => {
+		it('should return empty object', () => {
+			expect(getBindings([])).toEqual({});
+		});
+		it('should return object', () => {
+			expect(getBindings(questionnaire)).toEqual(R.bindingsResults);
+		});
+	});
+});