From d4d5242972624c83b9d3ccba239f151f095ad192 Mon Sep 17 00:00:00 2001 From: anandtiwary <52081890+anandtiwary@users.noreply.github.com> Date: Thu, 24 Feb 2022 14:49:04 -0800 Subject: [PATCH 1/2] refactor: minor style changes --- .../src/collapsible-sidebar/collapsible-sidebar.component.scss | 1 - .../filtering/filter/builder/types/boolean-filter-builder.ts | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/projects/components/src/collapsible-sidebar/collapsible-sidebar.component.scss b/projects/components/src/collapsible-sidebar/collapsible-sidebar.component.scss index 0cd40579e..5b9b42f69 100644 --- a/projects/components/src/collapsible-sidebar/collapsible-sidebar.component.scss +++ b/projects/components/src/collapsible-sidebar/collapsible-sidebar.component.scss @@ -2,7 +2,6 @@ .collapsible-sidebar { height: inherit; - width: 220px; position: relative; border: 1px solid $gray-2; border-radius: 8px; diff --git a/projects/components/src/filtering/filter/builder/types/boolean-filter-builder.ts b/projects/components/src/filtering/filter/builder/types/boolean-filter-builder.ts index bf9015b67..8c33e00f0 100644 --- a/projects/components/src/filtering/filter/builder/types/boolean-filter-builder.ts +++ b/projects/components/src/filtering/filter/builder/types/boolean-filter-builder.ts @@ -8,7 +8,7 @@ export class BooleanFilterBuilder extends AbstractFilterBuilder { } public supportedTopLevelOperators(): FilterOperator[] { - return [FilterOperator.Equals, FilterOperator.NotEquals]; + return [FilterOperator.Equals, FilterOperator.NotEquals, FilterOperator.In]; } public supportedSubpathOperators(): FilterOperator[] { From 118afd92ec109fc4fec4a14e24361e0b2221ddf9 Mon Sep 17 00:00:00 2001 From: anandtiwary <52081890+anandtiwary@users.noreply.github.com> Date: Thu, 24 Feb 2022 15:16:34 -0800 Subject: [PATCH 2/2] refactor: fixing tests --- .../filter-bar/filter-chip/filter-chip.service.test.ts | 6 ++++++ .../filter/builder/filter-builder-lookup.service.test.ts | 8 ++++++++ 2 files changed, 14 insertions(+) diff --git a/projects/components/src/filtering/filter-bar/filter-chip/filter-chip.service.test.ts b/projects/components/src/filtering/filter-bar/filter-chip/filter-chip.service.test.ts index 899fdb321..34f0e802d 100644 --- a/projects/components/src/filtering/filter-bar/filter-chip/filter-chip.service.test.ts +++ b/projects/components/src/filtering/filter-bar/filter-chip/filter-chip.service.test.ts @@ -161,6 +161,12 @@ describe('Filter Chip service', () => { field: attribute.name, operator: FilterOperator.NotEquals, userString: `${attribute.displayName} ${FilterOperator.NotEquals}` + }, + { + metadata: attribute, + field: attribute.name, + operator: FilterOperator.In, + userString: `${attribute.displayName} ${FilterOperator.In}` } ]); }); diff --git a/projects/components/src/filtering/filter/builder/filter-builder-lookup.service.test.ts b/projects/components/src/filtering/filter/builder/filter-builder-lookup.service.test.ts index 579b8e929..31cab5e45 100644 --- a/projects/components/src/filtering/filter/builder/filter-builder-lookup.service.test.ts +++ b/projects/components/src/filtering/filter/builder/filter-builder-lookup.service.test.ts @@ -56,6 +56,14 @@ describe('Filter Builder Lookup service', () => { value: false, userString: 'Boolean Attribute != false', urlString: 'booleanAttribute_neq_false' + }, + { + metadata: getTestFilterAttribute(FilterAttributeType.Boolean), + field: getTestFilterAttribute(FilterAttributeType.Boolean).name, + operator: FilterOperator.In, + value: false, + userString: 'Boolean Attribute IN false', + urlString: 'booleanAttribute_in_false' } ]);