diff --git a/apps/builder/components/shared/Graph/Nodes/ItemNode/ItemNodeContent/contents/ConditionNodeContent.tsx b/apps/builder/components/shared/Graph/Nodes/ItemNode/ItemNodeContent/contents/ConditionNodeContent.tsx index 6463f86543..75fe4ef1be 100644 --- a/apps/builder/components/shared/Graph/Nodes/ItemNode/ItemNodeContent/contents/ConditionNodeContent.tsx +++ b/apps/builder/components/shared/Graph/Nodes/ItemNode/ItemNodeContent/contents/ConditionNodeContent.tsx @@ -10,10 +10,26 @@ import { import React from 'react' import { byIdOrToken, isNotDefined } from 'utils' +import { Persons } from 'services/octadesk/persons/persons' + type Props = { item: ConditionItem } +type BasicOption = { key: number; value: string; label: string } + +export let basicOptions: BasicOption[] = [] + + ; (async () => { + const { getStatusContact } = Persons() + const ContactStatus = await getStatusContact() + + basicOptions = [ + { key: 0, value: ContactStatus.Lead, label: 'Lead' }, + { key: 1, value: ContactStatus.Cliente, label: 'Cliente' } + ] + })() + export const ConditionNodeContent = ({ item }: Props) => { const { typebot, customVariables } = useTypebot() @@ -22,7 +38,16 @@ export const ConditionNodeContent = ({ item }: Props) => { comparison: Comparison ) => { if (variable?.token === '#status-do-contato') { - return comparison.value + if (comparison.value === basicOptions[0].value + ) { + return basicOptions[0].label + } + if (comparison.value === basicOptions[1].value) { + return basicOptions[1].label + } + else { + return comparison.value + } } if (variable?.type !== 'select' || !variable) return comparison.value diff --git a/apps/builder/components/shared/Graph/Nodes/StepNode/SettingsPopoverContent/bodies/ConditionSettingsBody/ComparisonsItem.tsx b/apps/builder/components/shared/Graph/Nodes/StepNode/SettingsPopoverContent/bodies/ConditionSettingsBody/ComparisonsItem.tsx index 49a29c8689..70e29768e8 100644 --- a/apps/builder/components/shared/Graph/Nodes/StepNode/SettingsPopoverContent/bodies/ConditionSettingsBody/ComparisonsItem.tsx +++ b/apps/builder/components/shared/Graph/Nodes/StepNode/SettingsPopoverContent/bodies/ConditionSettingsBody/ComparisonsItem.tsx @@ -9,6 +9,7 @@ import { useTypebot } from 'contexts/TypebotContext' import { useEffect, useState } from 'react' import CustomFields from 'services/octadesk/customFields/customFields' import { CustomFieldTypes } from 'enums/customFieldsEnum' +import { basicOptions } from 'components/shared/Graph/Nodes/ItemNode/ItemNodeContent/contents/ConditionNodeContent' export const ComparisonItem = ({ item, @@ -120,10 +121,10 @@ export const ComparisonItem = ({ } const resolveOperators = () => { - function isStringArray(){ + function isStringArray() { return Number(myVariable?.type) === CustomFieldTypes.Text || Number(myVariable?.type) === CustomFieldTypes.MultiText } - function isNumberArray(){ + function isNumberArray() { return Number(myVariable?.type) === CustomFieldTypes.Numbers || Number(myVariable?.type) === CustomFieldTypes.Decimal || Number(myVariable?.type) === CustomFieldTypes.Date } const allTypesArray = [ @@ -191,6 +192,8 @@ export const ComparisonItem = ({ onItemChange({ ...item, secondaryValue: undefined }) }, [needSecondaryValue]) + + const typeOfInputValue = () => { const onSelect = (e: React.ChangeEvent) => { handleChangeValue(e.target.value) @@ -220,10 +223,6 @@ export const ComparisonItem = ({ } if (myVariable?.token === '#status-do-contato') { - const basicOptions = [ - { key: 0, value: 'Lead', label: 'Lead' }, - { key: 1, value: 'Cliente', label: 'Cliente' } - ] return (