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(api-v2): Fix custom datatypes in knora-api simple ontology #1601

Merged
merged 2 commits into from Feb 21, 2020

Conversation

@benjamingeer
Copy link
Collaborator

@benjamingeer benjamingeer commented Feb 19, 2020

This PR:

  • Fixes the definitions of custom datatypes in the knora-api ontology in the simple schema.
  • Adds rdfs:label a owl:DatatypeProperty so it can be used in cardinalities.

@tobiasschweizer Do you think this will affect knora-api-js-lib?

Fixes #1593.

- Add a definition for rdfs:label so it can be used in cardinalities.
@benjamingeer benjamingeer added this to the 2020.1 milestone Feb 19, 2020
@benjamingeer benjamingeer self-assigned this Feb 19, 2020
@benjamingeer benjamingeer requested a review from lrosenth Feb 19, 2020
@benjamingeer benjamingeer mentioned this pull request Feb 19, 2020
@benjamingeer benjamingeer requested a review from tobiasschweizer Feb 21, 2020
@tobiasschweizer
Copy link
Contributor

@tobiasschweizer tobiasschweizer commented Feb 21, 2020

@tobiasschweizer Do you think this will affect knora-api-js-lib?

knora-api-js-lib uses the complex schema. But it is better to be sure. Could you regenerate and integrate the client code and test data and see if there is any relevant change or if they unit tests break?

see https://github.com/dasch-swiss/knora-api-js-lib/blob/master/Makefile for detailed instructions.

@benjamingeer
Copy link
Collaborator Author

@benjamingeer benjamingeer commented Feb 21, 2020

The generated client code and test data are all in the complex schema. Also, I'm about to do a PR to remove the client code generation...

@tobiasschweizer
Copy link
Contributor

@tobiasschweizer tobiasschweizer commented Feb 21, 2020

btw: @subotic is working on automating this in #1577

@tobiasschweizer
Copy link
Contributor

@tobiasschweizer tobiasschweizer commented Feb 21, 2020

Also, I'm about to do a PR to remove the client code generation...

I know. I need some instructions how to generate the test data for admin and v2. Or will the route stay the same?

@benjamingeer
Copy link
Collaborator Author

@benjamingeer benjamingeer commented Feb 21, 2020

Or will the route stay the same?

I'll try to change it as little as possible.

@tobiasschweizer
Copy link
Contributor

@tobiasschweizer tobiasschweizer commented Feb 21, 2020

The generated client code and test data are all in the complex schema.

If this PR has no effects on data in the complex schema, it won't affect knora-api-lib-js. But as I said, it is better to try it out ;-)

@benjamingeer
Copy link
Collaborator Author

@benjamingeer benjamingeer commented Feb 21, 2020

If this PR has no effects on data in the complex schema

It doesn't affect data at all, only the knora-api simple ontology.

@tobiasschweizer
Copy link
Contributor

@tobiasschweizer tobiasschweizer commented Feb 21, 2020

I'll try to change it as little as possible.

great, so this should be easy

@tobiasschweizer
Copy link
Contributor

@tobiasschweizer tobiasschweizer commented Feb 21, 2020

It doesn't affect data at all, only the knora-api simple ontology.

Do you want me to try it out just to be sure?

@benjamingeer
Copy link
Collaborator Author

@benjamingeer benjamingeer commented Feb 21, 2020

Do you want me to try it out just to be sure?

Yes please, if you have time.

@tobiasschweizer
Copy link
Contributor

@tobiasschweizer tobiasschweizer commented Feb 21, 2020

ok, will do

@tobiasschweizer
Copy link
Contributor

@tobiasschweizer tobiasschweizer commented Feb 21, 2020

looks fine, there is just a new element in knora-api-ontology.json:

{
    "@id" : "rdfs:label",
    "@type" : "owl:DatatypeProperty"
  }
@benjamingeer
Copy link
Collaborator Author

@benjamingeer benjamingeer commented Feb 21, 2020

OK to merge this then?

@benjamingeer
Copy link
Collaborator Author

@benjamingeer benjamingeer commented Feb 21, 2020

@tobiasschweizer Thanks very much for your help with this.

@benjamingeer benjamingeer merged commit e0cfd4e into develop Feb 21, 2020
7 checks passed
7 checks passed
Build Everything
Details
API Unit Tests
Details
API E2E Tests
Details
API Integration Tests
Details
Upgrade Unit Tests
Details
Upgrade Integration Tests
Details
Docs Build Test
Details
@benjamingeer benjamingeer deleted the fix/1593-knora-api-onto branch Feb 21, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Linked issues

Successfully merging this pull request may close these issues.

2 participants