From 186b3760389c74b0451fc2430eba23ec9941553a Mon Sep 17 00:00:00 2001 From: Baptiste Arnaud Date: Sun, 26 Feb 2023 18:53:53 +0100 Subject: [PATCH] :fire: (viewer) Remove buttons input validation Did not work with buttons that contain a variable --- .../src/features/blocks/inputs/buttons/api/index.ts | 1 - .../features/blocks/inputs/buttons/api/utils/index.ts | 1 - .../inputs/buttons/api/utils/validateButtonInput.ts | 11 ----------- .../src/features/chat/api/utils/continueBotFlow.ts | 5 ----- 4 files changed, 18 deletions(-) delete mode 100644 apps/viewer/src/features/blocks/inputs/buttons/api/index.ts delete mode 100644 apps/viewer/src/features/blocks/inputs/buttons/api/utils/index.ts delete mode 100644 apps/viewer/src/features/blocks/inputs/buttons/api/utils/validateButtonInput.ts diff --git a/apps/viewer/src/features/blocks/inputs/buttons/api/index.ts b/apps/viewer/src/features/blocks/inputs/buttons/api/index.ts deleted file mode 100644 index 9c56149efa..0000000000 --- a/apps/viewer/src/features/blocks/inputs/buttons/api/index.ts +++ /dev/null @@ -1 +0,0 @@ -export * from './utils' diff --git a/apps/viewer/src/features/blocks/inputs/buttons/api/utils/index.ts b/apps/viewer/src/features/blocks/inputs/buttons/api/utils/index.ts deleted file mode 100644 index 53d445d256..0000000000 --- a/apps/viewer/src/features/blocks/inputs/buttons/api/utils/index.ts +++ /dev/null @@ -1 +0,0 @@ -export * from './validateButtonInput' diff --git a/apps/viewer/src/features/blocks/inputs/buttons/api/utils/validateButtonInput.ts b/apps/viewer/src/features/blocks/inputs/buttons/api/utils/validateButtonInput.ts deleted file mode 100644 index f58c52c5b3..0000000000 --- a/apps/viewer/src/features/blocks/inputs/buttons/api/utils/validateButtonInput.ts +++ /dev/null @@ -1,11 +0,0 @@ -import { ChoiceInputBlock } from 'models' - -export const validateButtonInput = ( - buttonBlock: ChoiceInputBlock, - input: string -) => - buttonBlock.items.some( - (item) => - item.content === input || - (item.content?.startsWith('{{') && item.content.endsWith('}}')) - ) diff --git a/apps/viewer/src/features/chat/api/utils/continueBotFlow.ts b/apps/viewer/src/features/chat/api/utils/continueBotFlow.ts index 74933d22c8..fca75fcd43 100644 --- a/apps/viewer/src/features/chat/api/utils/continueBotFlow.ts +++ b/apps/viewer/src/features/chat/api/utils/continueBotFlow.ts @@ -1,4 +1,3 @@ -import { validateButtonInput } from '@/features/blocks/inputs/buttons/api' import { validateEmail } from '@/features/blocks/inputs/email/api' import { formatPhoneNumber, @@ -231,10 +230,6 @@ export const isReplyValid = (inputValue: string, block: Block): boolean => { return validatePhoneNumber(inputValue) case InputBlockType.URL: return validateUrl(inputValue) - case InputBlockType.CHOICE: - if (block.options.isMultipleChoice || block.options.dynamicVariableId) - return true - return validateButtonInput(block, inputValue) } return true }