From 875092203b54a00e06eeb6c28415adc27497089c Mon Sep 17 00:00:00 2001 From: Vito Albano Date: Mon, 22 Apr 2024 16:26:09 +0100 Subject: [PATCH] Rebased ADF Migration PR --- .../search-facet-field.component.html | 2 +- .../card-view-textitem.component.html | 4 ++-- .../card-view-textitem.component.spec.ts | 23 ++++++++----------- .../services/user-preferences.service.spec.ts | 2 +- 4 files changed, 13 insertions(+), 18 deletions(-) diff --git a/lib/content-services/src/lib/search/components/search-facet-field/search-facet-field.component.html b/lib/content-services/src/lib/search/components/search-facet-field/search-facet-field.component.html index 94b4043653..518ee9c36b 100644 --- a/lib/content-services/src/lib/search/components/search-facet-field/search-facet-field.component.html +++ b/lib/content-services/src/lib/search/components/search-facet-field/search-facet-field.component.html @@ -4,7 +4,7 @@ - + {{ property.label | translate }} - + {{ propertyValue }} cancel @@ -95,7 +95,7 @@ title="{{ property.label | translate }}" [placeholder]="editedValue ? '' : (property.default | translate)" [attr.aria-label]="property.label | translate" - [matChipInputFor]="chipList" + [matChipInputFor]="chipElement" [matChipInputAddOnBlur]="true" (matChipInputTokenEnd)="addValueToList($event)" [attr.data-automation-id]="'card-textitem-editchipinput-' + property.key" diff --git a/lib/core/src/lib/card-view/components/card-view-textitem/card-view-textitem.component.spec.ts b/lib/core/src/lib/card-view/components/card-view-textitem/card-view-textitem.component.spec.ts index 9b1c444ced..4edce9800c 100644 --- a/lib/core/src/lib/card-view/components/card-view-textitem/card-view-textitem.component.spec.ts +++ b/lib/core/src/lib/card-view/components/card-view-textitem/card-view-textitem.component.spec.ts @@ -20,6 +20,7 @@ import { By } from '@angular/platform-browser'; import { CardViewTextItemModel } from '../../models/card-view-textitem.model'; import { CardViewUpdateService } from '../../services/card-view-update.service'; import { CardViewTextItemComponent } from './card-view-textitem.component'; +import { CoreTestingModule } from '../../../testing/core.testing.module'; import { CardViewItemFloatValidator } from '../../validators/card-view-item-float.validator'; import { CardViewItemIntValidator } from '../../validators/card-view-item-int.validator'; import { CardViewIntItemModel } from '../../models/card-view-intitem.model'; @@ -30,15 +31,8 @@ import { DebugElement, SimpleChange } from '@angular/core'; import { CardViewItemValidator } from '../../interfaces/card-view-item-validator.interface'; import { HarnessLoader } from '@angular/cdk/testing'; import { TestbedHarnessEnvironment } from '@angular/cdk/testing/testbed'; -import { MatChipGridHarness, MatChipHarness } from '@angular/material/chips/testing'; +import { MatChipHarness, MatChipGridHarness } from '@angular/material/chips/testing'; import { MatInputHarness } from '@angular/material/input/testing'; -import { HttpClientTestingModule } from '@angular/common/http/testing'; -import { MatSnackBarModule } from '@angular/material/snack-bar'; -import { TranslateModule } from '@ngx-translate/core'; -import { TranslationService } from '../../../translation'; -import { TranslationMock } from '../../../mock'; -import { MatTooltipModule } from '@angular/material/tooltip'; -import { NoopAnimationsModule } from '@angular/platform-browser/animations'; describe('CardViewTextItemComponent', () => { let loader: HarnessLoader; @@ -47,8 +41,9 @@ describe('CardViewTextItemComponent', () => { const expectedErrorMessages = [{ message: 'Something went wrong' } as CardViewItemValidator]; - const getTextField = (key: string): HTMLInputElement => - fixture.debugElement.query(By.css(`[data-automation-id="card-textitem-value-${key}"]`)).nativeElement; + const getTextField = (key: string): HTMLInputElement => { + return fixture.debugElement.query(By.css(`[data-automation-id="card-textitem-value-${key}"]`)).nativeElement; + }; const updateTextField = (key: string, value) => { const editInput = getTextField(key); @@ -63,8 +58,9 @@ describe('CardViewTextItemComponent', () => { return textItemInput.value; }; - const getErrorElements = (key: string, includeItems = false): DebugElement[] => - fixture.debugElement.queryAll(By.css(`[data-automation-id="card-textitem-error-${key}"]${includeItems ? ' li' : ''}`)); + const getErrorElements = (key: string, includeItems = false): DebugElement[] => { + return fixture.debugElement.queryAll(By.css(`[data-automation-id="card-textitem-error-${key}"]${includeItems ? ' li' : ''}`)); + }; const getTextFieldError = (key: string): string => { const textItemInputErrors = getErrorElements(key, true); @@ -116,8 +112,7 @@ describe('CardViewTextItemComponent', () => { beforeEach(() => { TestBed.configureTestingModule({ - imports: [HttpClientTestingModule, NoopAnimationsModule, TranslateModule.forRoot(), MatSnackBarModule, MatTooltipModule, MatChipsModule], - providers: [{ provide: TranslationService, useClass: TranslationMock }] + imports: [CoreTestingModule, MatChipsModule] }); fixture = TestBed.createComponent(CardViewTextItemComponent); component = fixture.componentInstance; diff --git a/lib/core/src/lib/common/services/user-preferences.service.spec.ts b/lib/core/src/lib/common/services/user-preferences.service.spec.ts index 77f8008355..ece3bf5942 100644 --- a/lib/core/src/lib/common/services/user-preferences.service.spec.ts +++ b/lib/core/src/lib/common/services/user-preferences.service.spec.ts @@ -16,7 +16,7 @@ */ import { TestBed } from '@angular/core/testing'; -import { TranslateService } from '@ngx-translate/core'; +import { TranslateModule, TranslateService } from '@ngx-translate/core'; import { AppConfigService } from '../../app-config/app-config.service'; import { StorageService } from '../../common/services/storage.service'; import { UserPreferencesService, UserPreferenceValues } from '../../common/services/user-preferences.service';