@arquimedes.co/eureka-forms 3.0.46-new-steps → 3.0.48-test

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

@@ -120,10 +120,12 @@ export interface EntityDateCondition extends EntityPropertyConditionBase {
 export interface EntityRelativeDateCondition extends EntityPropertyConditionBase {
     propertyType: EntityPropertyTypes.DATEPICKER;
     propertyOperator: OperatorTypes.PAST_RELATIVE_LESS | OperatorTypes.PAST_RELATIVE_MORE | OperatorTypes.FUTURE_RELATIVE_LESS | OperatorTypes.FUTURE_RELATIVE_MORE;
-    days: number;
-    hours: number;
-    minutes: number;
-    working: boolean;
+    value: {
+        days: number;
+        hours: number;
+        minutes: number;
+        working: boolean;
+    };
 }
 export type EntityTimeCondition = BaseEntityTimeCondition | WorkingEntityTimeCondition;
 export interface BaseEntityTimeCondition extends EntityPropertyConditionBase {

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

@@ -0,0 +1,16 @@
+import ErkValueTypes from '../constants/ErkValueTypes';
+import { EurekaDraft } from './Draft/Draft';
+export type ErkValue = StepErkValue | DraftErkValue | BooleanErkValue;
+interface StepErkValue {
+    type: ErkValueTypes.STEP;
+    idStep: string;
+}
+interface DraftErkValue {
+    type: ErkValueTypes.DRAFT;
+    value: EurekaDraft;
+}
+interface BooleanErkValue {
+    type: ErkValueTypes.BOOLEAN;
+    value: boolean;
+}
+export {};

package/dist/@Types/ErkValue.js

@@ -0,0 +1 @@
+export {};

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

@@ -11,6 +11,7 @@ export interface Form {
     size: FormSize;
     firstSection: string;
     type?: FormTypes;
+    hasLogin?: boolean;
     hasCaptcha?: boolean;
     isStandAlone?: boolean;
     style?: FormStyle;

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

@@ -2,6 +2,7 @@ import { ErkIconTypes } from '../constants/ErkIconTypes';
 import FormStepTypes, { ClassifierOptionTypes, OptionTypes, RatingTypes, MapperStyleTypes, EntityValueOptionTypes, EntityValueDataTypes, ApiSelectorOptionTypes, ApiSelectorParamTypes } from '../constants/FormStepTypes';
 import { Condition } from './Condition';
 import { EurekaDraft } from './Draft/Draft';
+import { ErkValue } from './ErkValue';
 import * as GSteps from './GenericFormSteps';
 import { Time } from './Time';
 export type FormStep = Title | TimePicker | Rating | CheckBox | TextArea | TextInput | DatePicker | FileUpload | Separator | FormSelector | ClassifierSelector | Collapsible | EntityValuePicker | ApiSelector | Mapper | DatePickerRange;
@@ -151,7 +152,7 @@ export interface ValueEntityValuePickerPath {
     type: EntityValueDataTypes.VALUE;
     idEntityValue: string | null;
 }
-export type EntityValuePickerFilter = StepEntityValuePickerFilter | ValueEntityValuePickerFilter | CurrentAgentEntityValuePickerFilter;
+export type EntityValuePickerFilter = StepEntityValuePickerFilter | ValueEntityValuePickerFilter | CurrentAgentEntityValuePickerFilter | IntegrationEntityValuePickerFilter;
 export interface StepEntityValuePickerFilter {
     idProperty: string;
     type: EntityValueDataTypes.STEP;
@@ -168,6 +169,12 @@ export interface CurrentAgentEntityValuePickerFilter {
     idProperty: string;
     type: EntityValueDataTypes.CURRENT_AGENT;
 }
+export interface IntegrationEntityValuePickerFilter {
+    idProperty: string;
+    type: EntityValueDataTypes.INTEGRATION;
+    idIntegration: string;
+    values?: Record<string, ErkValue>;
+}
 export interface ApiSelector extends GSteps.GSmartSelect {
     type: FormStepTypes.API_SELECTOR;
     icon?: ErkIconTypes;

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

@@ -0,0 +1,13 @@
+/**
+ * The currently active user
+ */
+export interface User {
+    /** The User's id (if capta agent)*/
+    _id?: string;
+    /** The User's name */
+    name?: string;
+    /** The user's Email*/
+    email: string;
+    /** The expiration of the token */
+    exp: number;
+}

package/dist/@Types/User.js

@@ -0,0 +1 @@
+export {};

package/dist/App/App.js

@@ -13,7 +13,7 @@ import { nanoid } from '@reduxjs/toolkit';
 import { IdFormContext } from '../Contexts/FormContext';
 import { StoreContext } from '../Utils/StoreContext';
 function AppComponent({ formData, valuesData, ...props }) {
-    const [idForm] = React.useState(nanoid(6));
+    const [idForm] = React.useState(nanoid(20));
     return (_jsx(IdFormContext.Provider, { value: idForm, children: _jsx(Provider, { store: store, context: StoreContext, children: _jsx(App, { formData: formData, valuesData: valuesData, ...props }) }) }));
 }
 export default AppComponent;

package/dist/App/AppFunctions.js

@@ -14,11 +14,11 @@ export const calcValuesStore = async (orgInfo, form, originalValues = {}, postvi
     await Promise.all(Object.keys(originalValues).map(async (idValue) => {
         const step = form.steps[idValue];
         if (step) {
+            if (!values.sections[step.idSection])
+                values.sections[step.idSection] = {};
             const value = await mapOriginalValue(orgInfo, step, originalValues[step.id], values, form);
             if (value !== undefined) {
                 if (!form.hiddenSteps?.includes(step.id)) {
-                    if (!values.sections[step.idSection])
-                        values.sections[step.idSection] = {};
                     values.sections[step.idSection][step.id] = value;
                 }
                 else {
@@ -163,7 +163,7 @@ export const mapOriginalValue = async (orgInfo, step, value, values, form, path
         }
         case FormStepTypes.ENTITYVALUEPICKER: {
             if (!value._id) {
-                const params = new URLSearchParams(value);
+                const params = typeof value !== 'string' ? new URLSearchParams(value) : new URLSearchParams();
                 const url = `${orgInfo.idOrganization}/entities/${step.idEntity}?${params.toString()}`;
                 const entityValues = (await widgetInstance.get(url)).data;
                 if (entityValues.length === 1) {
@@ -172,6 +172,11 @@ export const mapOriginalValue = async (orgInfo, step, value, values, form, path
                         return undefined;
                     return entityValues[0];
                 }
+                if (typeof value === 'string') {
+                    if (step.options[value]?.type === EntityValueOptionTypes.HIDE)
+                        return undefined;
+                    return entityValues.find((ev) => ev._id === value);
+                }
                 return null;
             }
             return value;

package/dist/App/AppHooks.js

@@ -4,6 +4,7 @@ import { fetchOrganization } from '../Services/OrganizationService';
 import { fetchForm } from '../Services/FormService';
 import { calcCbrForm } from '../Utils/CBRFunctions';
 import { calcInitialSections, calcValuesStore } from './AppFunctions';
+import { jwtDecode } from 'jwt-decode';
 import { useAppDispatch } from '../hooks';
 import InternalFormStyle from '../constants/InternalFormStyle';
 import { calcDependencies } from '../Form/FormFunctions';
@@ -39,6 +40,7 @@ export const useSetupApp = (isEmbedded, props) => {
     const loadData = async () => {
         let idOrganization = others.idOrganization;
         let organization = null;
+        let user = null;
         let form = formData ?? null;
         if (form && preview && form.isStandAlone) {
             organization = await loadOrg();
@@ -90,7 +92,24 @@ export const useSetupApp = (isEmbedded, props) => {
             return;
         const dependencies = {};
         const values = await calcValuesStore({ idOrganization, countryCode }, form, valuesData, postview, customSteps);
+        if (form.hasLogin && !internal && !preview) {
+            const token = localStorage.getItem('token');
+            if (token) {
+                try {
+                    user = jwtDecode(token);
+                    if (user && Date.now() / 1000 >= user.exp) {
+                        user = null;
+                        localStorage.removeItem('token');
+                    }
+                }
+                catch {
+                    user = null;
+                    localStorage.removeItem('token');
+                }
+            }
+        }
         dispatch(reset({
+            user,
             apiKey,
             formStyle: internal
                 ? InternalFormStyle
@@ -104,7 +123,7 @@ export const useSetupApp = (isEmbedded, props) => {
             },
             internal: !!internal,
             idOrganization,
-            idCurrentAgent,
+            idCurrentAgent: user?._id ?? idCurrentAgent,
             preview: !!preview,
             partial: !!partial,
             postview: !!postview,

package/dist/Form/Form.js

@@ -17,9 +17,10 @@ import { useWidthStats } from './FormHooks';
 import { useAppDispatch, useAppSelector } from '../hooks';
 import FormContext, { IdFormContext } from '../Contexts/FormContext';
 import { getAppState } from '../Utils/store';
+import LoginPage from '../Login/LoginPage';
 import { focusStep } from '../States/SiteSlice';
 function FormComponent({ form, apiKey, reload, isWidget, branding, setSubmit, scrollToTop, customSteps, containerRef, customSubmit, customSubmitBtns, customConfirmation, }) {
-    const { idOrganization, internal, postview } = useAppSelector((state) => state.global);
+    const { idOrganization, internal, postview, user } = useAppSelector((state) => state.global);
     const formMethods = useForm({
         mode: 'onTouched',
         shouldFocusError: true,
@@ -100,8 +101,11 @@ function FormComponent({ form, apiKey, reload, isWidget, branding, setSubmit, sc
             }, children: _jsx("div", { className: styles.widgetFormContainer, ref: containerRef, children: renderForm() }) }));
     }
     else {
+        if (user === null && form.hasLogin) {
+            return (_jsx("div", { className: styles.loginContainer, children: _jsx(LoginPage, { form: form }) }));
+        }
         //Standalone cant have widget
-        return (_jsxs(React.Fragment, { children: [_jsx(Navbar, { logo: branding?.images.logoUrl, color: branding?.colors?.navbarColor ?? branding?.colors?.primaryColor }), _jsx("div", { className: styles.standAloneFormContainer, ref: containerRef, style: {
+        return (_jsxs(React.Fragment, { children: [_jsx(Navbar, { apiKey: form.apiKey, logo: branding?.images.logoUrl, color: branding?.colors?.navbarColor ?? branding?.colors?.primaryColor }), _jsx("div", { className: styles.standAloneFormContainer, ref: containerRef, style: {
                         background: form.style?.standAloneBackgroundColor ?? '#ffffff',
                     }, children: _jsx("div", { className: isResponsive ? styles.fullScreenStandAloneForm : styles.standAloneFormCard, style: {
                             backgroundColor: form.style?.backgroundColor ?? InternalFormStyle.backgroundColor,

package/dist/Form/Form.module.css

@@ -1,39 +1,48 @@
-.standAloneFormContainer {
-    width: 100%;
-    max-width: 100%;
-    overflow: hidden;
-    min-height: calc(100vh - 60px);
-    display: flex;
-    overflow-x: hidden;
-}
-
-.fullScreenStandAloneForm {
-    width: 100%;
-    padding: 20px;
-    min-height: 100%;
-    overflow: hidden;
-}
-
-.standAloneFormCard {
-    -webkit-box-shadow: -6px 0px 8px 5px rgba(0, 0, 0, 0.2);
-    -moz-box-shadow: -6px 0px 8px 5px rgba(0, 0, 0, 0.2);
-    box-shadow: -6px 0px 8px 5px rgba(0, 0, 0, 0.2);
-    margin-top: 30px;
-    margin-left: auto;
-    margin-right: auto;
-    height: fit-content;
-    width: fit-content;
-    border-radius: 15px;
-    padding: 20px;
-    margin-bottom: 30px;
-}
-
-.widgetFormContainer {
-    padding-top: 10px;
-    padding-bottom: 10px;
-    margin-left: auto;
-    margin-right: auto;
-    height: fit-content;
-    width: fit-content;
-    max-width: 100%;
-}
+.standAloneFormContainer {
+    width: 100%;
+    max-width: 100%;
+    overflow: hidden;
+    min-height: calc(100vh - 60px);
+    display: flex;
+    overflow-x: hidden;
+}
+
+.fullScreenStandAloneForm {
+    width: 100%;
+    padding: 20px;
+    min-height: 100%;
+    overflow: hidden;
+}
+
+.loginContainer {
+    width: 100%;
+    max-width: 100%;
+    overflow: hidden;
+    min-height: 100vh;
+    display: flex;
+    overflow-x: hidden;
+}
+
+.standAloneFormCard {
+    -webkit-box-shadow: -6px 0px 8px 5px rgba(0, 0, 0, 0.2);
+    -moz-box-shadow: -6px 0px 8px 5px rgba(0, 0, 0, 0.2);
+    box-shadow: -6px 0px 8px 5px rgba(0, 0, 0, 0.2);
+    margin-top: 30px;
+    margin-left: auto;
+    margin-right: auto;
+    height: fit-content;
+    width: fit-content;
+    border-radius: 15px;
+    padding: 20px;
+    margin-bottom: 30px;
+}
+
+.widgetFormContainer {
+    padding-top: 10px;
+    padding-bottom: 10px;
+    margin-left: auto;
+    margin-right: auto;
+    height: fit-content;
+    width: fit-content;
+    max-width: 100%;
+}

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

@@ -3,13 +3,12 @@ import React, { useContext, useMemo } from 'react';
 import FormStepTypes, { ApiSelectorOptionTypes, ApiSelectorParamTypes } from '../../../constants/FormStepTypes';
 import StepComponent from '../../Step';
 import SmartSelect from '../../SmartSelectStep/MaterialSmartSelectStep/MaterialSmartSelectStep';
-import widgetInstance from '../../../Utils/AxiosWidget';
-import axiosInstance from '../../../Utils/AxiosAPI';
 import InputIcon from '../../../Shared/InputIcon/InputIcon';
 import FormContext from '../../../Contexts/FormContext';
 import StepFillerContainer from '../../Utils/@StepFiller/StepFiller';
 import { recursivelyCalcConditionSteps } from '../../StepHooks';
 import { evaluateCondition } from '../../StepFunctions';
+import { fetchApiSelectorOptionsThrottled } from '../../../Services/ApiSelectorService';
 function ApiSelectorComponent({ step, editable, ...others }) {
     const form = useContext(FormContext);
     function calcOptionId(option) {
@@ -34,6 +33,9 @@ function ApiSelectorComponent({ step, editable, ...others }) {
                         }
                         else if (typeof currentValue === 'string')
                             params.set(filter.key, currentValue);
+                        else if (step.url.includes('capta.co') && currentValue._id) {
+                            params.set(filter.key, currentValue._id);
+                        }
                         else
                             params.set(filter.key, currentValue.label ?? currentValue.id);
                     }
@@ -54,8 +56,10 @@ function ApiSelectorComponent({ step, editable, ...others }) {
         if (!step.url.includes('?'))
             url += '?';
         url += params.toString();
-        const response = await (idOrganization ? widgetInstance.get(url) : axiosInstance.get(url));
-        return response.data.filter((option) => calcOptionId(option) && step.options[calcOptionId(option)]?.type !== ApiSelectorOptionTypes.HIDE);
+        // Use the throttled fetch function that limits concurrent requests per URL
+        const response = await fetchApiSelectorOptionsThrottled(url, idOrganization);
+        return response.filter((option) => calcOptionId(option) !== undefined &&
+            step.options[calcOptionId(option)]?.type !== ApiSelectorOptionTypes.HIDE);
     }, [form]);
     return (_jsx(StepFillerContainer, { step: step, children: _jsx(SmartSelect, { ...others, editable: editable, step: step, IconComponent: () => (step.icon ? _jsx(InputIcon, { icon: step.icon }) : undefined), getOptions: getApiOptions, getOptionSelected: (option, value) => calcOptionId(option) === calcOptionId(value), calcDepError: (steps) => {
                 for (const step of steps) {

package/dist/FormSteps/CBRStepMapper.js

@@ -54,7 +54,7 @@ function CBRStepMapper(props) {
         case CBRFormStepTypes.CBR_EMAIL:
             return (_jsx(TextInputStep, { ...props, step: props.step, validation: {
                     type: 'EMAIL',
-                    value: /^(([^<>()[\]\\.,;:\s@"]+(\.[^<>()[\]\\.,;:\s@"]+)*)|(".+"))@((\[[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\])|(([a-zA-Z\-0-9]+\.)+[a-zA-Z]{2,}))$/
+                    value: /^(([^<>()[\]\\.,;:\s@"]+(\.[^<>()[\]\\.,;:\s@"]+)*)|(".+"))@(?!(gmal|gmai|gmil|hotmil|hotmal|hotmai|yaho|yhoo|yahoo|outlok|outloo|outluk)\.)((\[[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\])|(([a-zA-Z\-0-9]+\.)+[a-zA-Z]{2,}))$/
                         .source,
                     message: 'El correo no es válido',
                 } }));

package/dist/FormSteps/ClassifierSelectorStep/MaterialClassifierSelectorStep/MaterialClassifierSelectorStep.js

@@ -34,7 +34,7 @@ function ClassifierSelectorStep({ step, editable }) {
     const form = useContext(FormContext);
     const classifier = form.classifiers?.[step.idClassifier ?? ''];
     const options = useMemo(() => {
-        return classifier?.children
+        return (classifier?.children
             ?.filter((idClassifier) => {
             const option = step.options[idClassifier];
             if (option?.type === ClassifierOptionTypes.HIDE || !form.classifiers?.[idClassifier]) {
@@ -48,7 +48,7 @@ function ClassifierSelectorStep({ step, editable }) {
                 value: classifier?._id,
                 label: classifier?.clientName?.trim?.() && preview ? classifier?.clientName : classifier?.name,
             };
-        });
+        }) ?? []);
     }, 
     // eslint-disable-next-line react-hooks/exhaustive-deps
     [dependenciesValues]);

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

@@ -3,16 +3,30 @@ import React, { useCallback, useContext, useMemo, useState } from 'react';
 import FormStepTypes, { EntityValueDataTypes, EntityValueOptionTypes } from '../../../constants/FormStepTypes';
 import SmartSelect from '../../SmartSelectStep/MaterialSmartSelectStep/MaterialSmartSelectStep';
 import widgetInstance from '../../../Utils/AxiosWidget';
-import FormContext from '../../../Contexts/FormContext';
+import FormContext, { IdFormContext } from '../../../Contexts/FormContext';
 import StepFillerContainer from '../../Utils/@StepFiller/StepFiller';
 import { recursivelyCalcConditionSteps, selectDependencies } from '../../StepHooks';
-import { useAppSelector } from '../../../hooks';
+import { useApiSubscribe, useAppSelector } from '../../../hooks';
 import MaterialEntityValueDialog from './MaterialEntityValueDialog/MaterialEntityValueDialog';
 import InputIcon from '../../../Shared/InputIcon/InputIcon';
 import { evaluateCondition } from '../../StepFunctions';
 import StepComponent from '../../Step';
+import ErkValueTypes from '../../../constants/ErkValueTypes';
+import { IntegrationsApi } from '../../../Services/IntegrationService';
 function EntityValuePickerStep({ step, editable }) {
     const form = useContext(FormContext);
+    const subscribe = useApiSubscribe();
+    const idForm = useContext(IdFormContext);
+    const fetchFilterIntegration = useCallback(async (idIntegration, payload) => {
+        return ((await subscribe(IntegrationsApi.endpoints.fetchFilterIntegration.initiate({
+            idForm,
+            payload,
+            idIntegration,
+        }))) ?? []);
+    }, [subscribe, idForm]);
+    const getOptions = useCallback(async (step, dependencyStore, ids) => {
+        return await getEntityValueOptions(step, dependencyStore, ids, fetchFilterIntegration);
+    }, [fetchFilterIntegration]);
     const [dialogs, setDialogs] = useState();
     const dialogsIdStepDeps = useMemo(() => {
         const ids = [];
@@ -34,7 +48,7 @@ function EntityValuePickerStep({ step, editable }) {
             }
             : undefined);
     }, []);
-    return (_jsxs(React.Fragment, { children: [dialogs !== undefined && form.entities?.[step.idEntity] && (_jsx(MaterialEntityValueDialog, { type: dialogs.current.type, entity: form.entities?.[step.idEntity], entityValue: dialogs.value, message: dialogs.current.message, handleClose: handleCloseDialog })), _jsx(StepFillerContainer, { step: step, children: _jsx(SmartSelect, { step: step, editable: editable, getOptions: getEntityValueOptions, getOptionalDependencies: getOptionalDependencies, IconComponent: () => (step.icon ? _jsx(InputIcon, { icon: step.icon }) : undefined), getOptionSelected: (option, value) => option._id === value._id, calcDepError: (steps) => {
+    return (_jsxs(React.Fragment, { children: [dialogs !== undefined && form.entities?.[step.idEntity] && (_jsx(MaterialEntityValueDialog, { type: dialogs.current.type, entity: form.entities?.[step.idEntity], entityValue: dialogs.value, message: dialogs.current.message, handleClose: handleCloseDialog })), _jsx(StepFillerContainer, { step: step, children: _jsx(SmartSelect, { step: step, editable: editable, getOptions: getOptions, getOptionalDependencies: getOptionalDependencies, IconComponent: () => (step.icon ? _jsx(InputIcon, { icon: step.icon }) : undefined), getOptionSelected: (option, value) => option._id === value._id, calcDepError: (steps) => {
                         for (const step of steps) {
                             if (step.type === FormStepTypes.ENTITYVALUEPICKER) {
                                 return 'Selecciona un ' + step.label;
@@ -97,7 +111,7 @@ function EntityValuePickerStep({ step, editable }) {
                     } }) })] }));
 }
 export default EntityValuePickerStep;
-const getEntityValueOptions = async (step, dependencyStore, { idOrganization, idCurrentAgent, }) => {
+const getEntityValueOptions = async (step, dependencyStore, { idOrganization, idCurrentAgent, }, fetchFilterIntegration) => {
     if (!idOrganization)
         return null;
     let urlPath = '';
@@ -124,6 +138,40 @@ const getEntityValueOptions = async (step, dependencyStore, { idOrganization, id
     const params = new URLSearchParams({});
     for (const filter of step.filters) {
         switch (filter.type) {
+            case EntityValueDataTypes.INTEGRATION: {
+                const payload = {};
+                for (const [key, erkValue] of Object.entries(filter.values ?? {})) {
+                    switch (erkValue.type) {
+                        case ErkValueTypes.BOOLEAN:
+                            payload[key] = erkValue.value;
+                            break;
+                        case ErkValueTypes.DRAFT: {
+                            //TODO: Hacer esto bien, la lambda tiene que ser capaz de calcular un draft en un filtro
+                            // values[key] = await mapDraftEntities(
+                            //     `filters[${index}].values.${key}`
+                            // );
+                            break;
+                        }
+                        case ErkValueTypes.STEP: {
+                            const currentValue = dependencyStore[erkValue.idStep]?.value;
+                            if (currentValue) {
+                                if (typeof currentValue === 'string')
+                                    payload[key] = currentValue;
+                                else if (currentValue instanceof Date)
+                                    payload[key] = currentValue.toISOString();
+                                else
+                                    payload[key] = currentValue._id ?? currentValue.id;
+                            }
+                            else
+                                payload[key] = null;
+                            break;
+                        }
+                    }
+                }
+                const filtered = await fetchFilterIntegration(filter.idIntegration, payload);
+                params.set(filter.idProperty, filtered.join(','));
+                break;
+            }
             case EntityValueDataTypes.STEP: {
                 const currentValue = dependencyStore[filter.idStep]?.value;
                 if (currentValue) {

package/dist/FormSteps/StepFunctions.js

@@ -135,7 +135,7 @@ export const calcDefaultValue = (step) => {
             return undefined;
     }
 };
-export const iterateNestedSteps = (idStep, steps, iteration, path = [idStep]) => {
+export const iterateNestedSteps = (idStep, steps, iteration, path = []) => {
     const step = steps[idStep];
     if (!step) {
         console.error('Missing Step:', idStep);
@@ -144,15 +144,12 @@ export const iterateNestedSteps = (idStep, steps, iteration, path = [idStep]) =>
     iteration(step, path);
     if (step.type === FormStepTypes.MAPPER) {
         for (const idStep of step.rootSteps) {
-            iterateNestedSteps(idStep, step.steps, iteration, [
-                ...path,
-                step.id,
-            ]);
+            iterateNestedSteps(idStep, step.steps, iteration, [...path, step.id]);
         }
     }
     else {
         for (const idSubStep of calcSubSteps(step.id, steps)) {
-            iterateNestedSteps(idSubStep, steps, iteration, [...path, step.id]);
+            iterateNestedSteps(idSubStep, steps, iteration, path);
         }
     }
 };
@@ -523,13 +520,13 @@ const evaluateEntityPropertyCondition = (condition, entity, entityValue) => {
                 case OperatorTypes.PAST_RELATIVE_MORE:
                 case OperatorTypes.FUTURE_RELATIVE_LESS:
                 case OperatorTypes.FUTURE_RELATIVE_MORE: {
-                    const date = getRelativeDate(condition.days, condition.hours, condition.minutes, condition.propertyOperator === OperatorTypes.PAST_RELATIVE_LESS ||
+                    const date = getRelativeDate(condition.value?.days, condition.value?.hours, condition.value?.minutes, condition.propertyOperator === OperatorTypes.PAST_RELATIVE_LESS ||
                         condition.propertyOperator === OperatorTypes.PAST_RELATIVE_MORE);
                     if (condition.propertyOperator === OperatorTypes.PAST_RELATIVE_LESS ||
                         condition.propertyOperator === OperatorTypes.FUTURE_RELATIVE_LESS)
-                        return new Date().getTime() > date.getTime();
+                        return new Date(value).getTime() < date.getTime();
                     else
-                        return new Date().getTime() < date.getTime();
+                        return new Date(value).getTime() > date.getTime();
                 }
             }
             return false;

package/dist/FormSteps/StepFunctions.test.js

@@ -565,9 +565,9 @@ describe('StepFunctions', function () {
             const iterationMock = vi.fn();
             iterateNestedSteps('idStep1', steps, iterationMock);
             expect(iterationMock).toHaveBeenCalledTimes(3);
-            expect(iterationMock).toHaveBeenCalledWith(steps.idStep1);
-            expect(iterationMock).toHaveBeenCalledWith(steps.idStep1.steps.idStep2);
-            expect(iterationMock).toHaveBeenCalledWith(steps.idStep1.steps.idStep3);
+            expect(iterationMock).toHaveBeenCalledWith(steps.idStep1, []);
+            expect(iterationMock).toHaveBeenCalledWith(steps.idStep1.steps.idStep2, ['idStep1']);
+            expect(iterationMock).toHaveBeenCalledWith(steps.idStep1.steps.idStep3, ['idStep1']);
         });
     });
 });

package/dist/FormSteps/TitleStep/MaterialTitleStep/MaterialTitleStep.js

@@ -31,12 +31,13 @@ function TitleStep({ step }) {
         return values;
         // eslint-disable-next-line react-hooks/exhaustive-deps
     }, [stableDepsValues]);
+    const path = useMemo(() => [...step.stepPath, step.id].join('.'), [step.stepPath, step.id]);
     return (_jsxs("div", { className: styles.container, style: {
             color: formStyle.textColor,
             width: widthStats.currentBreakPoint <= size ? '100%' : calcStepWidth(size, form.size),
         }, children: [_jsx("div", { className: styles.titleLbl, style: {
                     textAlign: widthStats.isMobile && widthStats.currentBreakPoint <= size ? 'center' : 'start',
-                }, children: _jsx(SmartDraftRenderer, { draft: title, dependencies: values, property: `${step.stepPath.join('.')}.title`, onChange: (title) => onChange({ ...value, title }) }) }), _jsx("div", { className: styles.descriptionPar, children: _jsx(SmartDraftRenderer, { draft: description, dependencies: values, margin: title ? '10px 0px' : '0px 0px 5px 0px', property: `${step.stepPath.join('.')}.description`, onChange: (description) => onChange({ ...value, description }) }) })] }));
+                }, children: _jsx(SmartDraftRenderer, { draft: title, dependencies: values, property: `${path}.title`, onChange: (title) => onChange({ ...value, title }) }) }), _jsx("div", { className: styles.descriptionPar, children: _jsx(SmartDraftRenderer, { draft: description, dependencies: values, margin: title ? '10px 0px' : '0px 0px 5px 0px', property: `${path}.description`, onChange: (description) => onChange({ ...value, description }) }) })] }));
 }
 export default TitleStep;
 function calcBaseDraft(value) {

package/dist/Icons/@ErkIcon.d.ts

@@ -9,6 +9,6 @@ export interface IconProps {
     preserveAspectRatio?: 'none';
 }
 export declare function useIconProps(props: IconProps): IconProps & {
-    width?: number;
-    height?: number;
+    width?: number | string;
+    height?: number | string;
 };

package/dist/Icons/@ErkIcon.js

@@ -1,7 +1,7 @@
 export function useIconProps(props) {
     return {
-        width: props.size,
-        height: props.size,
+        width: props.size ?? '1em',
+        height: props.size ?? '1em',
         className: props.className ? props.className + ' ErkIcon' : 'ErkIcon',
         fill: 'currentColor',
         ...props,

package/dist/Icons/EmailIcon.d.ts

@@ -0,0 +1,3 @@
+import { IconProps } from './@ErkIcon';
+declare function EmailIcon(props: IconProps): JSX.Element;
+export default EmailIcon;

package/dist/Icons/EmailIcon.js

@@ -0,0 +1,7 @@
+import { jsx as _jsx } from "react/jsx-runtime";
+import { useIconProps } from './@ErkIcon';
+function EmailIcon(props) {
+    const iconProps = useIconProps(props);
+    return (_jsx("svg", { ...iconProps, version: "1.1", viewBox: "0 0 24 24", xmlns: "http://www.w3.org/2000/svg", children: _jsx("path", { d: "M20 4H4c-1.1 0-1.99.9-1.99 2L2 18c0 1.1.9 2 2 2h16c1.1 0 2-.9 2-2V6c0-1.1-.9-2-2-2zm-1 14H5c-.55 0-1-.45-1-1V8l6.94 4.34c.65.41 1.47.41 2.12 0L20 8v9c0 .55-.45 1-1 1zm-7-7L4 6h16l-8 5z" }) }));
+}
+export default EmailIcon;

package/dist/Icons/Entities/SchoolIcon.d.ts

@@ -0,0 +1,3 @@
+import { IconProps } from '../@ErkIcon';
+declare function SchoolIcon(props: IconProps): JSX.Element;
+export default SchoolIcon;

package/dist/Icons/Entities/SchoolIcon.js

@@ -0,0 +1,7 @@
+import { jsx as _jsx } from "react/jsx-runtime";
+import { useIconProps } from '../@ErkIcon';
+function SchoolIcon(props) {
+    const iconProps = useIconProps(props);
+    return (_jsx("svg", { ...iconProps, version: "1.1", viewBox: "0 0 24 24", xmlns: "http://www.w3.org/2000/svg", children: _jsx("path", { d: "M5 13.18v2.81c0 .73.4 1.41 1.04 1.76l5 2.73c.6.33 1.32.33 1.92 0l5-2.73c.64-.35 1.04-1.03 1.04-1.76v-2.81l-6.04 3.3c-.6.33-1.32.33-1.92 0zm6.04-9.66-8.43 4.6c-.69.38-.69 1.38 0 1.76l8.43 4.6c.6.33 1.32.33 1.92 0L21 10.09V16c0 .55.45 1 1 1s1-.45 1-1V9.59c0-.37-.2-.7-.52-.88l-9.52-5.19a2.04 2.04 0 0 0-1.92 0" }) }));
+}
+export default SchoolIcon;

package/dist/Icons/GroupIcon.d.ts

@@ -0,0 +1,3 @@
+import { IconProps } from './@ErkIcon';
+declare function GroupIcon(props: IconProps): JSX.Element;
+export default GroupIcon;

package/dist/Icons/GroupIcon.js

@@ -0,0 +1,7 @@
+import { jsx as _jsx } from "react/jsx-runtime";
+import { useIconProps } from './@ErkIcon';
+function GroupIcon(props) {
+    const iconProps = useIconProps(props);
+    return (_jsx("svg", { ...iconProps, version: "1.1", viewBox: "0 0 24 24", xmlns: "http://www.w3.org/2000/svg", children: _jsx("path", { d: "M12 12.75c1.63 0 3.07.39 4.24.9 1.08.48 1.76 1.56 1.76 2.73V17c0 .55-.45 1-1 1H7c-.55 0-1-.45-1-1v-.61c0-1.18.68-2.26 1.76-2.73 1.17-.52 2.61-.91 4.24-.91M4 13c1.1 0 2-.9 2-2s-.9-2-2-2-2 .9-2 2 .9 2 2 2m1.13 1.1c-.37-.06-.74-.1-1.13-.1-.99 0-1.93.21-2.78.58C.48 14.9 0 15.62 0 16.43V17c0 .55.45 1 1 1h3.5v-1.61c0-.83.23-1.61.63-2.29M20 13c1.1 0 2-.9 2-2s-.9-2-2-2-2 .9-2 2 .9 2 2 2m4 3.43c0-.81-.48-1.53-1.22-1.85-.85-.37-1.79-.58-2.78-.58-.39 0-.76.04-1.13.1.4.68.63 1.46.63 2.29V18H23c.55 0 1-.45 1-1zM12 6c1.66 0 3 1.34 3 3s-1.34 3-3 3-3-1.34-3-3 1.34-3 3-3" }) }));
+}
+export default GroupIcon;

package/dist/Icons/LockedIcon.d.ts

@@ -0,0 +1,3 @@
+import { IconProps } from './@ErkIcon';
+declare function LockedIcon(props: IconProps): JSX.Element;
+export default LockedIcon;

package/dist/Icons/LockedIcon.js

@@ -0,0 +1,7 @@
+import { jsx as _jsx } from "react/jsx-runtime";
+import { useIconProps } from './@ErkIcon';
+function LockedIcon(props) {
+    const iconProps = useIconProps(props);
+    return (_jsx("svg", { ...iconProps, version: "1.1", viewBox: "0 0 100 100", xmlns: "http://www.w3.org/2000/svg", children: _jsx("path", { d: "M81.9,49.6c0-9-0.4-9.4-9.3-9.7c0,0,0,0,0,0c0-4,0-9-0.1-12.1C72,16,64.7,8.9,53,8.7c-2,0-4,0-6.1,0  c-13,0.1-20.6,8-20.4,20.9c0,0,0,0.1,0,0.1V40c-0.7,0-1.4,0-2.2,0c-5.8,0-7.1,1.4-7.1,7.2c0,12.3,0.1,24.6-0.1,36.9  c-0.1,4.7,1.8,6.9,6.5,6.9c17.4,0,34.7,0,52.1,0c4.4,0,6.4-2,6.3-6.5C81.8,72.9,81.9,61.3,81.9,49.6z M53.1,67.5v5.8  c0,2-1.6,3.5-3.5,3.5S46,75.2,46,73.3v-5.8c-2.9-1.3-5-4.3-5-7.8c0-4.7,3.8-8.5,8.5-8.5c4.7,0,8.5,3.8,8.5,8.5  C58.1,63.2,56,66.2,53.1,67.5z M61.7,39.9C61.7,39.9,61.7,39.9,61.7,39.9c-8.1,0-16.1,0.1-24.2,0.1v-8.5c0.1-0.6,0.1-1.2,0.1-1.7  c-0.1-7.3,4-10.3,13-10.1c7.4,0.1,11.1,3.6,11.1,10.6C61.7,33.5,61.7,36.7,61.7,39.9z" }) }));
+}
+export default LockedIcon;