@arquimedes.co/eureka-forms 2.0.86-test → 2.0.86

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

@@ -148,7 +148,7 @@ export interface ValueEntityValuePickerPath {
     type: EntityValueDataTypes.VALUE;
     idEntityValue: string | null;
 }
-export type EntityValuePickerFilter = StepEntityValuePickerFilter | ValueEntityValuePickerFilter | IntegrationEntityValuePickerFilter;
+export type EntityValuePickerFilter = StepEntityValuePickerFilter | ValueEntityValuePickerFilter;
 export interface StepEntityValuePickerFilter {
     idProperty: string;
     type: EntityValueDataTypes.STEP;
@@ -161,10 +161,6 @@ export interface ValueEntityValuePickerFilter {
     type: EntityValueDataTypes.VALUE;
     value: any;
 }
-export interface IntegrationEntityValuePickerFilter {
-    idProperty: string;
-    type: EntityValueDataTypes.INTEGRATION;
-}
 export interface ApiSelector extends GSteps.GSmartSelect {
     type: FormStepTypes.API_SELECTOR;
     icon: string | null;

package/dist/App/App.d.ts

@@ -1,10 +1,8 @@
 import React from 'react';
 import { Classifier, Form } from '../@Types/Form';
 import './App.css';
-import { DependencyStore } from '../Form/Form';
 import { CustomStep, CustomStepProps } from '../FormSteps/CustomStep';
 import { EditorState } from 'draft-js';
-import { IntegrationEntityValuePickerFilter } from '../@Types/FormStep';
 export interface AppProps {
     /** If the app is currently a widget */
     isWidget?: boolean;
@@ -52,8 +50,6 @@ export interface AppProps {
     handleConfirmed?: () => void;
     /** Function called to scroll to the top */
     scrollToTop?: () => void;
-    /** Function to call to reload the form */
-    calcEntityValueIntegrationFilter?: (filter: IntegrationEntityValuePickerFilter, store: DependencyStore) => Promise<string | null>;
 }
 export declare const IdFormContext: React.Context<string>;
 declare function AppComponent({ formData, valuesData, ...props }: AppProps): JSX.Element;

package/dist/App/App.js

@@ -75,7 +75,6 @@ function App(_a) {
                 fetchDownloadUrl: props.fetchDownloadUrl,
                 customStepProps: (_g = props.customStepProps) !== null && _g !== void 0 ? _g : {},
                 customClientInfoStep: props.customClientInfoStep,
-                calcEntityValueIntegrationFilter: props.calcEntityValueIntegrationFilter,
             } }, { children: _jsx("div", __assign({ className: styles.container }, { children: _jsx(FormComponent, { form: form, reload: reload, branding: branding, apiKey: props.apiKey, isWidget: !!isWidget, customSteps: customSteps, containerRef: containerRef, setSubmit: props.setSubmit, customSubmit: props.customSubmit, scrollToTop: props.scrollToTop, customSubmitBtns: props.customSubmitBtns, customConfirmation: props.customConfirmation }) })) })));
     }
 }

package/dist/Contexts/CustomContext.d.ts

@@ -1,7 +1,6 @@
 /// <reference types="react" />
 import { CustomStep, CustomStepProps } from '../FormSteps/CustomStep';
