Better OpenAlex support #1316
Merged
Better OpenAlex support #1316
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
ewan-escience
force-pushed
the
1312-openalex-support
branch
from
092901d to
c72db4b
Compare
dmijatovic
approved these changes
Oct 11, 2024
| @@ -49,10 +49,14 @@ export default function MentionsOverview() { | |||
|
|
|||
| const searchTypeTerm: SearchTermInfo = extractSearchTerm(sanitisedSearch) | |||
| const termEscaped = encodeURIComponent(sanitisedSearch) | |||
| if (searchTypeTerm.type === 'doi') { | |||
| return `doi=eq.${termEscaped}` | |||
| switch (searchTypeTerm.type) { | |||
There was a problem hiding this comment.
Maybe use default instead of title?
Comment on lines
133
to
160
| {isAdmin && | ||
| <> | ||
| <ControlledTextField | ||
| control={control} | ||
| options={{ | ||
| name: 'doi', | ||
| label: config.doi.label, | ||
| useNull: true, | ||
| defaultValue: formData?.doi, | ||
| helperTextMessage: config.doi.help, | ||
| helperTextCnt: `${formData?.doi?.length || 0}/${config.doi.validation.maxLength.value}`, | ||
| }} | ||
| rules={config.doi.validation} | ||
| /> | ||
| <div className="py-2"></div> | ||
| </> | ||
| <> | ||
| <ControlledTextField | ||
| control={control} | ||
| options={{ | ||
| name: 'doi', | ||
| label: config.doi.label, | ||
| useNull: true, | ||
| defaultValue: formData?.doi, | ||
| helperTextMessage: config.doi.help, | ||
| helperTextCnt: `${formData?.doi?.length || 0}/${config.doi.validation.maxLength.value}`, | ||
| }} | ||
| rules={config.doi.validation} | ||
| /> | ||
| <div className="py-2"></div> | ||
| <ControlledTextField | ||
| control={control} | ||
| options={{ | ||
| name: 'openalex_id', | ||
| label: config.openalex_id.label, | ||
| useNull: true, | ||
| defaultValue: formData?.openalex_id, | ||
| helperTextMessage: config.openalex_id.help, | ||
| }} | ||
| rules={config.openalex_id.validation} | ||
| /> | ||
| <div className="py-2"></div> | ||
| </> |
There was a problem hiding this comment.
Two points:
- DOI / OpenAlex look different (DOI does not have help and have char count). Can we use same approach with OpenAlexId input?
- I think is better to have these ID's at the bottom. This modal is used for manual adding of mentions. The main assumption is that these do not have DOI or OpenAlexID (otherwise you can add them automatically using search).
Comment on lines
-15
to
+17
| We search in <strong> <a href="https://crossref.org" target="_blank">Crossref</a>, <a href="https://datacite.org" target="_blank">DataCite</a></strong> and the RSD. | ||
| We search in <strong> <a href="https://www.crossref.org/" target="_blank">Crossref</a>, <a href="https://datacite.org" target="_blank">DataCite</a>, <a href="https://openalex.org/" target="_blank">OpenAlex</a></strong> and the RSD. |
There was a problem hiding this comment.
Both work with or without www.
| @@ -39,35 +40,57 @@ export default function FindMentionSection({id,config,findPublicationByTitle}:Fi | |||
| const {session: {token}} = useAuth() | |||
| const {onAdd} = useEditMentionReducer() | |||
|
|
|||
| async function findPublication(searchFor: string) { | |||
| async function findPublication(searchFor: string): Promise<MentionItemProps[]> { | |||
There was a problem hiding this comment.
I prefer return type to be inferred by Typescript based on the function returns and not "forced" in the function signature.
| } | ||
| return [] | ||
| } | ||
| case 'title': { |
There was a problem hiding this comment.
Similar suggestion as with other case structure. I would suggest using default case.
Comment on lines
+51
to
69
| switch (search.type) { | ||
| case 'doi': { | ||
| // convert to lower case | ||
| const doi = search.term.toLowerCase() | ||
| // validate if not already included | ||
| const found = mentions.find(mention => mention.doi?.toLowerCase() === doi) | ||
| if (found) { | ||
| // flag item with DOI already processed | ||
| mentionResultPerDoi.set(doi, {doi, status: 'alreadyImported', include: false}) | ||
| return false | ||
| } | ||
| return true | ||
| } | ||
| return true | ||
| } else { | ||
| // flag invalid DOI entries | ||
| mentionResultPerDoi.set(search.term, {doi:search.term, status: 'invalidDoi', include: false}) | ||
| return false | ||
| case 'openalex': | ||
| case 'title': | ||
| // flag invalid DOI entries | ||
| mentionResultPerDoi.set(search.term, {doi: search.term, status: 'invalidDoi', include: false}) | ||
| return false | ||
| } |
There was a problem hiding this comment.
Maybe use default case or if/else as it seems only 2 options exist
|
Works as expected. There are a few small inconsistencies now:
|
jmaassen
approved these changes
Oct 14, 2024
ewan-escience
force-pushed
the
1312-openalex-support
branch
from
c72db4b to
c14a92e
Compare
|
|
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Better OpenAlex support
Changes proposed in this pull request
How to test
docker compose down --volumes && docker compose build --parallel && docker compose up --scale data-generation=0docker compose exec scrapers java -cp /usr/myjava/scrapers.jar nl.esciencecenter.rsd.scraper.doi.MainMentionsCloses #1312
PR Checklist:
docker-compose.yml