HTM-1538: Removed toolbar state, use toolmanager for state #1066

geertplaisier · 2025-11-21T11:38:52Z

projects/core/src/lib/components/feature-info/feature-info/feature-info.component.ts

...ts/core/src/lib/components/feature-info/feature-info-dialog/feature-info-dialog.component.ts

github-actions · 2025-11-21T11:42:58Z

Test Results

1 files ± 0 214 suites - 1 8m 47s ⏱️ +10s
528 tests - 4 528 ✅ - 4 0 💤 ±0 0 ❌ ±0
608 runs - 10 608 ✅ - 10 0 💤 ±0 0 ❌ ±0

Results for commit 98b4f7a. ± Comparison against base commit 328e55f.

This pull request removes 5 and adds 1 tests. Note that renamed tests count towards both.

ToolbarReducer activates tool ‑ ToolbarReducer activates tool
ToolbarReducer deactivates tool ‑ ToolbarReducer deactivates tool
ToolbarReducer deregister existing tool ‑ ToolbarReducer deregister existing tool
ToolbarReducer re-register existing tool ‑ ToolbarReducer re-register existing tool
ToolbarReducer register tool ‑ ToolbarReducer register tool

Switch3dComponent should render when (measure) tool is enabled ‑ Switch3dComponent should render when (measure) tool is enabled

♻️ This comment has been updated with latest results.

Copilot

Pull Request Overview

This PR refactors the toolbar state management system by removing the dedicated NgRx toolbar state and instead using the ToolManager for tracking tool activation status. The main architectural change involves adding an owner property to tools to identify which component owns them, and providing new observable streams and methods on MapService to check tool status.

Key Changes:

Replaced toolbar NgRx state (actions, selectors, reducer, effects) with ToolManager-based state management
Added owner property to ToolConfigModel to track tool ownership by component
Introduced getToolStatusChanged$() and someToolsEnabled$() methods on MapService
Migrated all toolbar components to use MapService methods instead of NgRx actions/selectors
Updated components to use Angular signals where appropriate

Reviewed Changes

Copilot reviewed 47 out of 49 changed files in this pull request and generated 7 comments.

Show a summary per file

