Add grouping of filters per layer per feature type #1099
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
![github-code-quality[bot]](https://avatars.githubusercontent.com/u/9919?s=60&v=4){kind=small}
Contributor
There was a problem hiding this comment.
Pull request overview
This pull request implements grouping of filters per layer per feature type, enabling more granular control over CQL filters by supporting related feature types in addition to the base layer filters.
Key Changes:
- Refactored filter data structure from
Map<layerId, cqlFilter>toMap<layerId, Map<featureType, cqlFilter>>to support feature type grouping - Renamed
AttributeFilterHelpertoFeaturesFilterHelperto better reflect its broader responsibility - Updated
CqlFilterHelperto group filters by feature type within each layer
Reviewed changes
Copilot reviewed 19 out of 19 changed files in this pull request and generated 12 comments.
Show a summary per file
| File | Description |
|---|---|
projects/core/src/lib/state/index.ts |
Exports new filter state types and selectors |
projects/core/src/lib/state/filter-state/filter.selectors.ts |
Updates selector return type to FeaturesFilters |
projects/core/src/lib/state/core.effects.ts |
Updates reference from AttributeFilterHelper to FeaturesFilterHelper |
projects/core/src/lib/map/services/application-map.service.ts |
Adds helper call to extract filter string from new structure |
projects/core/src/lib/map/models/extended-app-layer.model.ts |
Changes filter type to allow null values |
projects/core/src/lib/filter/services/spatial-filter-reference-layer.service.ts |
Adds filter extraction using FeaturesFilterHelper |
projects/core/src/lib/filter/services/filter.service.ts |
Updates internal filter tracking to use LayerFeaturesFilters type |
projects/core/src/lib/filter/models/feature-filter.model.ts |
Defines new type aliases for nested filter map structure |
projects/core/src/lib/filter/index.ts |
Exports all filter-related helpers and models |
projects/core/src/lib/filter/helpers/features-filter.helper.ts |
New helper class replacing AttributeFilterHelper with additional filter extraction method |
projects/core/src/lib/filter/helpers/cql-filter.helper.ts |
Major refactoring to group filters by feature type within layers |
projects/core/src/lib/filter/helpers/cql-filter.helper.spec.ts |
Updates all tests to work with new nested Map structure and adds test for multiple feature types |
projects/core/src/lib/filter/helpers/attribute-filter.helper.ts |
File deleted - functionality moved to FeaturesFilterHelper |
projects/core/src/lib/components/feature-info/feature-info.service.ts |
Uses helper to extract CQL filter string from new structure |
projects/core/src/lib/components/attribute-list/services/attribute-list-export.service.ts |
Updates filter parameter type to LayerFeaturesFilters |
projects/core/src/lib/components/attribute-list/services/attribute-list-api.service.ts |
Converts LayerFeaturesFilters to CQL string for API calls |
projects/core/src/lib/components/attribute-list/models/attribute-list-api-service.model.ts |
Updates filter parameter types and documentation |
projects/core/src/lib/components/attribute-list/attribute-list-content/attribute-list-content.component.ts |
Extracts filter for default feature type key |
projects/api/src/lib/models/base-filter.model.ts |
Adds optional featureType field to support feature type grouping |
Comments suppressed due to low confidence (1)
projects/core/src/lib/filter/services/filter.service.ts:6
- Unused import takeUntilDestroyed.
import { takeUntilDestroyed } from '@angular/core/rxjs-interop';
projects/core/src/lib/components/attribute-list/models/attribute-list-api-service.model.ts
Outdated
Show resolved
Hide resolved
projects/core/src/lib/components/attribute-list/services/attribute-list-api.service.ts
Outdated
Show resolved
Hide resolved
projects/core/src/lib/components/attribute-list/services/attribute-list-api.service.ts
Outdated
Show resolved
Hide resolved
❌ 13 Tests Failed:
View the top 3 failed test(s) by shortest run time
To view more test analytics, go to the Test Analytics Dashboard |
Contributor
|
@geertplaisier I've opened a new pull request, #1100, to work on those changes. Once the pull request is ready, I'll request review from you. |
Contributor
|
@geertplaisier I've opened a new pull request, #1101, to work on those changes. Once the pull request is ready, I'll request review from you. |
Contributor
|
@geertplaisier I've opened a new pull request, #1102, to work on those changes. Once the pull request is ready, I'll request review from you. |
...src/lib/components/attribute-list/attribute-list-content/attribute-list-content.component.ts
Fixed
Show fixed
Hide fixed
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
No description provided.