-
Notifications
You must be signed in to change notification settings - Fork 2
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
NickAkhmetov/CAT-937 Sort publications by their publication date, convert related hooks to TypeScript #3565
Merged
Merged
Changes from all commits
Commits
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
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
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1 @@ | ||
- Sort publications by their date of publication. |
43 changes: 0 additions & 43 deletions
43
context/app/static/js/components/publications/PublicationsPanelList/hooks.js
This file was deleted.
Oops, something went wrong.
55 changes: 55 additions & 0 deletions
55
context/app/static/js/components/publications/PublicationsPanelList/hooks.ts
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
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,55 @@ | ||
import useSearchData from 'js/hooks/useSearchData'; | ||
import { fetcher } from 'js/helpers/swr'; | ||
import { SearchRequest, SearchResponse } from '@elastic/elasticsearch/lib/api/types'; | ||
import { buildPublicationPanelProps, PublicationHit } from './utils'; | ||
|
||
const getPublicationsByStatusQuery: (publicationStatus: string) => SearchRequest = (publicationStatus) => ({ | ||
query: { | ||
bool: { | ||
must: [ | ||
{ | ||
term: { | ||
'entity_type.keyword': 'Publication', | ||
}, | ||
}, | ||
{ | ||
term: { | ||
publication_status: publicationStatus, | ||
}, | ||
}, | ||
], | ||
}, | ||
}, | ||
sort: [ | ||
{ | ||
'publication_date.keyword': { | ||
order: 'desc', | ||
}, | ||
}, | ||
], | ||
size: 10000, | ||
_source: ['uuid', 'title', 'contributors', 'publication_status', 'publication_venue', 'publication_date'], | ||
}); | ||
|
||
async function fetchPublicationsPanelData(args: Parameters<typeof fetcher>[0]) { | ||
const results = await fetcher<SearchResponse<PublicationHit['_source']>>(args); | ||
const unwrappedResults = results?.hits?.hits.map((hit) => hit._source!); | ||
if (!unwrappedResults) { | ||
return []; | ||
} | ||
return unwrappedResults.map((hit) => buildPublicationPanelProps({ _source: hit })); | ||
} | ||
|
||
function usePublicationsPanelList(publicationStatus: string) { | ||
const query = getPublicationsByStatusQuery(publicationStatus); | ||
|
||
const { searchData: publicationPanelsProps, isLoading } = useSearchData<PublicationHit, unknown>(query, { | ||
useDefaultQuery: true, | ||
fetcher: fetchPublicationsPanelData, | ||
fallbackData: [], | ||
}); | ||
|
||
return { publicationPanelsProps, isLoading }; | ||
} | ||
|
||
export { usePublicationsPanelList }; |
File renamed without changes.
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
Oops, something went wrong.
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.
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.
Is publicationStatus always one value or can it be multiple?
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.
This query is specific to one publication status at a time based on the currently selected tab on the page (publication or preprint).
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.
Great, thanks. In that case, the query looks good to me!