@legalplace/wizardx-core 4.13.3 → 4.14.1

package/dist/componentsConnectors/connectVariable.js

@@ -1,7 +1,7 @@
 import { componentConnector } from "./connector/componentConnector";
 import { isStepAvailable } from "../redux/selectors/app";
 import { parseRawWithVariables, parseVariableLabel, } from "../helpers/outputsParsing";
-import { selectAutocompleteDataset, selectIsVariableDisabled, selectLinkedVariables, selectVariableDisabledTooltip, } from "../redux";
+import { selectAutocompleteDataset, selectIsVariableDisabledByIndex, selectLinkedVariables, selectVariableDisabledTooltipByIndex, } from "../redux";
 export const canVariableDisplay = (id, index, selectors) => {
     const { selectVariableReference, isLevelAccessibleForUser } = selectors;
     const variable = selectVariableReference(id);
@@ -24,8 +24,8 @@ const stateToProps = (selectors) => (state, ownProps) => {
     const validator = selectVariableValidatorConditionValue(id, index);
     const linkedVariables = selectLinkedVariables(id);
     const autocompleteDataset = selectAutocompleteDataset(id);
-    const disabled = selectIsVariableDisabled(id);
-    const disabledTooltip = selectVariableDisabledTooltip(id);
+    const disabled = selectIsVariableDisabledByIndex(id, index);
+    const disabledTooltip = selectVariableDisabledTooltipByIndex(id, index);
     const { type } = variable;
     const mandatoryValidated = selectMandatoryVariableByIndex(id, index);
     const mandatoryIgnore = selectors.selectMandatoryIgnore();

package/dist/helpers/redirectToLogin.d.ts

@@ -0,0 +1 @@
+export declare const redirectToLogin: (redirectUrl: string, redirectParams?: boolean) => void;

package/dist/helpers/redirectToLogin.js

@@ -0,0 +1,12 @@
+export const redirectToLogin = (redirectUrl, redirectParams = false) => {
+    const currentParams = new URLSearchParams(window.location.search);
+    const redirectURL = new URL(redirectUrl, window.location.origin);
+    currentParams.forEach((value, key) => {
+        redirectURL.searchParams.append(key, value);
+    });
+    if (redirectParams) {
+        redirectURL.searchParams.append("redirectUrl", encodeURIComponent(window.location.href));
+    }
+    window.onbeforeunload = null;
+    window.location.href = redirectURL.toString();
+};

package/dist/redux/reducers/references/setDisabledVariable.js

@@ -1,7 +1,10 @@
 export const setDisabledVariableReducer = (state, action) => {
-    const { id, disabled, disabledTooltip } = action;
+    var _a;
+    const { id, disabled, index } = action;
     if (state.variables[id].disabled === disabled)
         return state;
-    return Object.assign(Object.assign({}, state), { variables: Object.assign(Object.assign({}, state.variables), { [id]: Object.assign(Object.assign({}, state.variables[id]), { disabledTooltip,
-                disabled }) }) });
+    const disabledIndexes = ((_a = state.variables[id].extraInformations) === null || _a === void 0 ? void 0 : _a.disabledIndexes) || [];
+    const extraInformations = Object.assign(Object.assign({}, state.variables[id].extraInformations), { disabledIndexes });
+    extraInformations.disabledIndexes[index] = disabled;
+    return Object.assign(Object.assign({}, state), { variables: Object.assign(Object.assign({}, state.variables), { [id]: Object.assign(Object.assign({}, state.variables[id]), { extraInformations }) }) });
 };

package/dist/redux/sagas/fetchModel.js

@@ -21,6 +21,7 @@ import { FETCH_MODEL, FETCH_MODEL_PREREQUISITES, } from "../constants/sagas/mode
 import { fetchModelAction } from "../actions/sagas/model";
 import { initInputsDecorator } from "./initInputs";
 import { cancelOnResetState } from "../../helpers/sagaCancelOnResetState";
+import { redirectToLogin } from "../../helpers/redirectToLogin";
 const cookies = new Cookies();
 function* setFetchModelToNonBlocking(firstCurrentAppState) {
     yield put(initPaginationAction({
@@ -82,10 +83,7 @@ function* getWizardConfig(permalink, uniqidParam, prefix, queryParams) {
     }
     response = yield call([response, "json"]);
     if (response.redirect) {
-        window.onbeforeunload = null;
-        window.location.href = `${response.redirect}${response.redirectParams
-            ? `?redirectUrl=${encodeURIComponent(window.location.href)}`
-            : ""}`;
+        redirectToLogin(response.redirect, response.redirectParams);
     }
     yield put(setModelUuidAction(response.modelUuid));
     return { modelUuid: response.modelUuid };
@@ -132,10 +130,7 @@ function* fetchInstanceInformation(appStates, permalink, uniqid, uniqidParam, pr
     }
     response = yield call([response, "json"]);
     if (response.redirect) {
-        window.onbeforeunload = null;
-        window.location.href = `${response.redirect}${response.redirectParams
-            ? `?redirectUrl=${encodeURIComponent(window.location.href)}`
-            : ""}`;
+        redirectToLogin(response.redirect, response.redirectParams);
     }
     if (response.errors || response.status === "error") {
         throw new Error(`Unable to fetch ${permalink}${uniqid && uniqid.trim().length > 0 ? `/${uniqid}` : ""}`);

package/dist/redux/selectors/inputs.d.ts

@@ -7,5 +7,5 @@ export declare const selectVariableInput: (id: number) => readonly (string | num
 export declare const selectVariableInputByIndex: (id: number, index: number) => Readonly<string | number>;
 export declare const selectLinkedVariables: (id: number) => Readonly<Record<string, number>>;
 export declare const selectAutocompleteDataset: (id: number) => Readonly<import("@legalplace/models-v3-types").AutocompleteDatasetType | undefined>;
-export declare const selectIsVariableDisabled: (id: number) => Readonly<boolean>;
-export declare const selectVariableDisabledTooltip: (id: number) => string;
+export declare const selectIsVariableDisabledByIndex: (id: number, index: number) => Readonly<boolean>;
+export declare const selectVariableDisabledTooltipByIndex: (id: number, index: number) => Readonly<string | undefined>;

package/dist/redux/selectors/inputs.js

@@ -20,5 +20,27 @@ export const selectVariableInput = createSelector((state, id) => {
 export const selectVariableInputByIndex = createSelector((state, id, index) => state.inputs.variables[id][index], (state, id, index) => `${state.inputs.variables[id].reduce((p, c) => `${p}-${c}`, "")}_${id.toString()}_${index}`);
 export const selectLinkedVariables = createSelector((state, id) => state.references.variables[id].linkedVariables || {}, (state, id) => `${Object.entries(state.references.variables[id].linkedVariables || {}).reduce((p, c) => `${p}-${c}`, "")}_${id.toString()}`);
 export const selectAutocompleteDataset = createSelector((state, id) => state.references.variables[id].autocompleteDataset, (state, id) => `${state.references.variables[id].autocompleteDataset}_${id.toString()}`);
-export const selectIsVariableDisabled = createSelector((state, id) => state.references.variables[id].disabled || false, (state, id) => state.references.variables[id].disabled ? "1" : "0");
-export const selectVariableDisabledTooltip = createSelector((state, id) => state.references.variables[id].disabledTooltip || "", (state, id) => { var _a; return ((_a = state.references.variables[id].disabledTooltip) === null || _a === void 0 ? void 0 : _a.length) ? "1" : "0"; });
+export const selectIsVariableDisabledByIndex = createSelector((state, id, index) => {
+    var _a;
+    return state.references.variables[id].disabled ||
+        ((_a = state.references.variables[id].extraInformations) === null || _a === void 0 ? void 0 : _a.disabledIndexes[index]) ||
+        false;
+}, (state, id, index) => {
+    var _a;
+    return state.references.variables[id].disabled ||
+        ((_a = state.references.variables[id].extraInformations) === null || _a === void 0 ? void 0 : _a.disabledIndexes[index])
+        ? "1"
+        : "0";
+});
+export const selectVariableDisabledTooltipByIndex = createSelector((state, id, index) => {
+    var _a;
+    return ((_a = state.references.variables[id].extraInformations) === null || _a === void 0 ? void 0 : _a.disabledIndexes[index])
+        ? state.references.variables[id].disabledTooltip
+        : "";
+}, (state, id, index) => {
+    var _a;
+    return state.references.variables[id].disabledTooltip ||
+        ((_a = state.references.variables[id].extraInformations) === null || _a === void 0 ? void 0 : _a.disabledIndexes[index])
+        ? "1"
+        : "0";
+});

package/dist/redux/selectors/library.d.ts

@@ -52,8 +52,8 @@ export declare const selectorsLibrary: {
     selectVariableInputByIndex: (id: number, index: number) => Readonly<string | number>;
     selectLinkedVariables: (id: number) => Readonly<Record<string, number>>;
     selectAutocompleteDataset: (id: number) => Readonly<import("@legalplace/models-v3-types").AutocompleteDatasetType | undefined>;
-    selectIsVariableDisabled: (id: number) => Readonly<boolean>;
-    selectVariableDisabledTooltip: (id: number) => string;
+    selectIsVariableDisabledByIndex: (id: number, index: number) => Readonly<boolean>;
+    selectVariableDisabledTooltipByIndex: (id: number, index: number) => Readonly<string | undefined>;
     selectOptionConditionValue(id: number): Readonly<boolean[] | undefined>;
     selectOptionConditionValue(id: number, index: number): Readonly<boolean | undefined>;
     selectVariableConditionValue(id: number): boolean[] | undefined;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@legalplace/wizardx-core",
-  "version": "4.13.3",
+  "version": "4.14.1",
   "author": "Moncef Hammou (moncef@legalplace.fr)",
   "license": "MIT",
   "files": [
@@ -24,9 +24,9 @@
     "@legalplace/lp-events": "1.14.0",
     "@legalplace/lplogic": "2.3.1",
     "@legalplace/model-healthcheck": "^1.1.5",
-    "@legalplace/referencesparser": "^3.1.17",
+    "@legalplace/referencesparser": "^3.1.18",
     "@legalplace/storybook": "^2.171.0",
-    "@legalplace/typeorm-constants": "^3.32.0",
+    "@legalplace/typeorm-constants": "^3.32.1",
     "@loadable/component": "^5.15.0",
     "@redux-saga/core": "^1.1.3",
     "connected-react-router": "^6.8.0",
@@ -56,9 +56,9 @@
   "devDependencies": {
     "@legalplace/data-gouv": "^1.5.11",
     "@legalplace/eslint-config": "^2.2.0",
-    "@legalplace/models-v3-types": "^5.11.4",
+    "@legalplace/models-v3-types": "^5.11.5",
     "@legalplace/prettier-config": "^2.1.3",
-    "@legalplace/typeorm-entities": "^5.29.7",
+    "@legalplace/typeorm-entities": "^5.29.8",
     "@swc-node/jest": "^1.3.2",
     "@swc/core": "^1.2.93",
     "@swc/jest": "^0.2.4",
@@ -96,5 +96,5 @@
     "*.test.ts",
     "*.test.tsx"
   ],
-  "gitHead": "cc93b324728874d719c5d9fd544bbf3d8498c1a4"
+  "gitHead": "1c66efb5a8066dc72f28eeb9758edc577d039df5"
 }