NickAkhmetov/CAT-776 Dataset Relationships diagram #3481
Merged
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
…ropriate section, standardize section hashes
…gain, break out soft assay lookup into its own hook, hopefully fix storybook/msw integration
|
Got layouting working by adding a consistently sized wrapper to the nodes: |
…controls, add loading skeleton, silence issue from null ToC section name/add todo, limit dataset relationship graphs to raw pages only
john-conroy
approved these changes
Jul 29, 2024
| alignItems="center" | ||
| justifyContent="center" | ||
| > | ||
| {Icon && <Icon color="primary" fontSize="0.75rem" width="0.75rem" height="0.75rem" />} |
There was a problem hiding this comment.
What necessitated both fontSize and width + height?
There was a problem hiding this comment.
I believe this was an artifact from troubleshooting the issue with dynamic status icons causing flickering, I'll remove the unnecessary width/height props.
| borderRadius={rounded ? '1rem' : 0} | ||
| maxWidth="18rem" | ||
| bgcolor={bgColor} | ||
| boxShadow="0px 0px 2px 0px rgba(0, 0, 0, 0.14), 0px 2px 2px 0px rgba(0, 0, 0, 0.12), 0px 1px 3px 0px rgba(0, 0, 0, 0.20)" |
There was a problem hiding this comment.
Custom box shadow that wasn't in the theme, I imagine?
Comment on lines
+69
to
+75
| <Box height="4.125rem" display="flex" alignItems="center"> | ||
| <Stack | ||
| direction="column" | ||
| px={2} | ||
| py={1} | ||
| borderRadius={rounded ? '1rem' : 0} | ||
| maxWidth="18rem" |
There was a problem hiding this comment.
Why these rem values?
There was a problem hiding this comment.
Mainly to match the measurements from the Figma designs; the outer Box is necessary to make the node positions line up (i.e. by making them all the same height without affecting the appearance of the content)
context/app/static/js/components/detailPage/DatasetRelationships/nodeTypes.tsx
Outdated
Show resolved
Hide resolved
context/app/static/js/components/detailPage/DatasetRelationships/utils.ts
Show resolved
Hide resolved
context/app/static/js/components/detailPage/DatasetRelationships/utils.ts
Show resolved
Hide resolved
context/app/static/js/components/detailPage/DatasetRelationships/utils.ts
Outdated
Show resolved
Hide resolved
john-conroy
added a commit
that referenced
this pull request
Aug 21, 2024
* Add changelog * NickAkhmetov/CAT-677 Unified Prov Graph (#3458) Co-authored-by: John Conroy <[email protected]> Co-authored-by: Tabassum Kakar <[email protected]> Co-authored-by: tkakar <[email protected]> Co-authored-by: Austen Money <[email protected]> fix table tabs (#3466) Fix incorrect URL structure in gene search results (#3467) * John conroy/update table of contents CAT-755 (#3473) * Convert table of contents to typescript * Convert route to ts and add boundaries * Fix styling so top works * Add icons map * Fix responsiveness * Handle sub links * Update marker color * Style table of contents * Add icons to table of contents * Add processed datasets for table of contents * Add loading state * Adjust padding per Tiffany feedback * Update style per Tiffany's feedback * Open toc accordions by default * Add visualization to processed data sections in toc * Add processed sections and refactor * Update changelog * Update organ page to use layout * Switch to derived data per tiffany's feedback * Use height props * Pull utils/hooks/types into files * Add a use callback for toc click handler * Pull find active index into hook * Consolidate styles * Use system props --------- Co-authored-by: John Conroy <[email protected]> * NickAkhmetov/CAT-776 Dataset Relationships diagram (#3481) * John conroy/summary bar (#3501) * Remove placeholder for undefined items * Create entity header action buttons * Add workspaces button * Add copy button * Always show entity header * Add basic view select chips * Fix opacity transition * Animation progress * Stash * Add check icon to view select * Add datasets relationship graph to summary bar * Delete unused gene components * Update summary components * Different heights for summary and diagram * Show entity header content when expanded * Use position sticky * Fix divider * Remove version select * Add citation and consortium to summary for datasets * Clamp description in expanded summary * Only show view buttons on large desktops * Show mapped status * Dedupe flask data and entity store assay metadata * Add icons to summary * Split out cases into components * Add icons * Add paper for relationship diagram * Show summary view for more entities * Integrate publication summary * Fix publication summary * Fix undefined * Fix tests * Fix offsets * Remove fit view * Fix comments from review * Fix data-testid propogation --------- Co-authored-by: John Conroy <[email protected]> * NickAkhmetov/CAT-777 Processed Data section (#3495) * make sure sample metadata doesn't get lost * hide empty dataset relationships box on dataset pages without processed descendants --------- Co-authored-by: John Conroy <[email protected]> Co-authored-by: Nikolay Akhmetov <[email protected]>
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.
Summary
This PR implements the dataset relationships diagram. It is currently displayed under the summary of raw datasets with at least one descendant in provenance that is not a publication or image pyramid. In the future, its position in the page will match the figma designs.
I also included other minor fixes:
TODOs
Update summary section of dataset page view- Holding off on this work to avoid interfering with entity header PR after conversation with JohnDesign Documentation/Original Tickets
Figma
JIRA Subtask
Testing
Screenshots/Video
Checklist
CHANGELOG-your-feature-name-here.mdis present in the root directory, describing the change(s) in full sentences.Additional Notes
Please specify any additional information or context relevant to this PR.