Fix funders show country

[ptamarit]

❤️ Thank you for your contribution!

Description

• Fixes Funders ROR v2 not showing country in suggestion #342

🚶 Review path

• The 1st commit includes the country_name in the API response for funders which have a country_name (recently updated ones)
• The pull request vocabularies: pass on country_name in deserializeFunder invenio-app-rdm#2704 modifies deserializeFunder to pass include country_name in the deserialized form of funder items.
• The 2nd commit simplifies the logic of deserializeFunderToDropdown by using optional chaining
• The 3rd commit modifies deserializeFunderToDropdown to shows the country code for existing funders which don't have yet a country_name
• Note that the modified deserializeFunder function is used lower down in the render function of CustomAwardForm.

🤷 Open questions

Places which might need to be modified to also include country_name:

• FundingField's deserializeFunder
• FundersLabels's fields
• FundersLabels's _vocab_to_label

Checklist

Ticks in all boxes and 🟢 on all GitHub actions status checks are required to merge:

• I'm aware of the code of conduct.
• I've created logical separate commits and followed the commit message format.
• I've added relevant test cases.
• I've added relevant documentation.
• I've marked translation strings.
• I've identified the copyright holder(s) and updated copyright headers for touched files (>15 lines contributions).
• I've NOT included third-party code (copy/pasted source code or new dependencies).
  • If you have added third-party code (copy/pasted or new dependencies), please reach out to an architect.

Frontend

• I've followed the CSS/JS and React guidelines.
• I've followed the web accessibility guidelines.
• I've followed the user interface guidelines.

Reminder

By using GitHub, you have already agreed to the GitHub’s Terms of Service including that:

1. You license your contribution under the same terms as the current repository’s license.
2. You agree that you have the right to license your contribution under the current repository’s license.

[alejandromumo]

I think this could be a one liner:

const funderCountry =  funderItem ?. country_name  ?? funderItem ?. country

You can check running this code (e.g. in a js fiddle):

let funderItem = {}
let funderCountry =  funderItem ?. country_name  ?? funderItem ?. country
console.log(funderCountry)
// Expected: undefined 

funderItem['country_name'] = 'Portugal'
funderCountry =  funderItem ?. country_name  ?? funderItem ?. country
console.log(funderCountry)
// Expected: 'Portugal'

delete funderItem['country_name']
funderItem['country'] = 'PT'
funderCountry =  funderItem ?. country_name  ?? funderItem ?. country
console.log(funderCountry)
// Expected: 'PT'

[ptamarit]

Done, I also simplified the other fields. Optional chaining returns undefined while before we were defaulting to null, but it does not make a difference since the rest of the function is relying on truthy/falsy and both undefined and null behave the same way in this regard.