From 4c22bd472f7808a0ec5caaed6e7a31cff3205790 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Pavel=20Tom=C3=A1=C5=A1ko?= Date: Tue, 24 Oct 2023 00:45:50 +0200 Subject: [PATCH 1/2] Fix filter type change causes any text to be interpreted as a guid array --- .../FilterSettings/HeaderControls/FilterSettingsLookup.tsx | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/frontend-html/src/gui/Components/ScreenElements/Table/FilterSettings/HeaderControls/FilterSettingsLookup.tsx b/frontend-html/src/gui/Components/ScreenElements/Table/FilterSettings/HeaderControls/FilterSettingsLookup.tsx index 3f376fb41e..9a4a6ef83d 100644 --- a/frontend-html/src/gui/Components/ScreenElements/Table/FilterSettings/HeaderControls/FilterSettingsLookup.tsx +++ b/frontend-html/src/gui/Components/ScreenElements/Table/FilterSettings/HeaderControls/FilterSettingsLookup.tsx @@ -57,7 +57,8 @@ const LOOKUP_TYPE_OPERATORS = [ function operatorGroupChanges(oldOperator: string, newOperator: string) { let lookupOperatorTypes = LOOKUP_TYPE_OPERATORS.map(operator => operator.type); return newOperator === "null" || newOperator === "nnull" || - lookupOperatorTypes.includes(newOperator) && !lookupOperatorTypes.includes(oldOperator); + lookupOperatorTypes.includes(newOperator) && !lookupOperatorTypes.includes(oldOperator) || + !lookupOperatorTypes.includes(newOperator) && lookupOperatorTypes.includes(oldOperator) } const OpCombo: React.FC<{ @@ -87,7 +88,7 @@ const OpCombo: React.FC<{ }); }} > - {op.caption} + {op.caption} 👹 ))} From dc458b2a8fb23d4bc857dd54d9da97f0a3637513 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Pavel=20Tom=C3=A1=C5=A1ko?= Date: Tue, 24 Oct 2023 00:51:55 +0200 Subject: [PATCH 2/2] Delete a devil --- .../FilterSettings/HeaderControls/FilterSettingsLookup.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/frontend-html/src/gui/Components/ScreenElements/Table/FilterSettings/HeaderControls/FilterSettingsLookup.tsx b/frontend-html/src/gui/Components/ScreenElements/Table/FilterSettings/HeaderControls/FilterSettingsLookup.tsx index 9a4a6ef83d..8cc10eb6fa 100644 --- a/frontend-html/src/gui/Components/ScreenElements/Table/FilterSettings/HeaderControls/FilterSettingsLookup.tsx +++ b/frontend-html/src/gui/Components/ScreenElements/Table/FilterSettings/HeaderControls/FilterSettingsLookup.tsx @@ -88,7 +88,7 @@ const OpCombo: React.FC<{ }); }} > - {op.caption} 👹 + {op.caption} ))}