@inseefr/lunatic 3.13.6-rc-fix-multimode.2 → 3.14.0-rc-delay-sequence-cleaning.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/components/Duration/getDurationFromValue.d.ts +2 -2
- package/components/Duration/getDurationFromValue.js +7 -6
- package/components/Duration/getDurationFromValue.js.map +1 -1
- package/components/Suggester/SuggesterType.d.ts +3 -1
- package/components/shared/Combobox/ComboboxType.d.ts +2 -0
- package/esm/components/Duration/getDurationFromValue.d.ts +2 -2
- package/esm/components/Duration/getDurationFromValue.js +7 -6
- package/esm/components/Duration/getDurationFromValue.js.map +1 -1
- package/esm/components/Suggester/SuggesterType.d.ts +3 -1
- package/esm/components/shared/Combobox/ComboboxType.d.ts +2 -0
- package/esm/use-lunatic/commons/compile-controls.d.ts +5 -0
- package/esm/use-lunatic/commons/compile-controls.js +6 -1
- package/esm/use-lunatic/commons/compile-controls.js.map +1 -1
- package/esm/use-lunatic/commons/compile-controls.spec.d.ts +1 -0
- package/esm/use-lunatic/commons/compile-controls.spec.js +121 -0
- package/esm/use-lunatic/commons/compile-controls.spec.js.map +1 -0
- package/esm/use-lunatic/reducer/reducerInitializer.js +1 -1
- package/esm/use-lunatic/reducer/reducerInitializer.js.map +1 -1
- package/esm/utils/search/SearchInterface.d.ts +9 -1
- package/esm/utils/search/melauto.d.ts +4 -1
- package/esm/utils/search/melauto.js +17 -17
- package/esm/utils/search/melauto.js.map +1 -1
- package/esm/utils/search/melauto.spec.js +9 -13
- package/esm/utils/search/melauto.spec.js.map +1 -1
- package/package.json +13 -1
- package/src/components/Duration/getDurationFromValue.ts +10 -6
- package/src/components/Suggester/SuggesterType.ts +3 -1
- package/src/components/shared/Combobox/ComboboxType.ts +2 -0
- package/src/stories/behaviour/cleaning/cleaning.stories.tsx +7 -0
- package/src/stories/behaviour/cleaning/source-sequence.json +444 -0
- package/src/stories/behaviour/search/search.stories.tsx +258 -0
- package/src/stories/questionnaires/SRCV/data.json +116 -0
- package/src/stories/questionnaires/SRCV/source.json +69256 -0
- package/src/stories/questionnaires/SRCV/srcv.stories.tsx +23 -0
- package/src/use-lunatic/commons/compile-controls.spec.ts +136 -0
- package/src/use-lunatic/commons/compile-controls.ts +7 -1
- package/src/use-lunatic/reducer/reducerInitializer.tsx +1 -1
- package/src/use-lunatic/use-lunatic.test.ts +6 -2
- package/src/utils/search/SearchInterface.ts +10 -1
- package/src/utils/search/melauto.spec.ts +10 -13
- package/src/utils/search/melauto.ts +20 -13
- package/tsconfig.build.tsbuildinfo +1 -1
- package/use-lunatic/commons/compile-controls.d.ts +5 -0
- package/use-lunatic/commons/compile-controls.js +6 -0
- package/use-lunatic/commons/compile-controls.js.map +1 -1
- package/use-lunatic/commons/compile-controls.spec.d.ts +1 -0
- package/use-lunatic/commons/compile-controls.spec.js +123 -0
- package/use-lunatic/commons/compile-controls.spec.js.map +1 -0
- package/use-lunatic/reducer/reducerInitializer.js +1 -1
- package/use-lunatic/reducer/reducerInitializer.js.map +1 -1
- package/utils/search/SearchInterface.d.ts +9 -1
- package/utils/search/melauto.d.ts +4 -1
- package/utils/search/melauto.js +11 -14
- package/utils/search/melauto.js.map +1 -1
- package/utils/search/melauto.spec.js +9 -13
- package/utils/search/melauto.spec.js.map +1 -1
|
@@ -4,6 +4,6 @@ import { type DurationValue } from './durationUtils';
|
|
|
4
4
|
* Convert a string into a duration
|
|
5
5
|
*
|
|
6
6
|
* ## Example
|
|
7
|
-
* - "P12Y5M" => {
|
|
7
|
+
* - "P12Y5M" => {years: 12, months: 5}
|
|
8
8
|
*/
|
|
9
|
-
export declare const getDurationFromValue: (value: string | null, format: DurationFormat) => DurationValue;
|
|
9
|
+
export declare const getDurationFromValue: (value: string | null | undefined, format: DurationFormat) => DurationValue;
|
|
@@ -1,18 +1,19 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.getDurationFromValue = void 0;
|
|
4
|
+
const isNullOrUndefined = (value) => value === null || value === undefined;
|
|
4
5
|
/**
|
|
5
6
|
* Convert a string into a duration
|
|
6
7
|
*
|
|
7
8
|
* ## Example
|
|
8
|
-
* - "P12Y5M" => {
|
|
9
|
+
* - "P12Y5M" => {years: 12, months: 5}
|
|
9
10
|
*/
|
|
10
11
|
const getDurationFromValue = (value, format) => {
|
|
11
|
-
// Handle nulls value
|
|
12
|
-
if (value
|
|
13
|
-
|
|
14
|
-
|
|
15
|
-
|
|
12
|
+
// Handle nulls or undefined value
|
|
13
|
+
if (isNullOrUndefined(value)) {
|
|
14
|
+
if (format === 'PTnHnM') {
|
|
15
|
+
return { hours: null, minutes: null };
|
|
16
|
+
}
|
|
16
17
|
return { years: null, months: null };
|
|
17
18
|
}
|
|
18
19
|
const match = matchFromFormat(value, format);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"getDurationFromValue.js","sourceRoot":"","sources":["../../src/components/Duration/getDurationFromValue.ts"],"names":[],"mappings":";;;AAGA;;;;;GAKG;AACI,MAAM,oBAAoB,GAAG,CACnC,
|
|
1
|
+
{"version":3,"file":"getDurationFromValue.js","sourceRoot":"","sources":["../../src/components/Duration/getDurationFromValue.ts"],"names":[],"mappings":";;;AAGA,MAAM,iBAAiB,GAAG,CAAC,KAAU,EAA6B,EAAE,CACnE,KAAK,KAAK,IAAI,IAAI,KAAK,KAAK,SAAS,CAAC;AAEvC;;;;;GAKG;AACI,MAAM,oBAAoB,GAAG,CACnC,KAAgC,EAChC,MAAsB,EACN,EAAE;IAClB,kCAAkC;IAClC,IAAI,iBAAiB,CAAC,KAAK,CAAC,EAAE,CAAC;QAC9B,IAAI,MAAM,KAAK,QAAQ,EAAE,CAAC;YACzB,OAAO,EAAE,KAAK,EAAE,IAAI,EAAE,OAAO,EAAE,IAAI,EAAE,CAAC;QACvC,CAAC;QACD,OAAO,EAAE,KAAK,EAAE,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,CAAC;IACtC,CAAC;IAED,MAAM,KAAK,GAAG,eAAe,CAAC,KAAK,EAAE,MAAM,CAAC,CAAC;IAC7C,IAAI,MAAM,KAAK,QAAQ,EAAE,CAAC;QACzB,OAAO,EAAE,KAAK,EAAE,KAAK,CAAC,CAAC,CAAC,EAAE,OAAO,EAAE,KAAK,CAAC,CAAC,CAAC,EAAE,CAAC;IAC/C,CAAC;IACD,OAAO,EAAE,KAAK,EAAE,KAAK,CAAC,CAAC,CAAC,EAAE,MAAM,EAAE,KAAK,CAAC,CAAC,CAAC,EAAE,CAAC;AAC9C,CAAC,CAAC;AAjBW,QAAA,oBAAoB,wBAiB/B;AAEF;;;;;GAKG;AACH,MAAM,eAAe,GAAG,CAAC,KAAa,EAAE,MAAsB,EAAY,EAAE;IAC3E,MAAM,KAAK,GAAG,IAAI,MAAM,CAAC,MAAM,CAAC,UAAU,CAAC,GAAG,EAAE,MAAM,CAAC,GAAG,CAAA,OAAO,CAAC,CAAC,CAAC;IACpE,MAAM,KAAK,GAAG,KAAK,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;IAChC,IAAI,CAAC,KAAK,EAAE,CAAC;QACZ,MAAM,IAAI,KAAK,CACd,2BAA2B,KAAK,gCAAgC,MAAM,GAAG,CACzE,CAAC;IACH,CAAC;IACD,MAAM,CAAC,EAAE,GAAG,OAAO,CAAC,GAAG,KAAK,CAAC;IAC7B,OAAO,OAAO,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC;AACnD,CAAC,CAAC"}
|
|
@@ -4,6 +4,6 @@ import { type DurationValue } from './durationUtils';
|
|
|
4
4
|
* Convert a string into a duration
|
|
5
5
|
*
|
|
6
6
|
* ## Example
|
|
7
|
-
* - "P12Y5M" => {
|
|
7
|
+
* - "P12Y5M" => {years: 12, months: 5}
|
|
8
8
|
*/
|
|
9
|
-
export declare const getDurationFromValue: (value: string | null, format: DurationFormat) => DurationValue;
|
|
9
|
+
export declare const getDurationFromValue: (value: string | null | undefined, format: DurationFormat) => DurationValue;
|
|
@@ -1,15 +1,16 @@
|
|
|
1
|
+
const isNullOrUndefined = (value) => value === null || value === undefined;
|
|
1
2
|
/**
|
|
2
3
|
* Convert a string into a duration
|
|
3
4
|
*
|
|
4
5
|
* ## Example
|
|
5
|
-
* - "P12Y5M" => {
|
|
6
|
+
* - "P12Y5M" => {years: 12, months: 5}
|
|
6
7
|
*/
|
|
7
8
|
export const getDurationFromValue = (value, format) => {
|
|
8
|
-
// Handle nulls value
|
|
9
|
-
if (value
|
|
10
|
-
|
|
11
|
-
|
|
12
|
-
|
|
9
|
+
// Handle nulls or undefined value
|
|
10
|
+
if (isNullOrUndefined(value)) {
|
|
11
|
+
if (format === 'PTnHnM') {
|
|
12
|
+
return { hours: null, minutes: null };
|
|
13
|
+
}
|
|
13
14
|
return { years: null, months: null };
|
|
14
15
|
}
|
|
15
16
|
const match = matchFromFormat(value, format);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"getDurationFromValue.js","sourceRoot":"","sources":["../../../src/components/Duration/getDurationFromValue.ts"],"names":[],"mappings":"AAGA;;;;;GAKG;AACH,MAAM,CAAC,MAAM,oBAAoB,GAAG,CACnC,
|
|
1
|
+
{"version":3,"file":"getDurationFromValue.js","sourceRoot":"","sources":["../../../src/components/Duration/getDurationFromValue.ts"],"names":[],"mappings":"AAGA,MAAM,iBAAiB,GAAG,CAAC,KAAU,EAA6B,EAAE,CACnE,KAAK,KAAK,IAAI,IAAI,KAAK,KAAK,SAAS,CAAC;AAEvC;;;;;GAKG;AACH,MAAM,CAAC,MAAM,oBAAoB,GAAG,CACnC,KAAgC,EAChC,MAAsB,EACN,EAAE;IAClB,kCAAkC;IAClC,IAAI,iBAAiB,CAAC,KAAK,CAAC,EAAE,CAAC;QAC9B,IAAI,MAAM,KAAK,QAAQ,EAAE,CAAC;YACzB,OAAO,EAAE,KAAK,EAAE,IAAI,EAAE,OAAO,EAAE,IAAI,EAAE,CAAC;QACvC,CAAC;QACD,OAAO,EAAE,KAAK,EAAE,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,CAAC;IACtC,CAAC;IAED,MAAM,KAAK,GAAG,eAAe,CAAC,KAAK,EAAE,MAAM,CAAC,CAAC;IAC7C,IAAI,MAAM,KAAK,QAAQ,EAAE,CAAC;QACzB,OAAO,EAAE,KAAK,EAAE,KAAK,CAAC,CAAC,CAAC,EAAE,OAAO,EAAE,KAAK,CAAC,CAAC,CAAC,EAAE,CAAC;IAC/C,CAAC;IACD,OAAO,EAAE,KAAK,EAAE,KAAK,CAAC,CAAC,CAAC,EAAE,MAAM,EAAE,KAAK,CAAC,CAAC,CAAC,EAAE,CAAC;AAC9C,CAAC,CAAC;AAEF;;;;;GAKG;AACH,MAAM,eAAe,GAAG,CAAC,KAAa,EAAE,MAAsB,EAAY,EAAE;IAC3E,MAAM,KAAK,GAAG,IAAI,MAAM,CAAC,MAAM,CAAC,UAAU,CAAC,GAAG,EAAE,MAAM,CAAC,GAAG,CAAA,OAAO,CAAC,CAAC,CAAC;IACpE,MAAM,KAAK,GAAG,KAAK,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;IAChC,IAAI,CAAC,KAAK,EAAE,CAAC;QACZ,MAAM,IAAI,KAAK,CACd,2BAA2B,KAAK,gCAAgC,MAAM,GAAG,CACzE,CAAC;IACH,CAAC;IACD,MAAM,CAAC,EAAE,GAAG,OAAO,CAAC,GAAG,KAAK,CAAC;IAC7B,OAAO,OAAO,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC;AACnD,CAAC,CAAC"}
|
|
@@ -1,5 +1,10 @@
|
|
|
1
1
|
import type { LunaticError, LunaticReducerState } from '../type';
|
|
2
|
+
import { type ComponentDefinition, type InterpretedComponent } from './component';
|
|
2
3
|
export type StateForControls = Pick<LunaticReducerState, 'pager' | 'pages' | 'isInLoop' | 'executeExpression'>;
|
|
4
|
+
/**
|
|
5
|
+
* Figure out the number of iterations of a component.
|
|
6
|
+
*/
|
|
7
|
+
export declare function computeIterations(component: InterpretedComponent | ComponentDefinition, executeExpression: LunaticReducerState['executeExpression']): number;
|
|
3
8
|
/**
|
|
4
9
|
* Check controls for currently visible components and output errors.
|
|
5
10
|
*/
|
|
@@ -61,13 +61,18 @@ function checkControls(controls, executeExpression, pager) {
|
|
|
61
61
|
/**
|
|
62
62
|
* Figure out the number of iterations of a component.
|
|
63
63
|
*/
|
|
64
|
-
function computeIterations(component, executeExpression) {
|
|
64
|
+
export function computeIterations(component, executeExpression) {
|
|
65
|
+
// iterations is present and it's already computed, return the actual value (case of InterpretedComponent)
|
|
66
|
+
if ('iterations' in component && typeof component.iterations === 'number')
|
|
67
|
+
return component.iterations;
|
|
68
|
+
// iteratons is present and it's an expression, compute it
|
|
65
69
|
if ('iterations' in component &&
|
|
66
70
|
component.iterations &&
|
|
67
71
|
typeof component.iterations === 'object' &&
|
|
68
72
|
'value' in component.iterations) {
|
|
69
73
|
return executeExpression(component.iterations);
|
|
70
74
|
}
|
|
75
|
+
// Fallback to variable collectes by this component, return it's length
|
|
71
76
|
if ('response' in component) {
|
|
72
77
|
const value = executeExpression({
|
|
73
78
|
type: 'VTL',
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"compile-controls.js","sourceRoot":"","sources":["../../../src/use-lunatic/commons/compile-controls.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"compile-controls.js","sourceRoot":"","sources":["../../../src/use-lunatic/commons/compile-controls.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
export {};
|
|
@@ -0,0 +1,121 @@
|
|
|
1
|
+
import { describe, it, expect, vi, beforeEach } from 'vitest';
|
|
2
|
+
import { computeIterations } from './compile-controls';
|
|
3
|
+
// Mock de la fonction executeExpression
|
|
4
|
+
const mockExecuteExpression = vi.fn();
|
|
5
|
+
describe('computeIterations', () => {
|
|
6
|
+
beforeEach(() => {
|
|
7
|
+
vi.resetAllMocks();
|
|
8
|
+
});
|
|
9
|
+
it('should return iterations directly if it is a number', () => {
|
|
10
|
+
const component = {
|
|
11
|
+
id: 'test',
|
|
12
|
+
componentType: 'Loop',
|
|
13
|
+
iterations: 5,
|
|
14
|
+
};
|
|
15
|
+
expect(computeIterations(component, mockExecuteExpression)).toBe(5);
|
|
16
|
+
});
|
|
17
|
+
it('should execute VTL expression for iterations if it is an object', () => {
|
|
18
|
+
const component = {
|
|
19
|
+
id: 'test',
|
|
20
|
+
componentType: 'Loop',
|
|
21
|
+
iterations: { type: 'VTL', value: 'count(ARRAY)' },
|
|
22
|
+
};
|
|
23
|
+
mockExecuteExpression.mockReturnValue(3);
|
|
24
|
+
expect(computeIterations(component, mockExecuteExpression)).toBe(3);
|
|
25
|
+
expect(mockExecuteExpression).toHaveBeenCalledWith({
|
|
26
|
+
type: 'VTL',
|
|
27
|
+
value: 'count(ARRAY)',
|
|
28
|
+
});
|
|
29
|
+
});
|
|
30
|
+
it('should return array length if component has a response with an array value', () => {
|
|
31
|
+
const component = {
|
|
32
|
+
id: 'test',
|
|
33
|
+
componentType: 'Question',
|
|
34
|
+
response: { name: 'ARRAY' },
|
|
35
|
+
};
|
|
36
|
+
mockExecuteExpression.mockReturnValue(['a', 'b', 'c', 'd']);
|
|
37
|
+
expect(computeIterations(component, mockExecuteExpression)).toBe(4);
|
|
38
|
+
expect(mockExecuteExpression).toHaveBeenCalledWith({
|
|
39
|
+
type: 'VTL',
|
|
40
|
+
value: 'ARRAY',
|
|
41
|
+
});
|
|
42
|
+
});
|
|
43
|
+
it('should return 0 if response value is not an array', () => {
|
|
44
|
+
const component = {
|
|
45
|
+
id: 'test',
|
|
46
|
+
componentType: 'Question',
|
|
47
|
+
response: { name: 'VAR' },
|
|
48
|
+
};
|
|
49
|
+
mockExecuteExpression.mockReturnValue('not an array');
|
|
50
|
+
expect(computeIterations(component, mockExecuteExpression)).toBe(0);
|
|
51
|
+
});
|
|
52
|
+
it('should return max iterations of children if component has components', () => {
|
|
53
|
+
const component = {
|
|
54
|
+
id: 'parent',
|
|
55
|
+
componentType: 'Loop',
|
|
56
|
+
components: [
|
|
57
|
+
{ id: 'child1', componentType: 'Question', iterations: 2 },
|
|
58
|
+
{ id: 'child2', componentType: 'Question', iterations: 5 },
|
|
59
|
+
],
|
|
60
|
+
};
|
|
61
|
+
expect(computeIterations(component, mockExecuteExpression)).toBe(5);
|
|
62
|
+
});
|
|
63
|
+
it('should return 0 if no iterations, response, or components are present', () => {
|
|
64
|
+
const component = {
|
|
65
|
+
id: 'test',
|
|
66
|
+
componentType: 'Question',
|
|
67
|
+
};
|
|
68
|
+
expect(computeIterations(component, mockExecuteExpression)).toBe(0);
|
|
69
|
+
});
|
|
70
|
+
it('should return 0 if iterations is null or undefined', () => {
|
|
71
|
+
const component1 = {
|
|
72
|
+
id: 'test1',
|
|
73
|
+
componentType: 'Loop',
|
|
74
|
+
iterations: null,
|
|
75
|
+
};
|
|
76
|
+
const component2 = {
|
|
77
|
+
id: 'test2',
|
|
78
|
+
componentType: 'Loop',
|
|
79
|
+
iterations: undefined,
|
|
80
|
+
};
|
|
81
|
+
expect(computeIterations(component1, mockExecuteExpression)).toBe(0);
|
|
82
|
+
expect(computeIterations(component2, mockExecuteExpression)).toBe(0);
|
|
83
|
+
});
|
|
84
|
+
it('should return 0 if all children have no iterations', () => {
|
|
85
|
+
const component = {
|
|
86
|
+
id: 'parent',
|
|
87
|
+
componentType: 'Loop',
|
|
88
|
+
components: [
|
|
89
|
+
{ id: 'child1', componentType: 'Question' },
|
|
90
|
+
{ id: 'child2', componentType: 'Question' },
|
|
91
|
+
],
|
|
92
|
+
};
|
|
93
|
+
expect(computeIterations(component, mockExecuteExpression)).toBe(0);
|
|
94
|
+
});
|
|
95
|
+
it('should prioritize iterations over response if both are present', () => {
|
|
96
|
+
const component = {
|
|
97
|
+
id: 'test',
|
|
98
|
+
componentType: 'Loop',
|
|
99
|
+
iterations: 3,
|
|
100
|
+
response: { name: 'ARRAY' },
|
|
101
|
+
};
|
|
102
|
+
mockExecuteExpression.mockReturnValue(['a', 'b', 'c', 'd', 'e']);
|
|
103
|
+
expect(computeIterations(component, mockExecuteExpression)).toBe(3);
|
|
104
|
+
expect(mockExecuteExpression).not.toHaveBeenCalled();
|
|
105
|
+
});
|
|
106
|
+
it('should prioritize iterations expression over response if both are present', () => {
|
|
107
|
+
const component = {
|
|
108
|
+
id: 'test',
|
|
109
|
+
componentType: 'Loop',
|
|
110
|
+
iterations: { type: 'VTL', value: 'count(ARRAY)' },
|
|
111
|
+
response: { name: 'ANOTHER_ARRAY' },
|
|
112
|
+
};
|
|
113
|
+
mockExecuteExpression.mockReturnValue(7);
|
|
114
|
+
expect(computeIterations(component, mockExecuteExpression)).toBe(7);
|
|
115
|
+
expect(mockExecuteExpression).toHaveBeenCalledWith({
|
|
116
|
+
type: 'VTL',
|
|
117
|
+
value: 'count(ARRAY)',
|
|
118
|
+
});
|
|
119
|
+
});
|
|
120
|
+
});
|
|
121
|
+
//# sourceMappingURL=compile-controls.spec.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"compile-controls.spec.js","sourceRoot":"","sources":["../../../src/use-lunatic/commons/compile-controls.spec.ts"],"names":[],"mappings":"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"}
|
|
@@ -33,7 +33,7 @@ const onChange = { current: () => { } };
|
|
|
33
33
|
export function reducerInitializer({ source, data, features = ['VTL'], initialPage = '1', lastReachedPage = undefined, withOverview = false, disableFilters = false, disableFiltersDescription = true, getReferentiel, onVariableChange = onChange, logger = console.error, }) {
|
|
34
34
|
var _a;
|
|
35
35
|
const variables = LunaticVariablesStore.makeFromSource(source, data, {
|
|
36
|
-
autoCommit:
|
|
36
|
+
autoCommit: false,
|
|
37
37
|
changeHandler: onVariableChange,
|
|
38
38
|
disableCleaning: disableFilters,
|
|
39
39
|
});
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"reducerInitializer.js","sourceRoot":"","sources":["../../../src/use-lunatic/reducer/reducerInitializer.tsx"],"names":[],"mappings":";AAMA,OAAO,EAAE,qBAAqB,EAAE,MAAM,8CAA8C,CAAC;AACrF,OAAO,EAAE,UAAU,EAAE,cAAc,EAAE,MAAM,YAAY,CAAC;AACxD,OAAO,EAAE,qBAAqB,EAAE,iBAAiB,EAAE,MAAM,iBAAiB,CAAC;AAC3E,OAAO,EAAE,EAAE,EAAE,GAAG,EAAE,MAAM,uBAAuB,CAAC;AAChD,OAAO,EAAE,OAAO,EAAE,MAAM,yCAAyC,CAAC;AAClE,OAAO,EAAE,mBAAmB,EAAE,MAAM,gCAAgC,CAAC;AACrE,OAAO,EAAE,aAAa,EAAE,MAAM,2BAA2B,CAAC;AAC1D,OAAO,EAAE,QAAQ,EAAE,MAAM,oBAAoB,CAAC;AAC9C,OAAO,EAAE,kBAAkB,EAAE,MAAM,uCAAuC,CAAC;AAI3E,MAAM,SAAS,GAAG;IACjB,IAAI,EAAE,CAAC;IACP,OAAO,EAAE,CAAC;IACV,OAAO,EAAE,SAAS;IAClB,UAAU,EAAE,SAAS;IACrB,SAAS,EAAE,SAAS;IACpB,gBAAgB,EAAE,SAAS;IAC3B,YAAY,EAAE,SAAS;CACvB,CAAC;AACF,MAAM,SAAS,GAAG;IACjB,SAAS,EAAE,IAAI,qBAAqB,EAAE;IACtC,KAAK,EAAE,SAAS;IAChB,aAAa,EAAE,SAAS;IACxB,KAAK,EAAE,EAAE;IACT,QAAQ,EAAE,KAAK;IACf,SAAS,EAAE,IAAI,CAAC,GAAG,EAAE;IACrB,QAAQ,EAAE,EAAE;IACZ,cAAc,EAAE,GAAG,EAAE,GAAE,CAAC;IACxB,iBAAiB,EAAE,GAAO,EAAE,CAAC,IAAS;IACtC,OAAO,EAAE,EAAE,cAAc,EAAE,KAAK,EAAE,yBAAyB,EAAE,IAAI,EAAE;CACrC,CAAC;AAEhC,MAAM,QAAQ,GAAG,EAAE,OAAO,EAAE,GAAG,EAAE,GAAE,CAAC,EAAE,CAAC;AAEvC,MAAM,UAAU,kBAAkB,CAAC,EAClC,MAAM,EACN,IAAI,EACJ,QAAQ,GAAG,CAAC,KAAK,CAAC,EAClB,WAAW,GAAG,GAAG,EACjB,eAAe,GAAG,SAAS,EAC3B,YAAY,GAAG,KAAK,EACpB,cAAc,GAAG,KAAK,EACtB,yBAAyB,GAAG,IAAI,EAChC,cAAc,EACd,gBAAgB,GAAG,QAAQ,EAC3B,MAAM,GAAG,OAAO,CAAC,KAAK,GAatB;;IACA,MAAM,SAAS,GAAG,qBAAqB,CAAC,cAAc,CAAC,MAAM,EAAE,IAAI,EAAE;QACpE,UAAU,EAAE,
|
|
1
|
+
{"version":3,"file":"reducerInitializer.js","sourceRoot":"","sources":["../../../src/use-lunatic/reducer/reducerInitializer.tsx"],"names":[],"mappings":"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"}
|
|
@@ -3,7 +3,15 @@ export type SearchInfo = LunaticSuggester;
|
|
|
3
3
|
export type IndexEntry = {
|
|
4
4
|
id: string;
|
|
5
5
|
label: string;
|
|
6
|
-
|
|
6
|
+
/**
|
|
7
|
+
* Score computed by MiniSearch algo
|
|
8
|
+
*/
|
|
9
|
+
score: number;
|
|
10
|
+
/**
|
|
11
|
+
* Score compute by melauto algo
|
|
12
|
+
*/
|
|
13
|
+
melautoScore: number;
|
|
14
|
+
[k: string]: any;
|
|
7
15
|
};
|
|
8
16
|
export interface SearchInterface<T extends IndexEntry> {
|
|
9
17
|
isIndexed(): boolean;
|
|
@@ -7,10 +7,13 @@
|
|
|
7
7
|
* (e.g., "0111Z" will appear before "0115Z" when both match "011")
|
|
8
8
|
* Numeric awareness means "item2" will come before "item10" (not "item10" before "item2")
|
|
9
9
|
*/
|
|
10
|
+
export type WithMelautoScore<T> = T & {
|
|
11
|
+
melautoScore?: number;
|
|
12
|
+
};
|
|
10
13
|
export declare function applyMelauto<T extends {
|
|
11
14
|
id: string;
|
|
12
15
|
label?: string;
|
|
13
|
-
}>(query: string, data: T[]): T[];
|
|
16
|
+
}>(query: string, data: T[]): WithMelautoScore<T>[];
|
|
14
17
|
/**
|
|
15
18
|
* Melauto scoring algorithm
|
|
16
19
|
*
|
|
@@ -1,23 +1,23 @@
|
|
|
1
|
-
/**
|
|
2
|
-
* Apply Melauto sorting algorithm on the data
|
|
3
|
-
*
|
|
4
|
-
* 1. Sort by melauto score
|
|
5
|
-
* 2. When scores are equal, sort alphabetically with numeric awareness
|
|
6
|
-
* This ensures consistent ordering for items with identical scores
|
|
7
|
-
* (e.g., "0111Z" will appear before "0115Z" when both match "011")
|
|
8
|
-
* Numeric awareness means "item2" will come before "item10" (not "item10" before "item2")
|
|
9
|
-
*/
|
|
10
1
|
export function applyMelauto(query, data) {
|
|
11
|
-
|
|
12
|
-
|
|
13
|
-
|
|
14
|
-
|
|
15
|
-
|
|
2
|
+
// no query -> no sort
|
|
3
|
+
if (query === undefined || query === '')
|
|
4
|
+
return data;
|
|
5
|
+
return data
|
|
6
|
+
.map((item) => {
|
|
7
|
+
var _a;
|
|
8
|
+
return ({
|
|
9
|
+
...item,
|
|
10
|
+
melautoScore: melautoScore((_a = item.label) !== null && _a !== void 0 ? _a : item.id, query),
|
|
11
|
+
});
|
|
12
|
+
})
|
|
13
|
+
.sort((a, b) => {
|
|
14
|
+
var _a, _b;
|
|
15
|
+
const diff = b.melautoScore - a.melautoScore;
|
|
16
16
|
if (diff !== 0)
|
|
17
17
|
return diff;
|
|
18
|
-
//
|
|
19
|
-
const ta = ((
|
|
20
|
-
const tb = ((
|
|
18
|
+
// if equal -> sort alphabetically with numeric awareness
|
|
19
|
+
const ta = ((_a = a.label) !== null && _a !== void 0 ? _a : a.id).toString();
|
|
20
|
+
const tb = ((_b = b.label) !== null && _b !== void 0 ? _b : b.id).toString();
|
|
21
21
|
return ta.localeCompare(tb, undefined, {
|
|
22
22
|
numeric: true,
|
|
23
23
|
sensitivity: 'base',
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"melauto.js","sourceRoot":"","sources":["../../../src/utils/search/melauto.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"melauto.js","sourceRoot":"","sources":["../../../src/utils/search/melauto.ts"],"names":[],"mappings":"AAWA,MAAM,UAAU,YAAY,CAC3B,KAAa,EACb,IAAS;IAET,sBAAsB;IACtB,IAAI,KAAK,KAAK,SAAS,IAAI,KAAK,KAAK,EAAE;QAAE,OAAO,IAAI,CAAC;IACrD,OAAO,IAAI;SACT,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE;;QAAC,OAAA,CAAC;YACf,GAAG,IAAI;YACP,YAAY,EAAE,YAAY,CAAC,MAAA,IAAI,CAAC,KAAK,mCAAI,IAAI,CAAC,EAAE,EAAE,KAAK,CAAC;SACxD,CAAC,CAAA;KAAA,CAAC;SACF,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE;;QACd,MAAM,IAAI,GAAG,CAAC,CAAC,YAAY,GAAG,CAAC,CAAC,YAAY,CAAC;QAC7C,IAAI,IAAI,KAAK,CAAC;YAAE,OAAO,IAAI,CAAC;QAE5B,yDAAyD;QACzD,MAAM,EAAE,GAAG,CAAC,MAAA,CAAC,CAAC,KAAK,mCAAI,CAAC,CAAC,EAAE,CAAC,CAAC,QAAQ,EAAE,CAAC;QACxC,MAAM,EAAE,GAAG,CAAC,MAAA,CAAC,CAAC,KAAK,mCAAI,CAAC,CAAC,EAAE,CAAC,CAAC,QAAQ,EAAE,CAAC;QACxC,OAAO,EAAE,CAAC,aAAa,CAAC,EAAE,EAAE,SAAS,EAAE;YACtC,OAAO,EAAE,IAAI;YACb,WAAW,EAAE,MAAM;SACnB,CAAC,CAAC;IACJ,CAAC,CAAC,CAAC;AACL,CAAC;AAED;;;GAGG;AACH,MAAM,SAAS,GAAG,CAAC,GAAW,EAAU,EAAE;IACzC,OAAO,GAAG;SACR,SAAS,CAAC,KAAK,CAAC;SAChB,OAAO,CAAC,kBAAkB,EAAE,EAAE,CAAC;SAC/B,WAAW,EAAE;SACb,KAAK,CAAC,YAAY,CAAC;SACnB,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,MAAM,GAAG,CAAC,CAAC;SAC3B,IAAI,CAAC,GAAG,CAAC,CAAC;AACb,CAAC,CAAC;AAEF;;;;;;GAMG;AACH,MAAM,UAAU,YAAY,CAAC,GAAW,EAAE,KAAa;IACtD,MAAM,UAAU,GAAG,SAAS,CAAC,GAAG,CAAC,CAAC;IAClC,MAAM,UAAU,GAAG,SAAS,CAAC,KAAK,CAAC,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;IAC/C,OAAO,UAAU,CAAC,MAAM,CAAC,UAAU,KAAK,EAAE,KAAK,EAAE,CAAC;QACjD,MAAM,KAAK,GAAG,UAAU,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC;QACvC,IAAI,KAAK,GAAG,CAAC,EAAE,CAAC;YACf,OAAO,KAAK,CAAC;QACd,CAAC;QACD,MAAM,GAAG,GAAG,CAAC,UAAU,CAAC,MAAM,GAAG,KAAK,CAAC,GAAG,UAAU,CAAC,MAAM,CAAC;QAC5D,MAAM,MAAM,GAAG,CAAC,UAAU,CAAC,MAAM,GAAG,CAAC,CAAC,GAAG,UAAU,CAAC,MAAM,CAAC;QAC3D,OAAO,KAAK,GAAG,GAAG,GAAG,MAAM,CAAC;IAC7B,CAAC,EAAE,CAAC,CAAC,CAAC;AACP,CAAC"}
|
|
@@ -19,12 +19,8 @@ describe('applyMelauto', () => {
|
|
|
19
19
|
{ id: 'hello-w' },
|
|
20
20
|
];
|
|
21
21
|
const sortedData = applyMelauto('hello', noLabelData);
|
|
22
|
-
|
|
23
|
-
|
|
24
|
-
{ id: 'hello-w' },
|
|
25
|
-
{ id: 'a' },
|
|
26
|
-
];
|
|
27
|
-
expect(sortedData).toStrictEqual(expectedSortedData);
|
|
22
|
+
// check only order with the id
|
|
23
|
+
expect(sortedData.map((item) => item.id)).toEqual(['b', 'hello-w', 'a']);
|
|
28
24
|
});
|
|
29
25
|
});
|
|
30
26
|
describe('melautoScore', () => {
|
|
@@ -61,13 +57,13 @@ describe('melautoScore', () => {
|
|
|
61
57
|
{ id: '0112B', label: '0112B' },
|
|
62
58
|
];
|
|
63
59
|
const sortedData = applyMelauto('011', numericData);
|
|
64
|
-
|
|
65
|
-
|
|
66
|
-
|
|
67
|
-
|
|
68
|
-
|
|
69
|
-
|
|
70
|
-
|
|
60
|
+
// check only order with the id
|
|
61
|
+
expect(sortedData.map((item) => item.id)).toEqual([
|
|
62
|
+
'0111Z',
|
|
63
|
+
'0112B',
|
|
64
|
+
'0115Z',
|
|
65
|
+
'0120A',
|
|
66
|
+
]);
|
|
71
67
|
});
|
|
72
68
|
it('should apply alphanumeric sort with numeric awareness', () => {
|
|
73
69
|
const mixedData = [
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"melauto.spec.js","sourceRoot":"","sources":["../../../src/utils/search/melauto.spec.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,EAAE,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAC;AAC9C,OAAO,EAAE,YAAY,EAAE,YAAY,EAAE,MAAM,WAAW,CAAC;AAEvD,4CAA4C;AAC5C,MAAM,IAAI,GAAG;IACZ,EAAE,EAAE,EAAE,GAAG,EAAE,KAAK,EAAE,aAAa,EAAE;IACjC,EAAE,EAAE,EAAE,GAAG,EAAE,KAAK,EAAE,kBAAkB,EAAE;IACtC,EAAE,EAAE,EAAE,GAAG,EAAE,KAAK,EAAE,gBAAgB,EAAE;IACpC,EAAE,EAAE,EAAE,GAAG,EAAE,KAAK,EAAE,kBAAkB,EAAE;CACtC,CAAC;AAEF,QAAQ,CAAC,cAAc,EAAE,GAAG,EAAE;IAC7B,EAAE,CAAC,wDAAwD,EAAE,GAAG,EAAE;QACjE,MAAM,UAAU,GAAG,YAAY,CAAC,EAAE,EAAE,IAAI,CAAC,CAAC;QAC1C,MAAM,CAAC,UAAU,CAAC,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC;IAClC,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,uDAAuD,EAAE,GAAG,EAAE;QAChE,MAAM,WAAW,GAAG;YACnB,EAAE,EAAE,EAAE,GAAG,EAAE;YACX,EAAE,EAAE,EAAE,GAAG,EAAE,KAAK,EAAE,OAAO,EAAE;YAC3B,EAAE,EAAE,EAAE,SAAS,EAAE;SACjB,CAAC;QACF,MAAM,UAAU,GAAG,YAAY,CAAC,OAAO,EAAE,WAAW,CAAC,CAAC;
|
|
1
|
+
{"version":3,"file":"melauto.spec.js","sourceRoot":"","sources":["../../../src/utils/search/melauto.spec.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,EAAE,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAC;AAC9C,OAAO,EAAE,YAAY,EAAE,YAAY,EAAE,MAAM,WAAW,CAAC;AAEvD,4CAA4C;AAC5C,MAAM,IAAI,GAAG;IACZ,EAAE,EAAE,EAAE,GAAG,EAAE,KAAK,EAAE,aAAa,EAAE;IACjC,EAAE,EAAE,EAAE,GAAG,EAAE,KAAK,EAAE,kBAAkB,EAAE;IACtC,EAAE,EAAE,EAAE,GAAG,EAAE,KAAK,EAAE,gBAAgB,EAAE;IACpC,EAAE,EAAE,EAAE,GAAG,EAAE,KAAK,EAAE,kBAAkB,EAAE;CACtC,CAAC;AAEF,QAAQ,CAAC,cAAc,EAAE,GAAG,EAAE;IAC7B,EAAE,CAAC,wDAAwD,EAAE,GAAG,EAAE;QACjE,MAAM,UAAU,GAAG,YAAY,CAAC,EAAE,EAAE,IAAI,CAAC,CAAC;QAC1C,MAAM,CAAC,UAAU,CAAC,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC;IAClC,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,uDAAuD,EAAE,GAAG,EAAE;QAChE,MAAM,WAAW,GAAG;YACnB,EAAE,EAAE,EAAE,GAAG,EAAE;YACX,EAAE,EAAE,EAAE,GAAG,EAAE,KAAK,EAAE,OAAO,EAAE;YAC3B,EAAE,EAAE,EAAE,SAAS,EAAE;SACjB,CAAC;QACF,MAAM,UAAU,GAAG,YAAY,CAAC,OAAO,EAAE,WAAW,CAAC,CAAC;QAEtD,+BAA+B;QAC/B,MAAM,CAAC,UAAU,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,GAAG,EAAE,SAAS,EAAE,GAAG,CAAC,CAAC,CAAC;IAC1E,CAAC,CAAC,CAAC;AACJ,CAAC,CAAC,CAAC;AAEH,QAAQ,CAAC,cAAc,EAAE,GAAG,EAAE;IAC7B,EAAE,CAAC,gCAAgC,EAAE,GAAG,EAAE;QACzC,MAAM,KAAK,GAAG,YAAY,CAAC,aAAa,EAAE,OAAO,CAAC,CAAC;QACnD,MAAM,aAAa,GAAG,CAAC,CAAC;QACxB,MAAM,CAAC,KAAK,CAAC,CAAC,WAAW,CAAC,aAAa,EAAE,CAAC,CAAC,CAAC;IAC7C,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,+CAA+C,EAAE,GAAG,EAAE;QACxD,MAAM,MAAM,GAAG,YAAY,CAAC,uBAAuB,EAAE,aAAa,CAAC,CAAC;QACpE,MAAM,MAAM,GAAG,YAAY,CAAC,uBAAuB,EAAE,OAAO,CAAC,CAAC;QAC9D,MAAM,CAAC,MAAM,CAAC,CAAC,eAAe,CAAC,MAAM,CAAC,CAAC;IACxC,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,gFAAgF,EAAE,GAAG,EAAE;QACzF,MAAM,MAAM,GAAG,YAAY,CAAC,aAAa,EAAE,OAAO,CAAC,CAAC;QACpD,MAAM,MAAM,GAAG,YAAY,CAAC,uBAAuB,EAAE,OAAO,CAAC,CAAC;QAC9D,MAAM,CAAC,MAAM,CAAC,CAAC,WAAW,CAAC,MAAM,EAAE,CAAC,CAAC,CAAC;IACvC,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,+BAA+B,EAAE,GAAG,EAAE;QACxC,MAAM,KAAK,GAAG,YAAY,CAAC,kBAAkB,EAAE,OAAO,CAAC,CAAC;QACxD,MAAM,aAAa,GAAG,CAAC,CAAC;QACxB,MAAM,CAAC,KAAK,CAAC,CAAC,IAAI,CAAC,aAAa,CAAC,CAAC;IACnC,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,uDAAuD,EAAE,GAAG,EAAE;QAChE,MAAM,MAAM,GAAG,YAAY,CAAC,aAAa,EAAE,aAAa,CAAC,CAAC;QAC1D,MAAM,MAAM,GAAG,YAAY,CAAC,aAAa,EAAE,aAAa,CAAC,CAAC;QAC1D,MAAM,CAAC,MAAM,CAAC,CAAC,WAAW,CAAC,MAAM,EAAE,CAAC,CAAC,CAAC;IACvC,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,yEAAyE,EAAE,GAAG,EAAE;QAClF,MAAM,WAAW,GAAG;YACnB,EAAE,EAAE,EAAE,OAAO,EAAE,KAAK,EAAE,OAAO,EAAE;YAC/B,EAAE,EAAE,EAAE,OAAO,EAAE,KAAK,EAAE,OAAO,EAAE;YAC/B,EAAE,EAAE,EAAE,OAAO,EAAE,KAAK,EAAE,OAAO,EAAE;YAC/B,EAAE,EAAE,EAAE,OAAO,EAAE,KAAK,EAAE,OAAO,EAAE;SAC/B,CAAC;QACF,MAAM,UAAU,GAAG,YAAY,CAAC,KAAK,EAAE,WAAW,CAAC,CAAC;QACpD,+BAA+B;QAC/B,MAAM,CAAC,UAAU,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC,CAAC,OAAO,CAAC;YACjD,OAAO;YACP,OAAO;YACP,OAAO;YACP,OAAO;SACP,CAAC,CAAC;IACJ,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,uDAAuD,EAAE,GAAG,EAAE;QAChE,MAAM,SAAS,GAAG;YACjB,EAAE,EAAE,EAAE,QAAQ,EAAE,KAAK,EAAE,QAAQ,EAAE;YACjC,EAAE,EAAE,EAAE,OAAO,EAAE,KAAK,EAAE,OAAO,EAAE;YAC/B,EAAE,EAAE,EAAE,QAAQ,EAAE,KAAK,EAAE,QAAQ,EAAE;SACjC,CAAC;QAEF,MAAM,MAAM,GAAG,YAAY,CAAC,MAAM,EAAE,SAAS,CAAC,CAAC;QAC/C,iDAAiD;QACjD,MAAM,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,aAAa,CAAC;YAC7C,OAAO;YACP,QAAQ;YACR,QAAQ;SACR,CAAC,CAAC;IACJ,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,+DAA+D,EAAE,GAAG,EAAE;QACxE,MAAM,IAAI,GAAG;YACZ,EAAE,EAAE,EAAE,SAAS,EAAE,KAAK,EAAE,SAAS,EAAE;YACnC,EAAE,EAAE,EAAE,QAAQ,EAAE,KAAK,EAAE,QAAQ,EAAE;YACjC,EAAE,EAAE,EAAE,SAAS,EAAE,KAAK,EAAE,SAAS,EAAE;YACnC,EAAE,EAAE,EAAE,QAAQ,EAAE,KAAK,EAAE,QAAQ,EAAE;SACjC,CAAC;QACF,MAAM,UAAU,GAAG,YAAY,CAAC,OAAO,EAAE,IAAI,CAAC,CAAC;QAC/C,wEAAwE;QACxE,MAAM,CAAC,UAAU,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,aAAa,CAAC;YACjD,QAAQ;YACR,SAAS;YACT,QAAQ;YACR,SAAS;SACT,CAAC,CAAC;IACJ,CAAC,CAAC,CAAC;AACJ,CAAC,CAAC,CAAC"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@inseefr/lunatic",
|
|
3
|
-
"version": "3.
|
|
3
|
+
"version": "3.14.0-rc-delay-sequence-cleaning.0",
|
|
4
4
|
"description": "Library of questionnaire components",
|
|
5
5
|
"repository": {
|
|
6
6
|
"type": "git",
|
|
@@ -247,6 +247,7 @@
|
|
|
247
247
|
"src/stories/behaviour/cleaning/cleaning.stories.tsx",
|
|
248
248
|
"src/stories/behaviour/cleaning/source-loop-scopes.json",
|
|
249
249
|
"src/stories/behaviour/cleaning/source-loop.json",
|
|
250
|
+
"src/stories/behaviour/cleaning/source-sequence.json",
|
|
250
251
|
"src/stories/behaviour/cleaning/source.json",
|
|
251
252
|
"src/stories/behaviour/controls/controls.stories.tsx",
|
|
252
253
|
"src/stories/behaviour/controls/data-standalone-loop.json",
|
|
@@ -272,6 +273,7 @@
|
|
|
272
273
|
"src/stories/behaviour/resizing/source-calculating.json",
|
|
273
274
|
"src/stories/behaviour/resizing/source-resizing-cleaning.json",
|
|
274
275
|
"src/stories/behaviour/resizing/source.json",
|
|
276
|
+
"src/stories/behaviour/search/search.stories.tsx",
|
|
275
277
|
"src/stories/behaviour/slots.stories.tsx",
|
|
276
278
|
"src/stories/checkbox/checkbox.stories.tsx",
|
|
277
279
|
"src/stories/checkbox/source.json",
|
|
@@ -314,6 +316,9 @@
|
|
|
314
316
|
"src/stories/paste.stories.tsx",
|
|
315
317
|
"src/stories/question/question.stories.tsx",
|
|
316
318
|
"src/stories/question/source.json",
|
|
319
|
+
"src/stories/questionnaires/SRCV/data.json",
|
|
320
|
+
"src/stories/questionnaires/SRCV/source.json",
|
|
321
|
+
"src/stories/questionnaires/SRCV/srcv.stories.tsx",
|
|
317
322
|
"src/stories/questionnaires/logement/data.json",
|
|
318
323
|
"src/stories/questionnaires/logement/logement.stories.tsx",
|
|
319
324
|
"src/stories/questionnaires/logement/source-sequence.json",
|
|
@@ -370,6 +375,7 @@
|
|
|
370
375
|
"src/type.utils.ts",
|
|
371
376
|
"src/use-lunatic/__snapshots__/use-lunatic.test.ts.snap",
|
|
372
377
|
"src/use-lunatic/actions.ts",
|
|
378
|
+
"src/use-lunatic/commons/compile-controls.spec.ts",
|
|
373
379
|
"src/use-lunatic/commons/compile-controls.ts",
|
|
374
380
|
"src/use-lunatic/commons/component.ts",
|
|
375
381
|
"src/use-lunatic/commons/execute-condition-filter.ts",
|
|
@@ -1405,6 +1411,9 @@
|
|
|
1405
1411
|
"esm/use-lunatic/commons/compile-controls.d.ts",
|
|
1406
1412
|
"esm/use-lunatic/commons/compile-controls.js",
|
|
1407
1413
|
"esm/use-lunatic/commons/compile-controls.js.map",
|
|
1414
|
+
"esm/use-lunatic/commons/compile-controls.spec.d.ts",
|
|
1415
|
+
"esm/use-lunatic/commons/compile-controls.spec.js",
|
|
1416
|
+
"esm/use-lunatic/commons/compile-controls.spec.js.map",
|
|
1408
1417
|
"esm/use-lunatic/commons/component.d.ts",
|
|
1409
1418
|
"esm/use-lunatic/commons/component.js",
|
|
1410
1419
|
"esm/use-lunatic/commons/component.js.map",
|
|
@@ -1750,6 +1759,9 @@
|
|
|
1750
1759
|
"use-lunatic/commons/compile-controls.d.ts",
|
|
1751
1760
|
"use-lunatic/commons/compile-controls.js",
|
|
1752
1761
|
"use-lunatic/commons/compile-controls.js.map",
|
|
1762
|
+
"use-lunatic/commons/compile-controls.spec.d.ts",
|
|
1763
|
+
"use-lunatic/commons/compile-controls.spec.js",
|
|
1764
|
+
"use-lunatic/commons/compile-controls.spec.js.map",
|
|
1753
1765
|
"use-lunatic/commons/component.d.ts",
|
|
1754
1766
|
"use-lunatic/commons/component.js",
|
|
1755
1767
|
"use-lunatic/commons/component.js.map",
|
|
@@ -1,20 +1,24 @@
|
|
|
1
1
|
import { DurationFormat } from '../type';
|
|
2
2
|
import { type DurationValue } from './durationUtils';
|
|
3
3
|
|
|
4
|
+
const isNullOrUndefined = (value: any): value is null | undefined =>
|
|
5
|
+
value === null || value === undefined;
|
|
6
|
+
|
|
4
7
|
/**
|
|
5
8
|
* Convert a string into a duration
|
|
6
9
|
*
|
|
7
10
|
* ## Example
|
|
8
|
-
* - "P12Y5M" => {
|
|
11
|
+
* - "P12Y5M" => {years: 12, months: 5}
|
|
9
12
|
*/
|
|
10
13
|
export const getDurationFromValue = (
|
|
11
|
-
value: string | null,
|
|
14
|
+
value: string | null | undefined,
|
|
12
15
|
format: DurationFormat
|
|
13
16
|
): DurationValue => {
|
|
14
|
-
// Handle nulls value
|
|
15
|
-
if (value
|
|
16
|
-
|
|
17
|
-
|
|
17
|
+
// Handle nulls or undefined value
|
|
18
|
+
if (isNullOrUndefined(value)) {
|
|
19
|
+
if (format === 'PTnHnM') {
|
|
20
|
+
return { hours: null, minutes: null };
|
|
21
|
+
}
|
|
18
22
|
return { years: null, months: null };
|
|
19
23
|
}
|
|
20
24
|
|