File	Description
projects/map/src/lib/openlayers-map/open-layers-tool-manager.ts	Enhanced to store tool owner information and emit status changes via observable; added debug logging capabilities
projects/map/src/lib/models/tools/tool-config.model.ts	Added required `owner` property to track which component owns a tool
projects/map/src/lib/models/tools-status.model.ts	New model defining tool status structure with owner information
projects/map/src/lib/models/tool-manager.model.ts	Updated interface to make toolId optional and renamed method to `getToolStatusChanged$`
projects/map/src/lib/map-service/map.service.ts	Added new methods for tool status management: `getToolStatusChanged$`, `someToolsEnabled$`, `enableTool`, `disableTool`
projects/core/src/lib/test-helpers/map-service.mock.spec.ts	Added `createMapServiceMockWithDrawingTools` helper and updated mock to include new MapService methods
projects/core/src/lib/map/services/drawing.service.ts	Updated to use new `getToolStatusChanged$` method and added owner to tool configurations
projects/core/src/lib/map/index.ts	Removed export of deleted MapDrawingButtonsComponent
projects/core/src/lib/map/application-map.module.ts	Removed MapDrawingButtonsComponent from module declarations
projects/core/src/lib/components/toolbar/toolbar.module.ts	Removed toolbar state imports (StoreModule, EffectsModule, reducer, effects)
projects/core/src/lib/components/toolbar/switch3d/switch3d.component.ts	Migrated from toolbar selectors to use MapService.someToolsEnabled$
projects/core/src/lib/components/toolbar/switch3d/switch3d.component.spec.ts	Updated test to remove toolbar selector dependencies
projects/core/src/lib/components/toolbar/streetview/streetview.component.ts	Migrated to MapService and Angular signals; removed toolbar state dependencies
projects/core/src/lib/components/toolbar/streetview/streetview.component.spec.ts	Updated test to remove toolbar state mock setup
projects/core/src/lib/components/toolbar/streetview/streetview.component.html	Updated to use signal-based template syntax
projects/core/src/lib/components/toolbar/state/*	Deleted all toolbar state files (state, selectors, reducer, effects, actions)
projects/core/src/lib/components/toolbar/models/*	Deleted ToolbarToolModel and ToolbarComponentEnum
projects/core/src/lib/components/toolbar/measure/measure.component.ts	Migrated to MapService and signals; removed toolbar state dependencies
projects/core/src/lib/components/toolbar/measure/measure.component.spec.ts	Updated test to remove toolbar selector dependencies
projects/core/src/lib/components/toolbar/measure/measure.component.html	Updated to use signal-based template syntax
projects/core/src/lib/components/toolbar/coordinate-link-window/coordinate-link-window.component.ts	Migrated to MapService with signals
projects/core/src/lib/components/toolbar/coordinate-link-window/coordinate-link-window.component.spec.ts	Updated test to remove toolbar state dependencies
projects/core/src/lib/components/toolbar/coordinate-link-window/coordinate-link-window.component.html	Updated to use signal-based template syntax
projects/core/src/lib/components/toolbar/clicked-coordinates/clicked-coordinates.component.ts	Migrated to MapService and signals
projects/core/src/lib/components/toolbar/clicked-coordinates/clicked-coordinates.component.spec.ts	Updated test to remove toolbar state dependencies
projects/core/src/lib/components/toolbar/clicked-coordinates/clicked-coordinates.component.html	Updated to use signal-based template syntax
projects/core/src/lib/components/toolbar/scale-bar/scale-bar.component.ts	Added owner property to tool configuration
projects/core/src/lib/components/toolbar/mouse-coordinates/mouse-coordinates.component.ts	Added owner property to tool configuration
projects/core/src/lib/components/filter/spatial-filter-form-draw-geometries/map-drawing-buttons/*	Moved MapDrawingButtonsComponent to filter module with updated imports
projects/core/src/lib/components/filter/filter-component.module.ts	Added MapDrawingButtonsComponent to declarations
projects/core/src/lib/components/feature-info/feature-info/feature-info.component.ts	Updated to use MapService and added tool activation logic based on dialog visibility
projects/core/src/lib/components/feature-info/feature-info/feature-info.component.spec.ts	Updated test to remove toolbar state dependencies
projects/core/src/lib/components/feature-info/feature-info-dialog/feature-info-dialog.component.ts	Added distinctUntilChanged import
projects/core/src/lib/components/edit/state/edit.effects.ts	Removed toolbar-related effect
projects/core/src/lib/components/edit/services/edit-map-tool.service.ts	Removed toolbar state dependencies and added owner property to tools
projects/core/src/lib/components/edit/edit/edit.component.ts	Added subscription to tool status and removed toolbar action dispatches
projects/core/src/lib/components/edit/edit-dialog/edit-dialog.component.ts	Removed toolbar action dispatches
projects/core/src/lib/components/drawing/drawing/drawing.component.spec.ts	Updated to use new test helper for drawing tools

projects/core/src/lib/components/toolbar/switch3d/switch3d.component.ts

projects/map/src/lib/map-service/map.service.ts

projects/map/src/lib/openlayers-map/open-layers-tool-manager.ts

projects/core/src/lib/components/feature-info/feature-info/feature-info.component.ts

...ts/core/src/lib/components/feature-info/feature-info-dialog/feature-info-dialog.component.ts

Copilot

Pull Request Overview

Copilot reviewed 46 out of 48 changed files in this pull request and generated 4 comments.

projects/map/src/lib/openlayers-map/open-layers-tool-manager.ts

projects/map/src/lib/models/tools/tool-config.model.ts

projects/map/src/lib/openlayers-map/open-layers-tool-manager.ts

codecov · 2025-11-21T12:27:59Z

❌ 2 Tests Failed:

Tests completed	Failed	Passed	Skipped
529	2	527	0

View the top 2 failed test(s) by shortest run time

Switch3dComponent should render

Stack Traces | 0.244s run time

TestingLibraryElementError: Unable to find a label with the text of: Switch to 3D

Ignored nodes: comments, script, style
<body>
  <div
    id="root0"
    ng-version="20.1.4"
  />
</body>
    at Object.getElementError (.../tailormap-viewer/tailormap-viewer/node_modules/@.../dom/dist/config.js:37:19)
    at getAllByLabelText (.../tailormap-viewer/tailormap-viewer/node_modules/@.../dist/queries/label-text.js:111:38)
    at .../tailormap-viewer/tailormap-viewer/node_modules/@.../dom/dist/query-helpers.js:52:17
    at .../tailormap-viewer/tailormap-viewer/node_modules/@.../dom/dist/query-helpers.js:95:19
    at .../toolbar/switch3d/switch3d.component.spec.ts:40:19
    at processTicksAndRejections (node:internal/process/task_queues:105:5)

Switch3dComponent toggle between 2D and 3D

Stack Traces | 1.04s run time

Error: Unable to find role="button"

Ignored nodes: comments, script, style
<body>
  <div
    id="root2"
    ng-version="20.1.4"
  />
</body>
    at waitForWrapper (.../tailormap-viewer/tailormap-viewer/node_modules/@.../dom/dist/wait-for.js:163:27)
    at waitFor$1 (.../tailormap-viewer/tailormap-viewer/node_modules/@.../angular/fesm2022/testing-library-angular.mjs:398:18)
    at Generator.next (<anonymous>)
    at .../tailormap-viewer/tailormap-viewer/node_modules/@.../angular/fesm2022/testing-library-angular.mjs:71:61
    at new ZoneAwarePromise (.../tailormap-viewer/tailormap-viewer/node_modules/zone.js/bundles/zone.umd.js:2580:29)
    at __async (.../tailormap-viewer/tailormap-viewer/node_modules/@.../angular/fesm2022/testing-library-angular.mjs:55:10)
    at waitForWrapper (.../tailormap-viewer/tailormap-viewer/node_modules/@.../angular/fesm2022/testing-library-angular.mjs:390:65)
    at .../tailormap-viewer/tailormap-viewer/node_modules/@.../angular/fesm2022/testing-library-angular.mjs:473:30
    at Generator.next (<anonymous>)
    at .../tailormap-viewer/tailormap-viewer/node_modules/@.../angular/fesm2022/testing-library-angular.mjs:71:61
    at new ZoneAwarePromise (.../tailormap-viewer/tailormap-viewer/node_modules/zone.js/bundles/zone.umd.js:2580:29)
    at __async (.../tailormap-viewer/tailormap-viewer/node_modules/@.../angular/fesm2022/testing-library-angular.mjs:55:10)
    at Object.newQueries.<computed> [as findByRole] (.../tailormap-viewer/tailormap-viewer/node_modules/@.../angular/fesm2022/testing-library-angular.mjs:470:58)
    at .../toolbar/switch3d/switch3d.component.spec.ts:50:40
    at processTicksAndRejections (node:internal/process/task_queues:105:5)

To view more test analytics, go to the Test Analytics Dashboard
_{📋 Got 3 mins? Take this short survey to help us improve Test Analytics.}

HTM-1538: Removed toolbar state, use toolmanager for state

3f3f565

geertplaisier requested review from Copilot, matthijsln, mprins and steinkobben November 21, 2025 11:38

geertplaisier self-assigned this Nov 21, 2025

Copilot started reviewing on behalf of geertplaisier November 21, 2025 11:39 View session

github-code-quality bot found potential problems Nov 21, 2025

View reviewed changes

projects/core/src/lib/components/feature-info/feature-info/feature-info.component.ts Fixed Show fixed Hide fixed

...ts/core/src/lib/components/feature-info/feature-info-dialog/feature-info-dialog.component.ts Fixed Show fixed Hide fixed

Copilot finished reviewing on behalf of geertplaisier November 21, 2025 11:42

Copilot AI reviewed Nov 21, 2025

View reviewed changes

Fix lint + remove unnecessary code

b291d5d

geertplaisier requested a review from Copilot November 21, 2025 12:03

Copilot started reviewing on behalf of geertplaisier November 21, 2025 12:03 View session

Copilot finished reviewing on behalf of geertplaisier November 21, 2025 12:06

github-actions bot deployed to pr-1066 November 21, 2025 12:06 View deployment

Copilot AI reviewed Nov 21, 2025

View reviewed changes

Added unsubscribe

81ffab3

Fix tests

98b4f7a

github-actions bot deployed to pr-1066 November 21, 2025 14:28 View deployment

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

HTM-1538: Removed toolbar state, use toolmanager for state #1066

HTM-1538: Removed toolbar state, use toolmanager for state #1066

Uh oh!

geertplaisier commented Nov 21, 2025 •

edited by atlassian bot

Loading

Uh oh!

Uh oh!

Uh oh!

github-actions bot commented Nov 21, 2025 •

edited

Loading

Uh oh!

Copilot AI left a comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Copilot AI left a comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

codecov bot commented Nov 21, 2025

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

2 participants

HTM-1538: Removed toolbar state, use toolmanager for state #1066

Are you sure you want to change the base?

HTM-1538: Removed toolbar state, use toolmanager for state #1066

Uh oh!

Conversation

geertplaisier commented Nov 21, 2025 • edited by atlassian bot Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

Uh oh!

Uh oh!

github-actions bot commented Nov 21, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Test Results

Uh oh!

Copilot AI left a comment

Choose a reason for hiding this comment

Pull Request Overview

Reviewed Changes

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Copilot AI left a comment

Choose a reason for hiding this comment

Pull Request Overview

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

codecov bot commented Nov 21, 2025

❌ 2 Tests Failed:

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

2 participants

geertplaisier commented Nov 21, 2025 •

edited by atlassian bot

Loading

github-actions bot commented Nov 21, 2025 •

edited

Loading