-
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.
Merge branch 'main' into austenem/cat-934-fix-metadata-table
- Loading branch information
Showing
16 changed files
with
100 additions
and
36 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 @@ | ||
- Avoid page scrolling from using arrow keys on vitessce visualization. |
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 @@ | ||
- Prevent malformed provenance graph data from crashing the entire page. |
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 @@ | ||
- Update group for HIVE-processed datasets to be 'HIVE'. |
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
24 changes: 24 additions & 0 deletions
24
context/app/static/js/components/detailPage/provenance/ProvGraph/ProvGraphErrorBoundary.tsx
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,24 @@ | ||
import { FaroErrorBoundary } from '@grafana/faro-react'; | ||
import Stack from '@mui/material/Stack'; | ||
import Typography from '@mui/material/Typography'; | ||
import DetailsAccordion from 'js/shared-styles/accordions/DetailsAccordion'; | ||
import React from 'react'; | ||
|
||
interface ErrorBoundaryProps { | ||
children: React.ReactNode; | ||
} | ||
|
||
function ErrorFallback(error: Error) { | ||
return ( | ||
<Stack p={4}> | ||
<Typography variant="subtitle1">An error occurred while attempting to display the provenance graph.</Typography> | ||
<DetailsAccordion summary="Click to expand error details"> | ||
<Typography variant="body2">{error?.message}</Typography> | ||
</DetailsAccordion> | ||
</Stack> | ||
); | ||
} | ||
|
||
export default function ProvGraphErrorBoundary({ children }: ErrorBoundaryProps) { | ||
return <FaroErrorBoundary fallback={ErrorFallback}>{children}</FaroErrorBoundary>; | ||
} |
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
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
20 changes: 6 additions & 14 deletions
20
context/app/static/js/shared-styles/tooltips/DonorAgeTooltip/DonorAgeTooltip.tsx
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,25 +1,17 @@ | ||
import React from 'react'; | ||
|
||
import { SecondaryBackgroundTooltip } from 'js/shared-styles/tooltips'; | ||
import { StyledStack, StyledInfoIcon } from 'js/shared-styles/tooltips/DonorAgeTooltip/style'; | ||
import React, { PropsWithChildren } from 'react'; | ||
import InfoTextTooltip from 'js/shared-styles/tooltips/InfoTextTooltip'; | ||
|
||
const DONOR_AGE_TEXT = 'For donors older than 89, the metadata will indicate an age of 90.'; | ||
|
||
interface DonorAgeTooltipProps { | ||
interface DonorAgeTooltipProps extends PropsWithChildren { | ||
donorAge?: string; | ||
} | ||
|
||
function DonorAgeTooltip({ donorAge }: DonorAgeTooltipProps) { | ||
function DonorAgeTooltip({ donorAge, children }: DonorAgeTooltipProps) { | ||
if (!donorAge || Number(donorAge) <= 89) { | ||
return null; | ||
return children; | ||
} | ||
|
||
return ( | ||
<SecondaryBackgroundTooltip title={DONOR_AGE_TEXT}> | ||
<StyledStack> | ||
<StyledInfoIcon /> | ||
</StyledStack> | ||
</SecondaryBackgroundTooltip> | ||
); | ||
return <InfoTextTooltip tooltipTitle={DONOR_AGE_TEXT}>{children}</InfoTextTooltip>; | ||
} | ||
export default DonorAgeTooltip; |
22 changes: 22 additions & 0 deletions
22
context/app/static/js/shared-styles/tooltips/InfoTextTooltip/InfoTextTooltip.tsx
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,22 @@ | ||
import React, { PropsWithChildren } from 'react'; | ||
|
||
import { SecondaryBackgroundTooltip } from 'js/shared-styles/tooltips'; | ||
import { StyledInfoIcon, StyledOuterStack, StyledInnerStack } from 'js/shared-styles/tooltips/InfoTextTooltip/style'; | ||
|
||
interface InfoTextTooltipProps extends PropsWithChildren { | ||
tooltipTitle: string; | ||
} | ||
|
||
function InfoTextTooltip({ tooltipTitle, children }: InfoTextTooltipProps) { | ||
return ( | ||
<StyledOuterStack> | ||
{children} | ||
<SecondaryBackgroundTooltip title={tooltipTitle}> | ||
<StyledInnerStack> | ||
<StyledInfoIcon /> | ||
</StyledInnerStack> | ||
</SecondaryBackgroundTooltip> | ||
</StyledOuterStack> | ||
); | ||
} | ||
export default InfoTextTooltip; |
3 changes: 3 additions & 0 deletions
3
context/app/static/js/shared-styles/tooltips/InfoTextTooltip/index.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,3 @@ | ||
import InfoTextTooltip from './InfoTextTooltip'; | ||
|
||
export default InfoTextTooltip; |
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