@arquimedes.co/eureka-forms 1.9.93-test → 1.9.94-test

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

@@ -1,4 +1,4 @@
-import Types, { ClassifierOptionTypes, OptionTypes, RatingTypes, MapperStyleTypes, EntityValueOptionTypes } from '../constants/FormStepTypes';
+import Types, { ClassifierOptionTypes, OptionTypes, RatingTypes, MapperStyleTypes, EntityValueOptionTypes, EntityValueDataTypes } from '../constants/FormStepTypes';
 import * as GSteps from './GenericFormSteps';
 export type FormStep = Title | Rating | CheckBox | TextArea | TextInput | DatePicker | FileUpload | Separator | FormSelector | ClassifierSelector | Collapsible | EntityValuePicker | Mapper;
 export interface Title extends GSteps.GBaseStep {
@@ -98,17 +98,8 @@ export interface EntityValuePicker extends GSteps.GSmartSelect {
     type: Types.ENTITYVALUEPICKER;
     idEntity: string;
     icon: string | null;
-    filters: {
-        idProperty: string;
-        idStep?: string;
-        value?: string;
-        required?: boolean;
-    }[];
-    path: {
-        idEntity: string;
-        idStep?: string;
-        idEntityValue?: string;
-    }[];
+    filters: EntityValuePickerFilter[];
+    path: EntityValuePickerPath[];
     options: Record<string, FormEntityValuePickerOption>;
     maxSize?: number;
 }
@@ -122,6 +113,31 @@ interface HideFormEntityValuePickerOption {
     type: EntityValueOptionTypes.HIDE;
     idEntityValue: String;
 }
+export type EntityValuePickerPath = StepEntityValuePickerPath | ValueEntityValuePickerPath;
+export interface StepEntityValuePickerPath {
+    idEntity: string;
+    type: EntityValueDataTypes.STEP;
+    idStep: string;
+    any: boolean;
+}
+export interface ValueEntityValuePickerPath {
+    idEntity: string;
+    type: EntityValueDataTypes.VALUE;
+    idEntityValue: string | null;
+}
+export type EntityValuePickerFilter = StepEntityValuePickerFilter | ValueEntityValuePickerFilter;
+export interface StepEntityValuePickerFilter {
+    idProperty: string;
+    type: EntityValueDataTypes.STEP;
+    idStep: string;
+    any: boolean;
+    required: boolean;
+}
+export interface ValueEntityValuePickerFilter {
+    idProperty: string;
+    type: EntityValueDataTypes.VALUE;
+    value: any;
+}
 export interface Mapper extends GSteps.GBaseStep {
     type: Types.MAPPER;
     style: {

package/dist/FormComponents/Step/EntityValueStep/MaterialEntityValuePickerStep/MaterialEntityValuePickerStep.js

@@ -59,7 +59,7 @@ var __rest = (this && this.__rest) || function (s, e) {
 import { createElement as _createElement } from "react";
 import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
 import React, { useEffect, useState } from 'react';
-import FormStepTypes, { EntityValueOptionTypes, } from '../../../../constants/FormStepTypes';
+import FormStepTypes, { EntityValueDataTypes, EntityValueOptionTypes, } from '../../../../constants/FormStepTypes';
 import styles from './MaterialEntityValuePickerStep.module.css';
 import StepComponent from '../../Step';
 import { Controller } from 'react-hook-form';
@@ -85,50 +85,63 @@ function EntityValuePicker(_a) {
     var getEntityValueOptions = function (_a, _step, dependencyStore, domain) {
         var idOrganization = _a.idOrganization;
         return __awaiter(_this, void 0, void 0, function () {
-            var params, _i, _b, filter, value_1, currentValue, url, response;
-            var _c;
-            return __generator(this, function (_d) {
-                switch (_d.label) {
+            var params, _i, _b, filter, currentValue, urlPath, _c, _d, path, idEntityValue, currentValue, url, response;
+            var _e, _f, _g;
+            return __generator(this, function (_h) {
+                switch (_h.label) {
                     case 0:
                         params = new URLSearchParams({});
                         for (_i = 0, _b = step.filters; _i < _b.length; _i++) {
                             filter = _b[_i];
-                            value_1 = filter.value;
-                            if (filter.idStep) {
-                                currentValue = dependencyStore[filter.idStep];
-                                if (currentValue) {
-                                    if (typeof currentValue === 'string')
-                                        value_1 = currentValue;
-                                    else
-                                        value_1 = (_c = currentValue._id) !== null && _c !== void 0 ? _c : currentValue.id;
-                                    //TODO: Manejo de multiple!
-                                }
-                                else if (filter.required) {
-                                    return [2 /*return*/, null];
-                                }
+                            switch (filter.type) {
+                                case EntityValueDataTypes.STEP:
+                                    currentValue = dependencyStore[filter.idStep];
+                                    if (currentValue) {
+                                        if (typeof currentValue === 'string')
+                                            params.set(filter.idProperty, currentValue);
+                                        else
+                                            params.set(filter.idProperty, (_e = currentValue._id) !== null && _e !== void 0 ? _e : currentValue.id);
+                                    }
+                                    else if (filter.required) {
+                                        return [2 /*return*/, null];
+                                    }
+                                    break;
+                                case EntityValueDataTypes.VALUE:
+                                default:
+                                    params.set(filter.idProperty, filter.value);
+                                    break;
                             }
-                            if (value_1)
-                                params.set(filter.idProperty, value_1);
                         }
-                        url = "".concat(domain !== null && domain !== void 0 ? domain : idOrganization, "/entities/").concat(step.idEntity).concat(step.path.map(function (path) {
-                            var _a;
-                            var idEntityValue = path.idEntityValue;
-                            if (path.idStep) {
-                                var currentValue = dependencyStore[path.idStep];
-                                if (currentValue) {
+                        urlPath = '';
+                        for (_c = 0, _d = step.path; _c < _d.length; _c++) {
+                            path = _d[_c];
+                            idEntityValue = 'null';
+                            switch (path.type) {
+                                case EntityValueDataTypes.STEP:
+                                    currentValue = dependencyStore[path.idStep];
+                                    if (!currentValue)
+                                        return [2 /*return*/, null];
                                     if (typeof currentValue === 'string')
                                         idEntityValue = currentValue;
                                     else
-                                        idEntityValue = (_a = currentValue._id) !== null && _a !== void 0 ? _a : currentValue.id;
-                                }
+                                        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;
                             }
-                            return ('/' + path.idEntity + (idEntityValue ? '/' + idEntityValue : ''));
-                        }), "?").concat(params.toString());
+                            urlPath +=
+                                '/' +
+                                    path.idEntity +
+                                    (idEntityValue ? '/' + idEntityValue : '');
+                        }
+                        url = "".concat(domain !== null && domain !== void 0 ? domain : idOrganization, "/entities/").concat(step.idEntity).concat(urlPath, "?").concat(params.toString());
                         return [4 /*yield*/, (domain
                                 ? widgetInstance.get(url)
                                 : axiosInstance.get(url))];
                     case 1:
-                        response = _d.sent();
+                        response = _h.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/FormComponents/Step/MapperStep/MaterialMapperStep/MaterialMapperStep.js

@@ -33,7 +33,7 @@ import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
 import React, { useState, useEffect, cloneElement } from 'react';
 import styles from './MaterialMapperStep.module.css';
 import { Controller } from 'react-hook-form';
-import StepTypes, { ClassifierOptionTypes, EntityValueOptionTypes, MapperStyleTypes, OptionTypes, } from '../../../../constants/FormStepTypes';
+import StepTypes, { ClassifierOptionTypes, EntityValueDataTypes, EntityValueOptionTypes, MapperStyleTypes, OptionTypes, } from '../../../../constants/FormStepTypes';
 import RoundedButton from '../../../../shared/RoundedButton/RoundedButton';
 import { nanoid } from 'nanoid';
 import { calcStepDependencyValue } from '../../../Form/ColumnForm/ColumnForm';
@@ -249,12 +249,16 @@ function calcRecursiveData(element, newSteps, deps, customSteps, originalValues)
             case StepTypes.ENTITYVALUEPICKER:
                 for (var _j = 0, _k = step.filters; _j < _k.length; _j++) {
                     var filter = _k[_j];
-                    if (filter.idStep) {
-                        var newId = element.ids[filter.idStep];
-                        if (newId) {
-                            filter.idStep = newId;
-                            deps[newId] = calcStepDependencyValue(newSteps[newId], originalValues);
-                        }
+                    switch (filter.type) {
+                        case EntityValueDataTypes.STEP:
+                            var newId = element.ids[filter.idStep];
+                            if (newId) {
+                                filter.idStep = newId;
+                                deps[newId] = calcStepDependencyValue(newSteps[newId], originalValues);
+                            }
+                            break;
+                        default:
+                            break;
                     }
                 }
                 for (var _l = 0, _m = Object.keys((_a = step.options) !== null && _a !== void 0 ? _a : {}); _l < _m.length; _l++) {

package/dist/constants/FormStepTypes.d.ts

@@ -44,3 +44,7 @@ export declare enum MapperStyleTypes {
     LIST = "LIST",
     INLINE = "INLINE"
 }
+export declare enum EntityValueDataTypes {
+    STEP = "STEP",
+    VALUE = "VALUE"
+}

package/dist/constants/FormStepTypes.js

@@ -52,3 +52,8 @@ export var MapperStyleTypes;
     MapperStyleTypes["LIST"] = "LIST";
     MapperStyleTypes["INLINE"] = "INLINE";
 })(MapperStyleTypes || (MapperStyleTypes = {}));
+export var EntityValueDataTypes;
+(function (EntityValueDataTypes) {
+    EntityValueDataTypes["STEP"] = "STEP";
+    EntityValueDataTypes["VALUE"] = "VALUE";
+})(EntityValueDataTypes || (EntityValueDataTypes = {}));

package/package.json

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