From a1a705321a32d66b9b9a29b6c2c617370f9cefd1 Mon Sep 17 00:00:00 2001 From: till_schuetze Date: Tue, 27 Aug 2024 16:15:21 +0200 Subject: [PATCH 01/43] keep all temporary url params if there was an error with the search --- src/app/shared/errors/search.errors.ts | 3 ++- src/app/state/app/actions/url.actions.ts | 3 ++- src/app/state/app/effects/url.effects.ts | 24 +++++++++++++++++++---- src/app/state/app/reducers/url.reducer.ts | 7 ++++++- src/app/state/app/states/url.state.ts | 1 + 5 files changed, 31 insertions(+), 7 deletions(-) diff --git a/src/app/shared/errors/search.errors.ts b/src/app/shared/errors/search.errors.ts index ced33a824..d631771d5 100644 --- a/src/app/shared/errors/search.errors.ts +++ b/src/app/shared/errors/search.errors.ts @@ -6,7 +6,8 @@ export class SearchResultsCouldNotBeLoaded extends RecoverableError { } export class InvalidSearchParameters extends RecoverableError { - public override message = 'Um über die URL zu suchen, müssen die Parameter "searchTerm" und "searchIndex" definiert sein.'; + public override message = + 'Um über die URL zu suchen, müssen die Parameter "searchTerm" und "searchIndex" definiert sein. Bitte passen Sie die URL entsprechend an.'; public override name = 'InvalidSearchParameters'; } diff --git a/src/app/state/app/actions/url.actions.ts b/src/app/state/app/actions/url.actions.ts index 3f280565e..87fa3d00a 100644 --- a/src/app/state/app/actions/url.actions.ts +++ b/src/app/state/app/actions/url.actions.ts @@ -1,4 +1,4 @@ -import {createActionGroup, props} from '@ngrx/store'; +import {createActionGroup, emptyProps, props} from '@ngrx/store'; import {MainPage} from '../../../shared/enums/main-page.enum'; import {Params} from '@angular/router'; @@ -8,5 +8,6 @@ export const UrlActions = createActionGroup({ 'Set Page': props<{mainPage: MainPage | undefined; isHeadlessPage: boolean; isSimplifiedPage: boolean}>(), 'Set App Params': props<{params: Params}>(), 'Set Map Page Params': props<{params: Params}>(), + 'Keep Temporary Url Parameters': emptyProps(), }, }); diff --git a/src/app/state/app/effects/url.effects.ts b/src/app/state/app/effects/url.effects.ts index 470e81f6d..41fcf4200 100644 --- a/src/app/state/app/effects/url.effects.ts +++ b/src/app/state/app/effects/url.effects.ts @@ -11,7 +11,7 @@ import {distinctUntilChanged, filter, switchMap} from 'rxjs'; import {MapConfigActions} from '../../map/actions/map-config.actions'; import {MapConstants} from '../../../shared/constants/map.constants'; import {selectMapConfigParams} from '../../map/selectors/map-config-params.selector'; -import {selectMainPage} from '../reducers/url.reducer'; +import {selectKeepTemporaryUrlParams, selectMainPage} from '../reducers/url.reducer'; import {MainPage} from '../../../shared/enums/main-page.enum'; import {Store} from '@ngrx/store'; import {BasemapConfigService} from '../../../map/services/basemap-config.service'; @@ -112,11 +112,18 @@ export class UrlEffects { () => { return this.actions$.pipe( ofType(UrlActions.setMapPageParams), - concatLatestFrom(() => [this.store.select(selectQueryParams), this.store.select(selectMainPage)]), + concatLatestFrom(() => [ + this.store.select(selectQueryParams), + this.store.select(selectMainPage), + this.store.select(selectKeepTemporaryUrlParams), + ]), filter(([, , mainPage]) => mainPage === MainPage.Maps), - map(([{params}, currentParams, _]) => { + map(([{params}, currentParams, _, keepTemporaryUrlParams]) => { let adjustedAndCurrentParams: {params: Params; currentParams: Params} = {params, currentParams}; - if (Object.keys(currentParams).some((paramKey) => MapConstants.TEMPORARY_URL_PARAMS.includes(paramKey))) { + if ( + Object.keys(currentParams).some((paramKey) => MapConstants.TEMPORARY_URL_PARAMS.includes(paramKey)) && + !keepTemporaryUrlParams + ) { // remove temporary parameters const paramsToRemove = MapConstants.TEMPORARY_URL_PARAMS.reduce((prev, curr) => ({...prev, [curr]: null}), {}); const adjustedParams: Params = { @@ -141,6 +148,15 @@ export class UrlEffects { {dispatch: false}, ); + public keepTemporaryUrlParameters$ = createEffect(() => { + return this.actions$.pipe( + ofType(SearchActions.setSearchApiError, SearchActions.handleEmptyResultsFromUrlSearch, SearchActions.handleInvalidParameters), + map(() => { + return UrlActions.keepTemporaryUrlParameters(); + }), + ); + }); + constructor( private readonly actions$: Actions, private readonly router: Router, diff --git a/src/app/state/app/reducers/url.reducer.ts b/src/app/state/app/reducers/url.reducer.ts index 8c429aec5..b3ecdb07c 100644 --- a/src/app/state/app/reducers/url.reducer.ts +++ b/src/app/state/app/reducers/url.reducer.ts @@ -9,6 +9,7 @@ export const initialState: UrlState = { previousPage: undefined, isHeadlessPage: false, isSimplifiedPage: false, + keepTemporaryUrlParams: false, }; export const urlFeature = createFeature({ @@ -18,7 +19,11 @@ export const urlFeature = createFeature({ on(UrlActions.setPage, (state, {mainPage, isHeadlessPage, isSimplifiedPage}): UrlState => { return {...state, previousPage: state.mainPage, mainPage, isHeadlessPage, isSimplifiedPage}; }), + on(UrlActions.keepTemporaryUrlParameters, (state): UrlState => { + return {...state, keepTemporaryUrlParams: true}; + }), ), }); -export const {name, reducer, selectUrlState, selectMainPage, selectIsHeadlessPage, selectIsSimplifiedPage} = urlFeature; +export const {name, reducer, selectUrlState, selectMainPage, selectIsHeadlessPage, selectIsSimplifiedPage, selectKeepTemporaryUrlParams} = + urlFeature; diff --git a/src/app/state/app/states/url.state.ts b/src/app/state/app/states/url.state.ts index 958966355..28ea2ae1e 100644 --- a/src/app/state/app/states/url.state.ts +++ b/src/app/state/app/states/url.state.ts @@ -11,4 +11,5 @@ export interface UrlState { * Flag which can be used to toggle simplified layouts, e.g. no ZH Lion in the header. */ isSimplifiedPage: boolean; + keepTemporaryUrlParams: boolean; } From a0107953ce3ad6c7b2d82a3e5ab434676962d0ed Mon Sep 17 00:00:00 2001 From: Sebastian Wendland Date: Fri, 30 Aug 2024 12:39:38 +0200 Subject: [PATCH 02/43] GB3-1623: Updated the `grav-cms-generated.interfaces` which introduced `altText` for images. Modified `discover-maps.component` and `frequently-used-items.component` accordingly so that they will show this alt text properly. --- .../discover-maps-item.interface.ts | 1 + .../frequently-used-item.interface.ts | 1 + .../models/grav-cms-generated.interfaces.ts | 25 +++++++++++-------- .../apis/grav-cms/grav-cms.service.ts | 2 ++ .../discover-maps.component.html | 7 +++--- .../discover-maps.component.scss | 6 ++--- .../frequently-used-items.component.html | 2 +- .../frequently-used-items.component.scss | 1 + 8 files changed, 27 insertions(+), 18 deletions(-) diff --git a/src/app/shared/interfaces/discover-maps-item.interface.ts b/src/app/shared/interfaces/discover-maps-item.interface.ts index 6f003711c..dc9abbcae 100644 --- a/src/app/shared/interfaces/discover-maps-item.interface.ts +++ b/src/app/shared/interfaces/discover-maps-item.interface.ts @@ -14,4 +14,5 @@ interface DiscoverMapsItemImage { type: string; size: number; path: string; + altText?: string; } diff --git a/src/app/shared/interfaces/frequently-used-item.interface.ts b/src/app/shared/interfaces/frequently-used-item.interface.ts index 3a9f96bde..b7e4e99ad 100644 --- a/src/app/shared/interfaces/frequently-used-item.interface.ts +++ b/src/app/shared/interfaces/frequently-used-item.interface.ts @@ -13,4 +13,5 @@ interface FrequentlyUsedItemImage { type: string; size: number; path: string; + altText?: string; } diff --git a/src/app/shared/models/grav-cms-generated.interfaces.ts b/src/app/shared/models/grav-cms-generated.interfaces.ts index 584344917..1d11b83eb 100644 --- a/src/app/shared/models/grav-cms-generated.interfaces.ts +++ b/src/app/shared/models/grav-cms-generated.interfaces.ts @@ -1,5 +1,8 @@ /** * Generated using https://transform.tools/json-to-typescript and the output from the endpoint. + * There are some slight manual adjustments: + * - The root object is renamed to include the endpoint name to avoid conflicts with other interface names + * - The optional `image` in `FrequentlyUsed` is changed from `image?: Image` to `image: Image | null` to avoid errors */ /* eslint-disable */ /* tslint:disable */ @@ -9,20 +12,21 @@ export interface DiscoverMapsRoot { } export interface Map { - title: string; description: string; - id: string; + flex_id: string; from_date: string; - to_date: string; + id: string; image: Image; - flex_id: string; + image_alt?: string; + title: string; + to_date: string; } export interface Image { name: string; - type: string; - size: number; path: string; + size: number; + type: string; } export interface PageInfosRoot { @@ -51,10 +55,11 @@ export interface FrequentlyUsedRoot { } export interface FrequentlyUsed { - title: string; - description: string; - url?: string; - image: Image | null; created: string; + description: string; flex_id: string; + image: Image | null; + title: string; + image_alt?: string; + url?: string; } diff --git a/src/app/shared/services/apis/grav-cms/grav-cms.service.ts b/src/app/shared/services/apis/grav-cms/grav-cms.service.ts index 31f52ed8f..fe22a6822 100644 --- a/src/app/shared/services/apis/grav-cms/grav-cms.service.ts +++ b/src/app/shared/services/apis/grav-cms/grav-cms.service.ts @@ -52,6 +52,7 @@ export class GravCmsService extends BaseApiService { type: discoverMapData.image.type, size: discoverMapData.image.size, path: discoverMapData.image.path, + altText: discoverMapData.image_alt, }, }; }); @@ -86,6 +87,7 @@ export class GravCmsService extends BaseApiService { type: frequentlyUsedData.image.type, size: frequentlyUsedData.image.size, path: frequentlyUsedData.image.path, + altText: frequentlyUsedData.image_alt, } : undefined, created: dayjs.unix(+frequentlyUsedData.created).toDate(), diff --git a/src/app/start-page/components/discover-maps/discover-maps.component.html b/src/app/start-page/components/discover-maps/discover-maps.component.html index ddb66247c..295dbe40b 100644 --- a/src/app/start-page/components/discover-maps/discover-maps.component.html +++ b/src/app/start-page/components/discover-maps/discover-maps.component.html @@ -8,10 +8,11 @@
  • - + />

    {{ discoverMapsEntry.title }}

    {{ discoverMapsEntry.description }}

    diff --git a/src/app/start-page/components/discover-maps/discover-maps.component.scss b/src/app/start-page/components/discover-maps/discover-maps.component.scss index ca0028843..fedd82368 100644 --- a/src/app/start-page/components/discover-maps/discover-maps.component.scss +++ b/src/app/start-page/components/discover-maps/discover-maps.component.scss @@ -37,10 +37,8 @@ $number-of-entries: 2; display: block; width: 100%; height: 327px; - background-size: cover; - background-repeat: no-repeat; - background-position: center center; - // The url is added dynamically via ngStyle + object-fit: cover; + object-position: center; } .discover-maps__list__item__wrapper__content__container { diff --git a/src/app/start-page/components/frequently-used-items/frequently-used-items.component.html b/src/app/start-page/components/frequently-used-items/frequently-used-items.component.html index 7e4b65b19..57e6851b5 100644 --- a/src/app/start-page/components/frequently-used-items/frequently-used-items.component.html +++ b/src/app/start-page/components/frequently-used-items/frequently-used-items.component.html @@ -16,7 +16,7 @@
    diff --git a/src/app/start-page/components/frequently-used-items/frequently-used-items.component.scss b/src/app/start-page/components/frequently-used-items/frequently-used-items.component.scss index 8130c4dab..e95afde21 100644 --- a/src/app/start-page/components/frequently-used-items/frequently-used-items.component.scss +++ b/src/app/start-page/components/frequently-used-items/frequently-used-items.component.scss @@ -32,6 +32,7 @@ width: 100%; height: 100%; object-fit: cover; + object-position: center; } } From d6855ebd8d35cdb95508595b575d781f83f77af6 Mon Sep 17 00:00:00 2001 From: Sebastian Wendland Date: Fri, 30 Aug 2024 13:03:39 +0200 Subject: [PATCH 03/43] GB3-1623: Fixed and extended the unit tests. --- .../discover-maps-item.interface.ts | 2 +- .../frequently-used-item.interface.ts | 2 +- .../apis/grav-cms/grav-cms.service.spec.ts | 25 +++++++++++++++++++ 3 files changed, 27 insertions(+), 2 deletions(-) diff --git a/src/app/shared/interfaces/discover-maps-item.interface.ts b/src/app/shared/interfaces/discover-maps-item.interface.ts index dc9abbcae..82f04c634 100644 --- a/src/app/shared/interfaces/discover-maps-item.interface.ts +++ b/src/app/shared/interfaces/discover-maps-item.interface.ts @@ -14,5 +14,5 @@ interface DiscoverMapsItemImage { type: string; size: number; path: string; - altText?: string; + altText: string | undefined; } diff --git a/src/app/shared/interfaces/frequently-used-item.interface.ts b/src/app/shared/interfaces/frequently-used-item.interface.ts index b7e4e99ad..5fe0147af 100644 --- a/src/app/shared/interfaces/frequently-used-item.interface.ts +++ b/src/app/shared/interfaces/frequently-used-item.interface.ts @@ -13,5 +13,5 @@ interface FrequentlyUsedItemImage { type: string; size: number; path: string; - altText?: string; + altText: string | undefined; } diff --git a/src/app/shared/services/apis/grav-cms/grav-cms.service.spec.ts b/src/app/shared/services/apis/grav-cms/grav-cms.service.spec.ts index 789aa7593..52da2e359 100644 --- a/src/app/shared/services/apis/grav-cms/grav-cms.service.spec.ts +++ b/src/app/shared/services/apis/grav-cms/grav-cms.service.spec.ts @@ -60,6 +60,7 @@ describe('GravCmsService', () => { size: 542427, path: 'assets/uploads/discovermaps/c8xtlxyksm9w5tj.png', }, + image_alt: 'Bildbeschriftung für Landschaftstypologie', flex_id: 'da0a66b63d2b036dd6d0ad6b470d1a2c', }, ], @@ -82,6 +83,7 @@ describe('GravCmsService', () => { type: 'image/png', size: 662482, path: 'assets/uploads/discovermaps/ruvsmjzmt6ienof.png', + altText: undefined, }, }, { @@ -98,6 +100,7 @@ describe('GravCmsService', () => { type: 'image/png', size: 542427, path: 'assets/uploads/discovermaps/c8xtlxyksm9w5tj.png', + altText: 'Bildbeschriftung für Landschaftstypologie', }, }, ]; @@ -171,6 +174,7 @@ describe('GravCmsService', () => { size: 2361401, path: 'assets/uploads/frequentlyused/mdph1k0nyqstliu.png', }, + image_alt: 'Bildbeschriftung für Orthofotos', flex_id: 'b07395a55bd971a90884aff2e8bb7abf', }, { @@ -187,6 +191,16 @@ describe('GravCmsService', () => { }, flex_id: 'dc10938d401e622da75cbcfdcebf64d5', }, + { + title: 'Azeroth', + description: + 'Eine gefährliche, schöne, magische und inspirierende Welt. Eine Welt voller Entdeckungen, Innovationen und Wunder. Eine Welt, für die es sich zu kämpfen lohnt. Eine Welt, die es wert ist, beschützt zu werden.', + url: '/maps?initialMapIds=F0r7H3H0rD3', + created: '1424201337', + image: null, + image_alt: 'Bildbeschriftung für Azeroth', + flex_id: '00000000-0000-4000-y000-000000000000', + }, ], }; const httpClient = TestBed.inject(HttpClient); @@ -204,6 +218,7 @@ describe('GravCmsService', () => { type: 'image/png', size: 2361401, path: 'assets/uploads/frequentlyused/mdph1k0nyqstliu.png', + altText: 'Bildbeschriftung für Orthofotos', }, created: new Date(Date.UTC(2023, 8, 18, 9, 24, 31)), }, @@ -219,9 +234,19 @@ describe('GravCmsService', () => { type: 'image/png', size: 506099, path: 'assets/uploads/frequentlyused/czef0j9wrdgbyni.png', + altText: undefined, }, created: new Date(Date.UTC(2023, 8, 18, 9, 23, 2)), }, + { + id: '00000000-0000-4000-y000-000000000000', + title: 'Azeroth', + description: + 'Eine gefährliche, schöne, magische und inspirierende Welt. Eine Welt voller Entdeckungen, Innovationen und Wunder. Eine Welt, für die es sich zu kämpfen lohnt. Eine Welt, die es wert ist, beschützt zu werden.', + url: '/maps?initialMapIds=F0r7H3H0rD3', + image: undefined, + created: new Date(Date.UTC(2015, 1, 17, 19, 28, 57)), + }, ]; service.loadFrequentlyUsedData().subscribe((actual) => { From 6b171f7a3e3e3b33b997817111c39ee848c427b8 Mon Sep 17 00:00:00 2001 From: till_schuetze Date: Mon, 2 Sep 2024 17:09:21 +0200 Subject: [PATCH 04/43] Bugfix: Wrong update of dpi settings upon format change --- .../print-dialog/print-dialog.component.ts | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/src/app/map/components/map-tools/print-dialog/print-dialog.component.ts b/src/app/map/components/map-tools/print-dialog/print-dialog.component.ts index 30559a2be..9dfdc7b1d 100644 --- a/src/app/map/components/map-tools/print-dialog/print-dialog.component.ts +++ b/src/app/map/components/map-tools/print-dialog/print-dialog.component.ts @@ -382,7 +382,12 @@ export class PrintDialogComponent implements OnInit, OnDestroy { } else { this.formGroup.controls.dpi.enable(); } - this.formGroup.controls.dpi.setValue(this.availableDpiSettings[0]); + const isSelectedDpiSettingAllowed = this.availableDpiSettings.some( + (availableDpiSetting) => availableDpiSetting === this.formGroup.controls.dpi.value, + ); + if (!isSelectedDpiSettingAllowed) { + this.formGroup.controls.dpi.setValue(this.availableDpiSettings[0]); + } } private updateFileTypeValueOnValueChange() { @@ -391,6 +396,11 @@ export class PrintDialogComponent implements OnInit, OnDestroy { } else { this.formGroup.controls.fileFormat.enable(); } - this.formGroup.controls.fileFormat.setValue(this.availableFileFormats[0]); + const isSelectedFileFormatAllowed = this.availableFileFormats.some( + (availableFileFormat) => availableFileFormat === this.formGroup.controls.fileFormat.value, + ); + if (!isSelectedFileFormatAllowed) { + this.formGroup.controls.fileFormat.setValue(this.availableFileFormats[0]); + } } } From f03e530163388563ce4e99e671d50f62188ae14b Mon Sep 17 00:00:00 2001 From: till_schuetze Date: Mon, 2 Sep 2024 17:51:57 +0200 Subject: [PATCH 05/43] Update tests --- src/app/state/app/effects/search.effect.spec.ts | 2 ++ src/app/state/app/effects/url.effects.spec.ts | 5 ++++- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/src/app/state/app/effects/search.effect.spec.ts b/src/app/state/app/effects/search.effect.spec.ts index 2c671e089..348ec0fb0 100644 --- a/src/app/state/app/effects/search.effect.spec.ts +++ b/src/app/state/app/effects/search.effect.spec.ts @@ -105,6 +105,7 @@ describe('SearchEffects', () => { isHeadlessPage: false, isSimplifiedPage: false, previousPage: MainPage.Data, + keepTemporaryUrlParams: false, }); const mapDrawingService = TestBed.inject(MapDrawingService); @@ -123,6 +124,7 @@ describe('SearchEffects', () => { isHeadlessPage: false, isSimplifiedPage: false, previousPage: MainPage.Data, + keepTemporaryUrlParams: false, }); let newAction; diff --git a/src/app/state/app/effects/url.effects.spec.ts b/src/app/state/app/effects/url.effects.spec.ts index 64e306a2d..402d5ef30 100644 --- a/src/app/state/app/effects/url.effects.spec.ts +++ b/src/app/state/app/effects/url.effects.spec.ts @@ -12,7 +12,7 @@ import {BasemapConfigService} from '../../../map/services/basemap-config.service import {selectQueryParams} from '../selectors/router.selector'; import {selectMapConfigParams} from '../../map/selectors/map-config-params.selector'; import {MapConfigActions} from '../../map/actions/map-config.actions'; -import {selectMainPage} from '../reducers/url.reducer'; +import {selectKeepTemporaryUrlParams, selectMainPage} from '../reducers/url.reducer'; import {RouteParamConstants} from '../../../shared/constants/route-param.constants'; import {SearchActions} from '../actions/search.actions'; import {InitialMapExtentService} from '../../../map/services/initial-map-extent.service'; @@ -223,6 +223,7 @@ describe('UrlEffects', () => { const params = {x: 123, y: 456, scale: 789, basemap: 'Dust II'}; const existingParams = {x: 1, y: 2, scale: 3, basemap: '4'}; store.overrideSelector(selectQueryParams, existingParams); + store.overrideSelector(selectKeepTemporaryUrlParams, false); const expectedParams = params; @@ -240,6 +241,7 @@ describe('UrlEffects', () => { const params = {x: 123, y: 456, scale: 789, basemap: 'Dust II'}; const existingParams = {...params, initialMapIds: 'one,two', searchTerm: 'search', searchIndex: 'index'}; store.overrideSelector(selectQueryParams, existingParams); + store.overrideSelector(selectKeepTemporaryUrlParams, false); const expectedParams = {...params, initialMapIds: null, searchTerm: null, searchIndex: null}; @@ -257,6 +259,7 @@ describe('UrlEffects', () => { const params = {x: 123, y: 456, scale: 789, basemap: 'Dust II'}; const existingParams = params; store.overrideSelector(selectQueryParams, existingParams); + store.overrideSelector(selectKeepTemporaryUrlParams, false); actions$ = of(UrlActions.setMapPageParams({params})); effects.setMapPageParameters$.subscribe(); From c7bd6f018ffeae4a659f9988284f6809b9d4ccde Mon Sep 17 00:00:00 2001 From: till_schuetze Date: Tue, 3 Sep 2024 14:15:28 +0200 Subject: [PATCH 06/43] Close the selection list when map is selected and focus the button to allow opening it again right away --- .../basemap-selection-list.component.ts | 5 ++++- .../basemap-selector/basemap-selector.component.html | 3 ++- .../basemap-selector/basemap-selector.component.ts | 6 ++++++ 3 files changed, 12 insertions(+), 2 deletions(-) diff --git a/src/app/map/components/map-controls/basemap-selector/basemap-selection-list/basemap-selection-list.component.ts b/src/app/map/components/map-controls/basemap-selector/basemap-selection-list/basemap-selection-list.component.ts index 458a910de..06d9471fa 100644 --- a/src/app/map/components/map-controls/basemap-selector/basemap-selection-list/basemap-selection-list.component.ts +++ b/src/app/map/components/map-controls/basemap-selector/basemap-selection-list/basemap-selection-list.component.ts @@ -1,4 +1,4 @@ -import {Component, OnDestroy, OnInit} from '@angular/core'; +import {Component, EventEmitter, OnDestroy, OnInit, Output} from '@angular/core'; import {Store} from '@ngrx/store'; import {Subscription, tap} from 'rxjs'; import {ScreenMode} from 'src/app/shared/types/screen-size.type'; @@ -14,6 +14,8 @@ import {BasemapConfigService} from '../../../../services/basemap-config.service' styleUrls: ['./basemap-selection-list.component.scss'], }) export class BasemapSelectionListComponent implements OnInit, OnDestroy { + @Output() public basemapChangedEvent = new EventEmitter(); + public activeBasemap?: Basemap; public availableBasemaps: Basemap[] = []; public screenMode: ScreenMode = 'regular'; @@ -39,6 +41,7 @@ export class BasemapSelectionListComponent implements OnInit, OnDestroy { public switchBasemap(toId: string) { this.store.dispatch(MapConfigActions.setBasemap({activeBasemapId: toId})); + this.basemapChangedEvent.emit(); } private initSubscriptions() { diff --git a/src/app/map/components/map-controls/basemap-selector/basemap-selector.component.html b/src/app/map/components/map-controls/basemap-selector/basemap-selector.component.html index a79c45a70..0dc536ae7 100644 --- a/src/app/map/components/map-controls/basemap-selector/basemap-selector.component.html +++ b/src/app/map/components/map-controls/basemap-selector/basemap-selector.component.html @@ -1,9 +1,10 @@
    - +
    diff --git a/src/app/map/components/map-controls/basemap-selector/basemap-selector.component.ts b/src/app/map/components/map-controls/basemap-selector/basemap-selector.component.ts index fc4177009..f8ce49206 100644 --- a/src/app/map/components/map-controls/basemap-selector/basemap-selector.component.ts +++ b/src/app/map/components/map-controls/basemap-selector/basemap-selector.component.ts @@ -13,6 +13,7 @@ import {BasemapConfigService} from '../../../services/basemap-config.service'; }) export class BasemapSelectorComponent implements OnInit, OnDestroy, AfterViewInit { @ViewChild('basemapSelector', {read: ElementRef, static: false}) private basemapSelectorRef!: ElementRef; + @ViewChild('basemapSelectorButton', {read: ElementRef}) private basemapSelectorButtonRef!: ElementRef; public activeBasemap?: Basemap; public isSelectionOpen: boolean = false; @@ -50,6 +51,11 @@ export class BasemapSelectorComponent implements OnInit, OnDestroy, AfterViewIni ); } + public toggleAndFocusBasemapSelectorButton() { + this.toggleSelection(); + this.basemapSelectorButtonRef.nativeElement.focus(); + } + public toggleSelection() { this.isSelectionOpen = !this.isSelectionOpen; } From 51e8b7199d4f90567ebf7dd64518f63670547d90 Mon Sep 17 00:00:00 2001 From: till_schuetze Date: Tue, 3 Sep 2024 15:43:37 +0200 Subject: [PATCH 07/43] Add custom page title to each page --- src/app/app-routing.module.ts | 43 +++++++++++++++++++++++++++-------- 1 file changed, 33 insertions(+), 10 deletions(-) diff --git a/src/app/app-routing.module.ts b/src/app/app-routing.module.ts index e0ea49564..5a70b106e 100644 --- a/src/app/app-routing.module.ts +++ b/src/app/app-routing.module.ts @@ -5,29 +5,52 @@ import {NotFoundErrorPageComponent} from './error-handling/components/not-found- import {FatalErrorPageComponent} from './error-handling/components/fatal-error-page/fatal-error-page.component'; import {fatalErrorMapGuard} from './embedded-page/guards/fatal-error-page.guard'; +const siteOperator = 'Geoportal Kanton Zürich'; const routes: Routes = [ { path: '', children: [ - {path: MainPage.Auth, loadChildren: () => import('./auth/auth.module').then((m) => m.AuthModule)}, - {path: MainPage.Maps, loadChildren: () => import('./map/map.module').then((m) => m.MapModule)}, - {path: MainPage.Data, loadChildren: () => import('./data-catalogue/data-catalogue.module').then((m) => m.DataCatalogueModule)}, - {path: MainPage.Support, loadChildren: () => import('./support-page/support-page.module').then((m) => m.SupportPageModule)}, - {path: MainPage.Privacy, loadChildren: () => import('./privacy/privacy.module').then((m) => m.PrivacyModule)}, - {path: MainPage.TermsOfUse, loadChildren: () => import('./terms-of-use/terms-of-use.module').then((m) => m.TermsOfUseModule)}, - {path: MainPage.Start, loadChildren: () => import('./start-page/start-page.module').then((m) => m.StartPageModule)}, + {path: MainPage.Auth, loadChildren: () => import('./auth/auth.module').then((m) => m.AuthModule), title: `Login ${siteOperator}`}, + {path: MainPage.Maps, loadChildren: () => import('./map/map.module').then((m) => m.MapModule), title: `GIS-Browser ${siteOperator}`}, + { + path: MainPage.Data, + loadChildren: () => import('./data-catalogue/data-catalogue.module').then((m) => m.DataCatalogueModule), + title: `Geodatenkatalog ${siteOperator}`, + }, + { + path: MainPage.Support, + loadChildren: () => import('./support-page/support-page.module').then((m) => m.SupportPageModule), + title: `Hilfe & Support ${siteOperator}`, + }, + { + path: MainPage.Privacy, + loadChildren: () => import('./privacy/privacy.module').then((m) => m.PrivacyModule), + title: `Datenschutz ${siteOperator}`, + }, + { + path: MainPage.TermsOfUse, + loadChildren: () => import('./terms-of-use/terms-of-use.module').then((m) => m.TermsOfUseModule), + title: `Nutzungshinweise ${siteOperator}`, + }, + { + path: MainPage.Start, + loadChildren: () => import('./start-page/start-page.module').then((m) => m.StartPageModule), + title: `${siteOperator}`, + }, { path: MainPage.ShareLink, loadChildren: () => import('./share-link/share-link.module').then((m) => m.ShareLinkModule), + title: `Link teilen ${siteOperator}`, }, { path: MainPage.Embedded, loadChildren: () => import('./embedded-page/embedded-map-page.module').then((m) => m.EmbeddedMapPageModule), + title: `GIS-Browser ${siteOperator}`, }, - {path: MainPage.Error, component: FatalErrorPageComponent, canDeactivate: [fatalErrorMapGuard]}, - {path: MainPage.NotFound, component: NotFoundErrorPageComponent}, - {path: '**', component: NotFoundErrorPageComponent}, + {path: MainPage.Error, component: FatalErrorPageComponent, canDeactivate: [fatalErrorMapGuard], title: `Fehler ${siteOperator}`}, + {path: MainPage.NotFound, component: NotFoundErrorPageComponent, title: `Seite nicht gefunden ${siteOperator}`}, + {path: '**', component: NotFoundErrorPageComponent, title: `Seite nicht gefunden ${siteOperator}`}, ], }, ]; From 48bde88f6e66fc1d390017abc1149e3e9951bd75 Mon Sep 17 00:00:00 2001 From: Renovate Bot Date: Wed, 4 Sep 2024 00:09:52 +0000 Subject: [PATCH 08/43] Update dependency puppeteer to v23.2.2 --- package-lock.json | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/package-lock.json b/package-lock.json index a4880f511..2f149d7fe 100644 --- a/package-lock.json +++ b/package-lock.json @@ -7474,9 +7474,9 @@ } }, "node_modules/chromium-bidi": { - "version": "0.6.4", - "resolved": "https://registry.npmjs.org/chromium-bidi/-/chromium-bidi-0.6.4.tgz", - "integrity": "sha512-8zoq6ogmhQQkAKZVKO2ObFTl4uOkqoX1PlKQX3hZQ5E9cbUotcAb7h4pTNVAGGv8Z36PF3CtdOriEp/Rz82JqQ==", + "version": "0.6.5", + "resolved": "https://registry.npmjs.org/chromium-bidi/-/chromium-bidi-0.6.5.tgz", + "integrity": "sha512-RuLrmzYrxSb0s9SgpB+QN5jJucPduZQ/9SIe76MDxYJuecPW5mxMdacJ1f4EtgiV+R0p3sCkznTMvH0MPGFqjA==", "dev": true, "dependencies": { "mitt": "3.0.1", @@ -14063,17 +14063,17 @@ } }, "node_modules/puppeteer": { - "version": "23.2.1", - "resolved": "https://registry.npmjs.org/puppeteer/-/puppeteer-23.2.1.tgz", - "integrity": "sha512-IvJOBP2APjcIR2k0xKYYpAs/hAa39e6sn7y+qMlSWJDRraEc4JLfgCKlkXopzD5jrSc1iTANHWw7Rrj/w7bgpw==", + "version": "23.2.2", + "resolved": "https://registry.npmjs.org/puppeteer/-/puppeteer-23.2.2.tgz", + "integrity": "sha512-3RX5vEhlOE/9M7ZXxoJVvI7pbOF3fzFK4etwbdii7w+r58q+krK5l2FXWlA1ETnNs7ilM/KLFc0n6K8VUi99dA==", "dev": true, "hasInstallScript": true, "dependencies": { "@puppeteer/browsers": "2.3.1", - "chromium-bidi": "0.6.4", + "chromium-bidi": "0.6.5", "cosmiconfig": "^9.0.0", "devtools-protocol": "0.0.1330662", - "puppeteer-core": "23.2.1", + "puppeteer-core": "23.2.2", "typed-query-selector": "^2.12.0" }, "bin": { @@ -14084,13 +14084,13 @@ } }, "node_modules/puppeteer-core": { - "version": "23.2.1", - "resolved": "https://registry.npmjs.org/puppeteer-core/-/puppeteer-core-23.2.1.tgz", - "integrity": "sha512-AIFWfQ4Sq+En+OgqIUy8VJmD8yJHMDyt+qEmEVKW07zu5DKDNqysO7fzBZp0W85ShJTUlUf+RleKl4XLwFpUPA==", + "version": "23.2.2", + "resolved": "https://registry.npmjs.org/puppeteer-core/-/puppeteer-core-23.2.2.tgz", + "integrity": "sha512-MK2Kbdmro+nX9/pfGKm8TiU5G3CuS6BbcNfkcz42GWnHp7KYsJHrP6lPDepiyvwjti5Bt/4a8U3w+DoFpIcBHQ==", "dev": true, "dependencies": { "@puppeteer/browsers": "2.3.1", - "chromium-bidi": "0.6.4", + "chromium-bidi": "0.6.5", "debug": "^4.3.6", "devtools-protocol": "0.0.1330662", "typed-query-selector": "^2.12.0", From a6368447ddca51035f6541fd05a86404ac3d72cf Mon Sep 17 00:00:00 2001 From: Renovate Bot Date: Wed, 4 Sep 2024 00:09:58 +0000 Subject: [PATCH 09/43] Update dependency typescript to ~5.5.0 --- package-lock.json | 8 ++++---- package.json | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package-lock.json b/package-lock.json index a4880f511..08945b1d8 100644 --- a/package-lock.json +++ b/package-lock.json @@ -76,7 +76,7 @@ "lint-staged": "^15.0.0", "prettier": "^3.3.3", "puppeteer": "^23.0.0", - "typescript": "~5.4.5" + "typescript": "~5.5.0" }, "engines": { "node": "20.x" @@ -16067,9 +16067,9 @@ "dev": true }, "node_modules/typescript": { - "version": "5.4.5", - "resolved": "https://registry.npmjs.org/typescript/-/typescript-5.4.5.tgz", - "integrity": "sha512-vcI4UpRgg81oIRUFwR0WSIHKt11nJ7SAVlYNIu+QpqeyXP+gpQJy/Z4+F0aGxSE4MqwjyXvW/TzgkLAx2AGHwQ==", + "version": "5.5.4", + "resolved": "https://registry.npmjs.org/typescript/-/typescript-5.5.4.tgz", + "integrity": "sha512-Mtq29sKDAEYP7aljRgtPOpTvOfbwRWlS6dPRzwjdE+C0R4brX/GUyhHSecbHMFLNBLcJIPt9nl9yG5TZ1weH+Q==", "bin": { "tsc": "bin/tsc", "tsserver": "bin/tsserver" diff --git a/package.json b/package.json index 4eb0f8cfc..082b4a555 100644 --- a/package.json +++ b/package.json @@ -93,6 +93,6 @@ "lint-staged": "^15.0.0", "prettier": "^3.3.3", "puppeteer": "^23.0.0", - "typescript": "~5.4.5" + "typescript": "~5.5.0" } } From f28b643cc471361f5ef8f55d24eac3cbf679aa4e Mon Sep 17 00:00:00 2001 From: Renovate Bot Date: Thu, 5 Sep 2024 00:08:57 +0000 Subject: [PATCH 10/43] Update angular to v18.2.3 --- package-lock.json | 204 +++++++++++++++++++++++----------------------- 1 file changed, 102 insertions(+), 102 deletions(-) diff --git a/package-lock.json b/package-lock.json index 9700ca477..704fc0a5f 100644 --- a/package-lock.json +++ b/package-lock.json @@ -103,11 +103,11 @@ } }, "node_modules/@angular-devkit/architect": { - "version": "0.1802.2", - "resolved": "https://registry.npmjs.org/@angular-devkit/architect/-/architect-0.1802.2.tgz", - "integrity": "sha512-LPRl9jhcf0NgshaL6RoUy1uL/cAyNt7oxctoZ9EHUu8eh5E9W/jZGhVowjOLpirwqYhmEzKJJIeS49Ssqs3RQg==", + "version": "0.1802.3", + "resolved": "https://registry.npmjs.org/@angular-devkit/architect/-/architect-0.1802.3.tgz", + "integrity": "sha512-WQ2AmkUKy1bqrDlNfozW8+VT2Tv/Fdmu4GIXps3ytZANyAKiIvTzmmql2cRCXXraa9FNMjLWNvz+qolDxWVdYQ==", "dependencies": { - "@angular-devkit/core": "18.2.2", + "@angular-devkit/core": "18.2.3", "rxjs": "7.8.1" }, "engines": { @@ -117,15 +117,15 @@ } }, "node_modules/@angular-devkit/build-angular": { - "version": "18.2.2", - "resolved": "https://registry.npmjs.org/@angular-devkit/build-angular/-/build-angular-18.2.2.tgz", - "integrity": "sha512-7HEnTN2T1jnjuItXKcApOsoYGgfou4+POju3ZbwIQukDZ3B2COskvQkVTxqPNrQ0ZjT2mxZYoVlmGW9M+7N25g==", + "version": "18.2.3", + "resolved": "https://registry.npmjs.org/@angular-devkit/build-angular/-/build-angular-18.2.3.tgz", + "integrity": "sha512-uUQba0SIskKORHcPayt7LpqPRKD//48EW92SgGHEArn2KklM+FSYBOA9OtrJeZ/UAcoJpdLDtvyY4+S7oFzomg==", "dependencies": { "@ampproject/remapping": "2.3.0", - "@angular-devkit/architect": "0.1802.2", - "@angular-devkit/build-webpack": "0.1802.2", - "@angular-devkit/core": "18.2.2", - "@angular/build": "18.2.2", + "@angular-devkit/architect": "0.1802.3", + "@angular-devkit/build-webpack": "0.1802.3", + "@angular-devkit/core": "18.2.3", + "@angular/build": "18.2.3", "@babel/core": "7.25.2", "@babel/generator": "7.25.0", "@babel/helper-annotate-as-pure": "7.24.7", @@ -136,7 +136,7 @@ "@babel/preset-env": "7.25.3", "@babel/runtime": "7.25.0", "@discoveryjs/json-ext": "0.6.1", - "@ngtools/webpack": "18.2.2", + "@ngtools/webpack": "18.2.3", "@vitejs/plugin-basic-ssl": "1.1.0", "ansi-colors": "4.1.3", "autoprefixer": "10.4.20", @@ -179,7 +179,7 @@ "vite": "5.4.0", "watchpack": "2.4.1", "webpack": "5.94.0", - "webpack-dev-middleware": "7.3.0", + "webpack-dev-middleware": "7.4.2", "webpack-dev-server": "5.0.4", "webpack-merge": "6.0.1", "webpack-subresource-integrity": "5.1.0" @@ -669,11 +669,11 @@ "integrity": "sha512-xNvxJEOUiWPGhUuUdQgAJPKOOJfGnIyKySOc09XkKsgdUV/3E2zvwZYdejjmRgPCgcym1juLH3226yA7sEFJKQ==" }, "node_modules/@angular-devkit/build-webpack": { - "version": "0.1802.2", - "resolved": "https://registry.npmjs.org/@angular-devkit/build-webpack/-/build-webpack-0.1802.2.tgz", - "integrity": "sha512-Pj+YmKh0nJOKl6QAsqYh3SqfuVJrFqjyp5WrG9BgfsMD9GCMD+5teMHNYJlp+vG/C8e7VdZp4rqOon8K9Xn4Mw==", + "version": "0.1802.3", + "resolved": "https://registry.npmjs.org/@angular-devkit/build-webpack/-/build-webpack-0.1802.3.tgz", + "integrity": "sha512-/Nixv9uAg6v/OPoZa0PB0zi+iezzBkgLrnrJnestny5B536l9WRtsw97RjeQDu+x2BClQsxNe8NL2A7EvjVD6w==", "dependencies": { - "@angular-devkit/architect": "0.1802.2", + "@angular-devkit/architect": "0.1802.3", "rxjs": "7.8.1" }, "engines": { @@ -687,9 +687,9 @@ } }, "node_modules/@angular-devkit/core": { - "version": "18.2.2", - "resolved": "https://registry.npmjs.org/@angular-devkit/core/-/core-18.2.2.tgz", - "integrity": "sha512-Zz0tGptI/QQnUBDdp+1G5wGwQWMjpfe2oO+UohkrDVgFS71yVj4VDnOy51kMTxBvzw+36evTgthPpmzqPIfxBw==", + "version": "18.2.3", + "resolved": "https://registry.npmjs.org/@angular-devkit/core/-/core-18.2.3.tgz", + "integrity": "sha512-vbFs+ofNK9OWeMIcFarFjegXVklhtSdLTEFKZ9trDVr8alTJdjI9AiYa6OOUTDAyq0hqYxV26xlCisWAPe7s5w==", "dependencies": { "ajv": "8.17.1", "ajv-formats": "3.0.1", @@ -729,11 +729,11 @@ } }, "node_modules/@angular-devkit/schematics": { - "version": "18.2.2", - "resolved": "https://registry.npmjs.org/@angular-devkit/schematics/-/schematics-18.2.2.tgz", - "integrity": "sha512-PU6+3nX+gQ3gofR7BGwXuvNUNeeV2raURaZjlPfGpBqjyTBxukMV71QsTTWptAZT4WibCWkTFp6X1gvsOGbjMg==", + "version": "18.2.3", + "resolved": "https://registry.npmjs.org/@angular-devkit/schematics/-/schematics-18.2.3.tgz", + "integrity": "sha512-N3tRAzBW2yWQhebvc1Ha18XTMSXOQTfr8HNjx7Fasx0Fg1tNyGR612MJNZw6je/PqyItKeUHOhztvFMfCQjRyg==", "dependencies": { - "@angular-devkit/core": "18.2.2", + "@angular-devkit/core": "18.2.3", "jsonc-parser": "3.3.1", "magic-string": "0.30.11", "ora": "5.4.1", @@ -838,9 +838,9 @@ } }, "node_modules/@angular/animations": { - "version": "18.2.2", - "resolved": "https://registry.npmjs.org/@angular/animations/-/animations-18.2.2.tgz", - "integrity": "sha512-jh/dGrY77HGm54HdTiQsxmvoRfFeJgHeWAK2+nWCPoc4b7OHcWxy/04cYffs0/27ThmABmppP7ERAyZ0f60uow==", + "version": "18.2.3", + "resolved": "https://registry.npmjs.org/@angular/animations/-/animations-18.2.3.tgz", + "integrity": "sha512-rIATopHr83lYR0X05buHeHssq9CGw0I0YPIQcpUTGnlqIpJcQVCf7jCFn4KGZrE9V55hFY3MD4S28njlwCToQQ==", "dependencies": { "tslib": "^2.3.0" }, @@ -848,16 +848,16 @@ "node": "^18.19.1 || ^20.11.1 || >=22.0.0" }, "peerDependencies": { - "@angular/core": "18.2.2" + "@angular/core": "18.2.3" } }, "node_modules/@angular/build": { - "version": "18.2.2", - "resolved": "https://registry.npmjs.org/@angular/build/-/build-18.2.2.tgz", - "integrity": "sha512-okaDdTMXnDhvnnnih6rPQnexL6htfEAPr19bB1Ci9d31gEjVuKZCjlcw2sPZ6BUyilwC9nZlCI5vbH1Ljf6mzA==", + "version": "18.2.3", + "resolved": "https://registry.npmjs.org/@angular/build/-/build-18.2.3.tgz", + "integrity": "sha512-USrD2Zvcb1te2dnqhH7JZ5XeJDg/t7fjUHR4f93vvMrnrncwCjLoHbHpz01HCHfcIVRgsYUdAmAi1iG7vpak7w==", "dependencies": { "@ampproject/remapping": "2.3.0", - "@angular-devkit/architect": "0.1802.2", + "@angular-devkit/architect": "0.1802.3", "@babel/core": "7.25.2", "@babel/helper-annotate-as-pure": "7.24.7", "@babel/helper-split-export-declaration": "7.24.7", @@ -1323,9 +1323,9 @@ } }, "node_modules/@angular/cdk": { - "version": "18.2.2", - "resolved": "https://registry.npmjs.org/@angular/cdk/-/cdk-18.2.2.tgz", - "integrity": "sha512-+u7ZcMA24WO03vDzlBJJWq+okZLFDeW9JrtHzrdiT09FDt4sdUp+7PddXaZcRHIXjJL+CaCLQ6slaqPNEufqgg==", + "version": "18.2.3", + "resolved": "https://registry.npmjs.org/@angular/cdk/-/cdk-18.2.3.tgz", + "integrity": "sha512-lUcpYTxPZuntJ1FK7V2ugapCGMIhT6TUDjIGgXfS9AxGSSKgwr8HNs6Ze9pcjYC44UhP40sYAZuiaFwmE60A2A==", "dependencies": { "tslib": "^2.3.0" }, @@ -1339,16 +1339,16 @@ } }, "node_modules/@angular/cli": { - "version": "18.2.2", - "resolved": "https://registry.npmjs.org/@angular/cli/-/cli-18.2.2.tgz", - "integrity": "sha512-HVVaMxnbID0q+V3KE+JqzGbPHcBUFo1RKhBZ/jxY7USZNzgtyYbRc0IYqPWNdr99UT5QefTJrjVazJo1nqQZvQ==", + "version": "18.2.3", + "resolved": "https://registry.npmjs.org/@angular/cli/-/cli-18.2.3.tgz", + "integrity": "sha512-40258vuliH6+p8QSByZe5EcIXSj0iR3PNF6yuusClR/ByToHOnmuPw7WC+AYr0ooozmqlim/EjQe4/037OUB3w==", "dependencies": { - "@angular-devkit/architect": "0.1802.2", - "@angular-devkit/core": "18.2.2", - "@angular-devkit/schematics": "18.2.2", + "@angular-devkit/architect": "0.1802.3", + "@angular-devkit/core": "18.2.3", + "@angular-devkit/schematics": "18.2.3", "@inquirer/prompts": "5.3.8", "@listr2/prompt-adapter-inquirer": "2.0.15", - "@schematics/angular": "18.2.2", + "@schematics/angular": "18.2.3", "@yarnpkg/lockfile": "1.1.0", "ini": "4.1.3", "jsonc-parser": "3.3.1", @@ -1371,9 +1371,9 @@ } }, "node_modules/@angular/common": { - "version": "18.2.2", - "resolved": "https://registry.npmjs.org/@angular/common/-/common-18.2.2.tgz", - "integrity": "sha512-AQe4xnnNNch/sXRnV82C8FmhijxPATKfPGojC2qbAG2o6VkWKgt5Lbj0O8WxvSIOS5Syedv+O2kLY/JMGWHNtw==", + "version": "18.2.3", + "resolved": "https://registry.npmjs.org/@angular/common/-/common-18.2.3.tgz", + "integrity": "sha512-NFL4yXXImSCH7i1xnHykUjHa9vl9827fGiwSV2mnf7LjSUsyDzFD8/54dNuYN9OY8AUD+PnK0YdNro6cczVyIA==", "dependencies": { "tslib": "^2.3.0" }, @@ -1381,14 +1381,14 @@ "node": "^18.19.1 || ^20.11.1 || >=22.0.0" }, "peerDependencies": { - "@angular/core": "18.2.2", + "@angular/core": "18.2.3", "rxjs": "^6.5.3 || ^7.4.0" } }, "node_modules/@angular/compiler": { - "version": "18.2.2", - "resolved": "https://registry.npmjs.org/@angular/compiler/-/compiler-18.2.2.tgz", - "integrity": "sha512-gmVNCXZiv/CIk2eKRLnH19N9VsPuE2s3Oxm0MNi003zk1cLy7D4YEm4fSrjKXtPY8MMpRXiu5f63W94hLwWEVw==", + "version": "18.2.3", + "resolved": "https://registry.npmjs.org/@angular/compiler/-/compiler-18.2.3.tgz", + "integrity": "sha512-Il3ljs0j1GaYoqYFdShjUP1ryck5xTOaA8uQuRgqwU0FOwEDfugSAM3Qf7nJx/sgxTM0Lm/Nrdv2u6i1gZWeuQ==", "dependencies": { "tslib": "^2.3.0" }, @@ -1396,7 +1396,7 @@ "node": "^18.19.1 || ^20.11.1 || >=22.0.0" }, "peerDependencies": { - "@angular/core": "18.2.2" + "@angular/core": "18.2.3" }, "peerDependenciesMeta": { "@angular/core": { @@ -1405,9 +1405,9 @@ } }, "node_modules/@angular/compiler-cli": { - "version": "18.2.2", - "resolved": "https://registry.npmjs.org/@angular/compiler-cli/-/compiler-cli-18.2.2.tgz", - "integrity": "sha512-fF7lDrTA12YGqVjF4LyMi4hm58cv9G6CWmzSlvun0nMYCwrbRNnakZsj19dOfiIqqu4MwHaF4w3PTmUSxkMuiw==", + "version": "18.2.3", + "resolved": "https://registry.npmjs.org/@angular/compiler-cli/-/compiler-cli-18.2.3.tgz", + "integrity": "sha512-BcmqYKnkcJTkGjuPztClZNQve7tdI290J5F3iZBx6c7/vaw8EU8EGZtpWYZpgiVn5S6jhcKyc1dLF9ggO9vftg==", "dependencies": { "@babel/core": "7.25.2", "@jridgewell/sourcemap-codec": "^1.4.14", @@ -1427,14 +1427,14 @@ "node": "^18.19.1 || ^20.11.1 || >=22.0.0" }, "peerDependencies": { - "@angular/compiler": "18.2.2", + "@angular/compiler": "18.2.3", "typescript": ">=5.4 <5.6" } }, "node_modules/@angular/core": { - "version": "18.2.2", - "resolved": "https://registry.npmjs.org/@angular/core/-/core-18.2.2.tgz", - "integrity": "sha512-Rx6XajL0Ydj9hXUSPDvL2Q/kMzWtbiE3VxZFJnkE+fLQiWvr0GncB+NTb/nQ6QlPQ0ly60DvuI3KLcGDuFtGVA==", + "version": "18.2.3", + "resolved": "https://registry.npmjs.org/@angular/core/-/core-18.2.3.tgz", + "integrity": "sha512-VGhMJxj7d0rYpqVfQrcGRB7EE/BCziotft/I/YPl6bOMPSAvMukG7DXQuJdYpNrr62ks78mlzHlZX/cdmB9Prw==", "dependencies": { "tslib": "^2.3.0" }, @@ -1447,9 +1447,9 @@ } }, "node_modules/@angular/forms": { - "version": "18.2.2", - "resolved": "https://registry.npmjs.org/@angular/forms/-/forms-18.2.2.tgz", - "integrity": "sha512-K8cv0w6o7+ocQfUrdSA3XaKrYfa1+2TlmtyxPHjEd2mCu2R+Yqo5RqJ3P8keFewJ1+bSLhz6xnn6mumwl0RnUQ==", + "version": "18.2.3", + "resolved": "https://registry.npmjs.org/@angular/forms/-/forms-18.2.3.tgz", + "integrity": "sha512-+OBaAH0e8hue9eyLnbgpxg1/X9fps6bwXECfJ0nL5BDPU5itZ428YJbEnj5bTx0hEbqfTRiV4LgexdI+D9eOpw==", "dependencies": { "tslib": "^2.3.0" }, @@ -1457,16 +1457,16 @@ "node": "^18.19.1 || ^20.11.1 || >=22.0.0" }, "peerDependencies": { - "@angular/common": "18.2.2", - "@angular/core": "18.2.2", - "@angular/platform-browser": "18.2.2", + "@angular/common": "18.2.3", + "@angular/core": "18.2.3", + "@angular/platform-browser": "18.2.3", "rxjs": "^6.5.3 || ^7.4.0" } }, "node_modules/@angular/localize": { - "version": "18.2.2", - "resolved": "https://registry.npmjs.org/@angular/localize/-/localize-18.2.2.tgz", - "integrity": "sha512-grWQ3CVbizOWCthGpyIlNNnZCpF/xpWYa6tIsPzKOXLCyqFQ7vOEtSludNN1nsUmMlZQt76+wA17Fx0qcNx0EA==", + "version": "18.2.3", + "resolved": "https://registry.npmjs.org/@angular/localize/-/localize-18.2.3.tgz", + "integrity": "sha512-ZTliuRfH/hGwQTmFb1FwKOyMUks2ATuFVFzKnxbsxoo+XgTg+e12FcUfPEfdtPAteZ9gSuc/9hP8sM0RzW0LPg==", "dependencies": { "@babel/core": "7.25.2", "@types/babel__core": "7.20.5", @@ -1482,20 +1482,20 @@ "node": "^18.19.1 || ^20.11.1 || >=22.0.0" }, "peerDependencies": { - "@angular/compiler": "18.2.2", - "@angular/compiler-cli": "18.2.2" + "@angular/compiler": "18.2.3", + "@angular/compiler-cli": "18.2.3" } }, "node_modules/@angular/material": { - "version": "18.2.2", - "resolved": "https://registry.npmjs.org/@angular/material/-/material-18.2.2.tgz", - "integrity": "sha512-c+EQo1GEvM2w3qasgV/BGxB0bpJeSGs2WcMVTXCYVMcqEk8nwpALwfZiCAYl8JoKoiC5k993zz19xP2Eu14qkQ==", + "version": "18.2.3", + "resolved": "https://registry.npmjs.org/@angular/material/-/material-18.2.3.tgz", + "integrity": "sha512-JFfvXaMHMhskncaxxus4sDvie9VYdMkfYgfinkLXpZlPFyn1IzjDw0c1BcrcsuD7UxQVZ/v5tucCgq1FQfGRpA==", "dependencies": { "tslib": "^2.3.0" }, "peerDependencies": { "@angular/animations": "^18.0.0 || ^19.0.0", - "@angular/cdk": "18.2.2", + "@angular/cdk": "18.2.3", "@angular/common": "^18.0.0 || ^19.0.0", "@angular/core": "^18.0.0 || ^19.0.0", "@angular/forms": "^18.0.0 || ^19.0.0", @@ -1504,9 +1504,9 @@ } }, "node_modules/@angular/platform-browser": { - "version": "18.2.2", - "resolved": "https://registry.npmjs.org/@angular/platform-browser/-/platform-browser-18.2.2.tgz", - "integrity": "sha512-Bfvl8elCFxyJ9vlwamr4X5sVMcp/tSwBal2coyl0WR+/PH2PAAtf+/WMYxIN90yZmPiJx6RZWUSJRlHOFiFp3A==", + "version": "18.2.3", + "resolved": "https://registry.npmjs.org/@angular/platform-browser/-/platform-browser-18.2.3.tgz", + "integrity": "sha512-M2ob4zN7tAcL2mx7U6KnZNqNFPFl9MlPBE0FrjQjIzAjU0wSYPIJXmaPu9aMUp9niyo+He5iX98I+URi2Yc99g==", "dependencies": { "tslib": "^2.3.0" }, @@ -1514,9 +1514,9 @@ "node": "^18.19.1 || ^20.11.1 || >=22.0.0" }, "peerDependencies": { - "@angular/animations": "18.2.2", - "@angular/common": "18.2.2", - "@angular/core": "18.2.2" + "@angular/animations": "18.2.3", + "@angular/common": "18.2.3", + "@angular/core": "18.2.3" }, "peerDependenciesMeta": { "@angular/animations": { @@ -1525,9 +1525,9 @@ } }, "node_modules/@angular/platform-browser-dynamic": { - "version": "18.2.2", - "resolved": "https://registry.npmjs.org/@angular/platform-browser-dynamic/-/platform-browser-dynamic-18.2.2.tgz", - "integrity": "sha512-UM/+1nY4iIj1v4lxAmV3XRHPAh/4qfNKScCLq8tJGot64rPCbtCl0Rl8rFFGqxAFvTErVDaJycUgWNZSfVl/hw==", + "version": "18.2.3", + "resolved": "https://registry.npmjs.org/@angular/platform-browser-dynamic/-/platform-browser-dynamic-18.2.3.tgz", + "integrity": "sha512-nWi9ZxN4KpbJkttIckFO1PCoW0+gb/18xFO+JWyLBAtcbsudj/Mv0P/fdOaSfQdLkPhZfORr3ZcfiTkhmuGyEg==", "dependencies": { "tslib": "^2.3.0" }, @@ -1535,16 +1535,16 @@ "node": "^18.19.1 || ^20.11.1 || >=22.0.0" }, "peerDependencies": { - "@angular/common": "18.2.2", - "@angular/compiler": "18.2.2", - "@angular/core": "18.2.2", - "@angular/platform-browser": "18.2.2" + "@angular/common": "18.2.3", + "@angular/compiler": "18.2.3", + "@angular/core": "18.2.3", + "@angular/platform-browser": "18.2.3" } }, "node_modules/@angular/router": { - "version": "18.2.2", - "resolved": "https://registry.npmjs.org/@angular/router/-/router-18.2.2.tgz", - "integrity": "sha512-tBHwuNtZNjzYAoVdveTI1ke/ZnQjKhc7gqDk9HCH2JUpdQhGbTvCKwDM51ktJpPMPcZlA263lQyy7VIyvdtK0A==", + "version": "18.2.3", + "resolved": "https://registry.npmjs.org/@angular/router/-/router-18.2.3.tgz", + "integrity": "sha512-fvD9eSDIiIbeYoUokoWkXzu7/ZaxlzKPUHFqX1JuKuH5ciQDeT/d7lp4mj31Bxammhohzi3+z12THJYsCkj/iQ==", "dependencies": { "tslib": "^2.3.0" }, @@ -1552,9 +1552,9 @@ "node": "^18.19.1 || ^20.11.1 || >=22.0.0" }, "peerDependencies": { - "@angular/common": "18.2.2", - "@angular/core": "18.2.2", - "@angular/platform-browser": "18.2.2", + "@angular/common": "18.2.3", + "@angular/core": "18.2.3", + "@angular/platform-browser": "18.2.3", "rxjs": "^6.5.3 || ^7.4.0" } }, @@ -4528,9 +4528,9 @@ } }, "node_modules/@ngtools/webpack": { - "version": "18.2.2", - "resolved": "https://registry.npmjs.org/@ngtools/webpack/-/webpack-18.2.2.tgz", - "integrity": "sha512-YhADmc+lVjLt3kze07A+yLry2yzcghdclu+7D3EDfa6fG2Pk33HK3MY2I0Z0BO+Ivoq7cV7yxm+naR+Od0Y5ng==", + "version": "18.2.3", + "resolved": "https://registry.npmjs.org/@ngtools/webpack/-/webpack-18.2.3.tgz", + "integrity": "sha512-DDuBHcu23qckt43SexBJaPEIeMc/HKaFOidILZM9D4gU4C9VroMActdR218dvQ802QfL0S46t5Ykz8ENprIfjA==", "engines": { "node": "^18.19.1 || ^20.11.1 || >=22.0.0", "npm": "^6.11.0 || ^7.5.6 || >=8.0.0", @@ -5076,12 +5076,12 @@ ] }, "node_modules/@schematics/angular": { - "version": "18.2.2", - "resolved": "https://registry.npmjs.org/@schematics/angular/-/angular-18.2.2.tgz", - "integrity": "sha512-0uPA1kQ38RnbNrzMlveX/QAqQIDu2INl5IYd3EUbJZRfYSp1VVyOSyuIBJ+1iUl5Y5VUa2uylaVZXhFdKWprXw==", + "version": "18.2.3", + "resolved": "https://registry.npmjs.org/@schematics/angular/-/angular-18.2.3.tgz", + "integrity": "sha512-whSON70z9HYb4WboVXmPFE/RLKJJQLWNzNcUyi8OSDZkQbJnYgPp0///n738m26Y/XeJDv11q1gESy+Zl2AdUw==", "dependencies": { - "@angular-devkit/core": "18.2.2", - "@angular-devkit/schematics": "18.2.2", + "@angular-devkit/core": "18.2.3", + "@angular-devkit/schematics": "18.2.3", "jsonc-parser": "3.3.1" }, "engines": { @@ -16442,9 +16442,9 @@ } }, "node_modules/webpack-dev-middleware": { - "version": "7.3.0", - "resolved": "https://registry.npmjs.org/webpack-dev-middleware/-/webpack-dev-middleware-7.3.0.tgz", - "integrity": "sha512-xD2qnNew+F6KwOGZR7kWdbIou/ud7cVqLEXeK1q0nHcNsX/u7ul/fSdlOTX4ntSL5FNFy7ZJJXbf0piF591JYw==", + "version": "7.4.2", + "resolved": "https://registry.npmjs.org/webpack-dev-middleware/-/webpack-dev-middleware-7.4.2.tgz", + "integrity": "sha512-xOO8n6eggxnwYpy1NlzUKpvrjfJTvae5/D6WOK0S2LSo7vjmo5gCM1DbLUmFqrMTJP+W/0YZNctm7jasWvLuBA==", "dependencies": { "colorette": "^2.0.10", "memfs": "^4.6.0", From 7a21aefcf73d9c191d3475370c2815c2fda9e3b1 Mon Sep 17 00:00:00 2001 From: Renovate Bot Date: Thu, 5 Sep 2024 00:09:10 +0000 Subject: [PATCH 11/43] Update dependency puppeteer to v23.3.0 --- package-lock.json | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/package-lock.json b/package-lock.json index 9700ca477..cc67aa8c0 100644 --- a/package-lock.json +++ b/package-lock.json @@ -4862,9 +4862,9 @@ } }, "node_modules/@puppeteer/browsers": { - "version": "2.3.1", - "resolved": "https://registry.npmjs.org/@puppeteer/browsers/-/browsers-2.3.1.tgz", - "integrity": "sha512-uK7o3hHkK+naEobMSJ+2ySYyXtQkBxIH8Gn4MK9ciePjNV+Pf+PgY/W7iPzn2MTjl3stcYB5AlcTmPYw7AXDwA==", + "version": "2.4.0", + "resolved": "https://registry.npmjs.org/@puppeteer/browsers/-/browsers-2.4.0.tgz", + "integrity": "sha512-x8J1csfIygOwf6D6qUAZ0ASk3z63zPb7wkNeHRerCMh82qWKUrOgkuP005AJC8lDL6/evtXETGEJVcwykKT4/g==", "dev": true, "dependencies": { "debug": "^4.3.6", @@ -14063,17 +14063,17 @@ } }, "node_modules/puppeteer": { - "version": "23.2.2", - "resolved": "https://registry.npmjs.org/puppeteer/-/puppeteer-23.2.2.tgz", - "integrity": "sha512-3RX5vEhlOE/9M7ZXxoJVvI7pbOF3fzFK4etwbdii7w+r58q+krK5l2FXWlA1ETnNs7ilM/KLFc0n6K8VUi99dA==", + "version": "23.3.0", + "resolved": "https://registry.npmjs.org/puppeteer/-/puppeteer-23.3.0.tgz", + "integrity": "sha512-e2jY8cdWSUGsrLxqGm3hIbJq/UIk1uOY8XY7SM51leXkH7shrIyE91lK90Q9byX6tte+cyL3HKqlWBEd6TjWTA==", "dev": true, "hasInstallScript": true, "dependencies": { - "@puppeteer/browsers": "2.3.1", + "@puppeteer/browsers": "2.4.0", "chromium-bidi": "0.6.5", "cosmiconfig": "^9.0.0", "devtools-protocol": "0.0.1330662", - "puppeteer-core": "23.2.2", + "puppeteer-core": "23.3.0", "typed-query-selector": "^2.12.0" }, "bin": { @@ -14084,12 +14084,12 @@ } }, "node_modules/puppeteer-core": { - "version": "23.2.2", - "resolved": "https://registry.npmjs.org/puppeteer-core/-/puppeteer-core-23.2.2.tgz", - "integrity": "sha512-MK2Kbdmro+nX9/pfGKm8TiU5G3CuS6BbcNfkcz42GWnHp7KYsJHrP6lPDepiyvwjti5Bt/4a8U3w+DoFpIcBHQ==", + "version": "23.3.0", + "resolved": "https://registry.npmjs.org/puppeteer-core/-/puppeteer-core-23.3.0.tgz", + "integrity": "sha512-sB2SsVMFs4gKad5OCdv6w5vocvtEUrRl0zQqSyRPbo/cj1Ktbarmhxy02Zyb9R9HrssBcJDZbkrvBnbaesPyYg==", "dev": true, "dependencies": { - "@puppeteer/browsers": "2.3.1", + "@puppeteer/browsers": "2.4.0", "chromium-bidi": "0.6.5", "debug": "^4.3.6", "devtools-protocol": "0.0.1330662", From 7f0261b5167e24356fc4da1b83820b00a678180b Mon Sep 17 00:00:00 2001 From: till_schuetze Date: Thu, 5 Sep 2024 08:51:33 +0200 Subject: [PATCH 12/43] Pr fixes --- .../basemap-selection-list.component.ts | 2 +- .../basemap-selector/basemap-selector.component.html | 5 ++++- .../basemap-selector/basemap-selector.component.ts | 2 +- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/src/app/map/components/map-controls/basemap-selector/basemap-selection-list/basemap-selection-list.component.ts b/src/app/map/components/map-controls/basemap-selector/basemap-selection-list/basemap-selection-list.component.ts index 06d9471fa..bf233e86d 100644 --- a/src/app/map/components/map-controls/basemap-selector/basemap-selection-list/basemap-selection-list.component.ts +++ b/src/app/map/components/map-controls/basemap-selector/basemap-selection-list/basemap-selection-list.component.ts @@ -14,7 +14,7 @@ import {BasemapConfigService} from '../../../../services/basemap-config.service' styleUrls: ['./basemap-selection-list.component.scss'], }) export class BasemapSelectionListComponent implements OnInit, OnDestroy { - @Output() public basemapChangedEvent = new EventEmitter(); + @Output() public readonly basemapChangedEvent = new EventEmitter(); public activeBasemap?: Basemap; public availableBasemaps: Basemap[] = []; diff --git a/src/app/map/components/map-controls/basemap-selector/basemap-selector.component.html b/src/app/map/components/map-controls/basemap-selector/basemap-selector.component.html index 0dc536ae7..79f79324b 100644 --- a/src/app/map/components/map-controls/basemap-selector/basemap-selector.component.html +++ b/src/app/map/components/map-controls/basemap-selector/basemap-selector.component.html @@ -6,5 +6,8 @@ class="basemap-selector__active" [ngStyle]="{'background-image': 'url(' + (activeBasemap?.id | basemapImageLink) + ')'}" > - +
    diff --git a/src/app/map/components/map-controls/basemap-selector/basemap-selector.component.ts b/src/app/map/components/map-controls/basemap-selector/basemap-selector.component.ts index f8ce49206..2cc4c26c8 100644 --- a/src/app/map/components/map-controls/basemap-selector/basemap-selector.component.ts +++ b/src/app/map/components/map-controls/basemap-selector/basemap-selector.component.ts @@ -51,7 +51,7 @@ export class BasemapSelectorComponent implements OnInit, OnDestroy, AfterViewIni ); } - public toggleAndFocusBasemapSelectorButton() { + public toggleSelectionAndFocusBasemapSelectorButton() { this.toggleSelection(); this.basemapSelectorButtonRef.nativeElement.focus(); } From 1a4d2c0968b1e3cf55231bf133353f314fad70ef Mon Sep 17 00:00:00 2001 From: till_schuetze Date: Thu, 5 Sep 2024 09:16:19 +0200 Subject: [PATCH 13/43] Pr fixes --- src/app/state/app/effects/url.effects.spec.ts | 17 +++++++++++++++++ src/app/state/app/effects/url.effects.ts | 4 ++-- src/app/state/app/reducers/url.reducer.spec.ts | 12 +++++++++++- 3 files changed, 30 insertions(+), 3 deletions(-) diff --git a/src/app/state/app/effects/url.effects.spec.ts b/src/app/state/app/effects/url.effects.spec.ts index 402d5ef30..b560095ed 100644 --- a/src/app/state/app/effects/url.effects.spec.ts +++ b/src/app/state/app/effects/url.effects.spec.ts @@ -268,4 +268,21 @@ describe('UrlEffects', () => { expect(routerSpy).not.toHaveBeenCalled(); })); }); + describe('keepTemporaryUrlParameters$', () => { + const actions = [ + {name: 'SearchActions.setSearchApiError', action: SearchActions.setSearchApiError}, + {name: 'SearchActions.handleEmptyResultsFromUrlSearch', action: SearchActions.handleEmptyResultsFromUrlSearch}, + {name: 'SearchActions.handleInvalidParameters', action: SearchActions.handleInvalidParameters}, + ]; + actions.forEach(({name, action}) => { + it(`dispatches UrlActions.keepTemporaryUrlParameters when ${name} is triggered`, () => { + const expectedAction = UrlActions.keepTemporaryUrlParameters(); + + actions$ = of(action); + effects.keepTemporaryUrlParameters$.subscribe((result) => { + expect(result).toEqual(expectedAction); + }); + }); + }); + }); }); diff --git a/src/app/state/app/effects/url.effects.ts b/src/app/state/app/effects/url.effects.ts index 41fcf4200..096857d23 100644 --- a/src/app/state/app/effects/url.effects.ts +++ b/src/app/state/app/effects/url.effects.ts @@ -121,8 +121,8 @@ export class UrlEffects { map(([{params}, currentParams, _, keepTemporaryUrlParams]) => { let adjustedAndCurrentParams: {params: Params; currentParams: Params} = {params, currentParams}; if ( - Object.keys(currentParams).some((paramKey) => MapConstants.TEMPORARY_URL_PARAMS.includes(paramKey)) && - !keepTemporaryUrlParams + !keepTemporaryUrlParams && + Object.keys(currentParams).some((paramKey) => MapConstants.TEMPORARY_URL_PARAMS.includes(paramKey)) ) { // remove temporary parameters const paramsToRemove = MapConstants.TEMPORARY_URL_PARAMS.reduce((prev, curr) => ({...prev, [curr]: null}), {}); diff --git a/src/app/state/app/reducers/url.reducer.spec.ts b/src/app/state/app/reducers/url.reducer.spec.ts index 05820420d..8ffe578db 100644 --- a/src/app/state/app/reducers/url.reducer.spec.ts +++ b/src/app/state/app/reducers/url.reducer.spec.ts @@ -13,7 +13,7 @@ describe('UrlReducer', () => { }); }); - describe('setUrl', () => { + describe('setPage', () => { it('correctly sets the values from the action and previus state', () => { const props = {mainPage: MainPage.Data, isSimplifiedPage: true, isHeadlessPage: true}; const action = UrlActions.setPage(props); @@ -27,4 +27,14 @@ describe('UrlReducer', () => { expect(result.previousPage).toBe(mockState.mainPage); }); }); + describe('keepTemporaryUrlParameters', () => { + it('correctly sets the value for keepTemporaryUrlParams ', () => { + const action = UrlActions.keepTemporaryUrlParameters(); + const mockState: UrlState = {...initialState, keepTemporaryUrlParams: false}; + + const result = reducer(mockState, action); + + expect(result.keepTemporaryUrlParams).toBe(true); + }); + }); }); From 41c65b929e26eace40f017a4412da9f40c4beccc Mon Sep 17 00:00:00 2001 From: Lukas Merz Date: Thu, 5 Sep 2024 14:06:00 +0200 Subject: [PATCH 14/43] GB3-1647: Add CNAME file to deployment step --- .github/workflows/node-deploy.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.github/workflows/node-deploy.yml b/.github/workflows/node-deploy.yml index 13fb87154..8627c4dfe 100644 --- a/.github/workflows/node-deploy.yml +++ b/.github/workflows/node-deploy.yml @@ -29,6 +29,9 @@ jobs: npm ci npm run build-dev-ebp + - name: Create CNAME file for custom domain + run: echo 'dev.geo.zh.ch' > ./dist/browser/CNAME + - name: Upload artifact uses: actions/upload-pages-artifact@v3 with: From 9c062fd7addac6935bdb03b6fe4f23f56959fc93 Mon Sep 17 00:00:00 2001 From: till_schuetze Date: Thu, 5 Sep 2024 15:00:05 +0200 Subject: [PATCH 15/43] Add skip links to all pages except map page --- src/app/app.component.html | 18 ++++++++++++++---- src/app/app.component.ts | 12 ++++++++++++ .../skip-link/skip-link.component.html | 5 +++++ .../skip-link/skip-link.component.scss | 18 ++++++++++++++++++ .../skip-link/skip-link.component.ts | 17 +++++++++++++++++ .../shared/constants/skip-link.constants.ts | 15 +++++++++++++++ src/app/shared/shared.module.ts | 3 +++ src/app/shared/types/skip-link.type.ts | 4 ++++ 8 files changed, 88 insertions(+), 4 deletions(-) create mode 100644 src/app/shared/components/skip-link/skip-link.component.html create mode 100644 src/app/shared/components/skip-link/skip-link.component.scss create mode 100644 src/app/shared/components/skip-link/skip-link.component.ts create mode 100644 src/app/shared/constants/skip-link.constants.ts create mode 100644 src/app/shared/types/skip-link.type.ts diff --git a/src/app/app.component.html b/src/app/app.component.html index 3b42d1aae..eec4344fb 100644 --- a/src/app/app.component.html +++ b/src/app/app.component.html @@ -1,10 +1,20 @@
    - - + + +
    - - + +
    diff --git a/src/app/app.component.ts b/src/app/app.component.ts index 746031b6a..034003836 100644 --- a/src/app/app.component.ts +++ b/src/app/app.component.ts @@ -18,6 +18,8 @@ import {selectUrlState} from './state/app/reducers/url.reducer'; import {selectMapUiState} from './state/map/reducers/map-ui.reducer'; import {MapUiState} from './state/map/states/map-ui.state'; import {selectDevMode} from './state/app/reducers/app.reducer'; +import {SkipLink} from './shared/types/skip-link.type'; +import {SkipLinkConstants} from './shared/constants/skip-link.constants'; @Component({ selector: 'app-root', @@ -31,6 +33,8 @@ export class AppComponent implements OnInit, OnDestroy { public isSimplifiedPage: boolean = false; public scrollbarWidth?: number; public isDevModeActive: boolean = false; + public readonly skipLinks: SkipLink[] = SkipLinkConstants.skipLinks; + public readonly skipLinksMobile: SkipLink[] = SkipLinkConstants.skipLinksMobile; private snackBarRef?: MatSnackBarRef; private readonly urlState$ = this.store.select(selectUrlState); @@ -59,6 +63,14 @@ export class AppComponent implements OnInit, OnDestroy { this.subscriptions.unsubscribe(); } + public skipTo(elementId: string): void { + const element = document.getElementById(elementId); + if (element) { + element.setAttribute('tabindex', '-1'); + element.focus(); + } + } + @HostListener('document:click', ['$event']) private onDocumentClick(event: PointerEvent) { this.documentService.documentClicked$.next(event); diff --git a/src/app/shared/components/skip-link/skip-link.component.html b/src/app/shared/components/skip-link/skip-link.component.html new file mode 100644 index 000000000..f1eb61e6f --- /dev/null +++ b/src/app/shared/components/skip-link/skip-link.component.html @@ -0,0 +1,5 @@ +@for (skipLink of skipLinks; track skipLink.id) { + +} diff --git a/src/app/shared/components/skip-link/skip-link.component.scss b/src/app/shared/components/skip-link/skip-link.component.scss new file mode 100644 index 000000000..416378149 --- /dev/null +++ b/src/app/shared/components/skip-link/skip-link.component.scss @@ -0,0 +1,18 @@ +@use 'variables/ktzh-design-variables' as ktzh-variables; + +.skip-link { + position: absolute; + left: max(24px, calc((100% - #{ktzh-variables.$zh-layout-max-content-width}) / 2)); + top: -100px; + padding: 24px 12px; + background-color: white; + font-weight: bold; + font-size: 16px; + pointer-events: none; +} + +.skip-link:focus { + top: 0; + z-index: 1000; + pointer-events: all; +} diff --git a/src/app/shared/components/skip-link/skip-link.component.ts b/src/app/shared/components/skip-link/skip-link.component.ts new file mode 100644 index 000000000..a282c0116 --- /dev/null +++ b/src/app/shared/components/skip-link/skip-link.component.ts @@ -0,0 +1,17 @@ +import {Component, EventEmitter, Input, Output} from '@angular/core'; +import {SkipLink} from '../../types/skip-link.type'; + +@Component({ + selector: 'skip-link', + templateUrl: './skip-link.component.html', + styleUrl: './skip-link.component.scss', +}) +export class SkipLinkComponent { + @Input() public skipLinks: SkipLink[] = []; + + @Output() public skipToLocationEvent = new EventEmitter(); + + public skipToLocation(id: string): void { + this.skipToLocationEvent.emit(id); + } +} diff --git a/src/app/shared/constants/skip-link.constants.ts b/src/app/shared/constants/skip-link.constants.ts new file mode 100644 index 000000000..c160ce540 --- /dev/null +++ b/src/app/shared/constants/skip-link.constants.ts @@ -0,0 +1,15 @@ +import {SkipLink} from '../types/skip-link.type'; + +export class SkipLinkConstants { + public static readonly skipLinks: SkipLink[] = [ + {id: 'navigation', label: 'Navigation'}, + {id: 'main-content', label: 'Inhalt'}, + {id: 'footer', label: 'Fussbereich'}, + ]; + + public static readonly skipLinksMobile: SkipLink[] = [ + {id: 'navigation-mobile', label: 'Navigation'}, + {id: 'main-content', label: 'Inhalt'}, + {id: 'footer', label: 'Fussbereich'}, + ]; +} diff --git a/src/app/shared/shared.module.ts b/src/app/shared/shared.module.ts index 156a50a5e..d0038746d 100644 --- a/src/app/shared/shared.module.ts +++ b/src/app/shared/shared.module.ts @@ -36,6 +36,7 @@ import {LayerTooltipPipe} from './pipes/layer-tooltip.pipe'; import {Gb2ExitButtonComponent} from './components/external-link-button/gb2-exit-button.component'; import {TypedTourAnchorDirective} from './directives/typed-tour-anchor.directive'; import {ClickOnSpaceBarDirective} from './directives/click-on-spacebar.directive'; +import {SkipLinkComponent} from './components/skip-link/skip-link.component'; @NgModule({ declarations: [ @@ -71,6 +72,7 @@ import {ClickOnSpaceBarDirective} from './directives/click-on-spacebar.directive ShowTooltipIfTruncatedDirective, Gb2ExitButtonComponent, TypedTourAnchorDirective, + SkipLinkComponent, ], imports: [MaterialModule, RouterModule, CommonModule, ResizableModule, ClickOnSpaceBarDirective, NgOptimizedImage], exports: [ @@ -105,6 +107,7 @@ import {ClickOnSpaceBarDirective} from './directives/click-on-spacebar.directive ShowTooltipIfTruncatedDirective, Gb2ExitButtonComponent, TypedTourAnchorDirective, + SkipLinkComponent, ], }) export class SharedModule {} diff --git a/src/app/shared/types/skip-link.type.ts b/src/app/shared/types/skip-link.type.ts new file mode 100644 index 000000000..6d5c59209 --- /dev/null +++ b/src/app/shared/types/skip-link.type.ts @@ -0,0 +1,4 @@ +export type SkipLink = { + id: string; + label: string; +}; From 9d60d4281c98bbd1c5a074aa2ca63535c76badc5 Mon Sep 17 00:00:00 2001 From: till_schuetze Date: Thu, 5 Sep 2024 15:20:06 +0200 Subject: [PATCH 16/43] make skip link standalone --- src/app/app.module.ts | 2 ++ src/app/shared/components/skip-link/skip-link.component.ts | 2 ++ src/app/shared/shared.module.ts | 3 --- src/app/start-page/start-page.component.html | 2 +- 4 files changed, 5 insertions(+), 4 deletions(-) diff --git a/src/app/app.module.ts b/src/app/app.module.ts index 5b0b45f4c..171655b29 100644 --- a/src/app/app.module.ts +++ b/src/app/app.module.ts @@ -31,6 +31,7 @@ import {effectErrorHandler} from './state/app/effects/effects-error-handler.effe import {EsriMapLoaderService} from './map/services/esri-services/esri-map-loader.service'; import {MapLoaderService} from './map/interfaces/map-loader.service'; import {DevModeBannerComponent} from './shared/components/dev-mode-banner/dev-mode-banner.component'; +import {SkipLinkComponent} from './shared/components/skip-link/skip-link.component'; // necessary for the locale 'de-CH' to work // see https://stackoverflow.com/questions/46419026/missing-locale-data-for-the-locale-xxx-with-angular @@ -55,6 +56,7 @@ export const GRAV_CMS_SERVICE = new InjectionToken('GravCmsServi ErrorHandlingModule, StoreRouterConnectingModule.forRoot(), DevModeBannerComponent, + SkipLinkComponent, ], providers: [ {provide: ErrorHandler, deps: [Router, ErrorHandlerService, EmbeddedErrorHandlerService], useFactory: errorHandlerServiceFactory}, diff --git a/src/app/shared/components/skip-link/skip-link.component.ts b/src/app/shared/components/skip-link/skip-link.component.ts index a282c0116..d9d9d2a48 100644 --- a/src/app/shared/components/skip-link/skip-link.component.ts +++ b/src/app/shared/components/skip-link/skip-link.component.ts @@ -5,6 +5,8 @@ import {SkipLink} from '../../types/skip-link.type'; selector: 'skip-link', templateUrl: './skip-link.component.html', styleUrl: './skip-link.component.scss', + standalone: true, + imports: [], }) export class SkipLinkComponent { @Input() public skipLinks: SkipLink[] = []; diff --git a/src/app/shared/shared.module.ts b/src/app/shared/shared.module.ts index d0038746d..156a50a5e 100644 --- a/src/app/shared/shared.module.ts +++ b/src/app/shared/shared.module.ts @@ -36,7 +36,6 @@ import {LayerTooltipPipe} from './pipes/layer-tooltip.pipe'; import {Gb2ExitButtonComponent} from './components/external-link-button/gb2-exit-button.component'; import {TypedTourAnchorDirective} from './directives/typed-tour-anchor.directive'; import {ClickOnSpaceBarDirective} from './directives/click-on-spacebar.directive'; -import {SkipLinkComponent} from './components/skip-link/skip-link.component'; @NgModule({ declarations: [ @@ -72,7 +71,6 @@ import {SkipLinkComponent} from './components/skip-link/skip-link.component'; ShowTooltipIfTruncatedDirective, Gb2ExitButtonComponent, TypedTourAnchorDirective, - SkipLinkComponent, ], imports: [MaterialModule, RouterModule, CommonModule, ResizableModule, ClickOnSpaceBarDirective, NgOptimizedImage], exports: [ @@ -107,7 +105,6 @@ import {SkipLinkComponent} from './components/skip-link/skip-link.component'; ShowTooltipIfTruncatedDirective, Gb2ExitButtonComponent, TypedTourAnchorDirective, - SkipLinkComponent, ], }) export class SharedModule {} diff --git a/src/app/start-page/start-page.component.html b/src/app/start-page/start-page.component.html index 2ebc2b70f..49937e956 100644 --- a/src/app/start-page/start-page.component.html +++ b/src/app/start-page/start-page.component.html @@ -4,7 +4,7 @@
    - +
    From 57b54c4d8b41d6d2783994d018543e4e09d7cb3c Mon Sep 17 00:00:00 2001 From: till_schuetze Date: Thu, 5 Sep 2024 15:27:56 +0200 Subject: [PATCH 17/43] use new control flow in app.component.html --- src/app/app.component.html | 33 +++++++++++--------- src/app/start-page/start-page.component.html | 2 +- 2 files changed, 19 insertions(+), 16 deletions(-) diff --git a/src/app/app.component.html b/src/app/app.component.html index eec4344fb..16248b268 100644 --- a/src/app/app.component.html +++ b/src/app/app.component.html @@ -1,20 +1,23 @@
    - - - - + @if (!isHeadlessPage && !isSimplifiedPage) { + + } + @if (screenMode === 'mobile' && !isHeadlessPage && !mapUiState?.hideUiElements) { + + } + @if (!isHeadlessPage && screenMode !== 'mobile') { + + } + @if (isDevModeActive) { + + }
    - + @if (!isHeadlessPage && !isSimplifiedPage) { + + }
    - + @if (scrollbarWidth === undefined) { + + }
    diff --git a/src/app/start-page/start-page.component.html b/src/app/start-page/start-page.component.html index 49937e956..2ebc2b70f 100644 --- a/src/app/start-page/start-page.component.html +++ b/src/app/start-page/start-page.component.html @@ -4,7 +4,7 @@
    - +
    From 4247c1484f55b91fde09f01311509506a67f82a6 Mon Sep 17 00:00:00 2001 From: till_schuetze Date: Thu, 5 Sep 2024 16:03:37 +0200 Subject: [PATCH 18/43] add aria labels to the navigation --- src/app/shared/components/navbar/navbar.component.html | 3 ++- .../support-page-navigation.component.html | 4 ++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/src/app/shared/components/navbar/navbar.component.html b/src/app/shared/components/navbar/navbar.component.html index ff47d164d..6bdcbbe5f 100644 --- a/src/app/shared/components/navbar/navbar.component.html +++ b/src/app/shared/components/navbar/navbar.component.html @@ -1,4 +1,4 @@ - + +
    diff --git a/src/app/support-page/components/support-page-navigation/support-page-navigation.component.html b/src/app/support-page/components/support-page-navigation/support-page-navigation.component.html index 1113b2a81..4978cbe06 100644 --- a/src/app/support-page/components/support-page-navigation/support-page-navigation.component.html +++ b/src/app/support-page/components/support-page-navigation/support-page-navigation.component.html @@ -1,6 +1,6 @@

    Themen

    -
    +
    +
    From 8f7c16f2fcfb05186717d251a0eb3e651ddbe08a Mon Sep 17 00:00:00 2001 From: till_schuetze Date: Thu, 5 Sep 2024 16:09:39 +0200 Subject: [PATCH 19/43] make label for subnavigation more descriptive --- .../support-page-navigation.component.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/app/support-page/components/support-page-navigation/support-page-navigation.component.html b/src/app/support-page/components/support-page-navigation/support-page-navigation.component.html index 4978cbe06..2681b7c49 100644 --- a/src/app/support-page/components/support-page-navigation/support-page-navigation.component.html +++ b/src/app/support-page/components/support-page-navigation/support-page-navigation.component.html @@ -1,6 +1,6 @@

    Themen

    -
    - +
    + +
    Date: Tue, 10 Sep 2024 17:19:43 +0200 Subject: [PATCH 25/43] make properties protected --- src/app/app.component.html | 8 ++++---- src/app/app.component.ts | 17 ++++++++--------- 2 files changed, 12 insertions(+), 13 deletions(-) diff --git a/src/app/app.component.html b/src/app/app.component.html index fcdefb2cc..1cd9ac3f2 100644 --- a/src/app/app.component.html +++ b/src/app/app.component.html @@ -3,17 +3,17 @@ } @if (screenMode === 'mobile' && !isHeadlessPage && !mapUiState?.hideUiElements) { - + } @else if (!isHeadlessPage && screenMode !== 'mobile') { - + } @if (isDevModeActive) { }
    - + @if (!isHeadlessPage && !isSimplifiedPage) { - + }
    @if (scrollbarWidth === undefined) { diff --git a/src/app/app.component.ts b/src/app/app.component.ts index 3c5abe432..18b65d688 100644 --- a/src/app/app.component.ts +++ b/src/app/app.component.ts @@ -30,15 +30,14 @@ import {SkipLinkTemplateVariable} from './shared/enums/skip-link-template-variab export class AppComponent implements OnInit, OnDestroy { @ViewChildren(Object.values(SkipLinkTemplateVariable).join(', '), {read: ElementRef}) private readonly elements!: QueryList; - public screenMode: ScreenMode = 'regular'; - public mapUiState?: MapUiState; - public isHeadlessPage: boolean = false; - public isSimplifiedPage: boolean = false; - public scrollbarWidth?: number; - public isDevModeActive: boolean = false; - public readonly skipLinks: SkipLink[] = SkipLinkConstants.skipLinks; - - protected readonly templateVariables = SkipLinkTemplateVariable; + protected screenMode: ScreenMode = 'regular'; + protected mapUiState?: MapUiState; + protected isHeadlessPage: boolean = false; + protected isSimplifiedPage: boolean = false; + protected scrollbarWidth?: number; + protected isDevModeActive: boolean = false; + protected readonly skipLinks: SkipLink[] = SkipLinkConstants.skipLinks; + protected readonly templateVariable = SkipLinkTemplateVariable; private snackBarRef?: MatSnackBarRef; private readonly urlState$ = this.store.select(selectUrlState); From 65971fad7d5683430f6b417943a833e9e2bde8c6 Mon Sep 17 00:00:00 2001 From: till_schuetze Date: Wed, 11 Sep 2024 10:38:22 +0200 Subject: [PATCH 26/43] Show error for invalid initial map ids and keep the url params. Ask users to log in if url search fails --- src/app/shared/errors/initial-maps.errors.ts | 27 +++++++++++++++++++ src/app/shared/errors/search.errors.ts | 13 +++++++-- src/app/state/app/actions/url.actions.ts | 2 ++ src/app/state/app/effects/search.effects.ts | 6 +++-- src/app/state/app/effects/url.effects.ts | 22 ++++++++++++++- .../map/effects/layer-catalog.effects.ts | 14 +++++++--- 6 files changed, 76 insertions(+), 8 deletions(-) create mode 100644 src/app/shared/errors/initial-maps.errors.ts diff --git a/src/app/shared/errors/initial-maps.errors.ts b/src/app/shared/errors/initial-maps.errors.ts new file mode 100644 index 000000000..337eb1417 --- /dev/null +++ b/src/app/shared/errors/initial-maps.errors.ts @@ -0,0 +1,27 @@ +import {Gb3RuntimeError, RecoverableError} from './abstract.errors'; + +export class InitialMapsParameterInvalid extends RecoverableError { + public override name = 'InitialMapsParameterInvalid'; + + constructor(initialMapParameter: string) { + super(); + this.message = `Die Karte "${initialMapParameter}" konnte nicht geladen werden.`; + } +} +export class InitialMapsCouldNotBeLoaded extends RecoverableError { + public override name = 'InitialMapsCouldNotBeLoaded'; + + constructor(isAuthenticated: boolean, originalError?: unknown) { + super(originalError); + let reason = 'Unbekannter Fehler'; + if (originalError && originalError instanceof Gb3RuntimeError && originalError.message) { + reason = originalError.message; + } + + let message = `Ungültige URL Paramter: ${reason}`; + if (!isAuthenticated) { + message += '\nMöglicherweise hilft es, wenn Sie sich einloggen.'; + } + this.message = message; + } +} diff --git a/src/app/shared/errors/search.errors.ts b/src/app/shared/errors/search.errors.ts index d631771d5..2065bf694 100644 --- a/src/app/shared/errors/search.errors.ts +++ b/src/app/shared/errors/search.errors.ts @@ -1,8 +1,17 @@ import {RecoverableError} from './abstract.errors'; export class SearchResultsCouldNotBeLoaded extends RecoverableError { - public override message = 'Die Resultate für die aktuelle Suche konnten nicht geladen werden.'; public override name = 'SearchResultsCouldNotBeLoaded'; + + constructor(isAuthenticated: boolean, originalError?: unknown) { + super(originalError); + + let message = 'Die Resultate für die aktuelle Suche konnten nicht geladen werden.'; + if (!isAuthenticated) { + message += '\nMöglicherweise hilft es, wenn Sie sich einloggen.'; + } + this.message = message; + } } export class InvalidSearchParameters extends RecoverableError { @@ -12,9 +21,9 @@ export class InvalidSearchParameters extends RecoverableError { } export class NoSearchResultsFoundForParameters extends RecoverableError { + public override name = 'NoSearchResultsFoundForParameters'; constructor(searchTerm: string) { super(); this.message = `Die URL-Suche für den Suchbegriff "${searchTerm}" hat keine Resultate geliefert.`; } - public override name = 'NoSearchResultsFoundForParameters'; } diff --git a/src/app/state/app/actions/url.actions.ts b/src/app/state/app/actions/url.actions.ts index 87fa3d00a..50b7cb930 100644 --- a/src/app/state/app/actions/url.actions.ts +++ b/src/app/state/app/actions/url.actions.ts @@ -1,6 +1,7 @@ import {createActionGroup, emptyProps, props} from '@ngrx/store'; import {MainPage} from '../../../shared/enums/main-page.enum'; import {Params} from '@angular/router'; +import {errorProps} from '../../../shared/utils/error-props.utils'; export const UrlActions = createActionGroup({ source: 'Url', @@ -9,5 +10,6 @@ export const UrlActions = createActionGroup({ 'Set App Params': props<{params: Params}>(), 'Set Map Page Params': props<{params: Params}>(), 'Keep Temporary Url Parameters': emptyProps(), + 'Set Initial Maps Error': errorProps(), }, }); diff --git a/src/app/state/app/effects/search.effects.ts b/src/app/state/app/effects/search.effects.ts index 5b4808e1f..78d635350 100644 --- a/src/app/state/app/effects/search.effects.ts +++ b/src/app/state/app/effects/search.effects.ts @@ -27,6 +27,7 @@ import {selectTerm} from '../reducers/search.reducer'; import {selectReady} from '../../map/reducers/map-config.reducer'; import {SearchIndex} from '../../../shared/services/apis/search/interfaces/search-index.interface'; import {isGeometrySearchApiResultMatch} from '../../../shared/type-guards/search-api-result-match.type-guard'; +import {selectIsAuthenticated} from '../../auth/reducers/auth-status.reducer'; @Injectable() export class SearchEffects { @@ -61,8 +62,9 @@ export class SearchEffects { () => { return this.actions$.pipe( ofType(SearchActions.setSearchApiError), - tap(({error}) => { - throw new SearchResultsCouldNotBeLoaded(error); + concatLatestFrom(() => this.store.select(selectIsAuthenticated)), + tap(([{error}, isAuthenticated]) => { + throw new SearchResultsCouldNotBeLoaded(isAuthenticated, error); }), ); }, diff --git a/src/app/state/app/effects/url.effects.ts b/src/app/state/app/effects/url.effects.ts index 096857d23..165051be8 100644 --- a/src/app/state/app/effects/url.effects.ts +++ b/src/app/state/app/effects/url.effects.ts @@ -19,6 +19,8 @@ import {selectQueryParams} from '../selectors/router.selector'; import {RouteParamConstants} from '../../../shared/constants/route-param.constants'; import {SearchActions} from '../actions/search.actions'; import {InitialMapExtentService} from '../../../map/services/initial-map-extent.service'; +import {selectIsAuthenticated} from '../../auth/reducers/auth-status.reducer'; +import {InitialMapsCouldNotBeLoaded} from '../../../shared/errors/initial-maps.errors'; @Injectable() export class UrlEffects { @@ -148,9 +150,27 @@ export class UrlEffects { {dispatch: false}, ); + public setErrorForInvalidInitialMapIds$ = createEffect( + () => { + return this.actions$.pipe( + ofType(UrlActions.setInitialMapsError), + concatLatestFrom(() => this.store.select(selectIsAuthenticated)), + map(([{error}, isAuthenticated]) => { + throw new InitialMapsCouldNotBeLoaded(isAuthenticated, error); + }), + ); + }, + {dispatch: false}, + ); + public keepTemporaryUrlParameters$ = createEffect(() => { return this.actions$.pipe( - ofType(SearchActions.setSearchApiError, SearchActions.handleEmptyResultsFromUrlSearch, SearchActions.handleInvalidParameters), + ofType( + SearchActions.setSearchApiError, + SearchActions.handleEmptyResultsFromUrlSearch, + SearchActions.handleInvalidParameters, + UrlActions.setInitialMapsError, + ), map(() => { return UrlActions.keepTemporaryUrlParameters(); }), diff --git a/src/app/state/map/effects/layer-catalog.effects.ts b/src/app/state/map/effects/layer-catalog.effects.ts index 5239a86f3..08633ef42 100644 --- a/src/app/state/map/effects/layer-catalog.effects.ts +++ b/src/app/state/map/effects/layer-catalog.effects.ts @@ -13,6 +13,8 @@ import {selectItems} from '../reducers/layer-catalog.reducer'; import {ActiveMapItemFactory} from '../../../shared/factories/active-map-item.factory'; import {TopicsCouldNotBeLoaded} from '../../../shared/errors/map.errors'; +import {UrlActions} from '../../app/actions/url.actions'; +import {InitialMapsParameterInvalid} from '../../../shared/errors/initial-maps.errors'; @Injectable() export class LayerCatalogEffects { @@ -46,11 +48,17 @@ export class LayerCatalogEffects { concatLatestFrom(() => [this.store.select(selectMaps), this.store.select(selectMapConfigState)]), // create an array of ActiveMapItems for each id in the initialMaps configuration that has a matching map in the layer catalog map(([_, availableMaps, {initialMaps}]) => { - const initialMapItems = availableMaps - .filter((availableMap) => initialMaps.includes(availableMap.id)) - .map((availableMap) => ActiveMapItemFactory.createGb2WmsMapItem(availableMap)); + const initialMapItems = initialMaps.map((initialMap) => { + const availableMap = availableMaps.find((map) => map.id === initialMap); + if (!availableMap) { + throw new InitialMapsParameterInvalid(initialMap); + } + return ActiveMapItemFactory.createGb2WmsMapItem(availableMap); + }); + return ActiveMapItemActions.addInitialMapItems({initialMapItems}); }), + catchError((error: unknown) => of(UrlActions.setInitialMapsError({error}))), ); }); From 81100c3fce54afa64c77bc238365a00fab8a7b0e Mon Sep 17 00:00:00 2001 From: till_schuetze Date: Wed, 11 Sep 2024 11:42:13 +0200 Subject: [PATCH 27/43] add tests --- .../state/app/effects/search.effect.spec.ts | 25 ++++++++++++++++++- src/app/state/app/effects/url.effects.spec.ts | 24 +++++++++++++++++- 2 files changed, 47 insertions(+), 2 deletions(-) diff --git a/src/app/state/app/effects/search.effect.spec.ts b/src/app/state/app/effects/search.effect.spec.ts index 348ec0fb0..fe44a1db6 100644 --- a/src/app/state/app/effects/search.effect.spec.ts +++ b/src/app/state/app/effects/search.effect.spec.ts @@ -18,8 +18,13 @@ import {selectReady} from '../../map/reducers/map-config.reducer'; import {SearchIndex} from '../../../shared/services/apis/search/interfaces/search-index.interface'; import {SearchService} from '../../../shared/services/apis/search/services/search.service'; import {GeometryWithSrs} from '../../../shared/interfaces/geojson-types-with-srs.interface'; -import {InvalidSearchParameters, NoSearchResultsFoundForParameters} from '../../../shared/errors/search.errors'; +import { + InvalidSearchParameters, + NoSearchResultsFoundForParameters, + SearchResultsCouldNotBeLoaded, +} from '../../../shared/errors/search.errors'; import {catchError} from 'rxjs/operators'; +import {selectIsAuthenticated} from '../../auth/reducers/auth-status.reducer'; describe('SearchEffects', () => { let actions$: Observable; @@ -50,6 +55,24 @@ describe('SearchEffects', () => { store.resetSelectors(); }); + describe('throwSearchApiError$', () => { + it('throws a SearchResultsCouldNotBeLoaded error', (done: DoneFn) => { + store.overrideSelector(selectIsAuthenticated, true); + const originalError = new Error('error'); + actions$ = of(SearchActions.setSearchApiError({error: originalError})); + effects.throwSearchApiError$ + .pipe( + catchError((error: unknown) => { + const expectedError = new SearchResultsCouldNotBeLoaded(true, originalError); + expect(error).toEqual(expectedError); + done(); + return EMPTY; + }), + ) + .subscribe(); + }); + }); + describe('zoomToAndHighlightSelectedSearchResult$', () => { it('calls mapService.zoomToExtent and MapDrawingSerivce.drawSearchResultHighlight', (done: DoneFn) => { const mapService = TestBed.inject(MAP_SERVICE); diff --git a/src/app/state/app/effects/url.effects.spec.ts b/src/app/state/app/effects/url.effects.spec.ts index b560095ed..1f892e984 100644 --- a/src/app/state/app/effects/url.effects.spec.ts +++ b/src/app/state/app/effects/url.effects.spec.ts @@ -1,6 +1,6 @@ import {provideMockActions} from '@ngrx/effects/testing'; import {fakeAsync, flush, TestBed} from '@angular/core/testing'; -import {Observable, of} from 'rxjs'; +import {EMPTY, Observable, of} from 'rxjs'; import {Action} from '@ngrx/store'; import {MockStore, provideMockStore} from '@ngrx/store/testing'; import {routerNavigatedAction} from '@ngrx/router-store'; @@ -16,6 +16,9 @@ import {selectKeepTemporaryUrlParams, selectMainPage} from '../reducers/url.redu import {RouteParamConstants} from '../../../shared/constants/route-param.constants'; import {SearchActions} from '../actions/search.actions'; import {InitialMapExtentService} from '../../../map/services/initial-map-extent.service'; +import {selectIsAuthenticated} from '../../auth/reducers/auth-status.reducer'; +import {catchError} from 'rxjs/operators'; +import {InitialMapsCouldNotBeLoaded} from '../../../shared/errors/initial-maps.errors'; describe('UrlEffects', () => { let actions$: Observable; @@ -268,11 +271,30 @@ describe('UrlEffects', () => { expect(routerSpy).not.toHaveBeenCalled(); })); }); + + describe('setErrorForInvalidInitialMapIds$', () => { + it('throws an InitialMapsCouldNotBeLoaded error', (done: DoneFn) => { + store.overrideSelector(selectIsAuthenticated, true); + const originalError = new Error('error'); + actions$ = of(UrlActions.setInitialMapsError({error: originalError})); + effects.setErrorForInvalidInitialMapIds$ + .pipe( + catchError((error: unknown) => { + const expectedError = new InitialMapsCouldNotBeLoaded(true, originalError); + expect(error).toEqual(expectedError); + done(); + return EMPTY; + }), + ) + .subscribe(); + }); + }); describe('keepTemporaryUrlParameters$', () => { const actions = [ {name: 'SearchActions.setSearchApiError', action: SearchActions.setSearchApiError}, {name: 'SearchActions.handleEmptyResultsFromUrlSearch', action: SearchActions.handleEmptyResultsFromUrlSearch}, {name: 'SearchActions.handleInvalidParameters', action: SearchActions.handleInvalidParameters}, + {name: 'UrlActions.setInitialMapsError', action: UrlActions.setInitialMapsError}, ]; actions.forEach(({name, action}) => { it(`dispatches UrlActions.keepTemporaryUrlParameters when ${name} is triggered`, () => { From dc087122cd281598f2c517eac8d5097ca953c36f Mon Sep 17 00:00:00 2001 From: till_schuetze Date: Wed, 11 Sep 2024 13:51:25 +0200 Subject: [PATCH 28/43] add tests for layer catalog --- .../map/effects/layer-catalog.effects.spec.ts | 81 +++++++++++++++++++ 1 file changed, 81 insertions(+) create mode 100644 src/app/state/map/effects/layer-catalog.effects.spec.ts diff --git a/src/app/state/map/effects/layer-catalog.effects.spec.ts b/src/app/state/map/effects/layer-catalog.effects.spec.ts new file mode 100644 index 000000000..b8b4bba49 --- /dev/null +++ b/src/app/state/map/effects/layer-catalog.effects.spec.ts @@ -0,0 +1,81 @@ +import {Observable, of} from 'rxjs'; +import {Action} from '@ngrx/store'; +import {MockStore, provideMockStore} from '@ngrx/store/testing'; +import {LayerCatalogEffects} from './layer-catalog.effects'; +import {TestBed} from '@angular/core/testing'; +import {provideMockActions} from '@ngrx/effects/testing'; +import {Gb3TopicsService} from '../../../shared/services/apis/gb3/gb3-topics.service'; +import {selectMaps} from '../selectors/maps.selector'; +import {selectMapConfigState} from '../reducers/map-config.reducer'; +import {ActiveMapItemActions} from '../actions/active-map-item.actions'; +import {LayerCatalogActions} from '../actions/layer-catalog.actions'; +import {MapConfigState} from '../states/map-config.state'; +import {Map} from '../../../shared/interfaces/topic.interface'; +import {provideHttpClient, withInterceptorsFromDi} from '@angular/common/http'; +import {provideHttpClientTesting} from '@angular/common/http/testing'; +import {ActiveMapItemFactory} from '../../../shared/factories/active-map-item.factory'; +import {UrlActions} from '../../app/actions/url.actions'; +import {InitialMapsParameterInvalid} from '../../../shared/errors/initial-maps.errors'; + +describe('LayerCatalogEffects', () => { + let actions$: Observable; + let store: MockStore; + let effects: LayerCatalogEffects; + let gb3TopicsService: Gb3TopicsService; + + beforeEach(() => { + actions$ = new Observable(); + + TestBed.configureTestingModule({ + imports: [], + providers: [ + LayerCatalogEffects, + provideMockActions(() => actions$), + provideMockStore(), + provideHttpClient(withInterceptorsFromDi()), + provideHttpClientTesting(), + ], + }); + effects = TestBed.inject(LayerCatalogEffects); + store = TestBed.inject(MockStore); + gb3TopicsService = TestBed.inject(Gb3TopicsService); + }); + + afterEach(() => { + store.resetSelectors(); + }); + + describe('handleInitialMapLoad', () => { + it('dispatches ActiveMapItemActions.addInitialMapItems with the correct inital Maps', () => { + const mapConfigStateMock: MapConfigState = { + initialMaps: ['1'], + } as MapConfigState; + const mapMock = [{id: '1'}] as Map[]; + const activeMapItemMock = ActiveMapItemFactory.createGb2WmsMapItem(mapMock[0]); + + store.overrideSelector(selectMaps, mapMock); + store.overrideSelector(selectMapConfigState, mapConfigStateMock); + const expectedAction = ActiveMapItemActions.addInitialMapItems({initialMapItems: [activeMapItemMock]}); + actions$ = of(LayerCatalogActions.setLayerCatalog({items: []})); + effects.handleInitialMapLoad.subscribe((action) => { + expect(action).toEqual(expectedAction); + }); + }); + it('dispatches UrlActions.setInitialMapsError if a map is not found', (done: DoneFn) => { + const mapConfigStateMock: MapConfigState = { + initialMaps: ['1'], + } as MapConfigState; + const mapMock = [] as Map[]; + + store.overrideSelector(selectMaps, mapMock); + store.overrideSelector(selectMapConfigState, mapConfigStateMock); + const expectedError = new InitialMapsParameterInvalid(mapConfigStateMock.initialMaps[0]); + const expectedAction = UrlActions.setInitialMapsError({error: expectedError}); + actions$ = of(LayerCatalogActions.setLayerCatalog({items: []})); + effects.handleInitialMapLoad.subscribe((action) => { + expect(action).toEqual(expectedAction); + done(); + }); + }); + }); +}); From d05ba036380c1574f851ac1be74f605a97a2c273 Mon Sep 17 00:00:00 2001 From: till_schuetze Date: Wed, 11 Sep 2024 15:54:13 +0200 Subject: [PATCH 29/43] zoom to coordinate input and display it on the map --- src/app/state/map/effects/map-config.effects.spec.ts | 12 ++++++++++-- src/app/state/map/effects/map-config.effects.ts | 7 ++++++- 2 files changed, 16 insertions(+), 3 deletions(-) diff --git a/src/app/state/map/effects/map-config.effects.spec.ts b/src/app/state/map/effects/map-config.effects.spec.ts index e47228a83..002bc39cb 100644 --- a/src/app/state/map/effects/map-config.effects.spec.ts +++ b/src/app/state/map/effects/map-config.effects.spec.ts @@ -17,6 +17,8 @@ import {MapConfigEffects} from './map-config.effects'; import {provideHttpClient, withInterceptorsFromDi} from '@angular/common/http'; import {InitialMapExtentService} from '../../../map/services/initial-map-extent.service'; import {SearchActions} from '../../app/actions/search.actions'; +import {ConfigService} from '../../../shared/services/config.service'; +import {MapDrawingService} from '../../../map/services/map-drawing.service'; describe('MapConfigEffects', () => { let actions$: Observable; @@ -24,6 +26,8 @@ describe('MapConfigEffects', () => { let effects: MapConfigEffects; let mapService: MapService; let initialMapExtentServiceMock: jasmine.SpyObj; + let configService: ConfigService; + let mapDrawingService: MapDrawingService; beforeEach(() => { actions$ = new Observable(); @@ -44,6 +48,8 @@ describe('MapConfigEffects', () => { effects = TestBed.inject(MapConfigEffects); mapService = TestBed.inject(MAP_SERVICE); store = TestBed.inject(MockStore); + configService = TestBed.inject(ConfigService); + mapDrawingService = TestBed.inject(MapDrawingService); }); afterEach(() => { @@ -97,12 +103,14 @@ describe('MapConfigEffects', () => { describe('setCenterOnMap$', () => { it('sets the map center using the map service, no further action dispatch', (done: DoneFn) => { const expectedCenter: PointWithSrs = {srs: 2056, type: 'Point', coordinates: [123, 456]}; - const mapServiceSpy = spyOn(mapService, 'setMapCenter').and.callThrough(); + const mapServiceSpy = spyOn(mapService, 'zoomToPoint').and.callThrough(); + const mapDrawingServiceSpy = spyOn(mapDrawingService, 'drawSearchResultHighlight').and.callThrough(); const expectedAction = MapConfigActions.setMapCenter({center: expectedCenter}); actions$ = of(expectedAction); effects.setCenterOnMap$.subscribe((action) => { - expect(mapServiceSpy).toHaveBeenCalledOnceWith(expectedCenter); + expect(mapServiceSpy).toHaveBeenCalledOnceWith(expectedCenter, configService.mapConfig.locateMeZoom); + expect(mapDrawingServiceSpy).toHaveBeenCalledOnceWith(expectedCenter); expect(action).toEqual(expectedAction); done(); }); diff --git a/src/app/state/map/effects/map-config.effects.ts b/src/app/state/map/effects/map-config.effects.ts index d6b38cf76..12ebbe0b3 100644 --- a/src/app/state/map/effects/map-config.effects.ts +++ b/src/app/state/map/effects/map-config.effects.ts @@ -11,6 +11,8 @@ import {UrlActions} from '../../app/actions/url.actions'; import {Store} from '@ngrx/store'; import {SearchActions} from '../../app/actions/search.actions'; import {InitialMapExtentService} from '../../../map/services/initial-map-extent.service'; +import {ConfigService} from '../../../shared/services/config.service'; +import {MapDrawingService} from '../../../map/services/map-drawing.service'; @Injectable() export class MapConfigEffects { @@ -53,7 +55,8 @@ export class MapConfigEffects { return this.actions$.pipe( ofType(MapConfigActions.setMapCenter), tap(({center}) => { - this.mapService.setMapCenter(center); + this.mapService.zoomToPoint(center, this.configService.mapConfig.locateMeZoom); + this.mapDrawingService.drawSearchResultHighlight(center); }), ); }, @@ -89,6 +92,8 @@ export class MapConfigEffects { private readonly actions$: Actions, @Inject(MAP_SERVICE) private readonly mapService: MapService, private readonly store: Store, + private readonly configService: ConfigService, private readonly initialMapExtentService: InitialMapExtentService, + private readonly mapDrawingService: MapDrawingService, ) {} } From 0d4625dbd9445852c3968f8385dec68b338e2571 Mon Sep 17 00:00:00 2001 From: till_schuetze Date: Wed, 11 Sep 2024 15:58:35 +0200 Subject: [PATCH 30/43] remove now unused setMapCenter method from map service --- src/app/map/interfaces/map.service.ts | 3 --- src/app/map/services/esri-services/esri-map.service.ts | 6 ------ src/app/testing/map-testing/map.service.stub.ts | 2 -- 3 files changed, 11 deletions(-) diff --git a/src/app/map/interfaces/map.service.ts b/src/app/map/interfaces/map.service.ts index c6797a640..bef6fae83 100644 --- a/src/app/map/interfaces/map.service.ts +++ b/src/app/map/interfaces/map.service.ts @@ -23,9 +23,6 @@ export interface MapService extends AddToMapVisitor { /** Sets the scale of the whole map */ setScale(scale: number): void; - /** Sets the map center point */ - setMapCenter(center: PointWithSrs): void; - /** Resets the extent of the map to the initial extent */ resetExtent(): void; diff --git a/src/app/map/services/esri-services/esri-map.service.ts b/src/app/map/services/esri-services/esri-map.service.ts index 68f4008ca..278e2b884 100644 --- a/src/app/map/services/esri-services/esri-map.service.ts +++ b/src/app/map/services/esri-services/esri-map.service.ts @@ -337,12 +337,6 @@ export class EsriMapService implements MapService, OnDestroy { } } - public setMapCenter(center: PointWithSrs): Promise { - return this.mapView.goTo({ - center: this.createGeoReferencedPoint(center), - }) as never; - } - public setTimeSliderExtent(timeExtent: TimeExtent, mapItem: Gb2WmsActiveMapItem) { const esriLayer = this.esriMapViewService.findEsriLayer(mapItem.id); diff --git a/src/app/testing/map-testing/map.service.stub.ts b/src/app/testing/map-testing/map.service.stub.ts index b99062e5e..d65eb45c3 100644 --- a/src/app/testing/map-testing/map.service.stub.ts +++ b/src/app/testing/map-testing/map.service.stub.ts @@ -41,8 +41,6 @@ export class MapServiceStub implements MapService { public handleZoom(zoomType: ZoomType): void {} - public setMapCenter(center: PointWithSrs): void {} - public init(): void {} public removeAllMapItems(): void {} From dfbd546f43c1756ab67fd1f59de2e799c5d62de2 Mon Sep 17 00:00:00 2001 From: till_schuetze Date: Wed, 11 Sep 2024 16:05:11 +0200 Subject: [PATCH 31/43] Revert "remove now unused setMapCenter method from map service" --- src/app/map/interfaces/map.service.ts | 3 +++ src/app/map/services/esri-services/esri-map.service.ts | 6 ++++++ src/app/testing/map-testing/map.service.stub.ts | 2 ++ 3 files changed, 11 insertions(+) diff --git a/src/app/map/interfaces/map.service.ts b/src/app/map/interfaces/map.service.ts index bef6fae83..c6797a640 100644 --- a/src/app/map/interfaces/map.service.ts +++ b/src/app/map/interfaces/map.service.ts @@ -23,6 +23,9 @@ export interface MapService extends AddToMapVisitor { /** Sets the scale of the whole map */ setScale(scale: number): void; + /** Sets the map center point */ + setMapCenter(center: PointWithSrs): void; + /** Resets the extent of the map to the initial extent */ resetExtent(): void; diff --git a/src/app/map/services/esri-services/esri-map.service.ts b/src/app/map/services/esri-services/esri-map.service.ts index 278e2b884..68f4008ca 100644 --- a/src/app/map/services/esri-services/esri-map.service.ts +++ b/src/app/map/services/esri-services/esri-map.service.ts @@ -337,6 +337,12 @@ export class EsriMapService implements MapService, OnDestroy { } } + public setMapCenter(center: PointWithSrs): Promise { + return this.mapView.goTo({ + center: this.createGeoReferencedPoint(center), + }) as never; + } + public setTimeSliderExtent(timeExtent: TimeExtent, mapItem: Gb2WmsActiveMapItem) { const esriLayer = this.esriMapViewService.findEsriLayer(mapItem.id); diff --git a/src/app/testing/map-testing/map.service.stub.ts b/src/app/testing/map-testing/map.service.stub.ts index d65eb45c3..b99062e5e 100644 --- a/src/app/testing/map-testing/map.service.stub.ts +++ b/src/app/testing/map-testing/map.service.stub.ts @@ -41,6 +41,8 @@ export class MapServiceStub implements MapService { public handleZoom(zoomType: ZoomType): void {} + public setMapCenter(center: PointWithSrs): void {} + public init(): void {} public removeAllMapItems(): void {} From 2c28078ecfdf26cba46821c0de7402724294be86 Mon Sep 17 00:00:00 2001 From: till_schuetze Date: Wed, 11 Sep 2024 16:08:36 +0200 Subject: [PATCH 32/43] reset zooming to the point --- src/app/state/map/effects/map-config.effects.spec.ts | 7 ++----- src/app/state/map/effects/map-config.effects.ts | 4 +--- 2 files changed, 3 insertions(+), 8 deletions(-) diff --git a/src/app/state/map/effects/map-config.effects.spec.ts b/src/app/state/map/effects/map-config.effects.spec.ts index 002bc39cb..ec3e6852d 100644 --- a/src/app/state/map/effects/map-config.effects.spec.ts +++ b/src/app/state/map/effects/map-config.effects.spec.ts @@ -17,7 +17,6 @@ import {MapConfigEffects} from './map-config.effects'; import {provideHttpClient, withInterceptorsFromDi} from '@angular/common/http'; import {InitialMapExtentService} from '../../../map/services/initial-map-extent.service'; import {SearchActions} from '../../app/actions/search.actions'; -import {ConfigService} from '../../../shared/services/config.service'; import {MapDrawingService} from '../../../map/services/map-drawing.service'; describe('MapConfigEffects', () => { @@ -26,7 +25,6 @@ describe('MapConfigEffects', () => { let effects: MapConfigEffects; let mapService: MapService; let initialMapExtentServiceMock: jasmine.SpyObj; - let configService: ConfigService; let mapDrawingService: MapDrawingService; beforeEach(() => { @@ -48,7 +46,6 @@ describe('MapConfigEffects', () => { effects = TestBed.inject(MapConfigEffects); mapService = TestBed.inject(MAP_SERVICE); store = TestBed.inject(MockStore); - configService = TestBed.inject(ConfigService); mapDrawingService = TestBed.inject(MapDrawingService); }); @@ -103,13 +100,13 @@ describe('MapConfigEffects', () => { describe('setCenterOnMap$', () => { it('sets the map center using the map service, no further action dispatch', (done: DoneFn) => { const expectedCenter: PointWithSrs = {srs: 2056, type: 'Point', coordinates: [123, 456]}; - const mapServiceSpy = spyOn(mapService, 'zoomToPoint').and.callThrough(); + const mapServiceSpy = spyOn(mapService, 'setMapCenter').and.callThrough(); const mapDrawingServiceSpy = spyOn(mapDrawingService, 'drawSearchResultHighlight').and.callThrough(); const expectedAction = MapConfigActions.setMapCenter({center: expectedCenter}); actions$ = of(expectedAction); effects.setCenterOnMap$.subscribe((action) => { - expect(mapServiceSpy).toHaveBeenCalledOnceWith(expectedCenter, configService.mapConfig.locateMeZoom); + expect(mapServiceSpy).toHaveBeenCalledOnceWith(expectedCenter); expect(mapDrawingServiceSpy).toHaveBeenCalledOnceWith(expectedCenter); expect(action).toEqual(expectedAction); done(); diff --git a/src/app/state/map/effects/map-config.effects.ts b/src/app/state/map/effects/map-config.effects.ts index 12ebbe0b3..e04c1d5a2 100644 --- a/src/app/state/map/effects/map-config.effects.ts +++ b/src/app/state/map/effects/map-config.effects.ts @@ -11,7 +11,6 @@ import {UrlActions} from '../../app/actions/url.actions'; import {Store} from '@ngrx/store'; import {SearchActions} from '../../app/actions/search.actions'; import {InitialMapExtentService} from '../../../map/services/initial-map-extent.service'; -import {ConfigService} from '../../../shared/services/config.service'; import {MapDrawingService} from '../../../map/services/map-drawing.service'; @Injectable() @@ -55,7 +54,7 @@ export class MapConfigEffects { return this.actions$.pipe( ofType(MapConfigActions.setMapCenter), tap(({center}) => { - this.mapService.zoomToPoint(center, this.configService.mapConfig.locateMeZoom); + this.mapService.setMapCenter(center); this.mapDrawingService.drawSearchResultHighlight(center); }), ); @@ -92,7 +91,6 @@ export class MapConfigEffects { private readonly actions$: Actions, @Inject(MAP_SERVICE) private readonly mapService: MapService, private readonly store: Store, - private readonly configService: ConfigService, private readonly initialMapExtentService: InitialMapExtentService, private readonly mapDrawingService: MapDrawingService, ) {} From a6d0ef1f34359a8bc387414eba64a294d0557350 Mon Sep 17 00:00:00 2001 From: Renovate Bot Date: Thu, 12 Sep 2024 00:10:31 +0000 Subject: [PATCH 33/43] Update dependency husky to v9.1.6 --- package-lock.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/package-lock.json b/package-lock.json index 6b3e8e58a..00d7429ea 100644 --- a/package-lock.json +++ b/package-lock.json @@ -10489,9 +10489,9 @@ } }, "node_modules/husky": { - "version": "9.1.5", - "resolved": "https://registry.npmjs.org/husky/-/husky-9.1.5.tgz", - "integrity": "sha512-rowAVRUBfI0b4+niA4SJMhfQwc107VLkBUgEYYAOQAbqDCnra1nYh83hF/MDmhYs9t9n1E3DuKOrs2LYNC+0Ag==", + "version": "9.1.6", + "resolved": "https://registry.npmjs.org/husky/-/husky-9.1.6.tgz", + "integrity": "sha512-sqbjZKK7kf44hfdE94EoX8MZNk0n7HeW37O4YrVGCF4wzgQjp+akPAkfUK5LZ6KuR/6sqeAVuXHji+RzQgOn5A==", "dev": true, "bin": { "husky": "bin.js" From 049a71ac60ebab495993b50f1d10dc768ade988f Mon Sep 17 00:00:00 2001 From: Renovate Bot Date: Thu, 12 Sep 2024 00:10:38 +0000 Subject: [PATCH 34/43] Update eslint to v18.3.1 --- package-lock.json | 52 +++++++++++++++++++++++------------------------ 1 file changed, 26 insertions(+), 26 deletions(-) diff --git a/package-lock.json b/package-lock.json index 6b3e8e58a..8f7c2f468 100644 --- a/package-lock.json +++ b/package-lock.json @@ -746,17 +746,17 @@ } }, "node_modules/@angular-eslint/bundled-angular-compiler": { - "version": "18.3.0", - "resolved": "https://registry.npmjs.org/@angular-eslint/bundled-angular-compiler/-/bundled-angular-compiler-18.3.0.tgz", - "integrity": "sha512-v/59FxUKnMzymVce99gV43huxoqXWMb85aKvzlNvLN+ScDu6ZE4YMiTQNpfapVL2lkxhs0uwB3jH17EYd5TcsA==" + "version": "18.3.1", + "resolved": "https://registry.npmjs.org/@angular-eslint/bundled-angular-compiler/-/bundled-angular-compiler-18.3.1.tgz", + "integrity": "sha512-sikmkjfsXPpPTku1aQkQ1MNNEKGBgGGRvUN/WeNS9dhCJ4dxU3O7dZctt1aQWj+W3nbuUtDiimAWF5fZHGFE2Q==" }, "node_modules/@angular-eslint/eslint-plugin": { - "version": "18.3.0", - "resolved": "https://registry.npmjs.org/@angular-eslint/eslint-plugin/-/eslint-plugin-18.3.0.tgz", - "integrity": "sha512-Vl7gfPMXxvtHTjYdlzR161aj5xrqW6T57wd8ToQ7Gqzm0qHGfY6kE4SQobUa2LCYckTNSlv+zXe48C4ah/dSjw==", + "version": "18.3.1", + "resolved": "https://registry.npmjs.org/@angular-eslint/eslint-plugin/-/eslint-plugin-18.3.1.tgz", + "integrity": "sha512-MP4Nm+SHboF8KdnN0KpPEGAaTTzDLPm3+S/4W3Mg8onqWCyadyd4mActh9mK/pvCj8TVlb/SW1zeTtdMYhwonw==", "dependencies": { - "@angular-eslint/bundled-angular-compiler": "18.3.0", - "@angular-eslint/utils": "18.3.0" + "@angular-eslint/bundled-angular-compiler": "18.3.1", + "@angular-eslint/utils": "18.3.1" }, "peerDependencies": { "@typescript-eslint/utils": "^7.11.0 || ^8.0.0", @@ -765,12 +765,12 @@ } }, "node_modules/@angular-eslint/eslint-plugin-template": { - "version": "18.3.0", - "resolved": "https://registry.npmjs.org/@angular-eslint/eslint-plugin-template/-/eslint-plugin-template-18.3.0.tgz", - "integrity": "sha512-ddR/qwYbUeq9IpyVKrPbfZyRBTy6V8uc5I0JcBKttQ4CZ4joXhqsVgWFsI+JAMi8E66uNj1VC7NuKCOjDINv2Q==", + "version": "18.3.1", + "resolved": "https://registry.npmjs.org/@angular-eslint/eslint-plugin-template/-/eslint-plugin-template-18.3.1.tgz", + "integrity": "sha512-hBJ3+f7VSidvrtYaXH7Vp0sWvblA9jLK2c6uQzhYGWdEDUcTg7g7VI9ThW39WvMbHqkyzNE4PPOynK69cBEDGg==", "dependencies": { - "@angular-eslint/bundled-angular-compiler": "18.3.0", - "@angular-eslint/utils": "18.3.0", + "@angular-eslint/bundled-angular-compiler": "18.3.1", + "@angular-eslint/utils": "18.3.1", "aria-query": "5.3.0", "axobject-query": "4.1.0" }, @@ -781,12 +781,12 @@ } }, "node_modules/@angular-eslint/schematics": { - "version": "18.3.0", - "resolved": "https://registry.npmjs.org/@angular-eslint/schematics/-/schematics-18.3.0.tgz", - "integrity": "sha512-rQ4DEWwf3f5n096GAK6JvXD0SRzRJ52WRaIyKg8MMkk6qvUDfZI8seOkcbjDtZoIe6Ds7DfqSfJgNVte75qvPQ==", + "version": "18.3.1", + "resolved": "https://registry.npmjs.org/@angular-eslint/schematics/-/schematics-18.3.1.tgz", + "integrity": "sha512-BTsQHDu7LjvXannJTb5BqMPCFIHRNN94eRyb60VfjJxB/ZFtsbAQDFFOi5lEZsRsd4mBeUMuL9mW4IMcPtUQ9Q==", "dependencies": { - "@angular-eslint/eslint-plugin": "18.3.0", - "@angular-eslint/eslint-plugin-template": "18.3.0", + "@angular-eslint/eslint-plugin": "18.3.1", + "@angular-eslint/eslint-plugin-template": "18.3.1", "ignore": "5.3.2", "semver": "7.6.3", "strip-json-comments": "3.1.1" @@ -797,11 +797,11 @@ } }, "node_modules/@angular-eslint/template-parser": { - "version": "18.3.0", - "resolved": "https://registry.npmjs.org/@angular-eslint/template-parser/-/template-parser-18.3.0.tgz", - "integrity": "sha512-1mUquqcnugI4qsoxcYZKZ6WMi6RPelDcJZg2YqGyuaIuhWmi3ZqJZLErSSpjP60+TbYZu7wM8Kchqa1bwJtEaQ==", + "version": "18.3.1", + "resolved": "https://registry.npmjs.org/@angular-eslint/template-parser/-/template-parser-18.3.1.tgz", + "integrity": "sha512-JUUkfWH1G+u/Uk85ZYvJSt/qwN/Ko+jlXFtzBEcknJZsTWTwBcp36v77gPZe5FmKSziJZpyPUd+7Kiy6tuSCTw==", "dependencies": { - "@angular-eslint/bundled-angular-compiler": "18.3.0", + "@angular-eslint/bundled-angular-compiler": "18.3.1", "eslint-scope": "^8.0.2" }, "peerDependencies": { @@ -825,11 +825,11 @@ } }, "node_modules/@angular-eslint/utils": { - "version": "18.3.0", - "resolved": "https://registry.npmjs.org/@angular-eslint/utils/-/utils-18.3.0.tgz", - "integrity": "sha512-sCrkHkpxBJZLuCikdboZoawCfc2UgbJv+T14tu2uQCv+Vwzeadnu04vkeY2vTkA8GeBdBij/G9/N/nvwmwVw3g==", + "version": "18.3.1", + "resolved": "https://registry.npmjs.org/@angular-eslint/utils/-/utils-18.3.1.tgz", + "integrity": "sha512-sd9niZI7h9H2FQ7OLiQsLFBhjhRQTASh+Q0+4+hyjv9idbSHBJli8Gsi2fqj9zhtMKpAZFTrWzuLUpubJ9UYbA==", "dependencies": { - "@angular-eslint/bundled-angular-compiler": "18.3.0" + "@angular-eslint/bundled-angular-compiler": "18.3.1" }, "peerDependencies": { "@typescript-eslint/utils": "^7.11.0 || ^8.0.0", From dc10292cb7e87d8da63713d015dc21858328cc98 Mon Sep 17 00:00:00 2001 From: till_schuetze Date: Mon, 16 Sep 2024 10:35:39 +0200 Subject: [PATCH 35/43] rename SetMapCenter action --- .../coordinate-scale-inputs.component.ts | 2 +- src/app/state/map/actions/map-config.actions.ts | 2 +- src/app/state/map/effects/map-config.effects.spec.ts | 2 +- src/app/state/map/effects/map-config.effects.ts | 9 +++++++-- 4 files changed, 10 insertions(+), 5 deletions(-) diff --git a/src/app/map/components/map-controls/coordinate-scale-inputs/coordinate-scale-inputs.component.ts b/src/app/map/components/map-controls/coordinate-scale-inputs/coordinate-scale-inputs.component.ts index add21d7de..8c2ea17d9 100644 --- a/src/app/map/components/map-controls/coordinate-scale-inputs/coordinate-scale-inputs.component.ts +++ b/src/app/map/components/map-controls/coordinate-scale-inputs/coordinate-scale-inputs.component.ts @@ -60,7 +60,7 @@ export class CoordinateScaleInputsComponent implements OnInit, OnDestroy { const center = this.coordinateParserService.parse(input.value); if (center) { - this.store.dispatch(MapConfigActions.setMapCenter({center})); + this.store.dispatch(MapConfigActions.setMapCenterAndDrawHighlight({center})); } else { input.value = this.mapCenter; } diff --git a/src/app/state/map/actions/map-config.actions.ts b/src/app/state/map/actions/map-config.actions.ts index e97b75eeb..ca508d90e 100644 --- a/src/app/state/map/actions/map-config.actions.ts +++ b/src/app/state/map/actions/map-config.actions.ts @@ -15,7 +15,7 @@ export const MapConfigActions = createActionGroup({ initialMaps: string[]; }>(), 'Set Map Extent': props(), - 'Set Map Center': props<{center: PointWithSrs}>(), + 'Set Map Center And Draw Highlight': props<{center: PointWithSrs}>(), 'Set Ready': props<{calculatedMinScale: number; calculatedMaxScale: number}>(), 'Set Scale': props<{scale: number}>(), 'Set Rotation': props<{rotation: number}>(), diff --git a/src/app/state/map/effects/map-config.effects.spec.ts b/src/app/state/map/effects/map-config.effects.spec.ts index ec3e6852d..5bc32e6ad 100644 --- a/src/app/state/map/effects/map-config.effects.spec.ts +++ b/src/app/state/map/effects/map-config.effects.spec.ts @@ -103,7 +103,7 @@ describe('MapConfigEffects', () => { const mapServiceSpy = spyOn(mapService, 'setMapCenter').and.callThrough(); const mapDrawingServiceSpy = spyOn(mapDrawingService, 'drawSearchResultHighlight').and.callThrough(); - const expectedAction = MapConfigActions.setMapCenter({center: expectedCenter}); + const expectedAction = MapConfigActions.setMapCenterAndDrawHighlight({center: expectedCenter}); actions$ = of(expectedAction); effects.setCenterOnMap$.subscribe((action) => { expect(mapServiceSpy).toHaveBeenCalledOnceWith(expectedCenter); diff --git a/src/app/state/map/effects/map-config.effects.ts b/src/app/state/map/effects/map-config.effects.ts index e04c1d5a2..c558e5cac 100644 --- a/src/app/state/map/effects/map-config.effects.ts +++ b/src/app/state/map/effects/map-config.effects.ts @@ -52,7 +52,7 @@ export class MapConfigEffects { public setCenterOnMap$ = createEffect( () => { return this.actions$.pipe( - ofType(MapConfigActions.setMapCenter), + ofType(MapConfigActions.setMapCenterAndDrawHighlight), tap(({center}) => { this.mapService.setMapCenter(center); this.mapDrawingService.drawSearchResultHighlight(center); @@ -64,7 +64,12 @@ export class MapConfigEffects { public updateMapPageQueryParams$ = createEffect(() => { return this.actions$.pipe( - ofType(MapConfigActions.setMapCenter, MapConfigActions.setScale, MapConfigActions.setBasemap, MapConfigActions.setMapExtent), + ofType( + MapConfigActions.setMapCenterAndDrawHighlight, + MapConfigActions.setScale, + MapConfigActions.setBasemap, + MapConfigActions.setMapExtent, + ), concatLatestFrom(() => this.store.select(selectMapConfigParams)), map(([_, params]) => UrlActions.setMapPageParams({params})), ); From bd671d66dec2c70c8fb06c118ba60f9facf25f40 Mon Sep 17 00:00:00 2001 From: till_schuetze Date: Mon, 16 Sep 2024 11:11:59 +0200 Subject: [PATCH 36/43] pr fixes --- src/app/shared/errors/initial-maps.errors.ts | 4 +- src/app/state/app/actions/url.actions.ts | 2 - src/app/state/app/effects/url.effects.spec.ts | 5 ++- src/app/state/app/effects/url.effects.ts | 5 ++- .../map/actions/layer-catalog.actions.ts | 2 + .../map/effects/layer-catalog.effects.spec.ts | 37 ++++++++++++++++--- .../map/effects/layer-catalog.effects.ts | 7 ++-- 7 files changed, 45 insertions(+), 17 deletions(-) diff --git a/src/app/shared/errors/initial-maps.errors.ts b/src/app/shared/errors/initial-maps.errors.ts index 337eb1417..4ff6cee3e 100644 --- a/src/app/shared/errors/initial-maps.errors.ts +++ b/src/app/shared/errors/initial-maps.errors.ts @@ -1,7 +1,7 @@ import {Gb3RuntimeError, RecoverableError} from './abstract.errors'; -export class InitialMapsParameterInvalid extends RecoverableError { - public override name = 'InitialMapsParameterInvalid'; +export class InitialMapIdsParameterInvalid extends RecoverableError { + public override name = 'InitialMapIdsParameterInvalid'; constructor(initialMapParameter: string) { super(); diff --git a/src/app/state/app/actions/url.actions.ts b/src/app/state/app/actions/url.actions.ts index 50b7cb930..87fa3d00a 100644 --- a/src/app/state/app/actions/url.actions.ts +++ b/src/app/state/app/actions/url.actions.ts @@ -1,7 +1,6 @@ import {createActionGroup, emptyProps, props} from '@ngrx/store'; import {MainPage} from '../../../shared/enums/main-page.enum'; import {Params} from '@angular/router'; -import {errorProps} from '../../../shared/utils/error-props.utils'; export const UrlActions = createActionGroup({ source: 'Url', @@ -10,6 +9,5 @@ export const UrlActions = createActionGroup({ 'Set App Params': props<{params: Params}>(), 'Set Map Page Params': props<{params: Params}>(), 'Keep Temporary Url Parameters': emptyProps(), - 'Set Initial Maps Error': errorProps(), }, }); diff --git a/src/app/state/app/effects/url.effects.spec.ts b/src/app/state/app/effects/url.effects.spec.ts index 1f892e984..7c9f98c3e 100644 --- a/src/app/state/app/effects/url.effects.spec.ts +++ b/src/app/state/app/effects/url.effects.spec.ts @@ -19,6 +19,7 @@ import {InitialMapExtentService} from '../../../map/services/initial-map-extent. import {selectIsAuthenticated} from '../../auth/reducers/auth-status.reducer'; import {catchError} from 'rxjs/operators'; import {InitialMapsCouldNotBeLoaded} from '../../../shared/errors/initial-maps.errors'; +import {LayerCatalogActions} from '../../map/actions/layer-catalog.actions'; describe('UrlEffects', () => { let actions$: Observable; @@ -276,7 +277,7 @@ describe('UrlEffects', () => { it('throws an InitialMapsCouldNotBeLoaded error', (done: DoneFn) => { store.overrideSelector(selectIsAuthenticated, true); const originalError = new Error('error'); - actions$ = of(UrlActions.setInitialMapsError({error: originalError})); + actions$ = of(LayerCatalogActions.setInitialMapsError({error: originalError})); effects.setErrorForInvalidInitialMapIds$ .pipe( catchError((error: unknown) => { @@ -294,7 +295,7 @@ describe('UrlEffects', () => { {name: 'SearchActions.setSearchApiError', action: SearchActions.setSearchApiError}, {name: 'SearchActions.handleEmptyResultsFromUrlSearch', action: SearchActions.handleEmptyResultsFromUrlSearch}, {name: 'SearchActions.handleInvalidParameters', action: SearchActions.handleInvalidParameters}, - {name: 'UrlActions.setInitialMapsError', action: UrlActions.setInitialMapsError}, + {name: 'LayerCatalogActions.setInitialMapsError', action: LayerCatalogActions.setInitialMapsError}, ]; actions.forEach(({name, action}) => { it(`dispatches UrlActions.keepTemporaryUrlParameters when ${name} is triggered`, () => { diff --git a/src/app/state/app/effects/url.effects.ts b/src/app/state/app/effects/url.effects.ts index 165051be8..c8e915248 100644 --- a/src/app/state/app/effects/url.effects.ts +++ b/src/app/state/app/effects/url.effects.ts @@ -21,6 +21,7 @@ import {SearchActions} from '../actions/search.actions'; import {InitialMapExtentService} from '../../../map/services/initial-map-extent.service'; import {selectIsAuthenticated} from '../../auth/reducers/auth-status.reducer'; import {InitialMapsCouldNotBeLoaded} from '../../../shared/errors/initial-maps.errors'; +import {LayerCatalogActions} from '../../map/actions/layer-catalog.actions'; @Injectable() export class UrlEffects { @@ -153,7 +154,7 @@ export class UrlEffects { public setErrorForInvalidInitialMapIds$ = createEffect( () => { return this.actions$.pipe( - ofType(UrlActions.setInitialMapsError), + ofType(LayerCatalogActions.setInitialMapsError), concatLatestFrom(() => this.store.select(selectIsAuthenticated)), map(([{error}, isAuthenticated]) => { throw new InitialMapsCouldNotBeLoaded(isAuthenticated, error); @@ -169,7 +170,7 @@ export class UrlEffects { SearchActions.setSearchApiError, SearchActions.handleEmptyResultsFromUrlSearch, SearchActions.handleInvalidParameters, - UrlActions.setInitialMapsError, + LayerCatalogActions.setInitialMapsError, ), map(() => { return UrlActions.keepTemporaryUrlParameters(); diff --git a/src/app/state/map/actions/layer-catalog.actions.ts b/src/app/state/map/actions/layer-catalog.actions.ts index fb3fadb76..72d0a0a95 100644 --- a/src/app/state/map/actions/layer-catalog.actions.ts +++ b/src/app/state/map/actions/layer-catalog.actions.ts @@ -1,5 +1,6 @@ import {createActionGroup, emptyProps, props} from '@ngrx/store'; import {Topic} from '../../../shared/interfaces/topic.interface'; +import {errorProps} from '../../../shared/utils/error-props.utils'; export const LayerCatalogActions = createActionGroup({ source: 'LayerCatalog', @@ -10,5 +11,6 @@ export const LayerCatalogActions = createActionGroup({ 'Clear Layer Catalog': emptyProps(), 'Set Filter String': props<{filterString: string}>(), 'Clear Filter String': emptyProps(), + 'Set Initial Maps Error': errorProps(), }, }); diff --git a/src/app/state/map/effects/layer-catalog.effects.spec.ts b/src/app/state/map/effects/layer-catalog.effects.spec.ts index b8b4bba49..355fcb552 100644 --- a/src/app/state/map/effects/layer-catalog.effects.spec.ts +++ b/src/app/state/map/effects/layer-catalog.effects.spec.ts @@ -14,8 +14,8 @@ import {Map} from '../../../shared/interfaces/topic.interface'; import {provideHttpClient, withInterceptorsFromDi} from '@angular/common/http'; import {provideHttpClientTesting} from '@angular/common/http/testing'; import {ActiveMapItemFactory} from '../../../shared/factories/active-map-item.factory'; -import {UrlActions} from '../../app/actions/url.actions'; -import {InitialMapsParameterInvalid} from '../../../shared/errors/initial-maps.errors'; +import {InitialMapIdsParameterInvalid} from '../../../shared/errors/initial-maps.errors'; +import {selectItems} from '../reducers/layer-catalog.reducer'; describe('LayerCatalogEffects', () => { let actions$: Observable; @@ -45,6 +45,33 @@ describe('LayerCatalogEffects', () => { store.resetSelectors(); }); + describe('requestLayerCatalog$', () => { + it('dispatches LayerCatalogActions.setLayerCatalog when there are already items in the store ', () => { + const mockItems = [{title: 'Topic', maps: []}]; + store.overrideSelector(selectItems, mockItems); + const expectedAction = LayerCatalogActions.setLayerCatalog({items: mockItems}); + actions$ = of(LayerCatalogActions.loadLayerCatalog()); + effects.requestLayerCatalog$.subscribe((action) => { + expect(action).toEqual(expectedAction); + }); + }); + + it('calls the Topicservice and dispatches LayerCatalogActions.setLayerCatalog with the results if the store has no items yet', () => { + const mockItems = [ + {title: 'Topic', maps: []}, + {title: 'Topic2', maps: []}, + ]; + store.overrideSelector(selectItems, []); + const expectedAction = LayerCatalogActions.setLayerCatalog({items: mockItems}); + const spy = spyOn(gb3TopicsService, 'loadTopics').and.returnValue(of({topics: mockItems})); + actions$ = of(LayerCatalogActions.loadLayerCatalog()); + effects.requestLayerCatalog$.subscribe((action) => { + expect(spy).toHaveBeenCalledTimes(1); + expect(action).toEqual(expectedAction); + }); + }); + }); + describe('handleInitialMapLoad', () => { it('dispatches ActiveMapItemActions.addInitialMapItems with the correct inital Maps', () => { const mapConfigStateMock: MapConfigState = { @@ -61,7 +88,7 @@ describe('LayerCatalogEffects', () => { expect(action).toEqual(expectedAction); }); }); - it('dispatches UrlActions.setInitialMapsError if a map is not found', (done: DoneFn) => { + it('dispatches LayerCatalogActions.setInitialMapsError if a map is not found', (done: DoneFn) => { const mapConfigStateMock: MapConfigState = { initialMaps: ['1'], } as MapConfigState; @@ -69,8 +96,8 @@ describe('LayerCatalogEffects', () => { store.overrideSelector(selectMaps, mapMock); store.overrideSelector(selectMapConfigState, mapConfigStateMock); - const expectedError = new InitialMapsParameterInvalid(mapConfigStateMock.initialMaps[0]); - const expectedAction = UrlActions.setInitialMapsError({error: expectedError}); + const expectedError = new InitialMapIdsParameterInvalid(mapConfigStateMock.initialMaps[0]); + const expectedAction = LayerCatalogActions.setInitialMapsError({error: expectedError}); actions$ = of(LayerCatalogActions.setLayerCatalog({items: []})); effects.handleInitialMapLoad.subscribe((action) => { expect(action).toEqual(expectedAction); diff --git a/src/app/state/map/effects/layer-catalog.effects.ts b/src/app/state/map/effects/layer-catalog.effects.ts index 08633ef42..fd89963a4 100644 --- a/src/app/state/map/effects/layer-catalog.effects.ts +++ b/src/app/state/map/effects/layer-catalog.effects.ts @@ -13,8 +13,7 @@ import {selectItems} from '../reducers/layer-catalog.reducer'; import {ActiveMapItemFactory} from '../../../shared/factories/active-map-item.factory'; import {TopicsCouldNotBeLoaded} from '../../../shared/errors/map.errors'; -import {UrlActions} from '../../app/actions/url.actions'; -import {InitialMapsParameterInvalid} from '../../../shared/errors/initial-maps.errors'; +import {InitialMapIdsParameterInvalid} from '../../../shared/errors/initial-maps.errors'; @Injectable() export class LayerCatalogEffects { @@ -51,14 +50,14 @@ export class LayerCatalogEffects { const initialMapItems = initialMaps.map((initialMap) => { const availableMap = availableMaps.find((map) => map.id === initialMap); if (!availableMap) { - throw new InitialMapsParameterInvalid(initialMap); + throw new InitialMapIdsParameterInvalid(initialMap); } return ActiveMapItemFactory.createGb2WmsMapItem(availableMap); }); return ActiveMapItemActions.addInitialMapItems({initialMapItems}); }), - catchError((error: unknown) => of(UrlActions.setInitialMapsError({error}))), + catchError((error: unknown) => of(LayerCatalogActions.setInitialMapsError({error}))), ); }); From 6363211228e8638a71afac5da06a8052948d6083 Mon Sep 17 00:00:00 2001 From: till_schuetze Date: Mon, 16 Sep 2024 14:00:49 +0200 Subject: [PATCH 37/43] add test --- .../map/effects/layer-catalog.effects.spec.ts | 21 ++++++++++++++++++- 1 file changed, 20 insertions(+), 1 deletion(-) diff --git a/src/app/state/map/effects/layer-catalog.effects.spec.ts b/src/app/state/map/effects/layer-catalog.effects.spec.ts index 355fcb552..5a623ef4a 100644 --- a/src/app/state/map/effects/layer-catalog.effects.spec.ts +++ b/src/app/state/map/effects/layer-catalog.effects.spec.ts @@ -1,4 +1,4 @@ -import {Observable, of} from 'rxjs'; +import {Observable, of, throwError} from 'rxjs'; import {Action} from '@ngrx/store'; import {MockStore, provideMockStore} from '@ngrx/store/testing'; import {LayerCatalogEffects} from './layer-catalog.effects'; @@ -16,6 +16,7 @@ import {provideHttpClientTesting} from '@angular/common/http/testing'; import {ActiveMapItemFactory} from '../../../shared/factories/active-map-item.factory'; import {InitialMapIdsParameterInvalid} from '../../../shared/errors/initial-maps.errors'; import {selectItems} from '../reducers/layer-catalog.reducer'; +import {TopicsCouldNotBeLoaded} from '../../../shared/errors/map.errors'; describe('LayerCatalogEffects', () => { let actions$: Observable; @@ -70,6 +71,24 @@ describe('LayerCatalogEffects', () => { expect(action).toEqual(expectedAction); }); }); + it('throws a TopicsCouldNotBeLoaded error if the Topicservice fails', (done: DoneFn) => { + const mockItems = [ + {title: 'Topic', maps: []}, + {title: 'Topic2', maps: []}, + ]; + store.overrideSelector(selectItems, []); + const originalError = new Error('oh no! butterfingers'); + const expectedError = new TopicsCouldNotBeLoaded(); + const spy = spyOn(gb3TopicsService, 'loadTopics').and.returnValue(throwError(() => originalError)); + actions$ = of(LayerCatalogActions.loadLayerCatalog()); + effects.requestLayerCatalog$.subscribe({ + error: (error) => { + expect(spy).toHaveBeenCalledTimes(1); + expect(error).toEqual(expectedError); + done(); + }, + }); + }); }); describe('handleInitialMapLoad', () => { From a7a3111e9b129e57438337f3d9d88de0800aef03 Mon Sep 17 00:00:00 2001 From: till_schuetze Date: Mon, 16 Sep 2024 14:54:59 +0200 Subject: [PATCH 38/43] remove unused variable assignment --- src/app/state/map/effects/layer-catalog.effects.spec.ts | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/src/app/state/map/effects/layer-catalog.effects.spec.ts b/src/app/state/map/effects/layer-catalog.effects.spec.ts index 5a623ef4a..099cb2aa1 100644 --- a/src/app/state/map/effects/layer-catalog.effects.spec.ts +++ b/src/app/state/map/effects/layer-catalog.effects.spec.ts @@ -72,10 +72,6 @@ describe('LayerCatalogEffects', () => { }); }); it('throws a TopicsCouldNotBeLoaded error if the Topicservice fails', (done: DoneFn) => { - const mockItems = [ - {title: 'Topic', maps: []}, - {title: 'Topic2', maps: []}, - ]; store.overrideSelector(selectItems, []); const originalError = new Error('oh no! butterfingers'); const expectedError = new TopicsCouldNotBeLoaded(); @@ -92,7 +88,7 @@ describe('LayerCatalogEffects', () => { }); describe('handleInitialMapLoad', () => { - it('dispatches ActiveMapItemActions.addInitialMapItems with the correct inital Maps', () => { + it('dispatches ActiveMapItemActions.addInitialMapItems with the correct inital Maps', (done: DoneFn) => { const mapConfigStateMock: MapConfigState = { initialMaps: ['1'], } as MapConfigState; @@ -105,6 +101,7 @@ describe('LayerCatalogEffects', () => { actions$ = of(LayerCatalogActions.setLayerCatalog({items: []})); effects.handleInitialMapLoad.subscribe((action) => { expect(action).toEqual(expectedAction); + done(); }); }); it('dispatches LayerCatalogActions.setInitialMapsError if a map is not found', (done: DoneFn) => { From c81bc3f660ba6d464c52651e33e32d16cf03207c Mon Sep 17 00:00:00 2001 From: Renovate Bot Date: Tue, 17 Sep 2024 00:09:10 +0000 Subject: [PATCH 39/43] Update dependency eslint to v8.57.1 --- package-lock.json | 210 ++++++++++++++++++++-------------------------- 1 file changed, 90 insertions(+), 120 deletions(-) diff --git a/package-lock.json b/package-lock.json index 842a2ef0a..527f76156 100644 --- a/package-lock.json +++ b/package-lock.json @@ -3673,11 +3673,6 @@ "url": "https://github.com/sponsors/epoberezkin" } }, - "node_modules/@eslint/eslintrc/node_modules/argparse": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/argparse/-/argparse-2.0.1.tgz", - "integrity": "sha512-8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q==" - }, "node_modules/@eslint/eslintrc/node_modules/globals": { "version": "13.23.0", "resolved": "https://registry.npmjs.org/globals/-/globals-13.23.0.tgz", @@ -3692,17 +3687,6 @@ "url": "https://github.com/sponsors/sindresorhus" } }, - "node_modules/@eslint/eslintrc/node_modules/js-yaml": { - "version": "4.1.0", - "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-4.1.0.tgz", - "integrity": "sha512-wpxZs9NoxZaJESJGIZTyDEaYpl0FKSA+FB9aJiyemKhMwkxQg63h4T1KJgUGHpTqPDNRcmmYLugrRjJlBtWvRA==", - "dependencies": { - "argparse": "^2.0.1" - }, - "bin": { - "js-yaml": "bin/js-yaml.js" - } - }, "node_modules/@eslint/eslintrc/node_modules/json-schema-traverse": { "version": "0.4.1", "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz", @@ -3720,9 +3704,9 @@ } }, "node_modules/@eslint/js": { - "version": "8.57.0", - "resolved": "https://registry.npmjs.org/@eslint/js/-/js-8.57.0.tgz", - "integrity": "sha512-Ys+3g2TaW7gADOJzPt83SJtCDhMjndcDMFVQ/Tj9iA1BfJzFKD9mAUXT3OenpuPHbI6P/myECxRJrofUsDx/5g==", + "version": "8.57.1", + "resolved": "https://registry.npmjs.org/@eslint/js/-/js-8.57.1.tgz", + "integrity": "sha512-d9zaMRSTIKDLhctzH12MtXvJKSSUhaHcjV+2Z+GK+EEY7XKpP5yR4x+N3TAcHTcu963nIr+TMcCb4DBCYX1z6Q==", "engines": { "node": "^12.22.0 || ^14.17.0 || >=16.0.0" } @@ -3800,11 +3784,12 @@ "integrity": "sha512-dWO2pw8hhi+WrXq1YJy2yCuWoL20PddgGaqTgVe4cOS9Q6qklXCiA1tJEqX6BEwRNSCP84/afac9hd4MS+zEUA==" }, "node_modules/@humanwhocodes/config-array": { - "version": "0.11.14", - "resolved": "https://registry.npmjs.org/@humanwhocodes/config-array/-/config-array-0.11.14.tgz", - "integrity": "sha512-3T8LkOmg45BV5FICb15QQMsyUSWrQ8AygVfC7ZG32zOalnqrilm018ZVCw0eapXux8FtA33q8PSRSstjee3jSg==", + "version": "0.13.0", + "resolved": "https://registry.npmjs.org/@humanwhocodes/config-array/-/config-array-0.13.0.tgz", + "integrity": "sha512-DZLEEqFWQFiyK6h5YIeynKx7JlvCYWL0cImfSRXZ9l4Sg2efkFGTuFf6vzXjK1cq6IYkU+Eg/JizXw+TD2vRNw==", + "deprecated": "Use @eslint/config-array instead", "dependencies": { - "@humanwhocodes/object-schema": "^2.0.2", + "@humanwhocodes/object-schema": "^2.0.3", "debug": "^4.3.1", "minimatch": "^3.0.5" }, @@ -3825,9 +3810,10 @@ } }, "node_modules/@humanwhocodes/object-schema": { - "version": "2.0.2", - "resolved": "https://registry.npmjs.org/@humanwhocodes/object-schema/-/object-schema-2.0.2.tgz", - "integrity": "sha512-6EwiSjwWYP7pTckG6I5eyFANjPhmPjUX9JRLUSfNPC7FX7zK9gyZAfUEaECL6ALTpGX5AjnBq3C9XmVWPitNpw==" + "version": "2.0.3", + "resolved": "https://registry.npmjs.org/@humanwhocodes/object-schema/-/object-schema-2.0.3.tgz", + "integrity": "sha512-93zYdMES/c1D69yZiKDBj0V24vqNzB/koF26KPaagAfd3P/4gUlh3Dys5ogAK+Exi9QyzlD8x/08Zt7wIKcDcA==", + "deprecated": "Use @eslint/object-schema instead" }, "node_modules/@inquirer/checkbox": { "version": "2.4.7", @@ -6575,6 +6561,11 @@ "url": "https://github.com/sponsors/jonschlinkert" } }, + "node_modules/argparse": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/argparse/-/argparse-2.0.1.tgz", + "integrity": "sha512-8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q==" + }, "node_modules/aria-query": { "version": "5.3.0", "resolved": "https://registry.npmjs.org/aria-query/-/aria-query-5.3.0.tgz", @@ -8036,22 +8027,6 @@ } } }, - "node_modules/cosmiconfig/node_modules/argparse": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/argparse/-/argparse-2.0.1.tgz", - "integrity": "sha512-8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q==" - }, - "node_modules/cosmiconfig/node_modules/js-yaml": { - "version": "4.1.0", - "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-4.1.0.tgz", - "integrity": "sha512-wpxZs9NoxZaJESJGIZTyDEaYpl0FKSA+FB9aJiyemKhMwkxQg63h4T1KJgUGHpTqPDNRcmmYLugrRjJlBtWvRA==", - "dependencies": { - "argparse": "^2.0.1" - }, - "bin": { - "js-yaml": "bin/js-yaml.js" - } - }, "node_modules/critters": { "version": "0.0.24", "resolved": "https://registry.npmjs.org/critters/-/critters-0.0.24.tgz", @@ -9037,15 +9012,15 @@ } }, "node_modules/eslint": { - "version": "8.57.0", - "resolved": "https://registry.npmjs.org/eslint/-/eslint-8.57.0.tgz", - "integrity": "sha512-dZ6+mexnaTIbSBZWgou51U6OmzIhYM2VcNdtiTtI7qPNZm35Akpr0f6vtw3w1Kmn5PYo+tZVfh13WrhpS6oLqQ==", + "version": "8.57.1", + "resolved": "https://registry.npmjs.org/eslint/-/eslint-8.57.1.tgz", + "integrity": "sha512-ypowyDxpVSYpkXr9WPv2PAZCtNip1Mv5KTW0SCurXv/9iOpcrH9PaqUElksqEB6pChqHGDRCFTyrZlGhnLNGiA==", "dependencies": { "@eslint-community/eslint-utils": "^4.2.0", "@eslint-community/regexpp": "^4.6.1", "@eslint/eslintrc": "^2.1.4", - "@eslint/js": "8.57.0", - "@humanwhocodes/config-array": "^0.11.14", + "@eslint/js": "8.57.1", + "@humanwhocodes/config-array": "^0.13.0", "@humanwhocodes/module-importer": "^1.0.1", "@nodelib/fs.walk": "^1.2.8", "@ungap/structured-clone": "^1.2.0", @@ -9240,11 +9215,6 @@ "url": "https://github.com/chalk/ansi-styles?sponsor=1" } }, - "node_modules/eslint/node_modules/argparse": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/argparse/-/argparse-2.0.1.tgz", - "integrity": "sha512-8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q==" - }, "node_modules/eslint/node_modules/chalk": { "version": "4.1.2", "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz", @@ -9287,21 +9257,6 @@ "url": "https://github.com/sponsors/sindresorhus" } }, - "node_modules/eslint/node_modules/find-up": { - "version": "5.0.0", - "resolved": "https://registry.npmjs.org/find-up/-/find-up-5.0.0.tgz", - "integrity": "sha512-78/PXT1wlLLDgTzDs7sjq9hzz0vXD+zn+7wypEe4fXQxCmdmqfGsEPQxmiCSQI3ajFV91bVSsvNtrJRiW6nGng==", - "dependencies": { - "locate-path": "^6.0.0", - "path-exists": "^4.0.0" - }, - "engines": { - "node": ">=10" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, "node_modules/eslint/node_modules/glob-parent": { "version": "6.0.2", "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-6.0.2.tgz", @@ -9335,64 +9290,11 @@ "node": ">=8" } }, - "node_modules/eslint/node_modules/js-yaml": { - "version": "4.1.0", - "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-4.1.0.tgz", - "integrity": "sha512-wpxZs9NoxZaJESJGIZTyDEaYpl0FKSA+FB9aJiyemKhMwkxQg63h4T1KJgUGHpTqPDNRcmmYLugrRjJlBtWvRA==", - "dependencies": { - "argparse": "^2.0.1" - }, - "bin": { - "js-yaml": "bin/js-yaml.js" - } - }, "node_modules/eslint/node_modules/json-schema-traverse": { "version": "0.4.1", "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz", "integrity": "sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg==" }, - "node_modules/eslint/node_modules/locate-path": { - "version": "6.0.0", - "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-6.0.0.tgz", - "integrity": "sha512-iPZK6eYjbxRu3uB4/WZ3EsEIMJFMqAoopl3R+zuq0UjcAm/MO6KCweDgPfP3elTztoKP3KtnVHxTn2NHBSDVUw==", - "dependencies": { - "p-locate": "^5.0.0" - }, - "engines": { - "node": ">=10" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, - "node_modules/eslint/node_modules/p-limit": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-3.1.0.tgz", - "integrity": "sha512-TYOanM3wGwNGsZN2cVTYPArw454xnXj5qmWF1bEoAc4+cU/ol7GVh7odevjp1FNHduHc3KZMcFduxU5Xc6uJRQ==", - "dependencies": { - "yocto-queue": "^0.1.0" - }, - "engines": { - "node": ">=10" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, - "node_modules/eslint/node_modules/p-locate": { - "version": "5.0.0", - "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-5.0.0.tgz", - "integrity": "sha512-LaNjtRWUBY++zB5nE/NwcaoMylSPk+S+ZHNB1TzdbMJMny6dynpAGt7X/tl/QYq3TIeE6nxHppbo2LGymrG5Pw==", - "dependencies": { - "p-limit": "^3.0.2" - }, - "engines": { - "node": ">=10" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, "node_modules/eslint/node_modules/supports-color": { "version": "7.2.0", "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz", @@ -9900,6 +9802,21 @@ "url": "https://github.com/sponsors/sindresorhus" } }, + "node_modules/find-up": { + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/find-up/-/find-up-5.0.0.tgz", + "integrity": "sha512-78/PXT1wlLLDgTzDs7sjq9hzz0vXD+zn+7wypEe4fXQxCmdmqfGsEPQxmiCSQI3ajFV91bVSsvNtrJRiW6nGng==", + "dependencies": { + "locate-path": "^6.0.0", + "path-exists": "^4.0.0" + }, + "engines": { + "node": ">=10" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, "node_modules/flat": { "version": "5.0.2", "resolved": "https://registry.npmjs.org/flat/-/flat-5.0.2.tgz", @@ -11106,6 +11023,17 @@ "resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-4.0.0.tgz", "integrity": "sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ==" }, + "node_modules/js-yaml": { + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-4.1.0.tgz", + "integrity": "sha512-wpxZs9NoxZaJESJGIZTyDEaYpl0FKSA+FB9aJiyemKhMwkxQg63h4T1KJgUGHpTqPDNRcmmYLugrRjJlBtWvRA==", + "dependencies": { + "argparse": "^2.0.1" + }, + "bin": { + "js-yaml": "bin/js-yaml.js" + } + }, "node_modules/jsbn": { "version": "1.1.0", "resolved": "https://registry.npmjs.org/jsbn/-/jsbn-1.1.0.tgz", @@ -11844,6 +11772,20 @@ "node": ">= 12.13.0" } }, + "node_modules/locate-path": { + "version": "6.0.0", + "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-6.0.0.tgz", + "integrity": "sha512-iPZK6eYjbxRu3uB4/WZ3EsEIMJFMqAoopl3R+zuq0UjcAm/MO6KCweDgPfP3elTztoKP3KtnVHxTn2NHBSDVUw==", + "dependencies": { + "p-locate": "^5.0.0" + }, + "engines": { + "node": ">=10" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, "node_modules/lodash": { "version": "4.17.21", "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.21.tgz", @@ -13334,6 +13276,34 @@ "node": ">=0.10.0" } }, + "node_modules/p-limit": { + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-3.1.0.tgz", + "integrity": "sha512-TYOanM3wGwNGsZN2cVTYPArw454xnXj5qmWF1bEoAc4+cU/ol7GVh7odevjp1FNHduHc3KZMcFduxU5Xc6uJRQ==", + "dependencies": { + "yocto-queue": "^0.1.0" + }, + "engines": { + "node": ">=10" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/p-locate": { + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-5.0.0.tgz", + "integrity": "sha512-LaNjtRWUBY++zB5nE/NwcaoMylSPk+S+ZHNB1TzdbMJMny6dynpAGt7X/tl/QYq3TIeE6nxHppbo2LGymrG5Pw==", + "dependencies": { + "p-limit": "^3.0.2" + }, + "engines": { + "node": ">=10" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, "node_modules/p-map": { "version": "4.0.0", "resolved": "https://registry.npmjs.org/p-map/-/p-map-4.0.0.tgz", From d1a65ccbd5d8b94d3200d2499f6869e52a2effdc Mon Sep 17 00:00:00 2001 From: Renovate Bot Date: Tue, 17 Sep 2024 00:09:15 +0000 Subject: [PATCH 40/43] Update dependency puppeteer to v23.3.1 --- package-lock.json | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/package-lock.json b/package-lock.json index 842a2ef0a..45da33d80 100644 --- a/package-lock.json +++ b/package-lock.json @@ -8249,11 +8249,11 @@ "integrity": "sha512-oaMBel6gjolK862uaPQOVTA7q3TZhuSvuMQAAglQDOWYO9A91IrAOUJEyKVlqJlHE0vq5p5UXxzdPfMH/x6xNg==" }, "node_modules/debug": { - "version": "4.3.6", - "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.6.tgz", - "integrity": "sha512-O/09Bd4Z1fBrU4VzkhFqVgpPzaGbw6Sm9FEkBT1A/YBXQFGuuSxa1dN2nxgxS34JmKXqYx8CZAwEVoJFImUXIg==", + "version": "4.3.7", + "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.7.tgz", + "integrity": "sha512-Er2nc/H7RrMXZBFCEim6TCmMk02Z8vLC2Rbi1KEBggpo0fS6l0S1nnapwmIi3yW/+GOJap1Krg4w0Hg80oCqgQ==", "dependencies": { - "ms": "2.1.2" + "ms": "^2.1.3" }, "engines": { "node": ">=6.0" @@ -12590,9 +12590,9 @@ } }, "node_modules/ms": { - "version": "2.1.2", - "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz", - "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==" + "version": "2.1.3", + "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.3.tgz", + "integrity": "sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==" }, "node_modules/msgpackr": { "version": "1.11.0", @@ -14063,9 +14063,9 @@ } }, "node_modules/puppeteer": { - "version": "23.3.0", - "resolved": "https://registry.npmjs.org/puppeteer/-/puppeteer-23.3.0.tgz", - "integrity": "sha512-e2jY8cdWSUGsrLxqGm3hIbJq/UIk1uOY8XY7SM51leXkH7shrIyE91lK90Q9byX6tte+cyL3HKqlWBEd6TjWTA==", + "version": "23.3.1", + "resolved": "https://registry.npmjs.org/puppeteer/-/puppeteer-23.3.1.tgz", + "integrity": "sha512-BxkuJyCv46ZKW8KEHiVMHgHEC89jKK9FffReWjbw1IfBUmNx+6JIZyqOtaJeSwyolTdVqqb5fiPiXflKeH3dKQ==", "dev": true, "hasInstallScript": true, "dependencies": { @@ -14073,7 +14073,7 @@ "chromium-bidi": "0.6.5", "cosmiconfig": "^9.0.0", "devtools-protocol": "0.0.1330662", - "puppeteer-core": "23.3.0", + "puppeteer-core": "23.3.1", "typed-query-selector": "^2.12.0" }, "bin": { @@ -14084,14 +14084,14 @@ } }, "node_modules/puppeteer-core": { - "version": "23.3.0", - "resolved": "https://registry.npmjs.org/puppeteer-core/-/puppeteer-core-23.3.0.tgz", - "integrity": "sha512-sB2SsVMFs4gKad5OCdv6w5vocvtEUrRl0zQqSyRPbo/cj1Ktbarmhxy02Zyb9R9HrssBcJDZbkrvBnbaesPyYg==", + "version": "23.3.1", + "resolved": "https://registry.npmjs.org/puppeteer-core/-/puppeteer-core-23.3.1.tgz", + "integrity": "sha512-m5gTpITEqqpSgAvPUI/Ch9igh5sNJV+BVVbqQMzqirRDVHDCkLGHaydEQZx2NZvSXdwCFrIV///cpSlX/uD0Sg==", "dev": true, "dependencies": { "@puppeteer/browsers": "2.4.0", "chromium-bidi": "0.6.5", - "debug": "^4.3.6", + "debug": "^4.3.7", "devtools-protocol": "0.0.1330662", "typed-query-selector": "^2.12.0", "ws": "^8.18.0" From 6960ea3b335f5585dfa1b567c377066c0f7af861 Mon Sep 17 00:00:00 2001 From: Sebastian Wendland Date: Tue, 17 Sep 2024 08:43:40 +0200 Subject: [PATCH 41/43] GB3-1665: Moved `setErrorForInvalidInitialMapIds$` from `url.effects` to `layer-catalog.effects`. --- src/app/state/app/effects/url.effects.spec.ts | 22 +--------------- src/app/state/app/effects/url.effects.ts | 15 ----------- .../map/effects/layer-catalog.effects.spec.ts | 26 +++++++++++++++++-- .../map/effects/layer-catalog.effects.ts | 16 +++++++++++- 4 files changed, 40 insertions(+), 39 deletions(-) diff --git a/src/app/state/app/effects/url.effects.spec.ts b/src/app/state/app/effects/url.effects.spec.ts index 7c9f98c3e..e3250bf8f 100644 --- a/src/app/state/app/effects/url.effects.spec.ts +++ b/src/app/state/app/effects/url.effects.spec.ts @@ -1,6 +1,6 @@ import {provideMockActions} from '@ngrx/effects/testing'; import {fakeAsync, flush, TestBed} from '@angular/core/testing'; -import {EMPTY, Observable, of} from 'rxjs'; +import {Observable, of} from 'rxjs'; import {Action} from '@ngrx/store'; import {MockStore, provideMockStore} from '@ngrx/store/testing'; import {routerNavigatedAction} from '@ngrx/router-store'; @@ -16,9 +16,6 @@ import {selectKeepTemporaryUrlParams, selectMainPage} from '../reducers/url.redu import {RouteParamConstants} from '../../../shared/constants/route-param.constants'; import {SearchActions} from '../actions/search.actions'; import {InitialMapExtentService} from '../../../map/services/initial-map-extent.service'; -import {selectIsAuthenticated} from '../../auth/reducers/auth-status.reducer'; -import {catchError} from 'rxjs/operators'; -import {InitialMapsCouldNotBeLoaded} from '../../../shared/errors/initial-maps.errors'; import {LayerCatalogActions} from '../../map/actions/layer-catalog.actions'; describe('UrlEffects', () => { @@ -273,23 +270,6 @@ describe('UrlEffects', () => { })); }); - describe('setErrorForInvalidInitialMapIds$', () => { - it('throws an InitialMapsCouldNotBeLoaded error', (done: DoneFn) => { - store.overrideSelector(selectIsAuthenticated, true); - const originalError = new Error('error'); - actions$ = of(LayerCatalogActions.setInitialMapsError({error: originalError})); - effects.setErrorForInvalidInitialMapIds$ - .pipe( - catchError((error: unknown) => { - const expectedError = new InitialMapsCouldNotBeLoaded(true, originalError); - expect(error).toEqual(expectedError); - done(); - return EMPTY; - }), - ) - .subscribe(); - }); - }); describe('keepTemporaryUrlParameters$', () => { const actions = [ {name: 'SearchActions.setSearchApiError', action: SearchActions.setSearchApiError}, diff --git a/src/app/state/app/effects/url.effects.ts b/src/app/state/app/effects/url.effects.ts index c8e915248..9f9edae90 100644 --- a/src/app/state/app/effects/url.effects.ts +++ b/src/app/state/app/effects/url.effects.ts @@ -19,8 +19,6 @@ import {selectQueryParams} from '../selectors/router.selector'; import {RouteParamConstants} from '../../../shared/constants/route-param.constants'; import {SearchActions} from '../actions/search.actions'; import {InitialMapExtentService} from '../../../map/services/initial-map-extent.service'; -import {selectIsAuthenticated} from '../../auth/reducers/auth-status.reducer'; -import {InitialMapsCouldNotBeLoaded} from '../../../shared/errors/initial-maps.errors'; import {LayerCatalogActions} from '../../map/actions/layer-catalog.actions'; @Injectable() @@ -151,19 +149,6 @@ export class UrlEffects { {dispatch: false}, ); - public setErrorForInvalidInitialMapIds$ = createEffect( - () => { - return this.actions$.pipe( - ofType(LayerCatalogActions.setInitialMapsError), - concatLatestFrom(() => this.store.select(selectIsAuthenticated)), - map(([{error}, isAuthenticated]) => { - throw new InitialMapsCouldNotBeLoaded(isAuthenticated, error); - }), - ); - }, - {dispatch: false}, - ); - public keepTemporaryUrlParameters$ = createEffect(() => { return this.actions$.pipe( ofType( diff --git a/src/app/state/map/effects/layer-catalog.effects.spec.ts b/src/app/state/map/effects/layer-catalog.effects.spec.ts index 099cb2aa1..4bd8b1557 100644 --- a/src/app/state/map/effects/layer-catalog.effects.spec.ts +++ b/src/app/state/map/effects/layer-catalog.effects.spec.ts @@ -1,4 +1,4 @@ -import {Observable, of, throwError} from 'rxjs'; +import {EMPTY, Observable, of, throwError} from 'rxjs'; import {Action} from '@ngrx/store'; import {MockStore, provideMockStore} from '@ngrx/store/testing'; import {LayerCatalogEffects} from './layer-catalog.effects'; @@ -14,9 +14,11 @@ import {Map} from '../../../shared/interfaces/topic.interface'; import {provideHttpClient, withInterceptorsFromDi} from '@angular/common/http'; import {provideHttpClientTesting} from '@angular/common/http/testing'; import {ActiveMapItemFactory} from '../../../shared/factories/active-map-item.factory'; -import {InitialMapIdsParameterInvalid} from '../../../shared/errors/initial-maps.errors'; +import {InitialMapIdsParameterInvalid, InitialMapsCouldNotBeLoaded} from '../../../shared/errors/initial-maps.errors'; import {selectItems} from '../reducers/layer-catalog.reducer'; import {TopicsCouldNotBeLoaded} from '../../../shared/errors/map.errors'; +import {selectIsAuthenticated} from '../../auth/reducers/auth-status.reducer'; +import {catchError} from 'rxjs/operators'; describe('LayerCatalogEffects', () => { let actions$: Observable; @@ -71,6 +73,7 @@ describe('LayerCatalogEffects', () => { expect(action).toEqual(expectedAction); }); }); + it('throws a TopicsCouldNotBeLoaded error if the Topicservice fails', (done: DoneFn) => { store.overrideSelector(selectItems, []); const originalError = new Error('oh no! butterfingers'); @@ -104,6 +107,7 @@ describe('LayerCatalogEffects', () => { done(); }); }); + it('dispatches LayerCatalogActions.setInitialMapsError if a map is not found', (done: DoneFn) => { const mapConfigStateMock: MapConfigState = { initialMaps: ['1'], @@ -121,4 +125,22 @@ describe('LayerCatalogEffects', () => { }); }); }); + + describe('setErrorForInvalidInitialMapIds$', () => { + it('throws an InitialMapsCouldNotBeLoaded error', (done: DoneFn) => { + store.overrideSelector(selectIsAuthenticated, true); + const originalError = new Error('error'); + actions$ = of(LayerCatalogActions.setInitialMapsError({error: originalError})); + effects.setErrorForInvalidInitialMapIds$ + .pipe( + catchError((error: unknown) => { + const expectedError = new InitialMapsCouldNotBeLoaded(true, originalError); + expect(error).toEqual(expectedError); + done(); + return EMPTY; + }), + ) + .subscribe(); + }); + }); }); diff --git a/src/app/state/map/effects/layer-catalog.effects.ts b/src/app/state/map/effects/layer-catalog.effects.ts index fd89963a4..f7cf7a62d 100644 --- a/src/app/state/map/effects/layer-catalog.effects.ts +++ b/src/app/state/map/effects/layer-catalog.effects.ts @@ -13,7 +13,8 @@ import {selectItems} from '../reducers/layer-catalog.reducer'; import {ActiveMapItemFactory} from '../../../shared/factories/active-map-item.factory'; import {TopicsCouldNotBeLoaded} from '../../../shared/errors/map.errors'; -import {InitialMapIdsParameterInvalid} from '../../../shared/errors/initial-maps.errors'; +import {InitialMapIdsParameterInvalid, InitialMapsCouldNotBeLoaded} from '../../../shared/errors/initial-maps.errors'; +import {selectIsAuthenticated} from '../../auth/reducers/auth-status.reducer'; @Injectable() export class LayerCatalogEffects { @@ -61,6 +62,19 @@ export class LayerCatalogEffects { ); }); + public setErrorForInvalidInitialMapIds$ = createEffect( + () => { + return this.actions$.pipe( + ofType(LayerCatalogActions.setInitialMapsError), + concatLatestFrom(() => this.store.select(selectIsAuthenticated)), + map(([{error}, isAuthenticated]) => { + throw new InitialMapsCouldNotBeLoaded(isAuthenticated, error); + }), + ); + }, + {dispatch: false}, + ); + constructor( private readonly actions$: Actions, private readonly topicsService: Gb3TopicsService, From f55f762cb8fbc4c0b2b30abde7b5d7f89ff8ef0b Mon Sep 17 00:00:00 2001 From: Sebastian Wendland Date: Tue, 17 Sep 2024 08:48:31 +0200 Subject: [PATCH 42/43] GB3-1658: Added a special rule for `zone.js` as minor changes are breaking. --- renovate.json | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/renovate.json b/renovate.json index 07c28661d..1fb5551bb 100644 --- a/renovate.json +++ b/renovate.json @@ -52,6 +52,14 @@ "groupName": "eslint", "matchPackagePrefixes": ["eslint", "@angular-eslint", "@ngrx/eslint", "@typescript-eslint"] }, + { + "matchManagers": ["npm"], + "matchPackageNames": ["zone.js"], + "matchUpdateTypes": ["minor"], + "automerge": false, + "autoApprove": false, + "description": "There are breaking changes for zone.js with updates on minor level. Therefore, this rule prevents automerge and autoApprove for this update type." + }, { "matchManagers": ["npm"], "matchPackageNames": ["prettier"], From ffafc6f1fe6364c3631f2d89cc0631fb447284b4 Mon Sep 17 00:00:00 2001 From: till_schuetze Date: Tue, 17 Sep 2024 10:43:59 +0200 Subject: [PATCH 43/43] pr fixes --- .../coordinate-scale-inputs.component.html | 7 ++++++- .../coordinate-scale-inputs.component.ts | 2 +- src/app/state/map/effects/map-config.effects.spec.ts | 6 +++--- src/app/state/map/effects/map-config.effects.ts | 2 +- 4 files changed, 11 insertions(+), 6 deletions(-) diff --git a/src/app/map/components/map-controls/coordinate-scale-inputs/coordinate-scale-inputs.component.html b/src/app/map/components/map-controls/coordinate-scale-inputs/coordinate-scale-inputs.component.html index 39b79e829..1bc85d0c9 100644 --- a/src/app/map/components/map-controls/coordinate-scale-inputs/coordinate-scale-inputs.component.html +++ b/src/app/map/components/map-controls/coordinate-scale-inputs/coordinate-scale-inputs.component.html @@ -2,7 +2,12 @@
    - +
    diff --git a/src/app/map/components/map-controls/coordinate-scale-inputs/coordinate-scale-inputs.component.ts b/src/app/map/components/map-controls/coordinate-scale-inputs/coordinate-scale-inputs.component.ts index 8c2ea17d9..c254dcf42 100644 --- a/src/app/map/components/map-controls/coordinate-scale-inputs/coordinate-scale-inputs.component.ts +++ b/src/app/map/components/map-controls/coordinate-scale-inputs/coordinate-scale-inputs.component.ts @@ -55,7 +55,7 @@ export class CoordinateScaleInputsComponent implements OnInit, OnDestroy { } } - public setMapCenter(event: Event) { + public setMapCenterAndDrawHighlight(event: Event) { const input = event.target as HTMLInputElement; const center = this.coordinateParserService.parse(input.value); diff --git a/src/app/state/map/effects/map-config.effects.spec.ts b/src/app/state/map/effects/map-config.effects.spec.ts index 5bc32e6ad..1bcb99fac 100644 --- a/src/app/state/map/effects/map-config.effects.spec.ts +++ b/src/app/state/map/effects/map-config.effects.spec.ts @@ -97,15 +97,15 @@ describe('MapConfigEffects', () => { }); }); - describe('setCenterOnMap$', () => { - it('sets the map center using the map service, no further action dispatch', (done: DoneFn) => { + describe('setCenterOnMapAndDrawHighlight$', () => { + it('sets the map center using the map service and draws point highlight, no further action dispatch', (done: DoneFn) => { const expectedCenter: PointWithSrs = {srs: 2056, type: 'Point', coordinates: [123, 456]}; const mapServiceSpy = spyOn(mapService, 'setMapCenter').and.callThrough(); const mapDrawingServiceSpy = spyOn(mapDrawingService, 'drawSearchResultHighlight').and.callThrough(); const expectedAction = MapConfigActions.setMapCenterAndDrawHighlight({center: expectedCenter}); actions$ = of(expectedAction); - effects.setCenterOnMap$.subscribe((action) => { + effects.setMapCenterAndDrawHighlight$.subscribe((action) => { expect(mapServiceSpy).toHaveBeenCalledOnceWith(expectedCenter); expect(mapDrawingServiceSpy).toHaveBeenCalledOnceWith(expectedCenter); expect(action).toEqual(expectedAction); diff --git a/src/app/state/map/effects/map-config.effects.ts b/src/app/state/map/effects/map-config.effects.ts index c558e5cac..2bceb84eb 100644 --- a/src/app/state/map/effects/map-config.effects.ts +++ b/src/app/state/map/effects/map-config.effects.ts @@ -49,7 +49,7 @@ export class MapConfigEffects { {dispatch: false}, ); - public setCenterOnMap$ = createEffect( + public setMapCenterAndDrawHighlight$ = createEffect( () => { return this.actions$.pipe( ofType(MapConfigActions.setMapCenterAndDrawHighlight),