@legalplace/wizardx-core 2.1.0-alpha.5 → 2.1.0-alpha.7

package/CHANGELOG.md

@@ -3,6 +3,30 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+# [2.1.0-alpha.7](https://git.legalplace.eu/legalplace/monorepo/compare/@legalplace/wizardx-core@2.1.0-alpha.6...@legalplace/wizardx-core@2.1.0-alpha.7) (2021-11-24)
+
+**Note:** Version bump only for package @legalplace/wizardx-core
+
+
+
+
+
+# [2.1.0-alpha.6](https://git.legalplace.eu/legalplace/monorepo/compare/@legalplace/wizardx-core@2.1.0-alpha.5...@legalplace/wizardx-core@2.1.0-alpha.6) (2021-11-23)
+
+
+### Bug Fixes
+
+* fix push api[#3338](https://git.legalplace.eu/legalplace/monorepo/issues/3338) ([1c961d5](https://git.legalplace.eu/legalplace/monorepo/commits/1c961d5a459513f791c2afb363881aa3d9214add))
+
+
+### Features
+
+* Adding possibility to clone instance and improving UX on kanoon softSocial modal api[#3338](https://git.legalplace.eu/legalplace/monorepo/issues/3338) ([cec91b7](https://git.legalplace.eu/legalplace/monorepo/commits/cec91b79a512de1699e75fbb0e1bf95359f43376))
+
+
+
+
+
 # [2.1.0-alpha.5](https://git.legalplace.eu/legalplace/monorepo/compare/@legalplace/wizardx-core@2.1.0-alpha.4...@legalplace/wizardx-core@2.1.0-alpha.5) (2021-11-15)
 
 

package/dist/componentsConnectors/connector/connectorSelectors.d.ts

@@ -15,6 +15,7 @@ declare const connectorSelectors: {
     selectUserValidToken: () => Readonly<boolean>;
     selectUserEmail: () => string;
     isLevelAccessibleForUser: (level: "ADMIN" | "MANAGER" | "USER" | "GUEST" | "SUPER") => Readonly<boolean>;
+    selectReferences: () => Readonly<import("@legalplace/referencesparser/dist/libs/References.type").ReferencesType>;
     selectOutputReference: (id: number) => Readonly<import("@legalplace/referencesparser/dist/libs/References.type").ReferencesSingleOutputType | undefined>;
     selectBoxReference: (id: number) => Readonly<import("@legalplace/referencesparser/dist/libs/References.type").ReferencesSingleBoxType>;
     isOptionMultiple: (id: number) => Readonly<boolean | undefined>;

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

@@ -1,4 +1,6 @@
+import { StateType } from '../../types/State.type';
 import { ActionsType } from '../../types/Actions.type';
+export declare const initInputsAction: (inputs: StateType.Inputs, references?: StateType.References | undefined) => ActionsType.Inputs.initInputs;
 export declare const initOptionAction: (id: number, values: boolean[]) => ActionsType.Inputs.initOption;
 export declare const updateOptionAction: (id: number, value: boolean, index: number) => ActionsType.Inputs.updateOptionInput;
 export declare const initVariableAction: (id: number, values: (string | number)[]) => ActionsType.Inputs.initVariable;

package/dist/redux/actions/inputs.js

@@ -1,4 +1,9 @@
-import { INIT_OPTION, INIT_VARIABLE, UPDATE_OPTION_INPUT, UPDATE_VARIABLE_INPUT, ADD_MULTIPLE_OCCURENCY, DELETE_MULTIPLE_OCCURENCY, } from '../constants/inputs';
+import { INIT_INPUTS, INIT_OPTION, INIT_VARIABLE, UPDATE_OPTION_INPUT, UPDATE_VARIABLE_INPUT, ADD_MULTIPLE_OCCURENCY, DELETE_MULTIPLE_OCCURENCY, } from '../constants/inputs';
+export const initInputsAction = (inputs, references) => ({
+    type: INIT_INPUTS,
+    inputs,
+    references,
+});
 export const initOptionAction = (id, values) => ({
     type: INIT_OPTION,
     id,

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

@@ -4,3 +4,4 @@ export declare const INIT_OPTION = "INIT_OPTION";
 export declare const UPDATE_OPTION_INPUT = "UPDATE_OPTION_INPUT";
 export declare const INIT_VARIABLE = "INIT_VARIABLE";
 export declare const UPDATE_VARIABLE_INPUT = "UPDATE_VARIABLE_INPUT";
+export declare const INIT_INPUTS = "INIT_INPUTS";

package/dist/redux/constants/inputs.js

@@ -4,3 +4,4 @@ export const INIT_OPTION = 'INIT_OPTION';
 export const UPDATE_OPTION_INPUT = 'UPDATE_OPTION_INPUT';
 export const INIT_VARIABLE = 'INIT_VARIABLE';
 export const UPDATE_VARIABLE_INPUT = 'UPDATE_VARIABLE_INPUT';
+export const INIT_INPUTS = 'INIT_INPUTS';

package/dist/redux/sagas/fetchModel.js

@@ -1,12 +1,10 @@
 import { call, put, takeLatest, select, fork, join } from 'redux-saga/effects';
 import Cookies from 'universal-cookie';
+import { initInputsAction } from '../actions/inputs';
 import { initMetaAction, initPaginationAction, initInstanceAction, fetchModelSucceededAction, fetchModelFailedAction, initCustomizationMetaAction, fetchModelUnhealthyAction, initCustomizationAutoDefaultAction, fetchModelUserLockedAction, updateAvailableAppStatesAction, goPageAction, fetchModelNonBlockingAction, setModelUuidAction, } from '../actions/app';
-import { ConditionsInitiator } from '../../libs/ConditionsInitiator';
 import { initReferencesAction } from '../actions/references';
-import { initOptionAction, initVariableAction } from '../actions/inputs';
-import { initConditionsAction } from '../actions/conditions';
 import { selectSectionConditionValue } from '../selectors/conditions';
-import { selectAllSectionsReferences, selectOptionRelations, } from '../selectors/references';
+import { selectAllSectionsReferences } from '../selectors/references';
 import { selectInstanceUniqid, isStepAvailable } from '../selectors/app';
 import { getConfig, updateConfig } from '../../config';
 import { isLevelAccessibleForUser } from '../selectors/user';
@@ -18,13 +16,11 @@ import Globals from '../../Globals';
 import { getFetchModelArguments, getCreateInstanceArguments, getClientConfigArguments, getWizardConfigArguments, getModelInformationArguments, } from '../../service/api.manager';
 import { loadTheme, setWizardTheme } from '../../ThemeLoader';
 import { loadPlugins } from '../../PluginLoader';
-import { selectMandatoryOptionItem, selectMandatoryOption, } from '../selectors/mandatories';
-import { initMandatoryOptionAction, initMandatoryVariableAction, } from '../actions/mandatories';
 import { enableSmartscriptAction } from '../actions/smartscript';
 import { FETCH_MODEL, FETCH_MODEL_PREREQUISITES, } from '../constants/sagas/model';
 import { fetchModelAction } from '../actions/sagas/model';
+import { initInputsDecorator } from './initInputs';
 const cookies = new Cookies();
-const getValues = (arr1, arr2) => arr1.map((v, index) => arr2[index] || v);
 function* setFetchModelToNonBlocking(firstCurrentAppState) {
     yield put(initPaginationAction({
         currentPage: 1,
@@ -277,51 +273,7 @@ function* fetchModelDecorator(action) {
         if (OvcConverter.isOvc(ovc))
             ovc = OvcConverter.convertToOptionsVariables(ovc, references);
         const inputs = new IntputsInitiator(references, ovc).getInputs();
-        const conditions = new ConditionsInitiator(references, inputs).getConditions();
-        yield put(initConditionsAction(conditions));
-        const optionsIds = Object.keys(inputs.options);
-        for (let i = 0; i < optionsIds.length; i += 1) {
-            let optionId = parseInt(optionsIds[i], 10);
-            let values = inputs.options[optionId];
-            yield put(initOptionAction(optionId, values));
-            const { meta: meta2 } = references.options[optionId];
-            const { type } = meta2;
-            let { mandatory } = meta2;
-            let sendOptionAction = true;
-            if (['checkbox', 'radio'].includes(type)) {
-                if (type === 'radio') {
-                    const { parents } = selectOptionRelations(optionId);
-                    const parentId = parents[0];
-                    const isMandatoryOption = selectMandatoryOptionItem(parentId);
-                    if (typeof isMandatoryOption !== 'undefined') {
-                        const mandatoryOption = selectMandatoryOption(parentId);
-                        sendOptionAction = !mandatoryOption.every((v) => v === true);
-                        if (sendOptionAction === true && mandatoryOption) {
-                            if (values.length >= mandatoryOption.length) {
-                                values = getValues(values, [...mandatoryOption]);
-                            }
-                            else {
-                                values = getValues([...mandatoryOption], values);
-                            }
-                        }
-                    }
-                    mandatory = references.options[parentId].meta.mandatory;
-                    optionId = parentId;
-                }
-                if (mandatory === true && sendOptionAction === true) {
-                    yield put(initMandatoryOptionAction(optionId, values));
-                }
-            }
-        }
-        const variablesIds = Object.keys(inputs.variables);
-        for (let i = 0; i < variablesIds.length; i += 1) {
-            const variableId = variablesIds[i];
-            const values = inputs.variables[variableId];
-            yield put(initVariableAction(parseInt(variableId, 10), values));
-            if (references.variables[variableId].mandatory === true)
-                yield put(initMandatoryVariableAction(parseInt(variableId, 10), values.map((value) => `${value}`.trim().length > 0)));
-        }
-        yield put(initConditionsAction(conditions));
+        yield call(initInputsDecorator, initInputsAction(inputs, references));
         const sectionsReferences = selectAllSectionsReferences();
         if (sectionsReferences === undefined)
             throw new Error('Sections references not found');

package/dist/redux/sagas/initInputs.d.ts

@@ -0,0 +1,5 @@
+import { StateType } from '../../types/State.type';
+import { ActionsType } from '../../types/Actions.type';
+export declare function initInputsDecorator(action: ActionsType.Inputs.initInputs): Generator<import("redux-saga/effects").SelectEffect | import("redux-saga/effects").PutEffect<ActionsType.Conditions.initConditions> | import("redux-saga/effects").PutEffect<ActionsType.Inputs.initOption> | import("redux-saga/effects").PutEffect<ActionsType.Mandatories.initMandatoryOption> | import("redux-saga/effects").PutEffect<ActionsType.Inputs.initVariable> | import("redux-saga/effects").PutEffect<ActionsType.Mandatories.initMandatoryVariable>, void, StateType>;
+declare function initInputsSaga(): Generator<import("redux-saga/effects").ForkEffect<never>, void, unknown>;
+export default initInputsSaga;

package/dist/redux/sagas/initInputs.js

@@ -0,0 +1,63 @@
+import { select, takeLatest, put } from 'redux-saga/effects';
+import { INIT_INPUTS } from '../constants/inputs';
+import { selectMandatoryOptionItem, selectMandatoryOption, } from '../selectors/mandatories';
+import { initMandatoryOptionAction, initMandatoryVariableAction, } from '../actions/mandatories';
+import { initOptionAction, initVariableAction } from '../actions/inputs';
+import { initConditionsAction } from '../actions/conditions';
+import { ConditionsInitiator } from '../../libs/ConditionsInitiator';
+import { selectOptionRelations } from '../selectors/references';
+const getValues = (arr1, arr2) => arr1.map((v, index) => arr2[index] || v);
+export function* initInputsDecorator(action) {
+    const state = yield select((s) => s);
+    const references = action.references ? action.references : state.references;
+    const { inputs } = action;
+    const conditions = new ConditionsInitiator(references, inputs).getConditions();
+    yield put(initConditionsAction(conditions));
+    const optionsIds = Object.keys(inputs.options);
+    for (let i = 0; i < optionsIds.length; i += 1) {
+        let optionId = parseInt(optionsIds[i], 10);
+        let values = inputs.options[optionId];
+        yield put(initOptionAction(optionId, values));
+        const { meta: meta2 } = references.options[optionId];
+        const { type } = meta2;
+        let { mandatory } = meta2;
+        let sendOptionAction = true;
+        if (['checkbox', 'radio'].includes(type)) {
+            if (type === 'radio') {
+                const { parents } = selectOptionRelations(optionId);
+                const parentId = parents[0];
+                const isMandatoryOption = selectMandatoryOptionItem(parentId);
+                if (typeof isMandatoryOption !== 'undefined') {
+                    const mandatoryOption = selectMandatoryOption(parentId);
+                    sendOptionAction = !mandatoryOption.every((v) => v === true);
+                    if (sendOptionAction === true && mandatoryOption) {
+                        if (values.length >= mandatoryOption.length) {
+                            values = getValues(values, [...mandatoryOption]);
+                        }
+                        else {
+                            values = getValues([...mandatoryOption], values);
+                        }
+                    }
+                }
+                mandatory = references.options[parentId].meta.mandatory;
+                optionId = parentId;
+            }
+            if (mandatory === true && sendOptionAction === true) {
+                yield put(initMandatoryOptionAction(optionId, values));
+            }
+        }
+    }
+    const variablesIds = Object.keys(inputs.variables);
+    for (let i = 0; i < variablesIds.length; i += 1) {
+        const variableId = variablesIds[i];
+        const values = inputs.variables[variableId];
+        yield put(initVariableAction(parseInt(variableId, 10), values));
+        if (references.variables[variableId].mandatory === true)
+            yield put(initMandatoryVariableAction(parseInt(variableId, 10), values.map((value) => `${value}`.trim().length > 0)));
+    }
+    yield put(initConditionsAction(conditions));
+}
+function* initInputsSaga() {
+    yield takeLatest(INIT_INPUTS, initInputsDecorator);
+}
+export default initInputsSaga;

package/dist/redux/sagas/runner.js

@@ -3,12 +3,14 @@ import setDefaultsSaga from './setDefaults';
 import saveDataSaga from './saveData';
 import homogeneousRadioInputsSaga from './homogeneousRadioInputsSaga';
 import setUserEmailSaga from './setUserEmail';
+import initInputsSaga from './initInputs';
 const sagas = [
     fetchModelSaga,
     setDefaultsSaga,
     saveDataSaga,
     setUserEmailSaga,
     homogeneousRadioInputsSaga,
+    initInputsSaga,
 ];
 export const sagasRunner = (sagaMiddleware) => {
     sagas.forEach((saga) => sagaMiddleware.run(saga));

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

@@ -1,3 +1,4 @@
+export declare const selectReferences: () => Readonly<import("@legalplace/referencesparser/dist/libs/References.type").ReferencesType>;
 export declare const selectOutputReference: (id: number) => Readonly<import("@legalplace/referencesparser/dist/libs/References.type").ReferencesSingleOutputType | undefined>;
 export declare const selectBoxReference: (id: number) => Readonly<import("@legalplace/referencesparser/dist/libs/References.type").ReferencesSingleBoxType>;
 export declare const isOptionMultiple: (id: number) => Readonly<boolean | undefined>;

package/dist/redux/selectors/references.js

@@ -1,4 +1,5 @@
 import { createSelector } from './selectors';
+export const selectReferences = createSelector((state) => state.references);
 export const selectOutputReference = createSelector((state, id) => {
     if (typeof state.references === 'undefined')
         return undefined;

package/dist/service/api.manager.js

@@ -27,10 +27,18 @@ const buildWizardUrl = (uri, prefix, queryParams) => {
     const searchParams = queryParams.toString()
         ? `?${queryParams.toString()}`
         : '';
+    console.log('BUILT URL: ', `${apiEndpoint}wizard/contractv1/${organizationPrefix}${uri}${searchParams}`, { uri, prefix, queryParams });
     return `${apiEndpoint}wizard/contractv1/${organizationPrefix}${uri}${searchParams}`;
 };
 const buildFetchModelUrl = (prefix, permalink, uniqidParam, queryParams) => {
     const uniqidOrFallback = uniqidParam || '/model';
+    console.log('fetchModel', {
+        prefix,
+        permalink,
+        uniqidParam,
+        queryParams,
+        uniqidOrFallback,
+    });
     return buildWizardUrl(`${permalink}${uniqidOrFallback}`, prefix, queryParams);
 };
 const buildWizardConfigUrl = (prefix, permalink, uniqidParam, queryParams) => {

package/dist/types/Actions.type.d.ts

@@ -3,7 +3,7 @@ import { StateType } from './State.type';
 import { UPDATE_AVAILABLE_SECTIONS, UPDATE_AVAILABLE_APPSTATES, GO_PREVIOUS_PAGE, GO_NEXT_PAGE, GO_PAGE, INIT_PAGINATION, UPDATE_INSTANCE_PAID, INIT_INSTANCE, UPDATE_INSTANCE, INIT_META, UPDATE_CURRENT_APPSTATE, UPDATE_CURRENT_SECTION_ID, FETCH_MODEL_SUCCEEDED, FETCH_MODEL_FAILED, SET_DATA_STATUS, SET_FETCH_STATUS, INIT_CUSTOMIZATION_META, FETCH_MODEL_UNHEALTHY, FETCH_MODEL_USER_LOCKED, INIT_CUSTOMIZATION_AUTO_DEFAULT, FETCH_MODEL_NONBLOCKING, SET_MODEL_UUID } from '../redux/constants/app';
 import { INIT_USER, SET_USER_STATUS, SET_USER_VALID_TOKEN } from '../redux/constants/user';
 import { INIT_REFERENCES, UPDATE_VARIABLE_META, UPDATE_OPTION_META } from '../redux/constants/references';
-import { INIT_OPTION, UPDATE_OPTION_INPUT, INIT_VARIABLE, UPDATE_VARIABLE_INPUT, ADD_MULTIPLE_OCCURENCY, DELETE_MULTIPLE_OCCURENCY } from '../redux/constants/inputs';
+import { INIT_INPUTS, INIT_OPTION, UPDATE_OPTION_INPUT, INIT_VARIABLE, UPDATE_VARIABLE_INPUT, ADD_MULTIPLE_OCCURENCY, DELETE_MULTIPLE_OCCURENCY } from '../redux/constants/inputs';
 import { INIT_CONDITIONS, UPDATE_OPTION_CONDITION, UPDATE_VARIABLE_CONDITION, UPDATE_SECTION_CONDITION, UPDATE_PREFILLER_CONDITION, UPDATE_OPTION_VALIDATOR_CONDITION, UPDATE_VARIABLE_VALIDATOR_CONDITION, UPDATE_DOCUMENT_CONDITION } from '../redux/constants/conditions';
 import { FETCH_MODEL, FETCH_MODEL_PREREQUISITES } from '../redux/constants/sagas/model';
 import { SAVE_DATA } from '../redux/constants/sagas/data';
@@ -154,6 +154,11 @@ export declare namespace ActionsType {
         }
     }
     namespace Inputs {
+        interface initInputs {
+            type: typeof INIT_INPUTS;
+            references?: StateType.References;
+            inputs: StateType.Inputs;
+        }
         interface initOption {
             type: typeof INIT_OPTION;
             id: number;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@legalplace/wizardx-core",
-  "version": "2.1.0-alpha.5",
+  "version": "2.1.0-alpha.7",
   "author": "Moncef Hammou (moncef@legalplace.fr)",
   "license": "MIT",
   "main": "dist/index.js",
@@ -45,9 +45,9 @@
     "xss": "^1.0.9"
   },
   "devDependencies": {
-    "@legalplace/eslint-config": "^2.0.1-alpha.0",
+    "@legalplace/eslint-config": "^2.0.3-alpha.0",
     "@legalplace/models-v3-types": "^3.6.0",
-    "@legalplace/prettier-config": "^2.0.1-alpha.0",
+    "@legalplace/prettier-config": "^2.0.3-alpha.0",
     "@swc-node/jest": "^1.3.2",
     "@swc/core": "^1.2.93",
     "@swc/jest": "^0.2.4",
@@ -82,5 +82,5 @@
     "*.test.ts",
     "*.test.tsx"
   ],
-  "gitHead": "945d0c37e3afd21b05178a02e5243a81acff60c1"
+  "gitHead": "2d15748fbe1a65a7c3f6dc3bdd13103e046d5eda"
 }

package/src/redux/actions/inputs.ts

@@ -1,5 +1,7 @@
+import { StateType } from '../../types/State.type';
 import { ActionsType } from '../../types/Actions.type';
 import {
+  INIT_INPUTS,
   INIT_OPTION,
   INIT_VARIABLE,
   UPDATE_OPTION_INPUT,
@@ -8,6 +10,20 @@ import {
   DELETE_MULTIPLE_OCCURENCY,
 } from '../constants/inputs';
 
+/**
+ * Initiates inputs
+ * @param inputs inputs object
+ * @param references (optional) references object
+ */
+export const initInputsAction = (
+  inputs: StateType.Inputs,
+  references?: StateType.References
+): ActionsType.Inputs.initInputs => ({
+  type: INIT_INPUTS,
+  inputs,
+  references,
+});
+
 /**
  * Initiates option's input
  * @param id Option's id

package/src/redux/constants/inputs.ts

@@ -11,3 +11,5 @@ export const UPDATE_OPTION_INPUT = 'UPDATE_OPTION_INPUT';
 // State.inputs.variables
 export const INIT_VARIABLE = 'INIT_VARIABLE';
 export const UPDATE_VARIABLE_INPUT = 'UPDATE_VARIABLE_INPUT';
+
+export const INIT_INPUTS = 'INIT_INPUTS';

package/src/redux/middlewares/smartscriptMiddleware.ts

@@ -5,6 +5,7 @@ import { getConfig } from '../../config';
 import { ActionsType } from '../../types/Actions.type';
 import { StateType } from '../../types/State.type';
 import {
+  INIT_INPUTS,
   ADD_MULTIPLE_OCCURENCY,
   DELETE_MULTIPLE_OCCURENCY,
   UPDATE_OPTION_INPUT,

package/src/redux/sagas/fetchModel.ts

@@ -3,6 +3,7 @@ import Cookies from 'universal-cookie';
 import type { CustomizationMetaDefault } from '@legalplace/models-v3-types';
 import type { HealthCheckReport } from '@legalplace/model-healthcheck/dist/libs/HealthCheck.type';
 import { Task } from '@redux-saga/core';
+import { initInputsAction } from '../actions/inputs';
 import {
   initMetaAction,
   initPaginationAction,
@@ -18,15 +19,9 @@ import {
   fetchModelNonBlockingAction,
   setModelUuidAction,
 } from '../actions/app';
-import { ConditionsInitiator } from '../../libs/ConditionsInitiator';
 import { initReferencesAction } from '../actions/references';
-import { initOptionAction, initVariableAction } from '../actions/inputs';
-import { initConditionsAction } from '../actions/conditions';
 import { selectSectionConditionValue } from '../selectors/conditions';
-import {
-  selectAllSectionsReferences,
-  selectOptionRelations,
-} from '../selectors/references';
+import { selectAllSectionsReferences } from '../selectors/references';
 import { ActionsType } from '../../types/Actions.type';
 import { selectInstanceUniqid, isStepAvailable } from '../selectors/app';
 import { getConfig, updateConfig } from '../../config';
@@ -46,14 +41,6 @@ import {
 } from '../../service/api.manager';
 import { loadTheme, setWizardTheme } from '../../ThemeLoader';
 import { loadPlugins } from '../../PluginLoader';
-import {
-  selectMandatoryOptionItem,
-  selectMandatoryOption,
-} from '../selectors/mandatories';
-import {
-  initMandatoryOptionAction,
-  initMandatoryVariableAction,
-} from '../actions/mandatories';
 import { enableSmartscriptAction } from '../actions/smartscript';
 import {
   FETCH_MODEL,
@@ -65,12 +52,10 @@ import {
   WizardConfigResponse,
   CreateInstanceResponse,
 } from '../../types/api.type';
+import { initInputsDecorator } from './initInputs';
 
 const cookies = new Cookies();
 
-const getValues = (arr1: boolean[], arr2: boolean[]) =>
-  arr1.map((v, index) => arr2[index] || v);
-
 function* setFetchModelToNonBlocking(firstCurrentAppState?: string) {
   yield put(
     initPaginationAction({
@@ -639,84 +624,7 @@ function* fetchModelDecorator(action: ActionsType.Sagas.Model.fetchModel): any {
     // Data
     const inputs = new IntputsInitiator(references, ovc).getInputs();
 
-    // Initiating Conditions
-    const conditions = new ConditionsInitiator(
-      references,
-      inputs
-    ).getConditions();
-
-    /**
-     * Initiating conditions first before initiating inputs
-     */
-    yield put(initConditionsAction(conditions));
-
-    /**
-     * Initiating inputs
-     */
-
-    // Options
-    const optionsIds = Object.keys(inputs.options);
-    for (let i = 0; i < optionsIds.length; i += 1) {
-      let optionId = parseInt(optionsIds[i], 10);
-      let values = inputs.options[optionId];
-      yield put(initOptionAction(optionId, values));
-      // If option is mandatory we initiate it
-      const { meta: meta2 } = references.options[optionId];
-      const { type } = meta2;
-      let { mandatory } = meta2;
-      let sendOptionAction = true;
-      if (['checkbox', 'radio'].includes(type)) {
-        if (type === 'radio') {
-          const { parents } = selectOptionRelations(optionId);
-          // Get parentId
-          const parentId = parents[0];
-          // check if optin exist on mandatory
-          const isMandatoryOption = selectMandatoryOptionItem(parentId);
-          // If parentId value = true don't send an action
-          if (typeof isMandatoryOption !== 'undefined') {
-            const mandatoryOption = selectMandatoryOption(parentId);
-            sendOptionAction = !mandatoryOption.every((v) => v === true);
-            // handle multiple
-            if (sendOptionAction === true && mandatoryOption) {
-              if (values.length >= mandatoryOption.length) {
-                values = getValues(values, [...mandatoryOption]);
-              } else {
-                values = getValues([...mandatoryOption], values);
-              }
-            }
-          }
-
-          mandatory = references.options[parentId].meta.mandatory;
-          optionId = parentId;
-        }
-
-        if (mandatory === true && sendOptionAction === true) {
-          yield put(initMandatoryOptionAction(optionId, values));
-        }
-      }
-    }
-
-    // Variables
-    const variablesIds = Object.keys(inputs.variables);
-    for (let i = 0; i < variablesIds.length; i += 1) {
-      const variableId = variablesIds[i];
-      const values = inputs.variables[variableId];
-      yield put(initVariableAction(parseInt(variableId, 10), values));
-
-      // If variable is mandatory we initiate it
-      if (references.variables[variableId].mandatory === true)
-        yield put(
-          initMandatoryVariableAction(
-            parseInt(variableId, 10),
-            values.map((value) => `${value}`.trim().length > 0)
-          )
-        );
-    }
-
-    /**
-     * Initiating conditions a second time after initiating inputs
-     */
-    yield put(initConditionsAction(conditions));
+    yield call(initInputsDecorator, initInputsAction(inputs, references));
 
     /**
      * Initiating pagination

package/src/redux/sagas/initInputs.ts

@@ -0,0 +1,110 @@
+import { select, takeLatest, put } from 'redux-saga/effects';
+import { StateType } from '../../types/State.type';
+import { ActionsType } from '../../types/Actions.type';
+import { INIT_INPUTS } from '../constants/inputs';
+import {
+  selectMandatoryOptionItem,
+  selectMandatoryOption,
+} from '../selectors/mandatories';
+import {
+  initMandatoryOptionAction,
+  initMandatoryVariableAction,
+} from '../actions/mandatories';
+import { initOptionAction, initVariableAction } from '../actions/inputs';
+import { initConditionsAction } from '../actions/conditions';
+import { ConditionsInitiator } from '../../libs/ConditionsInitiator';
+import { selectOptionRelations } from '../selectors/references';
+
+const getValues = (arr1: boolean[], arr2: boolean[]) =>
+  arr1.map((v, index) => arr2[index] || v);
+
+export function* initInputsDecorator(action: ActionsType.Inputs.initInputs) {
+  const state: StateType = yield select((s) => s);
+  const references = action.references ? action.references : state.references;
+  const { inputs } = action;
+
+  // Initiating Conditions
+  const conditions = new ConditionsInitiator(
+    references,
+    inputs
+  ).getConditions();
+
+  /**
+   * Initiating conditions first before initiating inputs
+   */
+  yield put(initConditionsAction(conditions));
+
+  /**
+   * Initiating inputs
+   */
+
+  // Options
+  const optionsIds = Object.keys(inputs.options);
+  for (let i = 0; i < optionsIds.length; i += 1) {
+    let optionId = parseInt(optionsIds[i], 10);
+    let values = inputs.options[optionId];
+    yield put(initOptionAction(optionId, values));
+    // If option is mandatory we initiate it
+    const { meta: meta2 } = references.options[optionId];
+    const { type } = meta2;
+    let { mandatory } = meta2;
+    let sendOptionAction = true;
+    if (['checkbox', 'radio'].includes(type)) {
+      if (type === 'radio') {
+        const { parents } = selectOptionRelations(optionId);
+        // Get parentId
+        const parentId = parents[0];
+        // check if optin exist on mandatory
+        const isMandatoryOption = selectMandatoryOptionItem(parentId);
+        // If parentId value = true don't send an action
+        if (typeof isMandatoryOption !== 'undefined') {
+          const mandatoryOption = selectMandatoryOption(parentId);
+          sendOptionAction = !mandatoryOption.every((v) => v === true);
+          // handle multiple
+          if (sendOptionAction === true && mandatoryOption) {
+            if (values.length >= mandatoryOption.length) {
+              values = getValues(values, [...mandatoryOption]);
+            } else {
+              values = getValues([...mandatoryOption], values);
+            }
+          }
+        }
+
+        mandatory = references.options[parentId].meta.mandatory;
+        optionId = parentId;
+      }
+
+      if (mandatory === true && sendOptionAction === true) {
+        yield put(initMandatoryOptionAction(optionId, values));
+      }
+    }
+  }
+
+  // Variables
+  const variablesIds = Object.keys(inputs.variables);
+  for (let i = 0; i < variablesIds.length; i += 1) {
+    const variableId = variablesIds[i];
+    const values = inputs.variables[variableId];
+    yield put(initVariableAction(parseInt(variableId, 10), values));
+
+    // If variable is mandatory we initiate it
+    if (references.variables[variableId].mandatory === true)
+      yield put(
+        initMandatoryVariableAction(
+          parseInt(variableId, 10),
+          values.map((value) => `${value}`.trim().length > 0)
+        )
+      );
+  }
+
+  /**
+   * Initiating conditions a second time after initiating inputs
+   */
+  yield put(initConditionsAction(conditions));
+}
+
+function* initInputsSaga() {
+  yield takeLatest(INIT_INPUTS, initInputsDecorator);
+}
+
+export default initInputsSaga;

package/src/redux/sagas/runner.ts

@@ -4,6 +4,7 @@ import setDefaultsSaga from './setDefaults';
 import saveDataSaga from './saveData';
 import homogeneousRadioInputsSaga from './homogeneousRadioInputsSaga';
 import setUserEmailSaga from './setUserEmail';
+import initInputsSaga from './initInputs';
 
 const sagas: { (): any }[] = [
   fetchModelSaga,
@@ -11,6 +12,7 @@ const sagas: { (): any }[] = [
   saveDataSaga,
   setUserEmailSaga,
   homogeneousRadioInputsSaga,
+  initInputsSaga,
 ];
 
 /**

package/src/redux/selectors/references.ts

@@ -8,6 +8,10 @@ import { createSelector } from './selectors';
  * memoization for them
  */
 
+export const selectReferences = createSelector(
+  (state: StateType) => state.references
+);
+
 /**
  * Returns output's reference
  * @param id Option's id

package/src/service/api.manager.ts

@@ -47,6 +47,12 @@ const buildWizardUrl = (
   const searchParams = queryParams.toString()
     ? `?${queryParams.toString()}`
     : '';
+
+  console.log(
+    'BUILT URL: ',
+    `${apiEndpoint}wizard/contractv1/${organizationPrefix}${uri}${searchParams}`,
+    { uri, prefix, queryParams }
+  );
   return `${apiEndpoint}wizard/contractv1/${organizationPrefix}${uri}${searchParams}`;
 };
 
@@ -57,6 +63,13 @@ const buildFetchModelUrl = (
   queryParams: URLSearchParams
 ) => {
   const uniqidOrFallback = uniqidParam || '/model';
+  console.log('fetchModel', {
+    prefix,
+    permalink,
+    uniqidParam,
+    queryParams,
+    uniqidOrFallback,
+  });
   return buildWizardUrl(`${permalink}${uniqidOrFallback}`, prefix, queryParams);
 };
 

package/src/types/Actions.type.ts

@@ -39,6 +39,7 @@ import {
   UPDATE_OPTION_META,
 } from '../redux/constants/references';
 import {
+  INIT_INPUTS,
   INIT_OPTION,
   UPDATE_OPTION_INPUT,
   INIT_VARIABLE,
@@ -329,6 +330,13 @@ export namespace ActionsType {
 
   // Inputs
   export namespace Inputs {
+    // INIT_INPUTS
+    export interface initInputs {
+      type: typeof INIT_INPUTS;
+      references?: StateType.References;
+      inputs: StateType.Inputs;
+    }
+
     // INIT_OPTION
     export interface initOption {
       type: typeof INIT_OPTION;