From a690427836f84a55424a72c29b4602cbb2a20d71 Mon Sep 17 00:00:00 2001 From: Denys Vuika Date: Thu, 25 Jul 2024 15:31:47 -0400 Subject: [PATCH] ACS-7402: search components [ci:force] --- .../search-chip-autocomplete-input.component.spec.ts | 3 +-- .../search-chip-autocomplete-input.component.ts | 12 +++++++++--- .../search-chip-list.component.spec.ts | 8 +++++--- .../search-chip-list/search-chip-list.component.ts | 7 ++++++- lib/content-services/src/lib/search/search.module.ts | 6 +----- 5 files changed, 22 insertions(+), 14 deletions(-) diff --git a/lib/content-services/src/lib/search/components/search-chip-autocomplete-input/search-chip-autocomplete-input.component.spec.ts b/lib/content-services/src/lib/search/components/search-chip-autocomplete-input/search-chip-autocomplete-input.component.spec.ts index 3a00fbbd3ef..da598ee6fe0 100644 --- a/lib/content-services/src/lib/search/components/search-chip-autocomplete-input/search-chip-autocomplete-input.component.spec.ts +++ b/lib/content-services/src/lib/search/components/search-chip-autocomplete-input/search-chip-autocomplete-input.component.spec.ts @@ -36,8 +36,7 @@ describe('SearchChipAutocompleteInputComponent', () => { beforeEach(() => { TestBed.configureTestingModule({ - declarations: [SearchChipAutocompleteInputComponent], - imports: [ContentTestingModule] + imports: [ContentTestingModule, SearchChipAutocompleteInputComponent] }); fixture = TestBed.createComponent(SearchChipAutocompleteInputComponent); diff --git a/lib/content-services/src/lib/search/components/search-chip-autocomplete-input/search-chip-autocomplete-input.component.ts b/lib/content-services/src/lib/search/components/search-chip-autocomplete-input/search-chip-autocomplete-input.component.ts index 5d4ffe06518..b3e57fdcd25 100644 --- a/lib/content-services/src/lib/search/components/search-chip-autocomplete-input/search-chip-autocomplete-input.component.ts +++ b/lib/content-services/src/lib/search/components/search-chip-autocomplete-input/search-chip-autocomplete-input.component.ts @@ -29,15 +29,21 @@ import { OnChanges } from '@angular/core'; import { ENTER } from '@angular/cdk/keycodes'; -import { FormControl } from '@angular/forms'; -import { MatAutocompleteSelectedEvent } from '@angular/material/autocomplete'; -import { MatChipInputEvent } from '@angular/material/chips'; +import { FormControl, ReactiveFormsModule } from '@angular/forms'; +import { MatAutocompleteModule, MatAutocompleteSelectedEvent } from '@angular/material/autocomplete'; +import { MatChipInputEvent, MatChipsModule } from '@angular/material/chips'; import { EMPTY, Observable, Subject, timer } from 'rxjs'; import { debounce, startWith, takeUntil, tap } from 'rxjs/operators'; import { AutocompleteOption } from '../../models/autocomplete-option.interface'; +import { CommonModule } from '@angular/common'; +import { MatFormFieldModule } from '@angular/material/form-field'; +import { TranslateModule } from '@ngx-translate/core'; +import { MatIconModule } from '@angular/material/icon'; @Component({ selector: 'adf-search-chip-autocomplete-input', + standalone: true, + imports: [CommonModule, MatFormFieldModule, MatChipsModule, TranslateModule, MatIconModule, ReactiveFormsModule, MatAutocompleteModule], templateUrl: './search-chip-autocomplete-input.component.html', styleUrls: ['./search-chip-autocomplete-input.component.scss'], encapsulation: ViewEncapsulation.None diff --git a/lib/content-services/src/lib/search/components/search-chip-list/search-chip-list.component.spec.ts b/lib/content-services/src/lib/search/components/search-chip-list/search-chip-list.component.spec.ts index 75d762d4da5..271ed69a556 100644 --- a/lib/content-services/src/lib/search/components/search-chip-list/search-chip-list.component.spec.ts +++ b/lib/content-services/src/lib/search/components/search-chip-list/search-chip-list.component.spec.ts @@ -23,9 +23,12 @@ import { ContentTestingModule } from '../../../testing/content.testing.module'; import { HarnessLoader } from '@angular/cdk/testing'; import { TestbedHarnessEnvironment } from '@angular/cdk/testing/testbed'; import { MatChipHarness, MatChipRemoveHarness } from '@angular/material/chips/testing'; +import { SearchChipListComponent } from './search-chip-list.component'; @Component({ selector: 'adf-test-component', + standalone: true, + imports: [SearchChipListComponent], template: ` ` }) class TestComponent { @@ -33,7 +36,7 @@ class TestComponent { searchFilter = { selectedBuckets: [], unselectFacetBucket: () => {} - }; + } as any; } describe('SearchChipListComponent', () => { @@ -44,8 +47,7 @@ describe('SearchChipListComponent', () => { beforeEach(() => { TestBed.configureTestingModule({ - imports: [ContentTestingModule], - declarations: [TestComponent] + imports: [ContentTestingModule, TestComponent] }); fixture = TestBed.createComponent(TestComponent); component = fixture.componentInstance; diff --git a/lib/content-services/src/lib/search/components/search-chip-list/search-chip-list.component.ts b/lib/content-services/src/lib/search/components/search-chip-list/search-chip-list.component.ts index d22fb351772..8c4f12424ba 100644 --- a/lib/content-services/src/lib/search/components/search-chip-list/search-chip-list.component.ts +++ b/lib/content-services/src/lib/search/components/search-chip-list/search-chip-list.component.ts @@ -18,16 +18,21 @@ import { Component, ViewEncapsulation, Input } from '@angular/core'; import { SearchFilterComponent } from '../../components/search-filter/search-filter.component'; import { SearchFacetFiltersService } from '../../services/search-facet-filters.service'; +import { CommonModule } from '@angular/common'; +import { MatChipsModule } from '@angular/material/chips'; +import { TranslateModule } from '@ngx-translate/core'; +import { MatIconModule } from '@angular/material/icon'; @Component({ selector: 'adf-search-chip-list', + standalone: true, + imports: [CommonModule, MatChipsModule, TranslateModule, MatIconModule], templateUrl: './search-chip-list.component.html', styleUrls: ['./search-chip-list.component.scss'], encapsulation: ViewEncapsulation.None, host: { class: 'adf-search-chip-list' } }) export class SearchChipListComponent { - /** * Search filter to supply the data for the chips. * Not required from 4.5.0 and later versions @deprecated diff --git a/lib/content-services/src/lib/search/search.module.ts b/lib/content-services/src/lib/search/search.module.ts index 89b9f583fc0..f2bb9eedbd2 100644 --- a/lib/content-services/src/lib/search/search.module.ts +++ b/lib/content-services/src/lib/search/search.module.ts @@ -57,7 +57,7 @@ import { SearchFacetChipTabbedComponent } from './components/search-filter-chips import { SearchFacetTabbedContentComponent } from './components/search-filter-chips/search-facet-chip-tabbed/search-facet-tabbed-content.component'; import { SearchInputComponent } from './components/search-input'; -export const CONTENT_SEARCH_DIRECTIVES = [SearchCheckListComponent] as const; +export const CONTENT_SEARCH_DIRECTIVES = [SearchCheckListComponent, SearchChipAutocompleteInputComponent, SearchChipListComponent] as const; @NgModule({ imports: [ @@ -76,10 +76,8 @@ export const CONTENT_SEARCH_DIRECTIVES = [SearchCheckListComponent] as const; EmptySearchResultComponent, SearchFilterComponent, SearchFilterCardComponent, - SearchChipListComponent, SearchWidgetContainerComponent, SearchTextComponent, - SearchChipAutocompleteInputComponent, SearchFilterAutocompleteChipsComponent, SearchRadioComponent, SearchSliderComponent, @@ -110,10 +108,8 @@ export const CONTENT_SEARCH_DIRECTIVES = [SearchCheckListComponent] as const; EmptySearchResultComponent, SearchFilterComponent, SearchFilterCardComponent, - SearchChipListComponent, SearchWidgetContainerComponent, SearchTextComponent, - SearchChipAutocompleteInputComponent, SearchFilterAutocompleteChipsComponent, SearchRadioComponent, SearchSliderComponent,