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

Moving source to components #625

Merged
merged 13 commits into from
Apr 10, 2024
Merged

Moving source to components #625

merged 13 commits into from
Apr 10, 2024

Conversation

odscrachel
Copy link
Collaborator

Overview

  • What does this pull request do?

Move source from defs to components file
Update person record and statement files to point to components for source

  • How can a reviewer test or examine your changes?

Check that it looks valid and that we haven't missed source pointers anywhere else

  • Who is best placed to review it?

@kd-ods

Closes #622

Translations

Documentation & Release

@kd-ods kd-ods self-requested a review April 9, 2024 10:58
@kd-ods
Copy link
Collaborator

kd-ods commented Apr 9, 2024

@odscrachel - this looks good. I'm going to hold off approving it until #623 is merged... since I think it'll be easier to deal with the merge conflicts here.

@kd-ods
Copy link
Collaborator

kd-ods commented Apr 10, 2024

@odscrachel - I've merged #623 so there are some conflicts here that need to be resolved. I can do that with you if helpful, since I'll recognise the edits that you'll need to accept.

@odscrachel
Copy link
Collaborator Author

@kd-ods ready to review again, the conflicts were the main changes in this PR

Copy link
Collaborator

@kd-ods kd-ods left a comment

Choose a reason for hiding this comment

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

Resolving the merge conflicts meant accepting the new description and title edits for the Source object in its old position in statement.json. So you'll see that the Source object in its new position in components.json still has the old text.

I've made suggested edits to fix that.

schema/components.json Outdated Show resolved Hide resolved
schema/components.json Outdated Show resolved Hide resolved
schema/components.json Outdated Show resolved Hide resolved
schema/components.json Outdated Show resolved Hide resolved
schema/components.json Outdated Show resolved Hide resolved
schema/components.json Outdated Show resolved Hide resolved
schema/components.json Outdated Show resolved Hide resolved
schema/components.json Outdated Show resolved Hide resolved
schema/components.json Outdated Show resolved Hide resolved
@odscrachel odscrachel requested a review from kd-ods April 10, 2024 09:30
Copy link
Collaborator

@kd-ods kd-ods left a comment

Choose a reason for hiding this comment

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

Great - this can be merged now :-)

@odscrachel odscrachel merged commit 60b00f3 into main Apr 10, 2024
2 checks passed
@odscrachel odscrachel deleted the 622_source_component branch April 10, 2024 09:55
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.

Schema: move Source object definition to components.json
2 participants