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

feat(catalogue): model update to 5.2 #4345

Merged
merged 32 commits into from
Oct 20, 2024
Merged

feat(catalogue): model update to 5.2 #4345

merged 32 commits into from
Oct 20, 2024

Conversation

BrendaHijmans
Copy link
Contributor

@BrendaHijmans BrendaHijmans commented Oct 11, 2024

What are the main changes you did:

  • add Resources.internal identifiers
  • adapt description Resources.external identifiers
  • add Internal identifiers ontology file
  • edit External identifiers ontology file
  • Resources.keywords from text to string_array
  • add Resources.exclusion criteria ontology_array
  • add Resources.other exlusion criteria text
  • rename ontology 'Inclusion criteria' to 'Inclusion and exclusion criteria'
  • add Subpopulations.exlusion criteria text

how to test:

  • explain here what to do to test this (or point to unit tests)

todo:

  • adapt UI
  • adapt tests
  • adapt demo data

@connoratrug
Copy link
Contributor

can you add the changes to the pr description , its hard to make out from the long csv strings in the change

@BrendaHijmans BrendaHijmans changed the title feat: model updat to 5.1 feat: model update to 5.1 Oct 11, 2024
@BrendaHijmans
Copy link
Contributor Author

can you add the changes to the pr description , its hard to make out from the long csv strings in the change

I was not done yet with this PR, it is a draft.

@mswertz mswertz changed the title feat: model update to 5.1 feat(catalogue): model update to 5.1 Oct 13, 2024
@mswertz mswertz marked this pull request as ready for review October 14, 2024 16:22
@BrendaHijmans
Copy link
Contributor Author

waiting to merge until we can also migrate the data on acc to 5.1. (migrations are written, but need time to run them)

@@ -8,5 +8,6 @@ dependencies {
task generateTypes(type: JavaExec) {
group = 'application'
classpath = sourceSets.main.runtimeClasspath
workingDir = rootProject.projectDir
Copy link
Contributor

Choose a reason for hiding this comment

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

what does this do ? , why is it part of this pr

Copy link
Member

Choose a reason for hiding this comment

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

this was necessary to generate the types (there was a bug created in the previous refactoring of the generateTypes task). This ensures the path is interpreted relatively to the root of the molgenis-emx2 repo.

Copy link
Member

Choose a reason for hiding this comment

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

I also updated docs of nuxt3-ssr to explain how to run that task routinely.

Copy link
Contributor

Choose a reason for hiding this comment

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

did not encounter this issue while generating the ts

Copy link
Member

Choose a reason for hiding this comment

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

you probably used another command than I did. What command do you use? because then we should add that maybe to the docs? Unless you also see this as an improvement?

Copy link
Contributor

Choose a reason for hiding this comment

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

generateTypes --args... , strange but guess this fine , maybe my intelij had that task cached at the old location

@connoratrug
Copy link
Contributor

Think the 'Version' needs to be updated, for the dm script to know when to run , and when checking compatibility (manually )

@BrendaHijmans BrendaHijmans changed the title feat(catalogue): model update to 5.1 feat(catalogue): model update to 5.2 Oct 18, 2024
Copy link

sonarcloud bot commented Oct 18, 2024

@BrendaHijmans BrendaHijmans merged commit 9b22e28 into master Oct 20, 2024
6 checks passed
@BrendaHijmans BrendaHijmans deleted the feat/model5.1 branch October 20, 2024 11:18
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.

3 participants