blsmedia/bot
2
0
Fork 0
Code Activity

Merge pull request #20 from baptisteArno/fix/delete-collaborator

Browse Source 
fix(share): 🐛 Delete collaborator
This commit is contained in:
Baptiste Arnaud
2022-04-08 16:00:56 +02:00
committed by GitHub
parent 25961d32fc c5919a766f
commit 6314ce2f62
3 changed files with 10 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
apps/builder/components/share/EditableUrl.tsx
View File

@@ -50,7 +50,7 @@ export const EditableUrl = ({
<HStack> <HStack>
<EditButton size="xs" /> <EditButton size="xs" />
<CopyButton size="xs" textToCopy={`${hostname}/${pathname}`} /> <CopyButton size="xs" textToCopy={`${hostname}/${pathname ?? ''}`} />
</HStack> </HStack>
</Editable> </Editable>
) )

2
apps/builder/components/shared/TypebotHeader/CollaborationMenuButton/CollaborationList.tsx
View File

@@ -200,7 +200,7 @@ export const CollaborationList = () => {
name={user.name ?? undefined} name={user.name ?? undefined}
type={type} type={type}
isOwner={isOwner} isOwner={isOwner}
onDeleteClick={handleDeleteCollaboration(user.email ?? '')} onDeleteClick={handleDeleteCollaboration(userId ?? '')}
onChangeCollaborationType={handleChangeCollaborationType(userId)} onChangeCollaborationType={handleChangeCollaborationType(userId)}
/> />
))} ))}

13
packages/bot-engine/src/services/logic.ts
View File

@@ -88,19 +88,22 @@ const executeCondition = (
const executeComparison = const executeComparison =
(variables: Variable[]) => (comparison: Comparison) => { (variables: Variable[]) => (comparison: Comparison) => {
if (!comparison?.variableId) return false if (!comparison?.variableId) return false
const inputValue = const inputValue = (
variables.find((v) => v.id === comparison.variableId)?.value ?? '' variables.find((v) => v.id === comparison.variableId)?.value ?? ''
const value = parseVariables(variables)(comparison.value) )
.toString()
.trim()
const value = parseVariables(variables)(comparison.value).toString().trim()
if (isNotDefined(value)) return false if (isNotDefined(value)) return false
switch (comparison.comparisonOperator) { switch (comparison.comparisonOperator) {
case ComparisonOperators.CONTAINS: { case ComparisonOperators.CONTAINS: {
return inputValue.toString().includes(value.toString()) return inputValue.toLowerCase().includes(value.toLowerCase())
} }
case ComparisonOperators.EQUAL: { case ComparisonOperators.EQUAL: {
return inputValue.toString() === value.toString() return inputValue === value
} }
case ComparisonOperators.NOT_EQUAL: { case ComparisonOperators.NOT_EQUAL: {
return inputValue.toString() !== value.toString() return inputValue !== value
} }
case ComparisonOperators.GREATER: { case ComparisonOperators.GREATER: {
return parseFloat(inputValue) >= parseFloat(value) return parseFloat(inputValue) >= parseFloat(value)