-
Notifications
You must be signed in to change notification settings - Fork 109
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
New maDMP Research Outputs tab #2992
Conversation
Hey @raycarrick-ed can you have a look at this Postgres error when you have a few minutes? I added some logic to switch between a Mysql and Postgres version of the Regex query but there seems to be something wrong with the Postgres version. |
Added tests added tests for new external_api services Added test for new presenter change migration classname fixes for rubocop and rspec offerings to the rubocop gods cleanup of unused code and added config for license opts fixed tests cleaned up schema Fix for postgres regex matching Fix for postgres regex matching trying to fix postgres updated config to disable research_outputs by default updated plans_controller to work with new Plan.grant setter method removed debug lines fixed typo in plan model and added dependent destroy on a few associations removed debug lines fixed bug in v1 api due to removed Plan.api_client column updated plan spec factory so that :creator ensures the owner's org matches the plan.org added api_client association back to plans model. Added some Mysql vs Postgres helper methods to the ApplicationRecord base class making rubocop happy fix typo making rubocop happy trying to fix postgres :/ Hopefully fibally fixed postgres Hopefully fibally fixed postgres Hopefully fibally fixed postgres
6d77d60
to
b52f735
Compare
finally passing! 😓 |
FYI @benjaminfaure these changes may be of interest for your installation |
…p-research-outputs
…p into madmp-research-outputs
NOTE THAT THIS PR IS LIKELY OUT OF DATE WITH DMPTOOL The DMPTool has had many updates since this PR was first created so an eval of these changes should be done to ensure that any bug fixes are included |
@raycarrick-ed this has been updated with all the latest from development and master. Will review with you all at our next dev meeting |
method |
I guess all that is left is to add model validation? (which is also a way to document the model) |
…uld speed up scripts. Reverted some use of '%<var>s' to the preferred '%{var}' style
…p into madmp-research-outputs
…admp-research-outputs
…s for repository access types
Any objections to merging this one @raycarrick-ed? |
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.
Don't have time to go through every line so merged it into a copy of current development branch and with the _dmproadmap.rb as shipped, nothing changed. So that's good. When I turned all the madmp stuff on the research outputs appeared and the changes came into project detais as expected and it all seemed to run ok. So I think that all looks fine.
thanks for reviewing it @raycarrick-ed. I will merge then. The new research outputs tab is pretty self contained so teams can leave it disabled until they're ready. |
Is there any relation to the behaviour of research outputs (or future intended behaviour) in dmpopidor (the French flavour)? This approach uses a fixed set of questions which is hardcoded, and there requires adding new table fields when new questions are needed. |
There is not at this time @nicolasfranck. The work done in the DMPTool was done in parallel with DMPOpidor's efforts. The table was based off of the original DMPOpidor table. DMPOpidor's research outputs are tightly tied to a new way of building templates and storing them as JSON in the DB. The JSON contains both the content of the sections and questions but also the description of their structure (e.g. question A is a text area field). There is then logic that builds the page based on this JSON. @benjaminfaure can probably do a much more thorough job of explaining the difference 😄 One of the nice things about the approach DMPOpidor took is that it is compatible with the current DMPRoadmap way of dealing with templates (they can be used in parallel. |
maDMP features
preservation_statement
in the JSON as:"<p><strong>Question:</strong> What is your favorite color?<br><strong>Answer:</strong> blue</p><p><strong>Question:</strong> Why?<br><strong>Answer:</strong> Because I do!</p>"
). The theme to element mapping is:data_quality_assurance
is populated from questions themed as "Data Collection"preservation_statement
is populated from questions themed as "Preservation"security_and_privacy
is populated from questions themed as "Ethics & privacy" and "Storage & security"Other features/fixes
app/views/layouts/modal_search
dir to help describe how to implement)services/external_apis
that fetch data for the License, Metadata Standard and Repository tablesDB changes
rails external_apis:load_spdx_licenses
rails external_apis:load_rdamsc_standards
rails external_apis:load_re3data_repos