🚑 (results) Fix results display when variable has null value
This commit is contained in:
@ -6,6 +6,7 @@ import {
|
||||
ModalContent,
|
||||
ModalOverlay,
|
||||
} from '@chakra-ui/react'
|
||||
import { GraphNavigation } from 'db'
|
||||
import React from 'react'
|
||||
import { EditorSettingsForm } from './EditorSettingsForm'
|
||||
|
||||
@ -23,9 +24,11 @@ export const EditorSettingsModal = ({ isOpen, onClose }: Props) => {
|
||||
<ModalContent>
|
||||
<ModalCloseButton />
|
||||
<ModalBody pt="12" pb="8" px="8">
|
||||
{user?.graphNavigation && (
|
||||
<EditorSettingsForm defaultGraphNavigation={user.graphNavigation} />
|
||||
)}
|
||||
<EditorSettingsForm
|
||||
defaultGraphNavigation={
|
||||
user?.graphNavigation ?? GraphNavigation.TRACKPAD
|
||||
}
|
||||
/>
|
||||
</ModalBody>
|
||||
</ModalContent>
|
||||
</Modal>
|
||||
|
@ -75,6 +75,7 @@ export const convertResultsToTableData = (
|
||||
}
|
||||
}
|
||||
const variable = answerOrVariable as VariableWithValue
|
||||
if (variable.value === null) return o
|
||||
const key = headerCells.find((headerCell) =>
|
||||
headerCell.variableIds?.includes(variable.id)
|
||||
)?.label
|
||||
|
@ -1,11 +1,5 @@
|
||||
import { TypebotViewer } from 'bot-engine'
|
||||
import {
|
||||
Answer,
|
||||
AnswerInput,
|
||||
PublicTypebot,
|
||||
Typebot,
|
||||
VariableWithValue,
|
||||
} from 'models'
|
||||
import { AnswerInput, PublicTypebot, Typebot, VariableWithValue } from 'models'
|
||||
import { useRouter } from 'next/router'
|
||||
import React, { useEffect, useState } from 'react'
|
||||
import { isDefined, isNotDefined } from 'utils'
|
||||
|
@ -19,7 +19,7 @@ export const parseVariables =
|
||||
const variable = variables.find((v) => {
|
||||
return matchedVarName === v.name && isDefined(v.value)
|
||||
}) as VariableWithValue | undefined
|
||||
if (!variable) return ''
|
||||
if (!variable || variable.value === null) return ''
|
||||
if (options.fieldToParse === 'id') return variable.id
|
||||
const { value } = variable
|
||||
if (options.escapeForJson) return jsonParse(value)
|
||||
|
@ -12,7 +12,7 @@ export const variableSchema = z.object({
|
||||
export const variableWithValueSchema = z.object({
|
||||
id: z.string(),
|
||||
name: z.string(),
|
||||
value: z.string(),
|
||||
value: z.string().nullable(),
|
||||
})
|
||||
|
||||
/**
|
||||
|
@ -3,7 +3,6 @@ import {
|
||||
Variable,
|
||||
InputBlock,
|
||||
ResultHeaderCell,
|
||||
ResultWithAnswers,
|
||||
Answer,
|
||||
VariableWithValue,
|
||||
Typebot,
|
||||
@ -209,7 +208,7 @@ export const parseAnswers =
|
||||
}
|
||||
}
|
||||
const variable = answerOrVariable as VariableWithValue
|
||||
if (isDefined(o[variable.name])) return o
|
||||
if (isDefined(o[variable.name]) || variable.value === null) return o
|
||||
return { ...o, [variable.name]: variable.value }
|
||||
}, {}),
|
||||
}
|
||||
|
Reference in New Issue
Block a user