-
Notifications
You must be signed in to change notification settings - Fork 2
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
John conroy/publication associated collection HMP-256 (#3167)
* Don't show collections text if no collections exist * Don't show provenance section if there is an associated collection * Separate useDatasetsCollections query * Only show collection for associated collection if defined * Update publications collections text * Make header optional in related entities section * Rename styled component for reuse * Move section around related entities and collections * Add conditional margin * Add id * Add changelog * Capitalize string * Return section wrapper * Remove redundant conditionals * Handle associated collection as obj * Remove extra curly bracket * Fix prov bool --------- Co-authored-by: John Conroy <[email protected]>
- Loading branch information
1 parent
a2820c1
commit 7a68075
Showing
9 changed files
with
74 additions
and
45 deletions.
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 @@ | ||
- Add support for publications with associated collections. |
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
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
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
7 changes: 6 additions & 1 deletion
7
context/app/static/js/components/publications/PublicationCollections/styles.js
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
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
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
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 |
---|---|---|
@@ -1,23 +1,21 @@ | ||
import { useMemo } from 'react'; | ||
import { useSearchHits } from 'js/hooks/useSearchData'; | ||
import { getAllCollectionsQuery } from 'js/helpers/queries'; | ||
|
||
function useDatasetsCollections(datasetUUIDs) { | ||
const datasetUUIDsString = JSON.stringify(datasetUUIDs.sort((a, b) => a - b)); | ||
const collectionsWithDatasetQuery = useMemo( | ||
() => ({ | ||
...getAllCollectionsQuery, | ||
query: { | ||
terms: { | ||
'datasets.uuid': JSON.parse(datasetUUIDsString), | ||
}, | ||
function buildCollectionsWithDatasetQuery(datasetUUIDs) { | ||
return { | ||
...getAllCollectionsQuery, | ||
query: { | ||
terms: { | ||
'datasets.uuid': datasetUUIDs, | ||
}, | ||
}), | ||
[datasetUUIDsString], | ||
); | ||
}, | ||
}; | ||
} | ||
|
||
const { searchHits: collections } = useSearchHits(collectionsWithDatasetQuery); | ||
function useDatasetsCollections(datasetUUIDs) { | ||
const query = buildCollectionsWithDatasetQuery(datasetUUIDs); | ||
const { searchHits: collections } = useSearchHits(query); | ||
return collections; | ||
} | ||
|
||
export { useDatasetsCollections }; | ||
export { useDatasetsCollections, buildCollectionsWithDatasetQuery }; |
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