@arquimedes.co/eureka-forms 1.9.36-test → 1.9.37-test

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.
@@ -94,7 +94,7 @@ function ColumnForm(_a) {
94
94
  return _jsx("div", {});
95
95
  }
96
96
  var onSubmit = function (token) { return __awaiter(_this, void 0, void 0, function () {
97
- var valid, values, newValues, _i, _a, idStep, step, test_1, payload, url, resp, _b, error_1;
97
+ var valid, values, newValues, _i, _a, idStep, step, payload, url, resp, _b, error_1;
98
98
  return __generator(this, function (_c) {
99
99
  switch (_c.label) {
100
100
  case 0:
@@ -119,10 +119,6 @@ function ColumnForm(_a) {
119
119
  step = form.steps[idStep];
120
120
  newValues[idStep] = calcValue(step, values, customSteps);
121
121
  }
122
- test_1 = true;
123
- setLoading(false);
124
- if (test_1)
125
- return [2 /*return*/];
126
122
  if (!customSend) return [3 /*break*/, 4];
127
123
  return [4 /*yield*/, customSend(newValues, reload)];
128
124
  case 3:
@@ -271,8 +267,8 @@ var calcValue = function (step, values, customSteps, value) {
271
267
  var mappedId = element.ids[idStep];
272
268
  if (values[mappedId] !== undefined) {
273
269
  var substep = step.steps[idStep];
274
- var test_2 = calcValue(substep, values, customSteps, values[mappedId]);
275
- newValue[idStep] = test_2;
270
+ var test_1 = calcValue(substep, values, customSteps, values[mappedId]);
271
+ newValue[idStep] = test_1;
276
272
  }
277
273
  }
278
274
  mappedValues.push(newValue);
@@ -305,19 +301,23 @@ function stringToDraft(text) {
305
301
  });
306
302
  return draftStructure;
307
303
  }
308
- function calcDependencies(steps, originalValues) {
309
- var dependencies = {};
304
+ function calcDependencies(steps, originalValues, allSteps, dependencies) {
305
+ if (allSteps === void 0) { allSteps = steps; }
306
+ if (dependencies === void 0) { dependencies = {}; }
310
307
  for (var _i = 0, _a = Object.values(steps); _i < _a.length; _i++) {
311
308
  var step = _a[_i];
312
309
  if (step.dependencies) {
313
310
  for (var _b = 0, _c = step.dependencies; _b < _c.length; _b++) {
314
311
  var idDep = _c[_b];
315
- var depStep = steps[idDep];
312
+ var depStep = allSteps[idDep];
316
313
  if (depStep && dependencies[idDep] === undefined) {
317
314
  dependencies[idDep] = calcStepDependencyValue(depStep, originalValues);
318
315
  }
319
316
  }
320
317
  }
318
+ if (step.type === Types.MAPPER) {
319
+ calcDependencies(step.steps, originalValues, __assign(__assign({}, allSteps), step.steps), dependencies);
320
+ }
321
321
  }
322
322
  return dependencies;
323
323
  }
@@ -39,6 +39,7 @@ import { nanoid } from 'nanoid';
39
39
  import { calcStepDependencyValue } from '../../../Form/ColumnForm/ColumnForm';
40
40
  import MapperElementComponent from './Element/MapperElement';
41
41
  import AYFFormStepTypes from '../../../../constants/AYFFormStepTypes';
42
+ import CBRFormStepTypes from '../../../../constants/CBRFormStepTypes';
42
43
  function Elements(_a) {
43
44
  var step = _a.step, form = _a.form, btnRef = _a.btnRef, editable = _a.editable, postview = _a.postview, onChange = _a.onChange, elements = _a.elements, formStyle = _a.formStyle, dependencyStore = _a.dependencyStore, setDependencyStore = _a.setDependencyStore, others = __rest(_a, ["step", "form", "btnRef", "editable", "postview", "onChange", "elements", "formStyle", "dependencyStore", "setDependencyStore"]);
44
45
  var _b = useState(false), firstRender = _b[0], setFirstRender = _b[1];
@@ -109,7 +110,7 @@ function Elements(_a) {
109
110
  margin: step.description
110
111
  ? '10px 0px'
111
112
  : '0px 0px 5px 0px',
112
- } }, { children: step.description }))), elements.map(function (incident, index) { return (_jsx(MapperElementComponent, __assign({ num: index, element: incident, formStyle: formStyle, step: step, form: __assign(__assign({}, form), { steps: localSteps }), editable: editable, postview: postview, dependencyStore: dependencyStore, setDependencyStore: setDependencyStore, handleDelete: function () {
113
+ } }, { children: step.description }))), elements.map(function (incident, index) { return (_jsx(MapperElementComponent, __assign({ num: index, element: incident, formStyle: formStyle, step: step, form: __assign(__assign({}, form), { steps: __assign(__assign({}, form.steps), localSteps) }), editable: editable, postview: postview, dependencyStore: dependencyStore, setDependencyStore: setDependencyStore, handleDelete: function () {
113
114
  var tempElements = __spreadArray([], elements, true);
114
115
  tempElements[index].deleted = true;
115
116
  onChange(tempElements);
@@ -195,13 +196,21 @@ function calcRecursiveData(element, newSteps, deps) {
195
196
  }
196
197
  }
197
198
  break;
199
+ case CBRFormStepTypes.CBR_LOCATIVAS:
200
+ var elementStep = step;
201
+ if (elementStep.subStep) {
202
+ var newId = element.ids[elementStep.subStep];
203
+ if (newId) {
204
+ elementStep.subStep = newId;
205
+ }
206
+ }
207
+ break;
198
208
  case AYFFormStepTypes.AYF_ICA_CITY:
199
209
  var cityStep = step;
200
210
  if (cityStep.idNitStep) {
201
211
  var newId = element.ids[cityStep.idNitStep];
202
212
  if (newId) {
203
213
  cityStep.idNitStep = newId;
204
- deps[newId] = calcStepDependencyValue(newSteps[newId], {});
205
214
  }
206
215
  }
207
216
  break;
package/package.json CHANGED
@@ -1,7 +1,7 @@
1
1
  {
2
2
  "name": "@arquimedes.co/eureka-forms",
3
3
  "repository": "git://github.com/Arquimede5/Eureka-Forms.git",
4
- "version":"1.9.36-test",
4
+ "version":"1.9.37-test",
5
5
  "scripts": {
6
6
  "start": "react-scripts start",
7
7
  "build": "react-scripts build",