chore: resolve merge conflicts (4f9feae3) · Commits · minerva / frontend · GitLab

Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

F

frontend
- Activity
- Members
- Labels
- Issues
- Issue boards
- Milestones
- Iterations
- Wiki
- Requirements
- Jira
- External wiki
- Environments
- Terraform modules
- Incidents
- Service Desk

Snippets Groups Projects

4f9feae3

Commit 4f9feae3 authored 4 months ago by Miłosz Grocholewski

Downloads
- Plain Diff

chore: resolve merge conflicts

parents 2dd8b36c 5bee37e0

No related branches found

No related tags found

1 merge request!321feat(vector-map): add text for filled compartments in a semantic view

Pipeline #98591 passed 4 months ago

Changes 9
Pipelines 2

Hide whitespace changes

Inline Side-by-side

Showing

src/components/Map/MapViewer/MapViewerVector/listeners/mouseClick/mouseLeftClick/onMapLeftClick.test.ts 7 additions, 3 deletions

...isteners/mouseClick/mouseLeftClick/onMapLeftClick.test.ts
src/components/Map/MapViewer/MapViewerVector/listeners/mouseClick/mouseLeftClick/onMapLeftClick.ts 3 additions, 3 deletions

...tor/listeners/mouseClick/mouseLeftClick/onMapLeftClick.ts
src/components/Map/MapViewer/MapViewerVector/listeners/mouseClick/mouseRightClick/onMapRightClick.ts 7 additions, 2 deletions

...r/listeners/mouseClick/mouseRightClick/onMapRightClick.ts
src/components/Map/MapViewer/MapViewerVector/utils/config/reactionsLayer/processModelElements.ts 2 additions, 1 deletion

...ector/utils/config/reactionsLayer/processModelElements.ts
src/components/Map/MapViewer/MapViewerVector/utils/shapes/elements/Glyph.test.ts 2 additions, 1 deletion

...iewer/MapViewerVector/utils/shapes/elements/Glyph.test.ts
src/components/Map/MapViewer/MapViewerVector/utils/shapes/elements/Glyph.ts 29 additions, 4 deletions

.../MapViewer/MapViewerVector/utils/shapes/elements/Glyph.ts
src/components/Map/MapViewer/MapViewerVector/utils/shapes/elements/getArrowFeature.ts 1 addition, 0 deletions

.../MapViewerVector/utils/shapes/elements/getArrowFeature.ts
src/components/Map/MapViewer/MapViewerVector/utils/shapes/reaction/Reaction.ts 5 additions, 8 deletions

...pViewer/MapViewerVector/utils/shapes/reaction/Reaction.ts
src/constants/features.ts 1 addition, 0 deletions

src/constants/features.ts

with 57 additions and 22 deletions

Loading

0% Loading or .

You are about to add 0 people to the discussion. Proceed with caution.

Finish editing this message first!

Please register or sign in to comment