Fix remove

This commit is contained in:
shamoon 2024-09-15 21:20:45 -07:00
parent 81a1d9bf28
commit 09a3445999
2 changed files with 7 additions and 2 deletions

View File

@ -281,10 +281,10 @@ describe('CustomFieldsQueryDropdownComponent', () => {
[4, 'icontains', 'test'],
],
])
expression2.addAtom(atom)
expression.addAtom(atom)
expression2.addExpression(expression)
model.addExpression(expression2)
model.removeElement(expression)
model.removeElement(atom)
expect(model.queries.length).toBe(1)
model.removeElement(expression2)
})

View File

@ -103,6 +103,11 @@ export class CustomFieldQueriesModel {
for (let i = 0; i < elements.length; i++) {
if (elements[i] === queryElement) {
return elements.splice(i, 1)[0]
} else if (elements[i].type === CustomFieldQueryElementType.Expression) {
return this.findElement(
queryElement,
elements[i].value as CustomFieldQueryElement[]
)
}
}
}