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

Enhanced conflict review [extended] #1197

Merged
merged 9 commits into from
Aug 26, 2024
Merged

Conversation

howard-e
Copy link
Contributor

@howard-e howard-e commented Aug 21, 2024

@stalgiag while doing additional checks on #1195, noticed a few usability concerns that I've addressed in this PR that I had originally missed:

  • Include versionString in issue body and title when creating from /conflicts
  • The requiredAtVersionName variable was incorrect. Changed to using exactAtVersionName
  • Updated the disclosures to be unique by commands per test, otherwise the same conflict was being duplicated if tester1 and tester2 had different results for assertion1 and assertion2 in the same test (each difference counts as conflict which was being mapped over in the view)
  • Added support for the markdown conflict being included from the Raise an Issue for Conflict button

@howard-e howard-e requested a review from stalgiag August 21, 2024 20:36
@howard-e
Copy link
Contributor Author

howard-e commented Aug 21, 2024

  • Updated the disclosures to be unique by commands per test, otherwise the same conflict was being duplicated if tester1 and tester2 had different results for assertion1 and assertion2 in the same test (each difference counts as conflict which was being mapped over in the view)

Thinking on this some more, to retain current behavior from the Test Run page, this should probably be unique to just the test

@howard-e howard-e marked this pull request as ready for review August 26, 2024 13:56
Copy link
Contributor

@stalgiag stalgiag left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This all makes sense to me! Thank you so much for adding it. This is a case of me forgetting to check with a production dump and relying on the limited cases in the default DB.

I am curious if now that we are heavily suggesting the use of a generated template for the issue, we should only enable a 'Raise an Issue' button when there isn't an existing issue. This can be a different discussion and isn't an important point but it feels a bit odd to me to suggest raising an issue that will be largely identical to an existing one.

@stalgiag stalgiag merged commit 4eded57 into enhanced-conflict-review Aug 26, 2024
2 checks passed
@stalgiag stalgiag deleted the 1195-extended branch August 26, 2024 15:22
@howard-e
Copy link
Contributor Author

I am curious if now that we are heavily suggesting the use of a generated template for the issue, we should only enable a 'Raise an Issue' button when there isn't an existing issue. This can be a different discussion and isn't an important point but it feels a bit odd to me to suggest raising an issue that will be largely identical to an existing one.

Very good point there! We can discuss a bit further and certainly a point to raise to others who may be reviewing.

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