@inseefr/lunatic 0.1.13-hackathon → 0.2.0-prisme

package/src/utils/to-expose/hooks/lunatic.js

@@ -1,19 +1,29 @@
 import { useState, useEffect, useCallback } from 'react';
 import { mergeQuestionnaireAndData } from '../init-questionnaire';
 import { getBindings } from '../state';
-import { updateQuestionnaire } from '../handler';
-import { getPage, FLOW_NEXT, FLOW_PREVIOUS, getControls } from '../../lib';
+import { updateQuestionnaire, updateExternals } from '../handler';
+import {
+	getPage,
+	FLOW_NEXT,
+	FLOW_PREVIOUS,
+	getControls,
+	isDev,
+} from '../../lib';
 import { COLLECTED } from '../../../constants';
 import { useFilterComponents } from './filter-components';
 import { loadSuggesters } from '../../store-tools/auto-load';
 
+const defaultData = {};
+const defaultPreferences = [COLLECTED];
+const defaultFeatures = ['VTL'];
+
 const useLunatic = (
 	source,
-	data,
+	data = defaultData,
 	{
 		savingType = COLLECTED,
-		preferences = [COLLECTED],
-		features = ['VTL'],
+		preferences = defaultPreferences,
+		features = defaultFeatures,
 		management = false,
 		pagination = false,
 		modalForControls = false,
@@ -24,28 +34,48 @@ const useLunatic = (
 		suggesters,
 	}
 ) => {
+	if (isDev) {
+		console.log('useLunatic');
+		var start = new Date().getTime();
+	}
 	const [initPage, setInitPage] = useState(false);
 	const featuresWithoutMD = features.filter((f) => f !== 'MD');
 	const [questionnaire, setQuestionnaire] = useState(() =>
 		mergeQuestionnaireAndData(source)(data || {})
 	);
-	const bindings = getBindings(questionnaire);
+	const [bindings, setBindings] = useState(() => getBindings(questionnaire));
+
 	const [page, setPage] = useState(initialPage);
 
 	const [todo, setTodo] = useState({});
+	const [todoExternals, setTodoExternals] = useState({});
 
 	const [modalContent, setModalContent] = useState(null);
 
-	const components = useFilterComponents({
+	const [components, setComponents] = useState([]);
+
+	const [cache, setCache] = useState({});
+	const [memoryTodo, setMemoryTodo] = useState({});
+
+	const { components: newComponents, todo: newTodo } = useFilterComponents({
 		questionnaire,
 		management,
 		bindings,
 		features: featuresWithoutMD,
 		page,
 		pagination,
-		todo,
+		todo: { ...todo, ...todoExternals },
+		cache,
+		setCache,
+		memoryTodo,
 	});
 
+	useEffect(() => {
+		if (newComponents) setComponents(newComponents);
+		if (newTodo) setMemoryTodo(newTodo);
+		// eslint-disable-next-line react-hooks/exhaustive-deps
+	}, [questionnaire, bindings, todo, todoExternals]);
+
 	const { suggesters: suggestersToLoad } = source;
 
 	useEffect(() => {
@@ -168,6 +198,10 @@ const useLunatic = (
 		setTodo((t) => ({ ...t, ...updatedValue }));
 	}, []);
 
+	const handleExternals = useCallback((externals) => {
+		setTodoExternals((t) => ({ ...t, ...externals }));
+	}, []);
+
 	// Assume we only want to handle source update
 	useEffect(() => {
 		setQuestionnaire(mergeQuestionnaireAndData(source)(data));
@@ -180,6 +214,7 @@ const useLunatic = (
 				preferences,
 				logFunction
 			)(todo);
+			setBindings(getBindings(newQ));
 			setQuestionnaire(newQ);
 			setTodo({});
 		}
@@ -193,6 +228,17 @@ const useLunatic = (
 		management,
 	]);
 
+	useEffect(() => {
+		if (Object.keys(todoExternals).length !== 0) {
+			const newQ = updateExternals(questionnaire)(logFunction, preferences)(
+				todoExternals
+			);
+			setBindings(getBindings(newQ));
+			setQuestionnaire(newQ);
+			setTodoExternals({});
+		}
+	}, [todoExternals, logFunction, questionnaire, preferences]);
+
 	const cancelModal = () => {
 		setModalContent(null);
 	};
@@ -215,9 +261,12 @@ const useLunatic = (
 			  ]
 			: components;
 
+	if (isDev) console.log(`End useLunatic: ${new Date().getTime() - start} ms`);
+
 	return {
 		questionnaire,
 		handleChange,
+		handleExternals,
 		components: componentsToDiplay,
 		bindings,
 		pagination: {

package/src/utils/to-expose/hooks/use-document-add-event-listener.js

@@ -1,63 +1,63 @@
-import { useEffect } from 'react';
-
-const CALLBACKS = {};
-
-function getSignature(event, options = {}) {
-	return Object.entries(options).reduce(function (a, [k, v]) {
-		return `${a}-${k}-${v}`;
-	}, event);
-}
-
-function createListener(event, options) {
-	const signature = getSignature(event, options);
-	const listener = function (e) {
-		if (signature in CALLBACKS) {
-			const { callbacks } = CALLBACKS[signature];
-			callbacks.forEach(function (c) {
-				c(e);
-			});
-		}
-	};
-	document.addEventListener(event, listener, options);
-	return listener;
-}
-
-function unmount(event, callback, options) {
-	const signature = getSignature(event, options);
-	if (signature in CALLBACKS) {
-		const { listener, callbacks } = CALLBACKS[signature];
-		const index = callbacks.indexOf(callback);
-		CALLBACKS[signature].callbacks.splice(index, 1);
-		if (CALLBACKS[signature].callbacks.length === 0) {
-			delete CALLBACKS[signature];
-			document.removeEventListener(event, listener);
-		}
-	}
-}
-
-function mount(event, callback, options) {
-	const signature = getSignature(event, options);
-	if (!(signature in CALLBACKS)) {
-		const listener = createListener(event, options);
-		CALLBACKS[signature] = { listener, callbacks: [callback] };
-	} else {
-		CALLBACKS[signature] = {
-			...CALLBACKS[signature],
-			callbacks: [...CALLBACKS[signature].callbacks, callback],
-		};
-	}
-}
-
-function useDocumentAddEventListener(event, callback, options) {
-	useEffect(
-		function () {
-			mount(event, callback, options);
-			return function () {
-				unmount(event, callback, options);
-			};
-		},
-		[event, callback, options]
-	);
-}
-
-export default useDocumentAddEventListener;
+import { useEffect } from 'react';
+
+const CALLBACKS = {};
+
+function getSignature(event, options = {}) {
+	return Object.entries(options).reduce(function (a, [k, v]) {
+		return `${a}-${k}-${v}`;
+	}, event);
+}
+
+function createListener(event, options) {
+	const signature = getSignature(event, options);
+	const listener = function (e) {
+		if (signature in CALLBACKS) {
+			const { callbacks } = CALLBACKS[signature];
+			callbacks.forEach(function (c) {
+				c(e);
+			});
+		}
+	};
+	document.addEventListener(event, listener, options);
+	return listener;
+}
+
+function unmount(event, callback, options) {
+	const signature = getSignature(event, options);
+	if (signature in CALLBACKS) {
+		const { listener, callbacks } = CALLBACKS[signature];
+		const index = callbacks.indexOf(callback);
+		CALLBACKS[signature].callbacks.splice(index, 1);
+		if (CALLBACKS[signature].callbacks.length === 0) {
+			delete CALLBACKS[signature];
+			document.removeEventListener(event, listener);
+		}
+	}
+}
+
+function mount(event, callback, options) {
+	const signature = getSignature(event, options);
+	if (!(signature in CALLBACKS)) {
+		const listener = createListener(event, options);
+		CALLBACKS[signature] = { listener, callbacks: [callback] };
+	} else {
+		CALLBACKS[signature] = {
+			...CALLBACKS[signature],
+			callbacks: [...CALLBACKS[signature].callbacks, callback],
+		};
+	}
+}
+
+function useDocumentAddEventListener(event, callback, options) {
+	useEffect(
+		function () {
+			mount(event, callback, options);
+			return function () {
+				unmount(event, callback, options);
+			};
+		},
+		[event, callback, options]
+	);
+}
+
+export default useDocumentAddEventListener;

package/src/utils/to-expose/index.js

@@ -1,11 +1,11 @@
-// updateQuestionnaire is useless since 2.0 optimization efforts
-// export { updateQuestionnaire } from './handler';
-export { mergeQuestionnaireAndData } from './init-questionnaire';
-export {
-	getState,
-	getCollectedState,
-	getCollectedStateByValueType,
-	getBindings,
-} from './state';
-export { interpret } from './interpret';
-export { default as useLunatic } from './hooks';
+// updateQuestionnaire is useless since 2.0 optimization efforts
+// export { updateQuestionnaire } from './handler';
+export { mergeQuestionnaireAndData } from './init-questionnaire';
+export {
+	getState,
+	getCollectedState,
+	getCollectedStateByValueType,
+	getBindings,
+} from './state';
+export { interpret } from './interpret';
+export { useLunatic, useLunaticSplit } from './hooks';

package/src/utils/to-expose/interpret/index.js

@@ -1 +1 @@
-export * from './main';
+export * from './main';

package/src/utils/to-expose/interpret/main.js

@@ -1,16 +1,16 @@
-import { interpretVTL } from './vtl';
-import { interpretMD } from './md';
-
-export const interpret =
-	(features, logFunction) => (bindings) => (expression) => {
-		if (!expression) return '';
-		if (!Array.isArray(features)) return expression;
-		if (features.includes('VTL')) {
-			const vtl = interpretVTL(bindings)(expression);
-			if (features.includes('MD')) {
-				return interpretMD(vtl)(logFunction);
-			}
-			return vtl;
-		}
-		return expression;
-	};
+import { interpretVTL } from './vtl';
+import { interpretMD } from './md';
+
+export const interpret =
+	(features, logFunction) => (bindings) => (expression) => {
+		if (!expression) return '';
+		if (!Array.isArray(features)) return expression;
+		if (features.includes('VTL')) {
+			const vtl = interpretVTL(bindings)(expression);
+			if (features.includes('MD')) {
+				return interpretMD(vtl)(logFunction);
+			}
+			return vtl;
+		}
+		return expression;
+	};

package/src/utils/to-expose/interpret/md.js

@@ -1,65 +1,65 @@
-import React from 'react';
-import ReactMarkdown from 'react-markdown';
-import ReactTooltip from 'react-tooltip';
-import {
-	EVENT_CLICK,
-	LINK_CATEGORY,
-	TOOLTIP_CATEGORY,
-} from '../../../constants';
-import { createObjectEvent, isFunction } from '../../lib';
-
-const Link = (props) => {
-	const { href, children, title, logFunction } = props;
-	const listener =
-		(link = true) =>
-		() => {
-			if (isFunction(logFunction))
-				logFunction(
-					createObjectEvent(
-						link ? `link-${href}` : `tooltip-${title}`,
-						link ? LINK_CATEGORY : TOOLTIP_CATEGORY,
-						EVENT_CLICK
-					)
-				);
-		};
-	if (href.trim().startsWith('http'))
-		return (
-			<a
-				href={href}
-				target="_blank"
-				rel="noreferrer noopener"
-				onClick={listener()}
-			>
-				{children}
-			</a>
-		);
-	return (
-		<span className="link-md" onPointerUp={listener(false)}>
-			<span
-				data-for={`${title}-tooltip`}
-				data-tip={title}
-				data-multiline
-				className="field-md"
-			>
-				{children}
-			</span>
-			<ReactTooltip
-				id={`${title}-tooltip`}
-				className="tooltip-content"
-				place="bottom"
-				effect="solid"
-				globalEventOff="click"
-			/>
-		</span>
-	);
-};
-
-const renderers = (otherProps) => {
-	return {
-		paragraph: (props) => <p style={{ margin: '0' }}>{props.children}</p>,
-		link: (props) => Link({ ...otherProps, ...props }),
-	};
-};
-
-export const interpretMD = (expression) => (logFunction) =>
-	<ReactMarkdown source={expression} renderers={renderers({ logFunction })} />;
+import React from 'react';
+import ReactMarkdown from 'react-markdown';
+import ReactTooltip from 'react-tooltip';
+import {
+	EVENT_CLICK,
+	LINK_CATEGORY,
+	TOOLTIP_CATEGORY,
+} from '../../../constants';
+import { createObjectEvent, isFunction } from '../../lib';
+
+const Link = (props) => {
+	const { href, children, title, logFunction } = props;
+	const listener =
+		(link = true) =>
+		() => {
+			if (isFunction(logFunction))
+				logFunction(
+					createObjectEvent(
+						link ? `link-${href}` : `tooltip-${title}`,
+						link ? LINK_CATEGORY : TOOLTIP_CATEGORY,
+						EVENT_CLICK
+					)
+				);
+		};
+	if (href.trim().startsWith('http'))
+		return (
+			<a
+				href={href}
+				target="_blank"
+				rel="noreferrer noopener"
+				onClick={listener()}
+			>
+				{children}
+			</a>
+		);
+	return (
+		<span className="link-md" onPointerUp={listener(false)}>
+			<span
+				data-for={`${title}-tooltip`}
+				data-tip={title}
+				data-multiline
+				className="field-md"
+			>
+				{children}
+			</span>
+			<ReactTooltip
+				id={`${title}-tooltip`}
+				className="tooltip-content"
+				place="bottom"
+				effect="solid"
+				globalEventOff="click"
+			/>
+		</span>
+	);
+};
+
+const renderers = (otherProps) => {
+	return {
+		paragraph: (props) => <p style={{ margin: '0' }}>{props.children}</p>,
+		link: (props) => Link({ ...otherProps, ...props }),
+	};
+};
+
+export const interpretMD = (expression) => (logFunction) =>
+	<ReactMarkdown source={expression} renderers={renderers({ logFunction })} />;

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

@@ -1,4 +1,5 @@
 import * as C from '../../constants';
+import { isDev } from '../lib';
 
 export const getState = (questionnaire) => {
 	const { variables } = questionnaire;
@@ -33,26 +34,33 @@ const getCalculatedFromVariables = (variables) =>
 const getExternalFromVariables = (variables) =>
 	(variables && variables[C.EXTERNAL]) || {};
 
-export const getCollectedStateByValueType = (questionnaire) => (
-	valueType,
-	displayNull
-) =>
-	['PREVIOUS', 'COLLECTED', 'FORCED', 'EDITED', 'INPUTED'].includes(valueType)
-		? Object.entries(getCollectedState(questionnaire)).reduce((_, v) => {
-				if (displayNull || v[1][valueType] !== null)
-					return {
-						..._,
-						[v[0]]: v[1][valueType],
-					};
-				return _;
-		  }, {})
-		: {};
+export const getCollectedStateByValueType =
+	(questionnaire, collectedState) => (valueType, displayNull) =>
+		['PREVIOUS', 'COLLECTED', 'FORCED', 'EDITED', 'INPUTED'].includes(valueType)
+			? Object.entries(
+					collectedState || getCollectedState(questionnaire)
+			  ).reduce((_, v) => {
+					if (displayNull || v[1][valueType] !== null)
+						return {
+							..._,
+							[v[0]]: v[1][valueType],
+						};
+					return _;
+			  }, {})
+			: {};
 
 export const getBindings = (questionnaire) => {
+	if (isDev) {
+		console.log('Get bindings');
+		var start = new Date().getTime();
+	}
 	const { variables } = questionnaire;
-	return {
+	const bindings = {
 		...getCollectedStateByValueType(questionnaire)('COLLECTED', true),
 		...getCalculatedFromVariables(variables),
 		...getExternalFromVariables(variables),
 	};
+	if (isDev)
+		console.log(`End get bindings: ${new Date().getTime() - start} ms`);
+	return bindings;
 };

package/src/tests/utils/to-expose/hooks/use-lunatic.spec.js

@@ -1,46 +0,0 @@
-import { renderHook, act } from '@testing-library/react-hooks';
-import useLunatic from 'utils/to-expose/hooks/lunatic';
-import source from '../init-questionnaire/questionnaire';
-
-describe('useLunatic', () => {
-	it('with pagination', () => {
-		const { result } = renderHook(() =>
-			useLunatic(source, {}, { features: ['VTL', 'MD'], pagination: true })
-		);
-		const {
-			current: {
-				components,
-				pagination: { page, goNext, goPrevious },
-			},
-		} = result;
-		expect(components.length).toEqual(2);
-		expect(page).toEqual('1');
-
-		act(() => {
-			goNext();
-		});
-
-		expect(components.length).toEqual(2);
-		expect(page).toEqual('1');
-
-		act(() => {
-			goPrevious();
-		});
-
-		expect(components.length).toEqual(2);
-		expect(page).toEqual('1');
-	});
-	it('with custom props', () => {
-		renderHook(() =>
-			useLunatic(
-				source,
-				{},
-				{
-					management: true,
-					savingType: 'EDITED',
-					preferences: ['COLLECTED', 'EDITED'],
-				}
-			)
-		);
-	});
-});