@legalplace/wizardx-core 4.36.2 → 4.36.4
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/dist/helpers/autocomplete.helper.d.ts +2 -1
- package/dist/helpers/autocomplete.helper.js +3 -3
- package/dist/helpers/autosave.helper.js +1 -0
- package/dist/helpers/inpiCitiesHelper.d.ts +1 -1
- package/dist/helpers/inpiCitiesHelper.js +1 -2
- package/dist/service/autocomplete.manager.d.ts +2 -1
- package/dist/service/autocomplete.manager.js +2 -1
- package/package.json +4 -4
|
@@ -1,6 +1,7 @@
|
|
|
1
1
|
import type { AutocompleteDatasetType } from "@legalplace/models-v3-types";
|
|
2
|
-
export declare const handleDataGouvCitiesWithInpi: ({ inputValue, dataset, signal, }: {
|
|
2
|
+
export declare const handleDataGouvCitiesWithInpi: ({ inputValue, dataset, signal, variableId, }: {
|
|
3
3
|
inputValue: string;
|
|
4
4
|
dataset: AutocompleteDatasetType;
|
|
5
5
|
signal?: AbortSignal | undefined;
|
|
6
|
+
variableId?: string | number | undefined;
|
|
6
7
|
}) => Promise<Record<string, string | number | null | undefined>[]>;
|
|
@@ -11,14 +11,14 @@ import { DataGouvApi } from "@legalplace/data-gouv";
|
|
|
11
11
|
import { autocompleteDatasetConfig } from "../constants/autocomplete";
|
|
12
12
|
import { DatasetTypeEnum } from "../types/autocomplete.type";
|
|
13
13
|
import { initializeInpiCities, mixDataGouvAndInpiCities, } from "./inpiCitiesHelper";
|
|
14
|
-
export const handleDataGouvCitiesWithInpi = ({ inputValue, dataset, signal, }) => __awaiter(void 0, void 0, void 0, function* () {
|
|
14
|
+
export const handleDataGouvCitiesWithInpi = ({ inputValue, dataset, signal, variableId, }) => __awaiter(void 0, void 0, void 0, function* () {
|
|
15
15
|
yield initializeInpiCities();
|
|
16
16
|
if (inputValue.length < 3) {
|
|
17
17
|
return [];
|
|
18
18
|
}
|
|
19
19
|
const { limit, debounceDelay } = autocompleteDatasetConfig[dataset];
|
|
20
20
|
const debounceId = DatasetTypeEnum.DATAGOUV_CITIES_WITH_INPI;
|
|
21
|
-
const debounceTimerKey = `debounceTimer_${debounceId}`;
|
|
21
|
+
const debounceTimerKey = `debounceTimer_${debounceId}_${variableId}`;
|
|
22
22
|
const windowWithTimers = window;
|
|
23
23
|
return new Promise((resolve) => {
|
|
24
24
|
if (windowWithTimers[debounceTimerKey]) {
|
|
@@ -42,7 +42,7 @@ export const handleDataGouvCitiesWithInpi = ({ inputValue, dataset, signal, }) =
|
|
|
42
42
|
}, autocompleteDatasetConfig[dataset].timeoutLimit);
|
|
43
43
|
});
|
|
44
44
|
const result = yield Promise.race([searchPromise, localTimeoutPromise]);
|
|
45
|
-
const processedResult = yield mixDataGouvAndInpiCities(result, inputValue
|
|
45
|
+
const processedResult = yield mixDataGouvAndInpiCities(result, inputValue);
|
|
46
46
|
resolve(processedResult);
|
|
47
47
|
}
|
|
48
48
|
catch (error) {
|
|
@@ -41,6 +41,7 @@ const getResultAutoComplete = (variableId, updateValue, index, store) => __await
|
|
|
41
41
|
dataset: autocompleteDataset,
|
|
42
42
|
inputValue: cleanString(updateValue),
|
|
43
43
|
attributes: Object.keys(linkedVariables || {}),
|
|
44
|
+
variableId,
|
|
44
45
|
});
|
|
45
46
|
if (!autocompleteResults) {
|
|
46
47
|
window.parent.postMessage({ from: "WIZARD", data: "ERROR" }, "*");
|
|
@@ -7,5 +7,5 @@ interface IAddress {
|
|
|
7
7
|
}
|
|
8
8
|
export declare function initializeInpiCities(): Promise<void>;
|
|
9
9
|
export declare function computeRelevance(address: IAddress, inputWords: string[]): number;
|
|
10
|
-
export declare function mixDataGouvAndInpiCities(dataGouvResult: IGeoJSON, inputValue: string
|
|
10
|
+
export declare function mixDataGouvAndInpiCities(dataGouvResult: IGeoJSON, inputValue: string): Promise<Record<string, string | number>[]>;
|
|
11
11
|
export {};
|
|
@@ -67,7 +67,7 @@ export function computeRelevance(address, inputWords) {
|
|
|
67
67
|
function addressKey(address) {
|
|
68
68
|
return address.postcode;
|
|
69
69
|
}
|
|
70
|
-
export function mixDataGouvAndInpiCities(dataGouvResult, inputValue
|
|
70
|
+
export function mixDataGouvAndInpiCities(dataGouvResult, inputValue) {
|
|
71
71
|
var _a;
|
|
72
72
|
return __awaiter(this, void 0, void 0, function* () {
|
|
73
73
|
if (!cachedInpiCities) {
|
|
@@ -106,7 +106,6 @@ export function mixDataGouvAndInpiCities(dataGouvResult, inputValue, limit) {
|
|
|
106
106
|
const sortedAddresses = combinedAddresses
|
|
107
107
|
.map((address) => (Object.assign(Object.assign({}, address), { score: computeRelevance(address, inputWords) })))
|
|
108
108
|
.sort((a, b) => b.score - a.score)
|
|
109
|
-
.slice(0, limit)
|
|
110
109
|
.map((_a) => {
|
|
111
110
|
var { score: _score, from: _from } = _a, rest = __rest(_a, ["score", "from"]);
|
|
112
111
|
return (Object.assign(Object.assign({}, rest), { field: `${rest.city} ${rest.postcode}`, primary: rest.city, secondary: rest.postcode || "" }));
|
|
@@ -1,7 +1,8 @@
|
|
|
1
1
|
import type { AutocompleteDatasetType } from "@legalplace/models-v3-types";
|
|
2
|
-
export declare const fetchAutocompleteDataFromInputValue: ({ dataset, inputValue, attributes, signal, }: {
|
|
2
|
+
export declare const fetchAutocompleteDataFromInputValue: ({ dataset, inputValue, attributes, signal, variableId, }: {
|
|
3
3
|
dataset: AutocompleteDatasetType;
|
|
4
4
|
inputValue: string;
|
|
5
5
|
attributes?: string[] | undefined;
|
|
6
6
|
signal?: AbortSignal | undefined;
|
|
7
|
+
variableId?: string | number | undefined;
|
|
7
8
|
}) => Promise<Record<string, string | number | null | undefined>[] | null>;
|
|
@@ -24,7 +24,7 @@ import { DatasetTypeEnum } from "../types/autocomplete.type";
|
|
|
24
24
|
import { initializeActivities, searchInActivities, } from "../helpers/activitiesHelper";
|
|
25
25
|
import { autocompleteDatasetConfig, LegalStatusMapperConfig, } from "../constants/autocomplete";
|
|
26
26
|
import { handleDataGouvCitiesWithInpi } from "../helpers/autocomplete.helper";
|
|
27
|
-
export const fetchAutocompleteDataFromInputValue = ({ dataset, inputValue, attributes = [], signal, }) => __awaiter(void 0, void 0, void 0, function* () {
|
|
27
|
+
export const fetchAutocompleteDataFromInputValue = ({ dataset, inputValue, attributes = [], signal, variableId, }) => __awaiter(void 0, void 0, void 0, function* () {
|
|
28
28
|
var _a, _b;
|
|
29
29
|
try {
|
|
30
30
|
if (dataset === DatasetTypeEnum.DATAGOUV_CITIES_WITH_INPI) {
|
|
@@ -32,6 +32,7 @@ export const fetchAutocompleteDataFromInputValue = ({ dataset, inputValue, attri
|
|
|
32
32
|
inputValue,
|
|
33
33
|
dataset,
|
|
34
34
|
signal,
|
|
35
|
+
variableId,
|
|
35
36
|
});
|
|
36
37
|
}
|
|
37
38
|
const errorTimeoutPromise = new Promise((_, reject) => {
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@legalplace/wizardx-core",
|
|
3
|
-
"version": "4.36.
|
|
3
|
+
"version": "4.36.4",
|
|
4
4
|
"author": "Moncef Hammou (moncef@legalplace.fr)",
|
|
5
5
|
"license": "MIT",
|
|
6
6
|
"files": [
|
|
@@ -21,7 +21,7 @@
|
|
|
21
21
|
"dependencies": {
|
|
22
22
|
"@appnest/masonry-layout": "^2.0.8",
|
|
23
23
|
"@cryptography/sha1": "^0.2.0",
|
|
24
|
-
"@legalplace/data-gouv": "^1.6.
|
|
24
|
+
"@legalplace/data-gouv": "^1.6.33",
|
|
25
25
|
"@legalplace/lp-events": "1.14.0",
|
|
26
26
|
"@legalplace/lplogic": "2.3.1",
|
|
27
27
|
"@legalplace/model-healthcheck": "^1.1.5",
|
|
@@ -62,7 +62,7 @@
|
|
|
62
62
|
"@legalplace/eslint-config": "^2.3.0",
|
|
63
63
|
"@legalplace/models-v3-types": "^5.13.25",
|
|
64
64
|
"@legalplace/prettier-config": "^2.1.3",
|
|
65
|
-
"@legalplace/typeorm-entities": "^5.57.
|
|
65
|
+
"@legalplace/typeorm-entities": "^5.57.2",
|
|
66
66
|
"@swc-node/jest": "^1.3.2",
|
|
67
67
|
"@swc/core": "^1.2.93",
|
|
68
68
|
"@swc/jest": "^0.2.4",
|
|
@@ -100,5 +100,5 @@
|
|
|
100
100
|
"*.test.ts",
|
|
101
101
|
"*.test.tsx"
|
|
102
102
|
],
|
|
103
|
-
"gitHead": "
|
|
103
|
+
"gitHead": "92e525c22a273e51603690511dca165f594a7c41"
|
|
104
104
|
}
|