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

New maDMP additions for the project details page #2986

Merged
merged 2 commits into from
Aug 4, 2021

Conversation

briri
Copy link
Contributor

@briri briri commented Jul 30, 2021

maDMP features

Other features/fixes

  • Fixed bug that was preventing the plan.funder_id from being set to nil
  • Added a new app/javascript/src/utils/conditionalFields.js file that allows you to define sets of fields that are hidden/shown. Currently using it to hides/show the Description and Report URL if the ethical issues checkbox is not checked and the Grant and Funding Status fields if no Funder is selected.
  • Added grant getter and setter overrides to the Plan model to allow the grant to be loaded and set properly from incoming UI params.
  • Added new config settings to allow the Research Domain and Ethical Issues to be enabled/disabled
  • Update API V1 to:
    • Use the plan.owner as the data contact if available (otherwise the contributor who is the :data_curator)
    • Include the new ethical_issues fields
    • Include the research_domain as a :keyword
    • include the plan.org as a :dmproadmap_funded_affilaition to deal with scenarios where the plan.org does not match the orgs defined for the owner or contributors
    • include the user eneterd plan.identifier as :dmproadmap_funding_opportunity_number
  • Added lots of tests

DB Changes

  • Removed old data_contact, principal_investigator, grant_number and funder_name fields from the plans table since they have been replaced with associations to contributors, identifiers and orgs
  • Removes the mime_types table which we decided not to use Remove mime type field from the Research Outputs tab #2816
  • Add a Rake task rails external_apis:add_field_of_science_to_research_domains that populates the new research_domains table

@briri briri requested a review from raycarrick-ed July 30, 2021 20:59
fix for rubocop

updated db schema

rubocop appeasement

fixed issue with db schema

eslinter fixes

fix weird rspec error

fixed issue with schema

fixed issue with deserialization service
Copy link
Contributor

@raycarrick-ed raycarrick-ed left a comment

Choose a reason for hiding this comment

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

Looks fine. Like the fact that it can be switched on/off so we can make it live once it suits.

@raycarrick-ed raycarrick-ed merged commit 1e9749d into development Aug 4, 2021
@briri briri deleted the madmp-project-details branch September 8, 2021 21:31
portagenetwork pushed a commit to portagenetwork/roadmap that referenced this pull request Feb 24, 2022
New maDMP additions for the project details page
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.

None yet

2 participants