@arquimedes.co/eureka-forms 2.0.5-test → 2.0.7-test

package/dist/App/App.d.ts

@@ -1,7 +1,6 @@
 /// <reference types="react" />
 import { Classifier, Form } from '../@Types/Form';
 import './App.css';
-import { FormComponentProps } from '../Form/Form';
 import { CustomStep } from '../FormSteps/CustomStep';
 export interface AppProps {
     /** If the app is currently a widget */
@@ -35,7 +34,7 @@ export interface AppProps {
     /** Custom function to call on send */
     customSubmit?: (values: Record<string, unknown>, reload: () => void) => Promise<void>;
     /** Custom submit buttons */
-    customSubmitBtns?: (onSubmit: FormComponentProps['onSubmit'], loading: boolean) => JSX.Element;
+    customSubmitBtns?: (onSubmit: () => Promise<Record<string, any> | void>, loading: boolean) => JSX.Element;
     /** Function to call on postview to fetch the download url of a file */
     fetchDownloadUrl?: (S3Key: string, fileName: string) => Promise<string>;
     /** Function to call after the confimation dialog has been closed */

package/dist/App/AppFunctions.js

@@ -47,7 +47,7 @@ export var calcValuesStore = function (originalValues, form, dependencies, custo
             values.sections[step.idSection] = {};
         var _f = addMapperStep(step, customSteps), element = _f.element, steps = _f.steps, mappers = _f.mappers;
         values.sections[step.idSection] = __assign(__assign(__assign({}, values.sections[step.idSection]), mappers), (_a = {}, _a[step.id] = [element], _a));
-        calcDependencies(steps, {}, customSteps, __assign(__assign({}, form.steps), steps), dependencies);
+        calcDependencies(steps, customSteps, __assign(__assign({}, form.steps), steps), dependencies, values);
     }
     return values;
 };
@@ -131,12 +131,12 @@ export var mapOriginalValue = function (step, value, values, form) {
                     if (value_1 !== undefined) {
                         if (!values.sections[step.idSection])
                             values.sections[step.idSection] = {};
-                        values.sections[step.idSection][step.id] = value_1;
+                        values.sections[step.idSection][newIdStep] = value_1;
                     }
                 }
                 for (var _j = 0, _k = Object.keys(element); _j < _k.length; _j++) {
                     var key = _k[_j];
-                    if (step.steps[key])
+                    if (step.steps[key] || key === 'id')
                         continue;
                     mappedElement.originalValues[key] = element[key];
                 }

package/dist/App/AppHooks.js

@@ -66,6 +66,7 @@ import { useAppDispatch } from '../hooks';
 import InternalFormStyle from '../constants/InternalFormStyle';
 import { calcDependencies } from '../Form/FormFunctions';
 import { iterateNestedSteps } from '../FormSteps/StepFunctions';
+import { createNextState } from '@reduxjs/toolkit';
 export var useSetupApp = function (isEmbedded, _a) {
     var preview = _a.preview, internal = _a.internal, postview = _a.postview, partial = _a.partial, editable = _a.editable, handleConfirmed = _a.handleConfirmed, customSteps = _a.customSteps, valuesData = _a.valuesData, apiKey = _a.apiKey, formData = _a.formData, classifiers = _a.classifiers, others = __rest(_a, ["preview", "internal", "postview", "partial", "editable", "handleConfirmed", "customSteps", "valuesData", "apiKey", "formData", "classifiers"]);
     var _b = useState(undefined), form = _b[0], setForm = _b[1];
@@ -111,11 +112,11 @@ export var useSetupApp = function (isEmbedded, _a) {
         });
     }); };
     var loadData = function () { return __awaiter(void 0, void 0, void 0, function () {
-        var idOrganization, organization, form, match, _loop_1, _i, _a, section, CBRStep, dependencies, values;
+        var idOrganization, organization, form, match, dependencies, values;
+        var _a;
         var _b;
-        var _c;
-        return __generator(this, function (_d) {
-            switch (_d.label) {
+        return __generator(this, function (_c) {
+            switch (_c.label) {
                 case 0:
                     idOrganization = others.idOrganization;
                     organization = null;
@@ -123,7 +124,7 @@ export var useSetupApp = function (isEmbedded, _a) {
                     if (!(form && preview && form.isStandAlone)) return [3 /*break*/, 2];
                     return [4 /*yield*/, loadOrg()];
                 case 1:
-                    organization = _d.sent();
+                    organization = _c.sent();
                     return [3 /*break*/, 4];
                 case 2:
                     if (!(!form && apiKey)) return [3 /*break*/, 4];
@@ -133,8 +134,8 @@ export var useSetupApp = function (isEmbedded, _a) {
                         ])];
                 case 3:
                     //Is iframe or widget
-                    _b = _d.sent(), organization = _b[0], form = _b[1];
-                    _d.label = 4;
+                    _a = _c.sent(), organization = _a[0], form = _a[1];
+                    _c.label = 4;
                 case 4:
                     if (organization && !idOrganization)
                         idOrganization = organization.idOrganization;
@@ -145,24 +146,26 @@ export var useSetupApp = function (isEmbedded, _a) {
                         idOrganization = match ? match[1] : '';
                     }
                     if (form) {
-                        if (form && classifiers)
-                            form.classifiers = classifiers;
-                        _loop_1 = function (section) {
-                            for (var _e = 0, _f = section.steps; _e < _f.length; _e++) {
-                                var idStep = _f[_e];
-                                iterateNestedSteps(idStep, form.steps, function (step) {
-                                    step.idSection = section.id;
-                                });
+                        form = createNextState(form, function (form) {
+                            if (form && classifiers)
+                                form.classifiers = classifiers;
+                            var _loop_1 = function (section) {
+                                for (var _b = 0, _c = section.steps; _b < _c.length; _b++) {
+                                    var idStep = _c[_b];
+                                    iterateNestedSteps(idStep, form.steps, function (step) {
+                                        step.idSection = section.id;
+                                    });
+                                }
+                            };
+                            /** Assign the idSection to all the forms steps */
+                            for (var _i = 0, _a = Object.values(form.sections); _i < _a.length; _i++) {
+                                var section = _a[_i];
+                                _loop_1(section);
                             }
-                        };
-                        /** Assign the idSection to all the forms steps */
-                        for (_i = 0, _a = Object.values(form.sections); _i < _a.length; _i++) {
-                            section = _a[_i];
-                            _loop_1(section);
-                        }
-                        CBRStep = Object.values(form.steps).find(function (step) { return step.type.startsWith('CBR'); });
-                        if (CBRStep)
-                            form = calcCbrForm(form, valuesData !== null && valuesData !== void 0 ? valuesData : {});
+                            var CBRStep = Object.values(form.steps).find(function (step) { return step.type.startsWith('CBR'); });
+                            if (CBRStep)
+                                form = calcCbrForm(form, valuesData !== null && valuesData !== void 0 ? valuesData : {});
+                        });
                     }
                     setForm(form);
                     if (!form || !idOrganization)
@@ -171,7 +174,7 @@ export var useSetupApp = function (isEmbedded, _a) {
                     values = calcValuesStore(valuesData !== null && valuesData !== void 0 ? valuesData : {}, form, dependencies, customSteps !== null && customSteps !== void 0 ? customSteps : {});
                     dispatch(reset(__assign(__assign({ formStyle: internal
                             ? InternalFormStyle
-                            : __assign(__assign({}, InternalFormStyle), ((_c = form === null || form === void 0 ? void 0 : form.style) !== null && _c !== void 0 ? _c : {})), internal: !!internal, idOrganization: idOrganization, preview: !!preview, partial: !!partial, postview: !!postview, editable: !!(editable !== null && editable !== void 0 ? editable : true), values: values }, calcInitialSections(form)), { dependencies: calcDependencies(form.steps, valuesData, customSteps, form.steps, dependencies) })));
+                            : __assign(__assign({}, InternalFormStyle), ((_b = form === null || form === void 0 ? void 0 : form.style) !== null && _b !== void 0 ? _b : {})), internal: !!internal, idOrganization: idOrganization, preview: !!preview, partial: !!partial, postview: !!postview, editable: !!(editable !== null && editable !== void 0 ? editable : true), values: values }, calcInitialSections(form)), { dependencies: calcDependencies(form.steps, customSteps, form.steps, dependencies, values) })));
                     return [2 /*return*/];
             }
         });

package/dist/Form/FormFunctions.d.ts

@@ -1,7 +1,7 @@
 import { FormStep } from '../@Types/FormStep';
-import { DependencyStore, StepDependency } from './Form';
+import { DependencyStore } from './Form';
 import { CustomStep } from '../FormSteps/CustomStep';
 import { CBRFormStep } from '../@Types/CBRFormStep';
+import { ValuesStore } from '../States/SiteStateReducer';
 export declare const calcValue: (idStep: string, steps: Record<string, FormStep>, values: Record<string, any>, customSteps: Record<string, CustomStep> | undefined, deleteIds: string[], value?: any) => any;
-export declare function calcDependencies(steps: Record<string, FormStep | CBRFormStep>, originalValues?: Record<string, any>, customSteps?: Record<string, CustomStep>, allSteps?: Record<string, FormStep | CBRFormStep>, dependencies?: DependencyStore): DependencyStore;
-export declare function calcStepDependency(idStep: string, steps: Record<string, FormStep | CBRFormStep>, originalValues: Record<string, any>, customSteps: Record<string, CustomStep>): StepDependency;
+export declare function calcDependencies(steps: Record<string, FormStep | CBRFormStep>, customSteps?: Record<string, CustomStep>, allSteps?: Record<string, FormStep | CBRFormStep>, dependencies?: DependencyStore, values?: ValuesStore): DependencyStore;

package/dist/Form/FormFunctions.js

@@ -112,19 +112,23 @@ function stringToDraft(text) {
     });
     return draftStructure;
 }
-export function calcDependencies(steps, originalValues, customSteps, allSteps, dependencies) {
+export function calcDependencies(steps, customSteps, allSteps, dependencies, values) {
     var _a, _b, _c;
-    if (originalValues === void 0) { originalValues = {}; }
     if (customSteps === void 0) { customSteps = {}; }
     if (allSteps === void 0) { allSteps = steps; }
     if (dependencies === void 0) { dependencies = {}; }
+    if (values === void 0) { values = {
+        global: {},
+        sections: {},
+    }; }
     for (var _i = 0, _d = Object.values(steps); _i < _d.length; _i++) {
         var step = _d[_i];
+        var originalValue = (_a = values.sections[step.idSection]) === null || _a === void 0 ? void 0 : _a[step.id];
         if (step.dependencies) {
             for (var _e = 0, _f = step.dependencies; _e < _f.length; _e++) {
                 var idDep = _f[_e];
                 if (dependencies[idDep] === undefined)
-                    dependencies[idDep] = calcStepDependency(idDep, allSteps, originalValues, customSteps);
+                    dependencies[idDep] = calcStepDependency(idDep, allSteps, originalValue, customSteps);
                 dependencies[idDep].dependents.push(step);
             }
         }
@@ -133,17 +137,17 @@ export function calcDependencies(steps, originalValues, customSteps, allSteps, d
                 var path = _h[_g];
                 if (path.type !== EntityValueDataTypes.STEP)
                     continue;
-                if ((_a = step.dependencies) === null || _a === void 0 ? void 0 : _a.includes(path.idStep))
+                if ((_b = step.dependencies) === null || _b === void 0 ? void 0 : _b.includes(path.idStep))
                     continue;
                 if (dependencies[path.idStep] === undefined) {
-                    dependencies[path.idStep] = calcStepDependency(path.idStep, allSteps, originalValues, customSteps);
+                    dependencies[path.idStep] = calcStepDependency(path.idStep, allSteps, originalValue, customSteps);
                 }
                 dependencies[path.idStep].dependents.push(step);
             }
         }
         if (step.type === StepTypes.MAPPER) {
             var newSteps = {};
-            var elements = (_b = originalValues[step.id]) !== null && _b !== void 0 ? _b : [];
+            var elements = originalValue !== null && originalValue !== void 0 ? originalValue : [];
             var _loop_1 = function (element) {
                 for (var _k = 0, _l = Object.keys(step.steps); _k < _l.length; _k++) {
                     var idSubStep = _l[_k];
@@ -159,27 +163,27 @@ export function calcDependencies(steps, originalValues, customSteps, allSteps, d
             if (elements.length === 0) {
                 newSteps = step.steps;
             }
-            calcDependencies(newSteps, originalValues, customSteps, __assign(__assign({}, allSteps), newSteps), dependencies);
+            calcDependencies(newSteps, customSteps, __assign(__assign({}, allSteps), newSteps), dependencies, values);
         }
     }
     return dependencies;
 }
-export function calcStepDependency(idStep, steps, originalValues, customSteps) {
-    var _a, _b;
+function calcStepDependency(idStep, steps, originalValue, customSteps) {
+    var _a;
     var depStep = steps[idStep];
     return {
         type: (_a = depStep === null || depStep === void 0 ? void 0 : depStep.type) !== null && _a !== void 0 ? _a : 'ORIGINAL',
         value: depStep
-            ? calcStepDependencyValue(depStep, originalValues, customSteps)
-            : (_b = originalValues[idStep]) !== null && _b !== void 0 ? _b : null,
+            ? calcStepDependencyValue(depStep, originalValue, customSteps)
+            : originalValue !== null && originalValue !== void 0 ? originalValue : null,
         dependents: [],
     };
 }
-function calcStepDependencyValue(depStep, originalValues, customSteps) {
-    var _a, _b, _c, _d;
+function calcStepDependencyValue(depStep, originalValue, customSteps) {
+    var _a;
     var custom = customSteps[depStep === null || depStep === void 0 ? void 0 : depStep.type];
     if (custom === null || custom === void 0 ? void 0 : custom.calcDependencyValue) {
-        return custom.calcDependencyValue(depStep, originalValues[depStep.id]);
+        return custom.calcDependencyValue(depStep, originalValue);
     }
     switch (depStep.type) {
         case StepTypes.TEXTAREA: {
@@ -187,13 +191,13 @@ function calcStepDependencyValue(depStep, originalValues, customSteps) {
                 return null;
             }
             else {
-                return (_a = originalValues[depStep.id]) === null || _a === void 0 ? void 0 : _a.value;
+                return originalValue === null || originalValue === void 0 ? void 0 : originalValue.value;
             }
         }
         case StepTypes.MAPPER: {
-            return ((_c = (_b = originalValues[depStep.id]) === null || _b === void 0 ? void 0 : _b.map(function (mapperValue) { var _a; return (_a = mapperValue.value) !== null && _a !== void 0 ? _a : mapperValue; })) !== null && _c !== void 0 ? _c : null);
+            return ((_a = originalValue === null || originalValue === void 0 ? void 0 : originalValue.map(function (mapperValue) { var _a; return (_a = mapperValue.value) !== null && _a !== void 0 ? _a : mapperValue; })) !== null && _a !== void 0 ? _a : null);
         }
         default:
-            return (_d = originalValues[depStep.id]) !== null && _d !== void 0 ? _d : null;
+            return originalValue !== null && originalValue !== void 0 ? originalValue : null;
     }
 }

package/dist/States/SiteStateReducer.js

@@ -50,7 +50,7 @@ export var SiteSlice = createSlice({
         },
         addStepsDependencies: function (state, _a) {
             var _b = _a.payload, steps = _b.steps, customSteps = _b.customSteps;
-            calcDependencies(steps, {}, customSteps, steps, state.dependencies);
+            calcDependencies(steps, customSteps, steps, state.dependencies);
         },
         handlePrevious: function (state, _a) {
             var payload = _a.payload;

package/package.json

@@ -1,7 +1,7 @@
 {
     "name": "@arquimedes.co/eureka-forms",
     "repository": "git://github.com/Arquimede5/Eureka-Forms.git",
-    "version":"2.0.5-test",
+    "version":"2.0.7-test",
     "scripts": {
         "start": "react-scripts start",
         "build": "react-scripts build",
@@ -9,7 +9,7 @@
         "test": "react-scripts test",
         "test-ci": "react-scripts test --reporters=default --reporters=jest-junit --coverage --coverageReporters cobertura html",
         "tsc-build": "tsc --noEmit false --outDir ./dist --incremental false",
-        "watch": "tsc --build -w --preserveWatchOutput",
+        "watch": "tsc -w --preserveWatchOutput",
         "storybook": "storybook dev -p 6006",
         "build-storybook": "storybook build",
         "cypress": "DISPLAY=:0 cypress open"
@@ -107,4 +107,4 @@
         "/dist"
     ],
     "proxy": "https://api.forms.eureka-test.click"
-}
+}