@inseefr/lunatic 3.7.6-rc.alphanumeric-sorting.1 → 3.7.7-rc.0

package/src/components/shared/Combobox/Combobox.tsx

@@ -13,6 +13,7 @@ import { ComboboxClearButton } from './Selection/ComboboxClearButton';
 import { ComboboxSelection } from './Selection/ComboboxSelection';
 import { between, forceInt } from '../../../utils/number';
 import { Label } from '../Label/Label';
+import D from '../../../i18n';
 import { slottableComponent } from '../HOC/slottableComponent';
 import type { LunaticError } from '../../../use-lunatic/type';
 import { Declarations } from '../Declarations/Declarations';
@@ -45,7 +46,7 @@ function LunaticComboBox({
 	className,
 	classNamePrefix,
 	classStyle = 'default-style',
-	placeholder = 'Commencez votre saisie...',
+	placeholder = D.PLACEHOLDER,
 	editable = false,
 	disabled,
 	readOnly,

package/src/i18n/dictionary.ts

@@ -5,7 +5,11 @@ const dictionary = {
 	MODAL_CORRECT: { fr: 'Corriger ma réponse', en: 'Correct' },
 	DK: { fr: 'Ne sais pas', en: "Don't know" },
 	RF: { fr: 'Refus', en: 'Refused' },
-	PLACEHOLDER: { fr: 'Commencez votre saisie...', en: 'Start typing...' },
+	PLACEHOLDER: { fr: 'Sélectionnez une modalité', en: 'Select a modality' },
+	SUGGESTER_PLACEHOLDER: {
+		fr: 'Commencez votre saisie...',
+		en: 'Start typing...',
+	},
 	SUGGESTER_LOADING: {
 		fr: 'Liste en cours de chargement',
 		en: 'List is loading',

package/src/use-lunatic/commons/page.ts

@@ -1,4 +1,4 @@
-import type { LunaticReducerState } from '../type';
+import type { LunaticComponentDefinition, LunaticReducerState } from '../type';
 import { getComponentsFromState } from './get-components-from-state';
 import executeConditionFilter from './execute-condition-filter';
 
@@ -16,7 +16,69 @@ export function getPageId({
  * Converts a page number (3.1.2) to an array of numbers [3, 1, 2]
  */
 export function pageStringToNumbers(page: string): number[] {
-	return page.split('.').map((v) => parseInt(v, 10));
+	return page.split('.').map((v) => Number.parseInt(v, 10));
+}
+
+// see useLoopUtils.ts
+function getIterationOfLoop(
+	component: LunaticComponentDefinition,
+	executeExpression: LunaticReducerState['executeExpression']
+) {
+	const min =
+		'lines' in component ? executeExpression<number>(component.lines.min) : 0;
+	const iterations =
+		'iterations' in component
+			? executeExpression<number>(component.iterations)
+			: 0;
+	return Math.max(min, iterations);
+}
+
+/**
+ * Check if component has a conditionFilter defined
+ * @param component
+ * @returns
+ */
+function hasConditionFilter(component: LunaticComponentDefinition): boolean {
+	return 'conditionFilter' in component && !!component.conditionFilter;
+}
+
+/**
+ * Check if a not paginated Loop has at least one component to display
+ * @param component
+ * @param state
+ * @returns boolean indicating if the not paginated Loop is empty
+ */
+function hasAtLeastOneComponentVisible(
+	component: LunaticComponentDefinition,
+	state: LunaticReducerState
+): boolean {
+	if (component.componentType === 'Loop' && !component.paginatedLoop) {
+		const nbIteration = getIterationOfLoop(component, state.executeExpression);
+		for (
+			let iterationOfLoop = 0;
+			iterationOfLoop < nbIteration;
+			iterationOfLoop++
+		) {
+			for (const c of component.components) {
+				// if no conditionFilter -> component is visible
+				if (!hasConditionFilter(c)) return true;
+				if (
+					executeConditionFilter(
+						// @ts-expect-error Seem to be a typescript issue since we check type with hasConditionFilter, c.conditionFilter is defined
+						c.conditionFilter,
+						state.executeExpression,
+						iterationOfLoop
+					)
+				) {
+					return true;
+				}
+			}
+		}
+		// no component visible in all iterations
+		return false;
+	}
+	// not a Loop
+	return true;
 }
 
 /**
@@ -27,6 +89,7 @@ export function isPageEmpty(state: LunaticReducerState): boolean {
 	const { executeExpression, pager, options } = state;
 	const { iteration } = pager;
 	const components = getComponentsFromState(state, true);
+
 	const visibleComponents = components.filter((component) => {
 		if (options.disableFilters) {
 			return true;
@@ -42,11 +105,17 @@ export function isPageEmpty(state: LunaticReducerState): boolean {
 
 		// Use condition filter if present
 		if ('conditionFilter' in component && component.conditionFilter) {
-			return executeConditionFilter(
+			const conditionFilterResult = executeConditionFilter(
 				component.conditionFilter,
 				executeExpression,
 				iteration
 			);
+			// early return if the result of filter is false
+			if (!conditionFilterResult) return false;
+			// early return if the component is not a not Loop
+			if (component.componentType !== 'Loop') return conditionFilterResult;
+			// if the conditionFilter of NOT paginated Loop is true (have to be visible), we have to check if at least one component is visible inside
+			return hasAtLeastOneComponentVisible(component, state);
 		}
 		return true;
 	});

package/src/use-lunatic/reducer/commons/auto-explore-loop.ts

@@ -35,7 +35,7 @@ export function autoExploreLoop(
 		hasExploredLoop = true;
 	};
 
-	// The page is a loop
+	// The page is a paginated loop
 	if (page.isLoop && page.subPages && page.subPages.length > 0) {
 		goInsideSubpage(
 			page.subPages,

package/src/utils/search/tokenizer.spec.ts

@@ -121,6 +121,13 @@ describe('tokenizeQuery', () => {
 		expect(result).toEqual(['eleve', 'etudiant']);
 	});
 
+	it('should normalize ligatures like œ and æ', () => {
+		const queryParser = { type: 'soft' } as SearchInfo['queryParser'];
+
+		const result = tokenizeQuery('œuvre Œuvre æternam Æternam', queryParser);
+		expect(result).toEqual(['oeuvre', 'oeuvre', 'aeternam', 'aeternam']);
+	});
+
 	it('should return an empty array for unmatched patterns', () => {
 		const queryParser = {
 			type: 'tokenized',
@@ -154,6 +161,13 @@ describe('tokenizeIndex', () => {
 		expect(result).toEqual(['eleve', 'etudiant']);
 	});
 
+	it('should normalize ligatures like œ and æ', () => {
+		const fieldInfo = mockSearchInfo.fields[0];
+
+		const result = tokenizeIndex('œuvre Œuvre æternam Æternam', fieldInfo);
+		expect(result).toEqual(['oeuvre', 'oeuvre', 'aeternam', 'aeternam']);
+	});
+
 	it('should filter out stopWords', () => {
 		const fieldInfo = { ...mockSearchInfo.fields[0], min: 1 };
 		const stopWords = ['is', 'the', 'of', 'this', 'a'];

package/src/utils/search/tokenizer.ts

@@ -70,14 +70,17 @@ export const tokenizeIndex = (
 
 /**
  * Normalize a string
- * - Remove accent (é => e, à => a
+ * - Remove accent (é => e, à => a)
+ * - remove ligatures (æ => ae, , Æ => ae, œ => oe, Œ => oe)
  * - Lowercase
  */
 const normalizeStr = (str: string) => {
 	return str
+		.toLowerCase()
+		.replaceAll('œ', 'oe')
+		.replaceAll('æ', 'ae')
 		.normalize('NFD')
-		.replace(/[\u0300-\u036f]/g, '')
-		.toLowerCase();
+		.replace(/[\u0300-\u036f]/g, '');
 };
 
 /**