From 950952383ce5921d345346de401d0d59f22d4efa Mon Sep 17 00:00:00 2001 From: Koen Pauwels Date: Mon, 16 Jan 2023 14:13:01 +0100 Subject: [PATCH 1/8] 97732 Fix flaky test for ContextHelpToggleComponent --- .../context-help-toggle.component.spec.ts | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/src/app/header/context-help-toggle/context-help-toggle.component.spec.ts b/src/app/header/context-help-toggle/context-help-toggle.component.spec.ts index 1df646f8aa..d1aadc3fe9 100644 --- a/src/app/header/context-help-toggle/context-help-toggle.component.spec.ts +++ b/src/app/header/context-help-toggle/context-help-toggle.component.spec.ts @@ -13,8 +13,9 @@ describe('ContextHelpToggleComponent', () => { const contextHelpEmpty$ = new BehaviorSubject(true); beforeEach(async () => { - contextHelpService = jasmine.createSpyObj('contextHelpService', - ['toggleIcons', 'contextHelpEmpty$']); + contextHelpService = jasmine.createSpyObj('contextHelpService', [ + 'contextHelpEmpty$', 'toggleIcons' + ]); contextHelpService.contextHelpEmpty$.and.returnValue(contextHelpEmpty$); await TestBed.configureTestingModule({ declarations: [ ContextHelpToggleComponent ], @@ -44,6 +45,7 @@ describe('ContextHelpToggleComponent', () => { it('clicking the button should toggle context help icon visibility', () => { fixture.whenStable().then((done) => { + spyOn(contextHelpService, 'toggleIcons'); fixture.debugElement.query(By.css('a')).nativeElement.click(); expect(contextHelpService.toggleIcons).toHaveBeenCalled(); done(); @@ -54,6 +56,7 @@ describe('ContextHelpToggleComponent', () => { describe('if there are no elements on the page with a tooltip', () => { it('clicking the button does not toggle context help icon visibility', () => { fixture.whenStable().then((done) => { + spyOn(contextHelpService, 'toggleIcons'); fixture.debugElement.query(By.css('a')).nativeElement.click(); expect(contextHelpService.toggleIcons).toHaveBeenCalledTimes(0); done(); From e5cc565327f7dfa84681d020e014cb1899273f72 Mon Sep 17 00:00:00 2001 From: Koen Pauwels Date: Mon, 16 Jan 2023 14:13:01 +0100 Subject: [PATCH 2/8] 97732 Fix flaky test for ContextHelpToggleComponent --- .../context-help-toggle.component.spec.ts | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/src/app/header/context-help-toggle/context-help-toggle.component.spec.ts b/src/app/header/context-help-toggle/context-help-toggle.component.spec.ts index 1df646f8aa..d1aadc3fe9 100644 --- a/src/app/header/context-help-toggle/context-help-toggle.component.spec.ts +++ b/src/app/header/context-help-toggle/context-help-toggle.component.spec.ts @@ -13,8 +13,9 @@ describe('ContextHelpToggleComponent', () => { const contextHelpEmpty$ = new BehaviorSubject(true); beforeEach(async () => { - contextHelpService = jasmine.createSpyObj('contextHelpService', - ['toggleIcons', 'contextHelpEmpty$']); + contextHelpService = jasmine.createSpyObj('contextHelpService', [ + 'contextHelpEmpty$', 'toggleIcons' + ]); contextHelpService.contextHelpEmpty$.and.returnValue(contextHelpEmpty$); await TestBed.configureTestingModule({ declarations: [ ContextHelpToggleComponent ], @@ -44,6 +45,7 @@ describe('ContextHelpToggleComponent', () => { it('clicking the button should toggle context help icon visibility', () => { fixture.whenStable().then((done) => { + spyOn(contextHelpService, 'toggleIcons'); fixture.debugElement.query(By.css('a')).nativeElement.click(); expect(contextHelpService.toggleIcons).toHaveBeenCalled(); done(); @@ -54,6 +56,7 @@ describe('ContextHelpToggleComponent', () => { describe('if there are no elements on the page with a tooltip', () => { it('clicking the button does not toggle context help icon visibility', () => { fixture.whenStable().then((done) => { + spyOn(contextHelpService, 'toggleIcons'); fixture.debugElement.query(By.css('a')).nativeElement.click(); expect(contextHelpService.toggleIcons).toHaveBeenCalledTimes(0); done(); From 711e2e1e7ce6671a7e222da7c58f8d14528f54e9 Mon Sep 17 00:00:00 2001 From: Koen Pauwels Date: Mon, 16 Jan 2023 18:07:39 +0100 Subject: [PATCH 3/8] 97732 Fix linter issues --- .../context-help-toggle.component.spec.ts | 45 +++++++++---------- 1 file changed, 22 insertions(+), 23 deletions(-) diff --git a/src/app/header/context-help-toggle/context-help-toggle.component.spec.ts b/src/app/header/context-help-toggle/context-help-toggle.component.spec.ts index d1aadc3fe9..93421b58eb 100644 --- a/src/app/header/context-help-toggle/context-help-toggle.component.spec.ts +++ b/src/app/header/context-help-toggle/context-help-toggle.component.spec.ts @@ -1,22 +1,21 @@ -import { ComponentFixture, TestBed } from '@angular/core/testing'; +import { ComponentFixture, TestBed, fakeAsync, tick } from '@angular/core/testing'; import { ContextHelpToggleComponent } from './context-help-toggle.component'; -import { TranslateService, TranslateModule } from '@ngx-translate/core'; +import { TranslateModule } from '@ngx-translate/core'; import { ContextHelpService } from '../../shared/context-help.service'; -import { of as observableOf, BehaviorSubject } from 'rxjs'; +import { of as observableOf } from 'rxjs'; import { By } from '@angular/platform-browser'; describe('ContextHelpToggleComponent', () => { let component: ContextHelpToggleComponent; let fixture: ComponentFixture; let contextHelpService; - const contextHelpEmpty$ = new BehaviorSubject(true); beforeEach(async () => { contextHelpService = jasmine.createSpyObj('contextHelpService', [ 'contextHelpEmpty$', 'toggleIcons' ]); - contextHelpService.contextHelpEmpty$.and.returnValue(contextHelpEmpty$); + contextHelpService.contextHelpEmpty$.and.returnValue(observableOf(true)); await TestBed.configureTestingModule({ declarations: [ ContextHelpToggleComponent ], providers: [ @@ -24,43 +23,43 @@ describe('ContextHelpToggleComponent', () => { ], imports: [ TranslateModule.forRoot() ] }) - .compileComponents(); + .compileComponents(); }); beforeEach(() => { fixture = TestBed.createComponent(ContextHelpToggleComponent); component = fixture.componentInstance; - fixture.detectChanges(); }); it('should create', () => { + fixture.detectChanges(); expect(component).toBeTruthy(); }); + describe('if there are no elements on the page with a tooltip', () => { + it('clicking the button does not toggle context help icon visibility', fakeAsync(() => { + fixture.detectChanges(); + fixture.whenStable().then(() => { + fixture.debugElement.query(By.css('a')).nativeElement.click(); + tick(); + expect(contextHelpService.toggleIcons).toHaveBeenCalledTimes(0); + }); + })); + }); + describe('if there are elements on the page with a tooltip', () => { beforeEach(() => { - contextHelpEmpty$.next(false); + contextHelpService.contextHelpEmpty$.and.returnValue(observableOf(false)); fixture.detectChanges(); }); - it('clicking the button should toggle context help icon visibility', () => { - fixture.whenStable().then((done) => { - spyOn(contextHelpService, 'toggleIcons'); + it('clicking the button should toggle context help icon visibility', fakeAsync(() => { + fixture.whenStable().then(() => { fixture.debugElement.query(By.css('a')).nativeElement.click(); + tick(); expect(contextHelpService.toggleIcons).toHaveBeenCalled(); - done(); }); - }); + })); }); - describe('if there are no elements on the page with a tooltip', () => { - it('clicking the button does not toggle context help icon visibility', () => { - fixture.whenStable().then((done) => { - spyOn(contextHelpService, 'toggleIcons'); - fixture.debugElement.query(By.css('a')).nativeElement.click(); - expect(contextHelpService.toggleIcons).toHaveBeenCalledTimes(0); - done(); - }); - }); - }); }); From f13b67e8ad940f302745e8c5a6f58b32863c06ea Mon Sep 17 00:00:00 2001 From: Koen Pauwels Date: Mon, 16 Jan 2023 18:11:40 +0100 Subject: [PATCH 4/8] 97732 Fix linter issues --- .../context-help-toggle.component.spec.ts | 45 +++++++++---------- 1 file changed, 22 insertions(+), 23 deletions(-) diff --git a/src/app/header/context-help-toggle/context-help-toggle.component.spec.ts b/src/app/header/context-help-toggle/context-help-toggle.component.spec.ts index d1aadc3fe9..93421b58eb 100644 --- a/src/app/header/context-help-toggle/context-help-toggle.component.spec.ts +++ b/src/app/header/context-help-toggle/context-help-toggle.component.spec.ts @@ -1,22 +1,21 @@ -import { ComponentFixture, TestBed } from '@angular/core/testing'; +import { ComponentFixture, TestBed, fakeAsync, tick } from '@angular/core/testing'; import { ContextHelpToggleComponent } from './context-help-toggle.component'; -import { TranslateService, TranslateModule } from '@ngx-translate/core'; +import { TranslateModule } from '@ngx-translate/core'; import { ContextHelpService } from '../../shared/context-help.service'; -import { of as observableOf, BehaviorSubject } from 'rxjs'; +import { of as observableOf } from 'rxjs'; import { By } from '@angular/platform-browser'; describe('ContextHelpToggleComponent', () => { let component: ContextHelpToggleComponent; let fixture: ComponentFixture; let contextHelpService; - const contextHelpEmpty$ = new BehaviorSubject(true); beforeEach(async () => { contextHelpService = jasmine.createSpyObj('contextHelpService', [ 'contextHelpEmpty$', 'toggleIcons' ]); - contextHelpService.contextHelpEmpty$.and.returnValue(contextHelpEmpty$); + contextHelpService.contextHelpEmpty$.and.returnValue(observableOf(true)); await TestBed.configureTestingModule({ declarations: [ ContextHelpToggleComponent ], providers: [ @@ -24,43 +23,43 @@ describe('ContextHelpToggleComponent', () => { ], imports: [ TranslateModule.forRoot() ] }) - .compileComponents(); + .compileComponents(); }); beforeEach(() => { fixture = TestBed.createComponent(ContextHelpToggleComponent); component = fixture.componentInstance; - fixture.detectChanges(); }); it('should create', () => { + fixture.detectChanges(); expect(component).toBeTruthy(); }); + describe('if there are no elements on the page with a tooltip', () => { + it('clicking the button does not toggle context help icon visibility', fakeAsync(() => { + fixture.detectChanges(); + fixture.whenStable().then(() => { + fixture.debugElement.query(By.css('a')).nativeElement.click(); + tick(); + expect(contextHelpService.toggleIcons).toHaveBeenCalledTimes(0); + }); + })); + }); + describe('if there are elements on the page with a tooltip', () => { beforeEach(() => { - contextHelpEmpty$.next(false); + contextHelpService.contextHelpEmpty$.and.returnValue(observableOf(false)); fixture.detectChanges(); }); - it('clicking the button should toggle context help icon visibility', () => { - fixture.whenStable().then((done) => { - spyOn(contextHelpService, 'toggleIcons'); + it('clicking the button should toggle context help icon visibility', fakeAsync(() => { + fixture.whenStable().then(() => { fixture.debugElement.query(By.css('a')).nativeElement.click(); + tick(); expect(contextHelpService.toggleIcons).toHaveBeenCalled(); - done(); }); - }); + })); }); - describe('if there are no elements on the page with a tooltip', () => { - it('clicking the button does not toggle context help icon visibility', () => { - fixture.whenStable().then((done) => { - spyOn(contextHelpService, 'toggleIcons'); - fixture.debugElement.query(By.css('a')).nativeElement.click(); - expect(contextHelpService.toggleIcons).toHaveBeenCalledTimes(0); - done(); - }); - }); - }); }); From 40de69dfec0ee96372b764f84e03466ab115a66e Mon Sep 17 00:00:00 2001 From: Koen Pauwels Date: Fri, 20 Jan 2023 14:33:00 +0100 Subject: [PATCH 5/8] 97732 ContextHelpToggleComponent: added typedoc and removed unnecessary dependency --- .../context-help-toggle/context-help-toggle.component.ts | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/app/header/context-help-toggle/context-help-toggle.component.ts b/src/app/header/context-help-toggle/context-help-toggle.component.ts index 6804836246..7adaffa1c0 100644 --- a/src/app/header/context-help-toggle/context-help-toggle.component.ts +++ b/src/app/header/context-help-toggle/context-help-toggle.component.ts @@ -1,9 +1,12 @@ import { Component, OnInit, OnDestroy } from '@angular/core'; import { ContextHelpService } from '../../shared/context-help.service'; -import { TranslateService } from '@ngx-translate/core'; import { Observable, Subscription, BehaviorSubject } from 'rxjs'; import { combineLatest } from 'rxjs'; +/** + * Renders a "context help toggle" button that toggles the visibility of tooltip buttons on the page. + * If there are no tooltip buttons available on the current page, the toggle is unclickable. + */ @Component({ selector: 'ds-context-help-toggle', templateUrl: './context-help-toggle.component.html', @@ -14,7 +17,6 @@ export class ContextHelpToggleComponent implements OnInit, OnDestroy { constructor( private contextHelpService: ContextHelpService, - private translateService: TranslateService ) { } private clickEvents: BehaviorSubject = new BehaviorSubject(null); From e717e610f963d10b464a0166d6cbc8d0c331e61c Mon Sep 17 00:00:00 2001 From: Koen Pauwels Date: Fri, 27 Jan 2023 11:03:18 +0100 Subject: [PATCH 6/8] 97732 Header buttons now behave consistently on hover --- .../context-help-toggle.component.scss | 2 +- src/app/header/header.component.scss | 2 +- src/app/search-navbar/search-navbar.component.scss | 3 --- .../shared/auth-nav-menu/auth-nav-menu.component.scss | 4 ++-- src/app/shared/lang-switch/lang-switch.component.scss | 10 ++++------ .../search-authority-filter.component.scss | 2 +- .../search-facet-option.component.scss | 2 +- .../search-facet-selected-option.component.scss | 2 +- 8 files changed, 11 insertions(+), 16 deletions(-) diff --git a/src/app/header/context-help-toggle/context-help-toggle.component.scss b/src/app/header/context-help-toggle/context-help-toggle.component.scss index af233dd7b5..a8c6100fae 100644 --- a/src/app/header/context-help-toggle/context-help-toggle.component.scss +++ b/src/app/header/context-help-toggle/context-help-toggle.component.scss @@ -2,7 +2,7 @@ color: var(--ds-header-icon-color); background-color: var(--ds-header-bg); - &:hover, &focus { + &:hover, &:focus { color: var(--ds-header-icon-color-hover); } } diff --git a/src/app/header/header.component.scss b/src/app/header/header.component.scss index 922b2d02e1..546f6a06fa 100644 --- a/src/app/header/header.component.scss +++ b/src/app/header/header.component.scss @@ -15,7 +15,7 @@ a { color: var(--ds-header-icon-color); - &:hover, &focus { + &:hover, &:focus { color: var(--ds-header-icon-color-hover); } } diff --git a/src/app/search-navbar/search-navbar.component.scss b/src/app/search-navbar/search-navbar.component.scss index c1ccd289b2..125aa82f1f 100644 --- a/src/app/search-navbar/search-navbar.component.scss +++ b/src/app/search-navbar/search-navbar.component.scss @@ -22,8 +22,5 @@ a.submit-icon { width: 40vw !important; } - a.submit-icon { - color: var(--bs-link-color); - } } diff --git a/src/app/shared/auth-nav-menu/auth-nav-menu.component.scss b/src/app/shared/auth-nav-menu/auth-nav-menu.component.scss index ac51af27bf..36161ff3da 100644 --- a/src/app/shared/auth-nav-menu/auth-nav-menu.component.scss +++ b/src/app/shared/auth-nav-menu/auth-nav-menu.component.scss @@ -13,9 +13,9 @@ } .dropdown-toggle { - color: var(--ds-header-icon-color) !important; + color: var(--ds-header-icon-color); - &:hover, &focus { + &:hover, &:focus { color: var(--ds-header-icon-color-hover); } } diff --git a/src/app/shared/lang-switch/lang-switch.component.scss b/src/app/shared/lang-switch/lang-switch.component.scss index 6d79e6ab25..7b593a9bb5 100644 --- a/src/app/shared/lang-switch/lang-switch.component.scss +++ b/src/app/shared/lang-switch/lang-switch.component.scss @@ -2,12 +2,10 @@ display:none; } -@media screen and (min-width: map-get($grid-breakpoints, md)) { - .dropdown-toggle { - color: var(--ds-header-icon-color); +.dropdown-toggle { + color: var(--ds-header-icon-color); - &:hover, &focus { - color: var(--ds-header-icon-color-hover); - } + &:hover, &:focus { + color: var(--ds-header-icon-color-hover); } } diff --git a/src/app/shared/search/search-filters/search-filter/search-authority-filter/search-authority-filter.component.scss b/src/app/shared/search/search-filters/search-filter/search-authority-filter/search-authority-filter.component.scss index 8f61f5ebf1..9e01e19d02 100644 --- a/src/app/shared/search/search-filters/search-filter/search-authority-filter/search-authority-filter.component.scss +++ b/src/app/shared/search/search-filters/search-filter/search-authority-filter/search-authority-filter.component.scss @@ -1,7 +1,7 @@ .filters { a { color: var(--bs-body-color); - &:hover, &focus { + &:hover, &:focus { text-decoration: none; } span.badge { diff --git a/src/app/shared/search/search-filters/search-filter/search-facet-filter-options/search-facet-option/search-facet-option.component.scss b/src/app/shared/search/search-filters/search-filter/search-facet-filter-options/search-facet-option/search-facet-option.component.scss index 74cede54a8..1211d2d478 100644 --- a/src/app/shared/search/search-filters/search-filter/search-facet-filter-options/search-facet-option/search-facet-option.component.scss +++ b/src/app/shared/search/search-filters/search-filter/search-facet-filter-options/search-facet-option/search-facet-option.component.scss @@ -1,6 +1,6 @@ a { color: var(--bs-body-color); - &:hover, &focus { + &:hover, &:focus { text-decoration: none; } span.badge { diff --git a/src/app/shared/search/search-filters/search-filter/search-facet-filter-options/search-facet-selected-option/search-facet-selected-option.component.scss b/src/app/shared/search/search-filters/search-filter/search-facet-filter-options/search-facet-selected-option/search-facet-selected-option.component.scss index 74cede54a8..1211d2d478 100644 --- a/src/app/shared/search/search-filters/search-filter/search-facet-filter-options/search-facet-selected-option/search-facet-selected-option.component.scss +++ b/src/app/shared/search/search-filters/search-filter/search-facet-filter-options/search-facet-selected-option/search-facet-selected-option.component.scss @@ -1,6 +1,6 @@ a { color: var(--bs-body-color); - &:hover, &focus { + &:hover, &:focus { text-decoration: none; } span.badge { From bceca43580e2e10896e281079ecc3abf6ad43e6a Mon Sep 17 00:00:00 2001 From: Koen Pauwels Date: Fri, 27 Jan 2023 11:59:24 +0100 Subject: [PATCH 7/8] 97732 Context help toggle button only appears when there is at least one element with a tooltip on the page --- .../context-help-toggle.component.html | 10 ++++------ .../context-help-toggle.component.scss | 7 +------ .../context-help-toggle.component.spec.ts | 12 +++++------- .../context-help-toggle.component.ts | 15 +++++---------- src/app/shared/context-help.service.ts | 4 ++-- src/assets/i18n/en.json5 | 2 -- 6 files changed, 17 insertions(+), 33 deletions(-) diff --git a/src/app/header/context-help-toggle/context-help-toggle.component.html b/src/app/header/context-help-toggle/context-help-toggle.component.html index 523874d461..1ec2050497 100644 --- a/src/app/header/context-help-toggle/context-help-toggle.component.html +++ b/src/app/header/context-help-toggle/context-help-toggle.component.html @@ -1,12 +1,10 @@ -
+ diff --git a/src/app/header/context-help-toggle/context-help-toggle.component.scss b/src/app/header/context-help-toggle/context-help-toggle.component.scss index a8c6100fae..f3e5e01880 100644 --- a/src/app/header/context-help-toggle/context-help-toggle.component.scss +++ b/src/app/header/context-help-toggle/context-help-toggle.component.scss @@ -1,4 +1,4 @@ -.ds-context-help-toggle-enabled { +.ds-context-help-toggle { color: var(--ds-header-icon-color); background-color: var(--ds-header-bg); @@ -6,8 +6,3 @@ color: var(--ds-header-icon-color-hover); } } - -.ds-context-help-toggle-disabled { - color: grey; - background-color: var(--ds-header-bg); -} diff --git a/src/app/header/context-help-toggle/context-help-toggle.component.spec.ts b/src/app/header/context-help-toggle/context-help-toggle.component.spec.ts index 93421b58eb..2d1b5bad20 100644 --- a/src/app/header/context-help-toggle/context-help-toggle.component.spec.ts +++ b/src/app/header/context-help-toggle/context-help-toggle.component.spec.ts @@ -13,9 +13,9 @@ describe('ContextHelpToggleComponent', () => { beforeEach(async () => { contextHelpService = jasmine.createSpyObj('contextHelpService', [ - 'contextHelpEmpty$', 'toggleIcons' + 'tooltipCount$', 'toggleIcons' ]); - contextHelpService.contextHelpEmpty$.and.returnValue(observableOf(true)); + contextHelpService.tooltipCount$.and.returnValue(observableOf(0)); await TestBed.configureTestingModule({ declarations: [ ContextHelpToggleComponent ], providers: [ @@ -37,19 +37,17 @@ describe('ContextHelpToggleComponent', () => { }); describe('if there are no elements on the page with a tooltip', () => { - it('clicking the button does not toggle context help icon visibility', fakeAsync(() => { + it('the toggle should not be visible', fakeAsync(() => { fixture.detectChanges(); fixture.whenStable().then(() => { - fixture.debugElement.query(By.css('a')).nativeElement.click(); - tick(); - expect(contextHelpService.toggleIcons).toHaveBeenCalledTimes(0); + expect(fixture.debugElement.query(By.css('div'))).toBeNull(); }); })); }); describe('if there are elements on the page with a tooltip', () => { beforeEach(() => { - contextHelpService.contextHelpEmpty$.and.returnValue(observableOf(false)); + contextHelpService.tooltipCount$.and.returnValue(observableOf(1)); fixture.detectChanges(); }); diff --git a/src/app/header/context-help-toggle/context-help-toggle.component.ts b/src/app/header/context-help-toggle/context-help-toggle.component.ts index 7adaffa1c0..1bd6eb4b17 100644 --- a/src/app/header/context-help-toggle/context-help-toggle.component.ts +++ b/src/app/header/context-help-toggle/context-help-toggle.component.ts @@ -2,6 +2,7 @@ import { Component, OnInit, OnDestroy } from '@angular/core'; import { ContextHelpService } from '../../shared/context-help.service'; import { Observable, Subscription, BehaviorSubject } from 'rxjs'; import { combineLatest } from 'rxjs'; +import { map } from 'rxjs/operators'; /** * Renders a "context help toggle" button that toggles the visibility of tooltip buttons on the page. @@ -13,23 +14,17 @@ import { combineLatest } from 'rxjs'; styleUrls: ['./context-help-toggle.component.scss'] }) export class ContextHelpToggleComponent implements OnInit, OnDestroy { - buttonDisabled$: Observable; + buttonVisible$: Observable; constructor( private contextHelpService: ContextHelpService, ) { } - private clickEvents: BehaviorSubject = new BehaviorSubject(null); private subs: Subscription[]; ngOnInit(): void { - this.buttonDisabled$ = this.contextHelpService.contextHelpEmpty$(); - this.subs = [ - this.buttonDisabled$.subscribe(), - combineLatest([this.clickEvents, this.buttonDisabled$]) - .subscribe(([_, disabled]) => - disabled ? null : this.contextHelpService.toggleIcons()) - ]; + this.buttonVisible$ = this.contextHelpService.tooltipCount$().pipe(map(x => x > 0)); + this.subs = [this.buttonVisible$.subscribe()]; } ngOnDestroy() { @@ -37,6 +32,6 @@ export class ContextHelpToggleComponent implements OnInit, OnDestroy { } onClick() { - this.clickEvents.next(null); + this.contextHelpService.toggleIcons(); } } diff --git a/src/app/shared/context-help.service.ts b/src/app/shared/context-help.service.ts index 68f6cfd92c..f10f258be9 100644 --- a/src/app/shared/context-help.service.ts +++ b/src/app/shared/context-help.service.ts @@ -54,9 +54,9 @@ export class ContextHelpService { /** * Observable that yields true iff there are currently no context help entries in the store. */ - contextHelpEmpty$(): Observable { + tooltipCount$(): Observable { return this.store.pipe(select(allContextHelpSelector)) - .pipe(map((models: ContextHelpModels) => Object.keys(models).length === 0)); + .pipe(map((models: ContextHelpModels) => Object.keys(models).length)); } /** diff --git a/src/assets/i18n/en.json5 b/src/assets/i18n/en.json5 index 5a8c27da0d..03596f2292 100644 --- a/src/assets/i18n/en.json5 +++ b/src/assets/i18n/en.json5 @@ -2680,8 +2680,6 @@ "nav.context-help-toggle": "Toggle context help", - "nav.context-help-toggle-disabled": "No context help available on this page", - "nav.language": "Language switch", "nav.login": "Log In", From 1e85e1d88b2380751c9d420e2d835019fc1a3695 Mon Sep 17 00:00:00 2001 From: Koen Pauwels Date: Fri, 27 Jan 2023 12:30:42 +0100 Subject: [PATCH 8/8] 97732 Fix header search icon hover color --- src/app/search-navbar/search-navbar.component.scss | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/src/app/search-navbar/search-navbar.component.scss b/src/app/search-navbar/search-navbar.component.scss index 125aa82f1f..40433fc619 100644 --- a/src/app/search-navbar/search-navbar.component.scss +++ b/src/app/search-navbar/search-navbar.component.scss @@ -14,6 +14,11 @@ a.submit-icon { cursor: pointer; position: sticky; top: 0; + + color: var(--ds-header-icon-color); + &:hover, &:focus { + color: var(--ds-header-icon-color-hover); + } } @media screen and (max-width: map-get($grid-breakpoints, md)) {