From ade937a64b69bb590b417fed8c6cf5291d55647c Mon Sep 17 00:00:00 2001 From: mertmit Date: Sat, 21 Jan 2023 23:41:54 +0300 Subject: [PATCH] fix: filtering options for select columns Signed-off-by: mertmit --- packages/nc-gui/utils/filterUtils.ts | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/packages/nc-gui/utils/filterUtils.ts b/packages/nc-gui/utils/filterUtils.ts index 5f6ab8c414..f48c16d82e 100644 --- a/packages/nc-gui/utils/filterUtils.ts +++ b/packages/nc-gui/utils/filterUtils.ts @@ -41,13 +41,13 @@ export const comparisonOpList: { text: 'is empty', value: 'empty', ignoreVal: true, - excludedTypes: [UITypes.Checkbox, UITypes.Rating], + excludedTypes: [UITypes.Checkbox, UITypes.Rating, UITypes.MultiSelect, UITypes.SingleSelect], }, { text: 'is not empty', value: 'notempty', ignoreVal: true, - excludedTypes: [UITypes.Checkbox, UITypes.Rating], + excludedTypes: [UITypes.Checkbox, UITypes.Rating, UITypes.MultiSelect, UITypes.SingleSelect], }, { text: 'is null', @@ -67,7 +67,7 @@ export const comparisonOpList: { { text: 'contains any of', value: 'anyof', - includedTypes: [UITypes.MultiSelect], + includedTypes: [UITypes.MultiSelect, UITypes.SingleSelect], }, { text: 'does not contain all of', @@ -77,26 +77,26 @@ export const comparisonOpList: { { text: 'does not contain any of', value: 'nanyof', - includedTypes: [UITypes.MultiSelect], + includedTypes: [UITypes.MultiSelect, UITypes.SingleSelect], }, { text: '>', value: 'gt', - excludedTypes: [UITypes.Checkbox], + excludedTypes: [UITypes.Checkbox, UITypes.MultiSelect, UITypes.SingleSelect], }, { text: '<', value: 'lt', - excludedTypes: [UITypes.Checkbox], + excludedTypes: [UITypes.Checkbox, UITypes.MultiSelect, UITypes.SingleSelect], }, { text: '>=', value: 'gte', - excludedTypes: [UITypes.Checkbox], + excludedTypes: [UITypes.Checkbox, UITypes.MultiSelect, UITypes.SingleSelect], }, { text: '<=', value: 'lte', - excludedTypes: [UITypes.Checkbox], + excludedTypes: [UITypes.Checkbox, UITypes.MultiSelect, UITypes.SingleSelect], }, ]