-import { AppProps } from '../App/App';
-export interface CustomContextData extends Pick<AppProps, 'calcEntityValueIntegrationFilter'> {
+export interface CustomContextData {
     sendLabel?: string;
     customStepProps: Record<string, unknown>;
     customSteps: Record<string, CustomStep>;

package/dist/FormSteps/ApiSelectorStep/MaterialApiSelectorStep/MaterialApiSelectorStep.js

@@ -66,7 +66,7 @@ var __spreadArray = (this && this.__spreadArray) || function (to, from, pack) {
     return to.concat(ar || Array.prototype.slice.call(from));
 };
 import { jsx as _jsx, Fragment as _Fragment } from "react/jsx-runtime";
-import React, { useContext } from 'react';
+import React, { useContext, useMemo } from 'react';
 import FormStepTypes, { ApiSelectorOptionTypes, ApiSelectorParamTypes, } from '../../../constants/FormStepTypes';
 import StepComponent from '../../Step';
 import SmartSelect from '../../SmartSelectStep/MaterialSmartSelectStep/MaterialSmartSelectStep';
@@ -78,6 +78,7 @@ import StepFillerContainer from '../../Utils/@StepFiller/StepFiller';
 import { recursivelyCalcConditionSteps } from '../../StepHooks';
 import { evaluateCondition } from '../../StepFunctions';
 function ApiSelectorComponent(_a) {
+    var _this = this;
     var step = _a.step, editable = _a.editable, others = __rest(_a, ["step", "editable"]);
     var form = useContext(FormContext);
     function calcOptionId(option) {
@@ -88,6 +89,67 @@ function ApiSelectorComponent(_a) {
         var _a;
         return (_a = option === null || option === void 0 ? void 0 : option[step.labelAttribute]) !== null && _a !== void 0 ? _a : '';
     }
+    var getApiOptions = useMemo(function () {
+        return function (idOrganization, step, dependencyStore) { return __awaiter(_this, void 0, void 0, function () {
+            function calcOptionId(option) {
+                var _a;
+                return (_a = option === null || option === void 0 ? void 0 : option[step.idAttribute]) !== null && _a !== void 0 ? _a : '';
+            }
+            var params, _i, _a, filter, currentValue, filterStep, url, response;
+            var _b, _c;
+            return __generator(this, function (_d) {
+                switch (_d.label) {
+                    case 0:
+                        params = new URLSearchParams({});
+                        for (_i = 0, _a = step.queryParams; _i < _a.length; _i++) {
+                            filter = _a[_i];
+                            switch (filter.type) {
+                                case ApiSelectorParamTypes.STEP: {
+                                    currentValue = (_b = dependencyStore[filter.idStep]) === null || _b === void 0 ? void 0 : _b.value;
+                                    filterStep = form.steps[filter.idStep];
+                                    if (currentValue) {
+                                        if (filterStep.type ===
+                                            FormStepTypes.API_SELECTOR) {
+                                            params.set(filter.key, currentValue[step.idAttribute]);
+                                        }
+                                        else if (typeof currentValue === 'string')
+                                            params.set(filter.key, currentValue);
+                                        else
+                                            params.set(filter.key, (_c = currentValue.label) !== null && _c !== void 0 ? _c : currentValue.id);
+                                    }
+                                    else if (filter.required) {
+                                        return [2 /*return*/, null];
+                                    }
+                                    break;
+                                }
+                                case ApiSelectorParamTypes.VALUE:
+                                default:
+                                    params.set(filter.key, filter.value);
+                                    break;
+                            }
+                        }
+                        url = step.url.replace('capta.co', process.env.REACT_APP_DOMAIN);
+                        if (idOrganization &&
+                            url.includes(process.env.REACT_APP_DOMAIN))
+                            params.set('idOrganization', idOrganization);
+                        if (!step.url.includes('?'))
+                            url += '?';
+                        url += params.toString();
+                        return [4 /*yield*/, (idOrganization
+                                ? widgetInstance.get(url)
+                                : axiosInstance.get(url))];
+                    case 1:
+                        response = _d.sent();
+                        return [2 /*return*/, response.data.filter(function (option) {
+                                var _a;
+                                return calcOptionId(option) &&
+                                    ((_a = step.options[calcOptionId(option)]) === null || _a === void 0 ? void 0 : _a.type) !==
+                                        ApiSelectorOptionTypes.HIDE;
+                            })];
+                }
+            });
+        }); };
+    }, [form]);
     return (_jsx(StepFillerContainer, __assign({ step: step }, { children: _jsx(SmartSelect, __assign({}, others, { editable: editable, step: step, icon: step.icon ? _jsx(InputIcon, { icon: step.icon }) : undefined, getOptions: getApiOptions, getOptionSelected: function (option, value) {
                 return calcOptionId(option) === calcOptionId(value);
             }, calcDepError: function (steps) {
@@ -137,56 +199,3 @@ function ApiSelectorComponent(_a) {
             } })) })));
 }
 export default ApiSelectorComponent;
-var getApiOptions = function (idOrganization, step, dependencyStore) { return __awaiter(void 0, void 0, void 0, function () {
-    function calcOptionId(option) {
-        var _a;
-        return (_a = option === null || option === void 0 ? void 0 : option[step.idAttribute]) !== null && _a !== void 0 ? _a : '';
-    }
-    var params, _i, _a, filter, currentValue, url, response;
-    var _b, _c;
-    return __generator(this, function (_d) {
-        switch (_d.label) {
-            case 0:
-                params = new URLSearchParams({});
-                for (_i = 0, _a = step.queryParams; _i < _a.length; _i++) {
-                    filter = _a[_i];
-                    switch (filter.type) {
-                        case ApiSelectorParamTypes.STEP: {
-                            currentValue = (_b = dependencyStore[filter.idStep]) === null || _b === void 0 ? void 0 : _b.value;
-                            if (currentValue) {
-                                if (typeof currentValue === 'string')
-                                    params.set(filter.key, currentValue);
-                                else
-                                    params.set(filter.key, (_c = currentValue.label) !== null && _c !== void 0 ? _c : currentValue.id);
-                            }
-                            else if (filter.required) {
-                                return [2 /*return*/, null];
-                            }
-                            break;
-                        }
-                        case ApiSelectorParamTypes.VALUE:
-                        default:
-                            params.set(filter.key, filter.value);
-                            break;
-                    }
-                }
-                url = step.url.replace('capta.co', process.env.REACT_APP_DOMAIN);
-                if (idOrganization && url.includes(process.env.REACT_APP_DOMAIN))
-                    params.set('idOrganization', idOrganization);
-                if (!step.url.includes('?'))
-                    url += '?';
-                url += params.toString();
-                return [4 /*yield*/, (idOrganization
-                        ? widgetInstance.get(url)
-                        : axiosInstance.get(url))];
-            case 1:
-                response = _d.sent();
-                return [2 /*return*/, response.data.filter(function (option) {
-                        var _a;
-                        return calcOptionId(option) &&
-                            ((_a = step.options[calcOptionId(option)]) === null || _a === void 0 ? void 0 : _a.type) !==
-                                ApiSelectorOptionTypes.HIDE;
-                    })];
-        }
-    });
-}); };

package/dist/FormSteps/EntityValueStep/MaterialEntityValuePickerStep/MaterialEntityValuePickerStep.js

@@ -67,12 +67,10 @@ import { evaluateCondition } from '../../StepFunctions';
 import { recursivelyCalcConditionSteps, selectDependencies, } from '../../StepHooks';
 import { useAppSelector } from '../../../hooks';
 import MaterialEntityValueDialog from './MaterialEntityValueDialog/MaterialEntityValueDialog';
-import CustomContext from '../../../Contexts/CustomContext';
 function EntityValuePickerStep(_a) {
     var _b, _c;
     var step = _a.step, editable = _a.editable;
     var form = useContext(FormContext);
-    var calcEntityValueIntegrationFilter = useContext(CustomContext).calcEntityValueIntegrationFilter;
     var _d = useState(), dialogs = _d[0], setDialogs = _d[1];
     var dialogsIdStepDeps = useMemo(function () {
         var ids = [];
@@ -98,9 +96,6 @@ function EntityValuePickerStep(_a) {
                 : undefined;
         });
     }, []);
-    var getEntityValueOptions = useMemo(function () {
-        return generateGetEntityValueOptionsFunction(calcEntityValueIntegrationFilter);
-    }, [calcEntityValueIntegrationFilter]);
     return (_jsxs(React.Fragment, { children: [dialogs !== undefined && ((_b = form.entities) === null || _b === void 0 ? void 0 : _b[step.idEntity]) && (_jsx(MaterialEntityValueDialog, { type: dialogs.current.type, entity: (_c = form.entities) === null || _c === void 0 ? void 0 : _c[step.idEntity], entityValue: dialogs.value, message: dialogs.current.message, handleClose: handleCloseDialog })), _jsx(StepFillerContainer, __assign({ step: step }, { children: _jsx(SmartSelect, { editable: editable, step: step, icon: step.icon ? _jsx(InputIcon, { icon: step.icon }) : undefined, getOptions: getEntityValueOptions, getOptionSelected: function (option, value) {
                         return option._id === value._id;
                     }, calcDepError: function (steps) {
@@ -176,90 +171,65 @@ function EntityValuePickerStep(_a) {
                     } }) }))] }));
 }
 export default EntityValuePickerStep;
-var generateGetEntityValueOptionsFunction = function (calcEntityValueIntegrationFilter) {
-    return function (idOrganization, step, dependencyStore) { return __awaiter(void 0, void 0, void 0, function () {
-        var urlPath, _i, _a, path, idEntityValue, currentValue, params, _b, _c, filter, _d, currentValue, value, url, response;
-        var _e, _f, _g, _h, _j;
-        return __generator(this, function (_k) {
-            switch (_k.label) {
-                case 0:
-                    if (!idOrganization)
-                        return [2 /*return*/, null];
-                    urlPath = '';
-                    for (_i = 0, _a = step.path; _i < _a.length; _i++) {
-                        path = _a[_i];
-                        idEntityValue = 'null';
-                        switch (path.type) {
-                            case EntityValueDataTypes.STEP: {
-                                currentValue = (_e = dependencyStore[path.idStep]) === null || _e === void 0 ? void 0 : _e.value;
-                                if (!currentValue)
-                                    return [2 /*return*/, null];
-                                if (typeof currentValue === 'string')
-                                    idEntityValue = currentValue;
-                                else
-                                    idEntityValue = (_f = currentValue._id) !== null && _f !== void 0 ? _f : currentValue.id;
-                                break;
-                            }
-                            case EntityValueDataTypes.VALUE:
-                            default:
-                                idEntityValue = (_g = path.idEntityValue) !== null && _g !== void 0 ? _g : 'null';
-                                break;
-                        }
-                        urlPath +=
-                            '/' +
-                                path.idEntity +
-                                (idEntityValue ? '/' + idEntityValue : '');
-                    }
-                    params = new URLSearchParams({});
-                    _b = 0, _c = step.filters;
-                    _k.label = 1;
-                case 1:
-                    if (!(_b < _c.length)) return [3 /*break*/, 8];
-                    filter = _c[_b];
-                    _d = filter.type;
-                    switch (_d) {
-                        case EntityValueDataTypes.STEP: return [3 /*break*/, 2];
-                        case EntityValueDataTypes.INTEGRATION: return [3 /*break*/, 3];
-                        case EntityValueDataTypes.VALUE: return [3 /*break*/, 6];
-                    }
-                    return [3 /*break*/, 6];
-                case 2:
-                    {
-                        currentValue = (_h = dependencyStore[filter.idStep]) === null || _h === void 0 ? void 0 : _h.value;
-                        if (currentValue) {
+var getEntityValueOptions = function (idOrganization, step, dependencyStore) { return __awaiter(void 0, void 0, void 0, function () {
+    var urlPath, _i, _a, path, idEntityValue, currentValue, params, _b, _c, filter, currentValue, url, response;
+    var _d, _e, _f, _g, _h;
+    return __generator(this, function (_j) {
+        switch (_j.label) {
+            case 0:
+                if (!idOrganization)
+                    return [2 /*return*/, null];
+                urlPath = '';
+                for (_i = 0, _a = step.path; _i < _a.length; _i++) {
+                    path = _a[_i];
+                    idEntityValue = 'null';
+                    switch (path.type) {
+                        case EntityValueDataTypes.STEP: {
+                            currentValue = (_d = dependencyStore[path.idStep]) === null || _d === void 0 ? void 0 : _d.value;
+                            if (!currentValue)
+                                return [2 /*return*/, null];
                             if (typeof currentValue === 'string')
-                                params.set(filter.idProperty, currentValue);
+                                idEntityValue = currentValue;
                             else
-                                params.set(filter.idProperty, (_j = currentValue._id) !== null && _j !== void 0 ? _j : currentValue.id);
+                                idEntityValue = (_e = currentValue._id) !== null && _e !== void 0 ? _e : currentValue.id;
+                            break;
                         }
-                        else if (filter.required) {
-                            return [2 /*return*/, null];
+                        case EntityValueDataTypes.VALUE:
+                        default:
+                            idEntityValue = (_f = path.idEntityValue) !== null && _f !== void 0 ? _f : 'null';
+                            break;
+                    }
+                    urlPath +=
+                        '/' + path.idEntity + (idEntityValue ? '/' + idEntityValue : '');
+                }
+                params = new URLSearchParams({});
+                for (_b = 0, _c = step.filters; _b < _c.length; _b++) {
+                    filter = _c[_b];
+                    switch (filter.type) {
+                        case EntityValueDataTypes.STEP: {
+                            currentValue = (_g = dependencyStore[filter.idStep]) === null || _g === void 0 ? void 0 : _g.value;
+                            if (currentValue) {
+                                if (typeof currentValue === 'string')
+                                    params.set(filter.idProperty, currentValue);
+                                else
+                                    params.set(filter.idProperty, (_h = currentValue._id) !== null && _h !== void 0 ? _h : currentValue.id);
+                            }
+                            else if (filter.required) {
+                                return [2 /*return*/, null];
+                            }
+                            break;
                         }
-                        return [3 /*break*/, 7];
+                        case EntityValueDataTypes.VALUE:
+                        default:
+                            params.set(filter.idProperty, filter.value);
+                            break;
                     }
-                    _k.label = 3;
-                case 3:
-                    if (!calcEntityValueIntegrationFilter) return [3 /*break*/, 5];
-                    return [4 /*yield*/, calcEntityValueIntegrationFilter(filter, dependencyStore)];
-                case 4:
-                    value = _k.sent();
-                    if (value)
-                        params.set(filter.idProperty, value);
-                    _k.label = 5;
-                case 5: return [3 /*break*/, 7];
-                case 6:
-                    params.set(filter.idProperty, filter.value);
-                    return [3 /*break*/, 7];
-                case 7:
-                    _b++;
-                    return [3 /*break*/, 1];
-                case 8:
-                    url = "".concat(idOrganization, "/entities/").concat(step.idEntity).concat(urlPath, "?").concat(params.toString());
-                    return [4 /*yield*/, widgetInstance.get(url)];
-                case 9:
-                    response = _k.sent();
-                    return [2 /*return*/, response.data.filter(function (option) { var _a; return ((_a = step.options[option._id]) === null || _a === void 0 ? void 0 : _a.type) !== EntityValueOptionTypes.HIDE; })];
-            }
-        });
-    }); };
-};
+                }
+                url = "".concat(idOrganization, "/entities/").concat(step.idEntity).concat(urlPath, "?").concat(params.toString());
+                return [4 /*yield*/, widgetInstance.get(url)];
+            case 1:
+                response = _j.sent();
+                return [2 /*return*/, response.data.filter(function (option) { var _a; return ((_a = step.options[option._id]) === null || _a === void 0 ? void 0 : _a.type) !== EntityValueOptionTypes.HIDE; })];
+        }
+    });
+}); };

package/dist/States/GlobalSlice.d.ts

@@ -26,11 +26,11 @@ export declare const GlobalSlice: import("@reduxjs/toolkit").Slice<GlobalState,
         formStyle: FormStyle;
         preview: boolean;
         idOrganization: string;
-        internal: boolean;
         confirmation: {
             confirmationMessage: EurekaDraft;
             showLink: boolean;
         };
+        internal: boolean;
         dependencies: import("../Form/Form").DependencyStore;
         values: import("./SiteSlice").ValuesStore;
         idCurrentSection: string | null;

package/dist/constants/FormStepTypes.d.ts

@@ -56,8 +56,7 @@ export declare enum MapperStyleTypes {
 }
 export declare enum EntityValueDataTypes {
     STEP = "STEP",
-    VALUE = "VALUE",
-    INTEGRATION = "INTEGRATION"
+    VALUE = "VALUE"
 }
 export declare enum ApiSelectorParamTypes {
     STEP = "STEP",

package/dist/constants/FormStepTypes.js

@@ -67,7 +67,6 @@ export var EntityValueDataTypes;
 (function (EntityValueDataTypes) {
     EntityValueDataTypes["STEP"] = "STEP";
     EntityValueDataTypes["VALUE"] = "VALUE";
-    EntityValueDataTypes["INTEGRATION"] = "INTEGRATION";
 })(EntityValueDataTypes || (EntityValueDataTypes = {}));
 export var ApiSelectorParamTypes;
 (function (ApiSelectorParamTypes) {

package/package.json

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