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

ColorDef validation and ColorByName fix (backport #3360) #3437

Closed
wants to merge 1 commit into from

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Mar 29, 2022

This is an automatic backport of pull request #3360 done by Mergify.
Cherry-pick of 84290b9 has failed:

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

You are currently cherry-picking commit 84290b9c58.
  (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:
	modified:   common/api/imodeljs-common.api.md
	modified:   common/api/summary/imodeljs-common.exports.csv
	new file:   common/changes/@itwin/core-common/pmc-validate-color-def_2022-03-15-15-16.json
	new file:   common/changes/@itwin/imodel-components-react/pmc-validate-color-def_2022-03-15-16-52.json
	modified:   core/common/src/test/ColorDef.test.ts
	modified:   test-apps/ui-test-extension/src/ui/tools/SampleTool.ts
	modified:   ui/components/src/test/TestUtils.ts

Unmerged paths:
  (use "git add/rm <file>..." as appropriate to mark resolution)
	both modified:   core/common/src/ColorByName.ts
	both modified:   core/common/src/ColorDef.ts
	both modified:   docs/changehistory/NextVersion.md
	deleted by us:   test-apps/ui-items-providers-test/src/ui/dialogs/TestUiProviderDialog.ts
	both modified:   test-apps/ui-test-app/src/frontend/appui/dialogs/TestUiProviderDialog.ts
	both modified:   ui/components/src/test/color/ColorPickerButton.test.tsx
	both modified:   ui/components/src/test/color/ColorPickerDialog.test.tsx
	both modified:   ui/components/src/test/editors/ColorEditor.test.tsx
	deleted by us:   ui/imodel-components-react/src/test/color/ColorPickerPopup.test.tsx

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

* ColorByName is an object not an enum

Add ColorDef validation.

* Test ColorDef.getName

* docs, types.

* lint, extract-api

* NextVersion.md

* why aren't integration tests running?

* so much casting.

(cherry picked from commit 84290b9)

# Conflicts:
#	core/common/src/ColorByName.ts
#	core/common/src/ColorDef.ts
#	docs/changehistory/NextVersion.md
#	test-apps/ui-items-providers-test/src/ui/dialogs/TestUiProviderDialog.ts
#	test-apps/ui-test-app/src/frontend/appui/dialogs/TestUiProviderDialog.ts
#	ui/components/src/test/color/ColorPickerButton.test.tsx
#	ui/components/src/test/color/ColorPickerDialog.test.tsx
#	ui/components/src/test/editors/ColorEditor.test.tsx
#	ui/imodel-components-react/src/test/color/ColorPickerPopup.test.tsx
@mergify mergify bot added the conflicts label Mar 29, 2022
@pmconne pmconne closed this Mar 29, 2022
@mergify mergify bot deleted the mergify/bp/release/2.19.x/pr-3360 branch March 29, 2022 15:47
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

1 participant