-
Notifications
You must be signed in to change notification settings - Fork 492
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
8671 license sorting #8697
8671 license sorting #8697
Conversation
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Looks good generally, but we should probably update the doc and example files to reflect that the add license api requires a sort order
I have updated the documentation and the examples. However, I have also corrected the pre-installed licenses list in documentation by removing CC BY as |
@ErykKul hi! The CC BY license is added in scripts/api/setup-all.sh. Please see this PR: Some more thoughts on what the source of truth should be for licenses (JSON used in setup scripts vs. Flyway scripts): #8407 (comment) |
@pdurbin I have reverted the removal of the CC BY references in the documentation. |
I know this PR is already in QA but I looked anyway and wanted to note a couple things.
|
looks like the LicensesIT test is failing due to lack of that sort order value: |
There was a problem with my flyway script. I have fixed it and got the integration test to run and pass. |
This works, waiting for integration tests to run before merging. |
OK. I will try to fix the jenkins build (I cannot see the output, I assume it fails because of the not null column without default value) by dropping the column first and then reverting the drop. |
…averse into 8671_license_sorting
@kcondon I still had a problem with preparation script as the column generated by eclipse-link was not the same as the one added by the flyway script (making this column nullable was the most difficult thing that I did in the dataverse context up until now, but it was worth it: I have learned a lot). Now both scripts; preparation and test, run without problems. Can you see why the jenkins build fails? I cannot see the output of that. The output of the integration test that I get locally looks OK to me:
|
Hi @ErykKul The jenkins build fails due to a component in the test pipeline infrastructure and not due to an integration test. Essentially, the image used for the test box has been updated and we are waiting for the corresponding ansible lib to be able to host the tests. The team is looking at it now. Thanks for the efforts and apologies for the delay. |
The build issue is related to gdcc/dataverse-ansible#263 and is not about a failing test. Once that issue is fixed (Don is working now), rerunning the build job should be enough to get the build to show green. So as far as I can tell, nothing for @ErykKul to do now (except wait a bit). |
OK, thanks! |
@ErykKul FYI - tests have run and there's a new failure:
|
What this PR does / why we need it:
Right now licenses are sorted only by the ID and this order cannot be changed. With this pull request, admins can sort the licenses with the API calls, where the ordering by ID remains default until changed by manually sorting (
order by sortOrder, id
). SortOrder is a new column in license that becomes also visible in JSON representation of the license.Which issue(s) this PR closes: