Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix constructors of data filterers (backport #620) #624

Merged
merged 2 commits into from
Dec 7, 2023

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Dec 7, 2023

This is an automatic backport of pull request #620 done by Mergify.
Cherry-pick of a7c16fc has failed:

On branch mergify/bp/release/4.7.x/pr-620
Your branch is up to date with 'origin/release/4.7.x'.

You are currently cherry-picking commit a7c16fc67.
  (fix conflicts and run "git cherry-pick --continue")
  (use "git cherry-pick --skip" to skip this patch)
  (use "git cherry-pick --abort" to cancel the cherry-pick operation)

Changes to be committed:
	new file:   common/changes/@itwin/components-react/filterer-edit-filtering-constructors_2023-12-07-13-35.json
	modified:   ui/components-react/src/components-react/propertygrid/dataproviders/filterers/DisplayValuePropertyDataFilterer.ts
	modified:   ui/components-react/src/components-react/propertygrid/dataproviders/filterers/LabelPropertyDataFilterer.ts
	modified:   ui/components-react/src/components-react/propertygrid/dataproviders/filterers/PropertyCategoryLabelFilterer.ts
	modified:   ui/components-react/src/test/propertygrid/dataproviders/filterers/DisplayValuePropertyDataFilterer.test.ts
	modified:   ui/components-react/src/test/propertygrid/dataproviders/filterers/LabelPropertyDataFilterer.test.ts
	modified:   ui/components-react/src/test/propertygrid/dataproviders/filterers/PropertyCategoryLabelFilterer.test.ts

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   docs/changehistory/NextVersion.md

To fix up this pull request, you can check it out locally. See documentation: https://docs.github.com/en/github/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/checking-out-pull-requests-locally


Mergify commands and options

More conditions and actions can be found in the documentation.

You can also trigger Mergify actions by commenting on this pull request:

  • @Mergifyio refresh will re-evaluate the rules
  • @Mergifyio rebase will rebase this PR on its base branch
  • @Mergifyio update will merge the base branch into this PR
  • @Mergifyio backport <destination> will backport this PR on <destination> branch

Additionally, on Mergify dashboard you can:

  • look at your merge queues
  • generate the Mergify configuration with the config editor.

Finally, you can contact us on https://mergify.com

* initial implementation

* changelogs

* spacing

(cherry picked from commit a7c16fc)

# Conflicts:
#	docs/changehistory/NextVersion.md
@mergify mergify bot requested review from a team as code owners December 7, 2023 18:22
@mergify mergify bot added the conflicts label Dec 7, 2023
@raplemie raplemie removed the conflicts label Dec 7, 2023
@raplemie raplemie enabled auto-merge (squash) December 7, 2023 18:24
@raplemie raplemie merged commit a353857 into release/4.7.x Dec 7, 2023
14 checks passed
@raplemie raplemie deleted the mergify/bp/release/4.7.x/pr-620 branch December 7, 2023 19:07
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants