@arquimedes.co/eureka-forms 1.9.53-test → 1.9.55-test

package/dist/@Types/GenericFormSteps.d.ts

@@ -1,6 +1,7 @@
 export interface GBaseStep {
     id: string;
     type: string;
+    editable?: boolean;
     dependencies?: string[];
 }
 export interface GTitle extends GBaseStep {

package/dist/App.d.ts

@@ -26,7 +26,7 @@ export interface AppProps {
     /** Custom steps to display */
     customSteps?: Record<string, CustomStep>;
     /** Custom function to call on send */
-    customSend?: (values: any, reload: Function, setLoading: (loading: boolean) => void) => Promise<void>;
+    customSend?: (values: any, reload: Function) => Promise<void>;
     /** Custom submit buttons */
     customSubmit?: JSX.Element;
     /** Function to call on postview to fetch the download url of a file */

package/dist/App.js

@@ -384,7 +384,7 @@ var mapOriginalValues = function (originalValues, form) {
                     }
                     for (var _f = 0, _g = Object.keys(element); _f < _g.length; _f++) {
                         var idValue_1 = _g[_f];
-                        if (!step.steps[idValue_1]) {
+                        if (!step.steps[idValue_1] && idValue_1 !== 'id') {
                             newValues[idValue_1] = element[idValue_1];
                         }
                     }

package/dist/FormComponents/Form/ColumnForm/ColumnForm.js

@@ -94,7 +94,7 @@ function ColumnForm(_a) {
         return _jsx("div", {});
     }
     var onSubmit = function (token) { return __awaiter(_this, void 0, void 0, function () {
-        var valid, values, newValues, _i, _a, idStep, payload, url, resp, _b, error_1;
+        var valid, values, newValues, _i, _a, idStep, customResp, payload, url, resp, _b, error_1;
         return __generator(this, function (_c) {
             switch (_c.label) {
                 case 0:
@@ -116,11 +116,14 @@ function ColumnForm(_a) {
                     newValues = {};
                     for (_i = 0, _a = Object.keys(values); _i < _a.length; _i++) {
                         idStep = _a[_i];
-                        newValues[idStep] = calcValue(idStep, form.steps, values, customSteps);
+                        newValues[idStep] = calcValue(newValues, idStep, form.steps, values, customSteps);
                     }
                     if (!customSend) return [3 /*break*/, 4];
-                    return [4 /*yield*/, customSend(newValues, reload, setLoading)];
-                case 3: return [2 /*return*/, _c.sent()];
+                    return [4 /*yield*/, customSend(newValues, reload)];
+                case 3:
+                    customResp = _c.sent();
+                    setLoading(false);
+                    return [2 /*return*/, customResp];
                 case 4:
                     payload = {
                         formValues: { steps: newValues },
@@ -217,7 +220,7 @@ function calcNextSection(form, idSection, sections) {
         }
     }
 }
-var calcValue = function (idStep, steps, values, customSteps, value) {
+var calcValue = function (newValues, idStep, steps, values, customSteps, value) {
     var _a, _b;
     if (value === void 0) { value = values[idStep]; }
     var step = steps[idStep];
@@ -269,7 +272,8 @@ var calcValue = function (idStep, steps, values, customSteps, value) {
                         var idStep_1 = _d[_c];
                         var mappedId = element.ids[idStep_1];
                         if (values[mappedId] !== undefined) {
-                            newValue[idStep_1] = calcValue(idStep_1, step.steps, values, customSteps, values[mappedId]);
+                            newValue[idStep_1] = calcValue(newValues, idStep_1, step.steps, values, customSteps, values[mappedId]);
+                            delete newValues[mappedId];
                         }
                     }
                     mappedValues.push(newValue);

package/dist/FormComponents/Form/Form.d.ts

@@ -13,7 +13,7 @@ export interface FormComponentProps {
     organization: Organization;
     originalValues: Record<string, unknown>;
     customSteps: Record<string, CustomStep>;
-    customSend?: (values: any, reload: Function, setLoading: (loading: boolean) => void) => Promise<void>;
+    customSend?: (values: any, reload: Function) => Promise<any>;
     customSubmit?: JSX.Element;
     widthStats: WidthStats;
     internal: boolean;

package/dist/FormComponents/Section/MaterialSection/MaterialSection.js

@@ -43,7 +43,7 @@ function MaterialSection(_a) {
                 return _jsx("div", {}, idStep);
             }
             else if (step) {
-                return (_createElement(StepComponent, __assign({}, others, { widthStats: widthStats, form: form, step: step, key: idStep, level: 0 })));
+                return (_createElement(StepComponent, __assign({}, others, { globalEditable: others.editable, widthStats: widthStats, form: form, step: step, key: idStep, level: 0 })));
             }
             else {
                 console.error('Step not found:', idStep);

package/dist/FormComponents/Section/Section.d.ts

@@ -9,7 +9,7 @@ export interface RecursiveData {
     organization: Organization;
     control: Control<FieldValues, object>;
     formStyle: FormStyle;
-    /** If the formsteps can be edited (For entities) */
+    /** If the formsteps can be edited (For internal) */
     editable: boolean;
     postview: boolean;
     partial: boolean;

package/dist/FormComponents/Step/MapperStep/MaterialMapperStep/Element/MapperElement.js

@@ -30,10 +30,11 @@ function MapperElementComponent(_a) {
         return _jsx("div", {});
     }
     return (_jsx(PillElementContainer, __assign({ handleDelete: handleDelete }, others, { step: step, size: form.size }, { children: step.rootSteps.map(function (idSubStep) {
+            var _a;
             var subStep = form.steps[element.ids[idSubStep]];
             if (!subStep)
                 return _jsx("div", {});
-            return (_createElement(StepComponent, __assign({}, others, { form: form, step: subStep, key: idSubStep, level: level + 1 })));
+            return (_createElement(StepComponent, __assign({}, others, { globalEditable: others.editable ? (_a = step.editable) !== null && _a !== void 0 ? _a : true : false, form: form, step: subStep, key: idSubStep, level: level + 1 })));
         }) })));
 }
 export default MapperElementComponent;

package/dist/FormComponents/Step/Step.d.ts

@@ -5,6 +5,7 @@ export interface StepProps extends RecursiveData {
     step: FormStep;
     handleSizeChange?: Function;
     level: number;
+    globalEditable: boolean;
 }
 declare function StepComponent({ step, ...props }: StepProps): JSX.Element;
 export default StepComponent;

package/dist/FormComponents/Step/Step.js

@@ -38,51 +38,52 @@ import EntityValuePickerStep from './EntityValueStep/EntityValueStep';
 import MapperStep from './MapperStep/MapperStep';
 import CollapsibleStep from './CollapsibleStep/CollapsibleStep';
 function StepComponent(_a) {
-    var _b;
+    var _b, _c;
     var step = _a.step, props = __rest(_a, ["step"]);
     var customStep = props.customSteps[step.type];
+    var editable = props.globalEditable ? (_b = step.editable) !== null && _b !== void 0 ? _b : true : false;
     if (customStep) {
-        return customStep.component(__assign(__assign({ step: step }, props), ((_b = customStep.componentProps) !== null && _b !== void 0 ? _b : {})));
+        return customStep.component(__assign(__assign(__assign({}, props), ((_c = customStep.componentProps) !== null && _c !== void 0 ? _c : {})), { step: step, editable: editable }));
     }
     switch (step.type) {
         case Types.TITLE: {
-            return _jsx(TitleStep, __assign({ step: step }, props));
+            return (_jsx(TitleStep, __assign({}, props, { step: step, editable: editable })));
         }
         case Types.SELECTOR: {
-            return _jsx(SelectorStep, __assign({ step: step }, props));
+            return (_jsx(SelectorStep, __assign({}, props, { step: step, editable: editable })));
         }
         case Types.CHECKBOX: {
-            return _jsx(CheckBoxStep, __assign({ step: step }, props));
+            return (_jsx(CheckBoxStep, __assign({}, props, { step: step, editable: editable })));
         }
         case Types.CLASSIFIER_SELECTOR: {
-            return (_jsx(ClassifierSelectorStep, __assign({ step: step }, props)));
+            return (_jsx(ClassifierSelectorStep, __assign({}, props, { step: step, editable: editable })));
         }
         case Types.TEXTAREA: {
-            return _jsx(TextAreaStep, __assign({ step: step }, props));
+            return (_jsx(TextAreaStep, __assign({}, props, { step: step, editable: editable })));
         }
         case Types.TEXTINPUT: {
-            return _jsx(TextInputStep, __assign({ step: step }, props));
+            return (_jsx(TextInputStep, __assign({}, props, { step: step, editable: editable })));
         }
         case Types.DATEPICKER: {
-            return _jsx(DatePickerStep, __assign({ step: step }, props));
+            return (_jsx(DatePickerStep, __assign({}, props, { step: step, editable: editable })));
         }
         case Types.SEPARATOR: {
-            return _jsx(SeparatorStep, __assign({ step: step }, props));
+            return (_jsx(SeparatorStep, __assign({}, props, { step: step, editable: editable })));
         }
         case Types.FILEUPLOAD: {
-            return _jsx(FileUploadStep, __assign({ step: step }, props));
+            return (_jsx(FileUploadStep, __assign({}, props, { step: step, editable: editable })));
         }
         case Types.RATING: {
-            return _jsx(RatingStep, __assign({ step: step }, props));
+            return (_jsx(RatingStep, __assign({}, props, { step: step, editable: editable })));
         }
         case Types.COLLAPSIBLE: {
-            return _jsx(CollapsibleStep, __assign({ step: step }, props));
+            return (_jsx(CollapsibleStep, __assign({}, props, { step: step, editable: editable })));
         }
         case Types.ENTITYVALUEPICKER: {
-            return (_jsx(EntityValuePickerStep, __assign({ step: step }, props)));
+            return (_jsx(EntityValuePickerStep, __assign({}, props, { step: step, editable: editable })));
         }
         case Types.MAPPER: {
-            return _jsx(MapperStep, __assign({ step: step }, props));
+            return (_jsx(MapperStep, __assign({}, props, { step: step, editable: editable })));
         }
         default:
             break;

package/package.json

@@ -1,7 +1,7 @@
 {
     "name": "@arquimedes.co/eureka-forms",
     "repository": "git://github.com/Arquimede5/Eureka-Forms.git",
-    "version":"1.9.53-test",
+    "version":"1.9.55-test",
     "scripts": {
         "start": "react-scripts start",
         "build": "react-scripts build",