blsmedia/bot
2
0
Fork 0
Code Activity

⚡ (condition) Add regex comparison item

Browse Source
This commit is contained in:
Baptiste Arnaud
2023-08-01 08:20:16 +02:00
parent 14c3d95b8a
commit aa9f5bc732
6 changed files with 81 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
apps/builder/src/features/blocks/logic/condition/components/ComparisonItem.tsx
View File

@@ -43,9 +43,33 @@ export const ComparisonItem = ({
<TextInput <TextInput
defaultValue={item.value ?? ''} defaultValue={item.value ?? ''}
onChange={handleChangeValue} onChange={handleChangeValue}
placeholder="Type a value..." placeholder={parseValuePlaceholder(item.comparisonOperator)}
/> />
)} )}
</Stack> </Stack>
) )
} }
const parseValuePlaceholder = (
operator: ComparisonOperators | undefined
): string => {
switch (operator) {
case ComparisonOperators.NOT_EQUAL:
case ComparisonOperators.EQUAL:
case ComparisonOperators.CONTAINS:
case ComparisonOperators.STARTS_WITH:
case ComparisonOperators.ENDS_WITH:
case ComparisonOperators.NOT_CONTAINS:
case undefined:
return 'Type a value...'
case ComparisonOperators.LESS:
case ComparisonOperators.GREATER:
return 'Type a number...'
case ComparisonOperators.IS_SET:
case ComparisonOperators.IS_EMPTY:
return ''
case ComparisonOperators.MATCHES_REGEX:
case ComparisonOperators.NOT_MATCH_REGEX:
return '^[0-9]+$'
}
}

4
apps/builder/src/features/blocks/logic/condition/components/ConditionContent.tsx
View File

@@ -74,5 +74,9 @@ const parseComparisonOperatorSymbol = (
return 'is empty' return 'is empty'
case ComparisonOperators.NOT_CONTAINS: case ComparisonOperators.NOT_CONTAINS:
return 'not contains' return 'not contains'
case ComparisonOperators.MATCHES_REGEX:
return 'matches'
case ComparisonOperators.NOT_MATCH_REGEX:
return 'not matches'
} }
} }

20
apps/docs/openapi/builder/_spec_.json
View File

@@ -896,7 +896,9 @@
"Is set", "Is set",
"Is empty", "Is empty",
"Starts with", "Starts with",
"Ends with" "Ends with",
"Matches regex",
"Does not match regex"
] ]
}, },
"value": { "value": {
@@ -1662,7 +1664,9 @@
"Is set", "Is set",
"Is empty", "Is empty",
"Starts with", "Starts with",
"Ends with" "Ends with",
"Matches regex",
"Does not match regex"
] ]
}, },
"value": { "value": {
@@ -1863,7 +1867,9 @@
"Is set", "Is set",
"Is empty", "Is empty",
"Starts with", "Starts with",
"Ends with" "Ends with",
"Matches regex",
"Does not match regex"
] ]
}, },
"value": { "value": {
@@ -2457,7 +2463,9 @@
"Is set", "Is set",
"Is empty", "Is empty",
"Starts with", "Starts with",
"Ends with" "Ends with",
"Matches regex",
"Does not match regex"
] ]
}, },
"value": { "value": {
@@ -2653,7 +2661,9 @@
"Is set", "Is set",
"Is empty", "Is empty",
"Starts with", "Starts with",
"Ends with" "Ends with",
"Matches regex",
"Does not match regex"
] ]
}, },
"value": { "value": {

28
apps/docs/openapi/chat/_spec_.json
View File

@@ -490,7 +490,9 @@
"Is set", "Is set",
"Is empty", "Is empty",
"Starts with", "Starts with",
"Ends with" "Ends with",
"Matches regex",
"Does not match regex"
] ]
}, },
"value": { "value": {
@@ -1256,7 +1258,9 @@
"Is set", "Is set",
"Is empty", "Is empty",
"Starts with", "Starts with",
"Ends with" "Ends with",
"Matches regex",
"Does not match regex"
] ]
}, },
"value": { "value": {
@@ -1457,7 +1461,9 @@
"Is set", "Is set",
"Is empty", "Is empty",
"Starts with", "Starts with",
"Ends with" "Ends with",
"Matches regex",
"Does not match regex"
] ]
}, },
"value": { "value": {
@@ -2051,7 +2057,9 @@
"Is set", "Is set",
"Is empty", "Is empty",
"Starts with", "Starts with",
"Ends with" "Ends with",
"Matches regex",
"Does not match regex"
] ]
}, },
"value": { "value": {
@@ -2247,7 +2255,9 @@
"Is set", "Is set",
"Is empty", "Is empty",
"Starts with", "Starts with",
"Ends with" "Ends with",
"Matches regex",
"Does not match regex"
] ]
}, },
"value": { "value": {
@@ -3904,7 +3914,9 @@
"Is set", "Is set",
"Is empty", "Is empty",
"Starts with", "Starts with",
"Ends with" "Ends with",
"Matches regex",
"Does not match regex"
] ]
}, },
"value": { "value": {
@@ -4670,7 +4682,9 @@
"Is set", "Is set",
"Is empty", "Is empty",
"Starts with", "Starts with",
"Ends with" "Ends with",
"Matches regex",
"Does not match regex"
] ]
}, },
"value": { "value": {

14
apps/viewer/src/features/blocks/logic/condition/executeCondition.ts
View File

@@ -89,6 +89,20 @@ const executeComparison =
} }
return compare(endsWith, inputValue, value) return compare(endsWith, inputValue, value)
} }
case ComparisonOperators.MATCHES_REGEX: {
const matchesRegex = (a: string | null, b: string | null) => {
if (b === '' || !b || !a) return false
return new RegExp(b).test(a)
}
return compare(matchesRegex, inputValue, value, 'some')
}
case ComparisonOperators.NOT_MATCH_REGEX: {
const matchesRegex = (a: string | null, b: string | null) => {
if (b === '' || !b || !a) return false
return !new RegExp(b).test(a)
}
return compare(matchesRegex, inputValue, value)
}
} }
} }

2
packages/schemas/features/blocks/logic/condition.ts
View File

@@ -20,6 +20,8 @@ export enum ComparisonOperators {
IS_EMPTY = 'Is empty', IS_EMPTY = 'Is empty',
STARTS_WITH = 'Starts with', STARTS_WITH = 'Starts with',
ENDS_WITH = 'Ends with', ENDS_WITH = 'Ends with',
MATCHES_REGEX = 'Matches regex',
NOT_MATCH_REGEX = 'Does not match regex',
} }
const comparisonSchema = z.object({ const comparisonSchema = z.object({