Adding filter banner component and filtering activated message #4426
Open
gabriel-bolbotina wants to merge 2 commits intodev/filteringfrom
Open
Adding filter banner component and filtering activated message #4426gabriel-bolbotina wants to merge 2 commits intodev/filteringfrom
gabriel-bolbotina wants to merge 2 commits intodev/filteringfrom
Conversation
Pull Request Test Coverage Report for Build 23648308057Details
💛 - Coveralls |
📦 Build Artifacts Ready
|
Added extra small MMButton size Added function to check if the referencing layer is filtered Added info message in gallery and relation editor pages
Simplified Filter banner component Added banner in the linked features corrected position according to figma design
gabriel-bolbotina
force-pushed
the
filter-hidden-feature-banner
branch
from
8f4d1be to
de09c4b
Compare
📦 Build Artifacts Ready
|
Withalion
reviewed
Mar 31, 2026
|
|
||
| property string errorMsg: "" | ||
| property string warningMsg: "" | ||
| property string hintMsg: "" |
Contributor
There was a problem hiding this comment.
Suggested change
| property string hintMsg: "" | |
| property string infoMsg: "" |
Comment on lines
+169
to
+199
| Item { | ||
| // hint message | ||
|
|
||
| width: parent.width | ||
| height: hintMessageGroup.implicitHeight | ||
|
|
||
| visible: root.hintMsg !== "" | ||
|
|
||
| RowLayout { | ||
| id: hintMessageGroup | ||
|
|
||
| width: parent.width | ||
|
|
||
| MMComponents.MMIcon { | ||
| source: __style.infoFilledIcon | ||
| size: __style.icon16 | ||
| color: __style.informativeColor | ||
| } | ||
|
|
||
| MMComponents.MMText { | ||
| Layout.fillWidth: true | ||
|
|
||
| text: root.hintMsg | ||
| color: __style.deepOceanColor | ||
| font: __style.t4 | ||
|
|
||
| wrapMode: Text.Wrap | ||
| maximumLineCount: 10 | ||
| } | ||
| } | ||
| } |
Contributor
There was a problem hiding this comment.
I would reuse the validation component below and just add new state where necessary. Validation info has priority over info message.
Comment on lines
+172
to
+173
| if ( root.size === MMButton.Sizes.ExtraSmall ) return row.paintedChildrenWidth + 2 * __style.margin8 | ||
| return row.paintedChildrenWidth + 2 * ( root.size === MMButton.Sizes.Small ? __style.margin16 : __style.margin20 ) |
Contributor
There was a problem hiding this comment.
Suggested change
| if ( root.size === MMButton.Sizes.ExtraSmall ) return row.paintedChildrenWidth + 2 * __style.margin8 | |
| return row.paintedChildrenWidth + 2 * ( root.size === MMButton.Sizes.Small ? __style.margin16 : __style.margin20 ) | |
| let margin = __style.margin20 | |
| if ( root.size === MMButton.Sizes.ExtraSmall ) margin = __style.margin8 | |
| else if ( root.size === MMButton.Sizes.Small ) margin = __style.margin16 | |
| return row.paintedChildrenWidth + 2 * margin |
this is more readable
Comment on lines
+165
to
+170
| implicitHeight: { | ||
| if ( root.type === MMButton.Types.Tertiary && root.size !== MMButton.Sizes.ExtraSmall ) | ||
| return buttonContent.height | ||
| else | ||
| return buttonContent.height + topPadding + bottomPadding | ||
| } |
Contributor
There was a problem hiding this comment.
after checking the padding values there is no reason to differentiate here as tertiary button sets it to 0
Comment on lines
+217
to
+220
| property real maxWidth: { | ||
| if ( root.size === MMButton.Sizes.ExtraSmall ) return parent.width - 2 * __style.margin8 | ||
| return parent.width - 2 * ( root.size === MMButton.Sizes.Small ? __style.margin16 : __style.margin20 ) | ||
| } |
Contributor
There was a problem hiding this comment.
same readability refactor as above would be nice
Comment on lines
+33
to
+36
| hintMsg: root._fieldAssociatedRelation && globalFilterController.hasActiveFilters | ||
| ? qsTr( "Some features may be hidden by active filters" ) | ||
| : "" | ||
|
|
Contributor
There was a problem hiding this comment.
Suggested change
| hintMsg: root._fieldAssociatedRelation && globalFilterController.hasActiveFilters | |
| ? qsTr( "Some features may be hidden by active filters" ) | |
| : "" | |
| infoMsg: root._fieldAssociatedRelation && __activeProject.filterController.hasActiveFilters | |
| ? qsTr( "Some features may be hidden by active filters" ) | |
| : "" | |
Comment on lines
+45
to
+48
| hintMsg: root._fieldAssociatedRelation && globalFilterController.hasActiveFilters | ||
| ? qsTr( "Some features may be hidden by active filters" ) | ||
| : "" | ||
|
|
Contributor
There was a problem hiding this comment.
Suggested change
| hintMsg: root._fieldAssociatedRelation && globalFilterController.hasActiveFilters | |
| ? qsTr( "Some features may be hidden by active filters" ) | |
| : "" | |
| infoMsg: root._fieldAssociatedRelation && __activeProject..filterController.hasActiveFilters | |
| ? qsTr( "Some features may be hidden by active filters" ) | |
| : "" | |
|
|
||
| delayedSearch: true | ||
| onSearchTextChanged: featuresModel.searchExpression = searchBar.text | ||
| visible: root.selectedLayer && globalFilterController.filteredLayerIds.indexOf(root.selectedLayer.id) >= 0 |
Contributor
There was a problem hiding this comment.
Suggested change
| visible: root.selectedLayer && globalFilterController.filteredLayerIds.indexOf(root.selectedLayer.id) >= 0 | |
| visible: root.selectedLayer && __activeProject.filterController.filteredLayerIds.indexOf(root.selectedLayer.id) >= 0 |
Comment on lines
+62
to
+66
| onActionClicked: { | ||
| globalFilterController.clearAllFilters() | ||
| globalFilterController.applyFiltersToAllLayers() | ||
| featuresModel.reloadFeatures() | ||
| } |
Contributor
There was a problem hiding this comment.
Suggested change
| onActionClicked: { | |
| globalFilterController.clearAllFilters() | |
| globalFilterController.applyFiltersToAllLayers() | |
| featuresModel.reloadFeatures() | |
| } | |
| onActionClicked: { | |
| __activeProject.filterController.clearAllFilters() | |
| __activeProject.filterController.applyFiltersToAllLayers() | |
| featuresModel.reloadFeatures() | |
| } |
Contributor
There was a problem hiding this comment.
Looks like this is never used, so let's remove it
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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
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.
In this PR:
Below some visuals:
filter-banner-info.MP4