@arquimedes.co/eureka-forms 0.2.7 → 0.2.8

package/dist/App.js

@@ -64,6 +64,7 @@ import Loader from './shared/Loader/Loader';
 import styles from './App.module.css';
 import FormComponent from './FormComponents/Form/Form';
 import StepTypes from './constants/FormStepTypes';
+import axiosInstance from './AxiosAPI';
 function App(_a) {
     var _this = this;
     var apiKey = _a.apiKey, domain = _a.domain, preview = _a.preview, formData = _a.formData, postview = _a.postview, isWidget = _a.isWidget, internal = _a.internal, valuesData = _a.valuesData, customSteps = _a.customSteps, others = __rest(_a, ["apiKey", "domain", "preview", "formData", "postview", "isWidget", "internal", "valuesData", "customSteps"]);
@@ -73,17 +74,21 @@ function App(_a) {
     //
     function fetchOrgData(domain) {
         return __awaiter(this, void 0, void 0, function () {
-            var url, response, currentOrg, favicon;
-            return __generator(this, function (_a) {
-                switch (_a.label) {
+            var response, _a, currentOrg, favicon;
+            return __generator(this, function (_b) {
+                switch (_b.label) {
                     case 0:
-                        url = 'https://xkmqdd6tr6.execute-api.us-east-1.amazonaws.com/Prod/organization';
-                        if (domain) {
-                            url += "?domain=" + domain;
-                        }
-                        return [4 /*yield*/, axios.get(url)];
+                        if (!domain) return [3 /*break*/, 2];
+                        return [4 /*yield*/, axios.get("https://" + domain + ".forms." + process.env.REACT_APP_DOMAIN + "/api/organization?domain=" + domain)];
                     case 1:
-                        response = _a.sent();
+                        _a = _b.sent();
+                        return [3 /*break*/, 4];
+                    case 2: return [4 /*yield*/, axiosInstance.get('/organization')];
+                    case 3:
+                        _a = _b.sent();
+                        _b.label = 4;
+                    case 4:
+                        response = _a;
                         if (response === null || response === void 0 ? void 0 : response.data) {
                             currentOrg = response.data;
                             favicon = document.getElementById('favicon');
@@ -100,7 +105,7 @@ function App(_a) {
             var response;
             return __generator(this, function (_a) {
                 switch (_a.label) {
-                    case 0: return [4 /*yield*/, axios.get('https://xkmqdd6tr6.execute-api.us-east-1.amazonaws.com/Prod/organization')];
+                    case 0: return [4 /*yield*/, axios.get("https://" + domain + ".forms." + process.env.REACT_APP_DOMAIN + "/api/organization")];
                     case 1:
                         response = _a.sent();
                         if (response.data) {
@@ -147,12 +152,9 @@ function App(_a) {
             switch (_b.label) {
                 case 0:
                     _b.trys.push([0, 2, , 3]);
-                    url = "https://xkmqdd6tr6.execute-api.us-east-1.amazonaws.com/Prod/form/" + apiKey;
-                    if (domain) {
-                        url += "?domain=" + domain;
-                    }
+                    url = "https://" + domain + ".forms." + process.env.REACT_APP_DOMAIN + "/api/form/" + apiKey + "?domain=" + domain;
                     return [4 /*yield*/, Promise.all([
-                            axios.get(url),
+                            domain ? axios.get(url) : axiosInstance.get("/form/" + apiKey),
                             fetchOrgData(domain),
                         ])];
                 case 1:

package/dist/AxiosAPI.d.ts

@@ -0,0 +1,2 @@
+declare const axiosInstance: import("axios").AxiosInstance;
+export default axiosInstance;

package/dist/AxiosAPI.js

@@ -0,0 +1,8 @@
+import axios from 'axios';
+var headers = {};
+var axiosInstance = axios.create({
+    baseURL: '/api',
+    timeout: 30000,
+    headers: headers,
+});
+export default axiosInstance;

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

@@ -56,12 +56,13 @@ import TermComponent from '../../Term/Term';
 import ConfirmationDialog from '../ConfirmationDialog/ConfirmationDialog';
 import Loader from '../../../shared/Loader/Loader';
 import axios from 'axios';
+import axiosInstance from '../../../AxiosAPI';
 function ColumnForm(_a) {
     var _this = this;
     var form = _a.form, apiKey = _a.apiKey, reload = _a.reload, domain = _a.domain, postview = _a.postview, internal = _a.internal, formStyle = _a.formStyle, widthStats = _a.widthStats, customSteps = _a.customSteps, originalValues = _a.originalValues;
     var _b = useState(false), tempError = _b[0], setTempError = _b[1];
     var _c = useForm({
-        defaultValues: mapValues(originalValues, form),
+        defaultValues: originalValues,
         mode: 'onTouched',
         shouldFocusError: true,
     }), getValues = _c.getValues, setValue = _c.setValue, clearErrors = _c.clearErrors, control = _c.control, errors = _c.formState.errors, trigger = _c.trigger;
@@ -77,14 +78,14 @@ function ColumnForm(_a) {
         return _jsx("div", {}, void 0);
     }
     var onSubmit = function () { return __awaiter(_this, void 0, void 0, function () {
-        var valid, values, _i, _a, idStep, url, resp, error_1;
-        return __generator(this, function (_b) {
-            switch (_b.label) {
+        var valid, values, _i, _a, idStep, url, payload, resp, _b, error_1;
+        return __generator(this, function (_c) {
+            switch (_c.label) {
                 case 0:
-                    if (!(apiKey || internal)) return [3 /*break*/, 5];
+                    if (!(apiKey || internal)) return [3 /*break*/, 8];
                     return [4 /*yield*/, trigger()];
                 case 1:
-                    valid = _b.sent();
+                    valid = _c.sent();
                     values = getValues();
                     if (!!valid) return [3 /*break*/, 2];
                     console.log('ERRORS:', errors);
@@ -92,34 +93,40 @@ function ColumnForm(_a) {
                     setTimeout(function () {
                         setTempError(false);
                     }, 500);
-                    return [3 /*break*/, 5];
+                    return [3 /*break*/, 8];
                 case 2:
-                    _b.trys.push([2, 4, , 5]);
+                    _c.trys.push([2, 7, , 8]);
                     setLoading(true);
                     for (_i = 0, _a = Object.keys(values); _i < _a.length; _i++) {
                         idStep = _a[_i];
                         updateValue(idStep, values, form);
                     }
-                    url = "https://xkmqdd6tr6.execute-api.us-east-1.amazonaws.com/Prod/ticket?apiKey=" + (internal ? form.apiKey : apiKey);
-                    if (domain) {
-                        url += "&domain=" + domain;
-                    }
+                    url = "https://xkmqdd6tr6.execute-api.us-east-1.amazonaws.com/Prod/ticket?apiKey=" + (internal ? form.apiKey : apiKey) + "&domain=" + domain;
                     console.log(values);
-                    return [4 /*yield*/, axios.post(url, {
-                            formValues: { steps: values },
-                        })];
+                    payload = {
+                        formValues: { steps: values },
+                    };
+                    if (!domain) return [3 /*break*/, 4];
+                    return [4 /*yield*/, axios.post(url, payload)];
                 case 3:
-                    resp = _b.sent();
+                    _b = _c.sent();
+                    return [3 /*break*/, 6];
+                case 4: return [4 /*yield*/, axiosInstance.post("ticket?apiKey=" + (internal ? form.apiKey : apiKey), payload)];
+                case 5:
+                    _b = _c.sent();
+                    _c.label = 6;
+                case 6:
+                    resp = _b;
                     console.log(resp);
                     setShowConfirmation(resp === null || resp === void 0 ? void 0 : resp.data);
                     setLoading(false);
-                    return [3 /*break*/, 5];
-                case 4:
-                    error_1 = _b.sent();
+                    return [3 /*break*/, 8];
+                case 7:
+                    error_1 = _c.sent();
                     console.error(error_1);
                     setLoading(false);
-                    return [3 /*break*/, 5];
-                case 5: return [2 /*return*/];
+                    return [3 /*break*/, 8];
+                case 8: return [2 /*return*/];
             }
         });
     }); };
@@ -170,17 +177,6 @@ var updateValue = function (idStep, values, form) {
             }
             break;
         }
-        case Types.CLASSIFIER_SELECTOR: {
-            var value = values[step.id];
-            if (value !== undefined) {
-                values[step.id] = {
-                    value: value,
-                    path: form.classifiers[value],
-                    idClassifier: step.idClassifier,
-                };
-            }
-            break;
-        }
         default:
             break;
     }
@@ -203,30 +199,3 @@ function stringToDraft(text) {
     });
     return draftStructure;
 }
-function mapValues(pValues, form) {
-    var _a, _b, _c;
-    var values = __assign({}, (pValues !== null && pValues !== void 0 ? pValues : {}));
-    for (var _i = 0, _d = Object.keys(values); _i < _d.length; _i++) {
-        var idStep = _d[_i];
-        var step = form.steps[idStep];
-        switch (step === null || step === void 0 ? void 0 : step.type) {
-            case Types.TEXTAREA: {
-                var value = __assign({}, values[step.id]);
-                if (step.hasTextEditor) {
-                    delete values[step.id];
-                }
-                else if (value.value != undefined) {
-                    values[step.id] = (_a = value.value) !== null && _a !== void 0 ? _a : '';
-                }
-                break;
-            }
-            case Types.CLASSIFIER_SELECTOR: {
-                values[step.id] = (_c = (_b = values[step.id]) === null || _b === void 0 ? void 0 : _b.value) !== null && _c !== void 0 ? _c : '';
-                break;
-            }
-            default:
-                break;
-        }
-    }
-    return values;
-}

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

@@ -1,5 +1,5 @@
 import { Form } from '../../@Types/Form';
 import { ClassifierSelector, FormSelector, FormStep } from '../../@Types/FormStep';
 export declare function calcFillerSize(step: FormSelector | ClassifierSelector, steps: Record<string, FormStep>, values: Record<string, unknown>, form: Form): number;
-export declare function recursivelyCheckOpenSize(step: FormStep, steps: Record<string, FormStep>, values: Record<string, any>): number;
+export declare function recursivelyCheckOpenSize(idStep: string, steps: Record<string, FormStep>, values: Record<string, any>): number;
 export declare const calcStepWidth: (stepSize: 1 | 2 | 3 | 4, form: Form) => number;

package/dist/FormComponents/Step/StepFunctions.js

@@ -1,15 +1,16 @@
 import Types, { ClassifierOptionTypes, OptionTypes, } from '../../constants/FormStepTypes';
 export function calcFillerSize(step, steps, values, form) {
     if (step.maxSize < form.blockNum) {
-        var stepSize = step.maxSize - recursivelyCheckOpenSize(step, steps, values);
+        var stepSize = step.maxSize - recursivelyCheckOpenSize(step.id, steps, values);
         return (form.blockSize * stepSize + form.spacingSize * (stepSize - 1) + 20);
     }
     else {
         return 0;
     }
 }
-export function recursivelyCheckOpenSize(step, steps, values) {
-    var value = values[step.id];
+export function recursivelyCheckOpenSize(idStep, steps, values) {
+    var step = steps[idStep];
+    var value = values[idStep];
     if (step.type === Types.SELECTOR) {
         var size = step.size;
         if (value) {
@@ -18,8 +19,7 @@ export function recursivelyCheckOpenSize(step, steps, values) {
                 var optionSize = 0;
                 for (var _i = 0, _a = currentOption.steps; _i < _a.length; _i++) {
                     var pStepId = _a[_i];
-                    var pStep = steps[pStepId];
-                    optionSize += recursivelyCheckOpenSize(pStep, steps, values);
+                    optionSize += recursivelyCheckOpenSize(pStepId, steps, values);
                 }
                 size += optionSize;
             }
@@ -34,8 +34,7 @@ export function recursivelyCheckOpenSize(step, steps, values) {
                 var optionSize = 0;
                 for (var _b = 0, _c = currentOption.steps; _b < _c.length; _b++) {
                     var pStepId = _c[_b];
-                    var pStep = steps[pStepId];
-                    optionSize += recursivelyCheckOpenSize(pStep, steps, values);
+                    optionSize += recursivelyCheckOpenSize(pStepId, steps, values);
                 }
                 size += optionSize;
             }

package/dist/controllers/FileService.js

@@ -35,6 +35,7 @@ var __generator = (this && this.__generator) || function (thisArg, body) {
     }
 };
 import axios from 'axios';
+import axiosInstance from '../AxiosAPI';
 export function getUploadUrls(files, domain) {
     var _a;
     return __awaiter(this, void 0, void 0, function () {
@@ -46,15 +47,19 @@ export function getUploadUrls(files, domain) {
                         publicFile: false,
                         extension: file.name.split('.').pop(),
                     }); });
-                    return [4 /*yield*/, axios.post('https://xkmqdd6tr6.execute-api.us-east-1.amazonaws.com/Prod/uploadfile', domain
-                            ? {
-                                domain: domain,
-                                files: filesArray,
-                            }
-                            : filesArray)];
+                    if (!domain) return [3 /*break*/, 2];
+                    return [4 /*yield*/, axiosInstance.post('/uploadfile', filesArray)];
                 case 1:
                     response = _b.sent();
-                    return [2 /*return*/, (_a = response.data) !== null && _a !== void 0 ? _a : undefined];
+                    return [3 /*break*/, 4];
+                case 2: return [4 /*yield*/, axios.post("https://" + domain + ".forms." + process.env.REACT_APP_DOMAIN + "/api/uploadfile", {
+                        domain: domain,
+                        files: filesArray,
+                    })];
+                case 3:
+                    response = _b.sent();
+                    _b.label = 4;
+                case 4: return [2 /*return*/, (_a = response.data) !== null && _a !== void 0 ? _a : undefined];
             }
         });
     });

package/package.json

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