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(v1.6.2): handle unexpected state when a record is viewed before registration confirmation #8306

Merged
merged 4 commits into from
Jan 9, 2025

Conversation

ocrvs-bot
Copy link
Collaborator

Automated PR to merge changes from develop to release-v1.6.2

I failed to cherry-pick the changes automatically because of the following:

Auto-merging packages/workflow/src/records/fhir.ts
[auto-pr-release-v1.6.2-8299-9932 99633d95c] fix: handle unexpected state when a record is viewed between it being set to awaiting validation and country config confirming the record
Author: Riku Rouvila <riku.rouvila@gmail.com>
Date: Wed Jan 8 12:06:55 2025 +0900
3 files changed, 164 insertions(+), 1 deletion(-)
create mode 100644 packages/migration/src/migrations/hearth/20250108114118-remove-nulls-from-tasks.ts
create mode 100644 packages/workflow/src/records/fhir.test.ts
[auto-pr-release-v1.6.2-8299-9932 81b779ab7] add missing header
Author: Riku Rouvila <riku.rouvila@gmail.com>
Date: Wed Jan 8 12:51:52 2025 +0900
1 file changed, 10 insertions(+)
Auto-merging CHANGELOG.md
CONFLICT (content): Merge conflict in CHANGELOG.md
error: could not apply 34c456dea... update changelog

To continue manually you can use these commands:

git fetch origin auto-pr-release-v1.6.2-8299-9932:auto-pr-release-v1.6.2-8299-9932
git fetch origin ocrvs-8278-fix:ocrvs-8278-fix

git checkout auto-pr-release-v1.6.2-8299-9932
git reset --hard HEAD~1  # Remove placeholder commit
git cherry-pick a5cb609ab 2a02e95ae 34c456dea 7b45b7b9d

This comment has been minimized.

@rikukissa rikukissa force-pushed the auto-pr-release-v1.6.2-8299-9932 branch from b2a5cd8 to 314bf04 Compare January 9, 2025 03:39
@rikukissa rikukissa merged commit 22834e1 into release-v1.6.2 Jan 9, 2025
60 checks passed
@rikukissa rikukissa deleted the auto-pr-release-v1.6.2-8299-9932 branch January 9, 2025 04:05
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