diff --git a/app/components/SummaryPrintTable/index.tsx b/app/components/SummaryPrintTable/index.tsx index 634e73749..ea4f4299d 100644 --- a/app/components/SummaryPrintTable/index.tsx +++ b/app/components/SummaryPrintTable/index.tsx @@ -1,6 +1,7 @@ import { Table, TableCell, TableRow, Typography, } from '@mui/material'; +import { Dictionary } from 'lodash'; import React from 'react'; type SummaryPrintTableProps = { @@ -11,6 +12,15 @@ type SummaryPrintTableProps = { renderValue?: (value: any) => unknown; }; +const variantTypes = ['cnv', 'smallMutation', 'structuralVariant', 'expression']; + +const variantToStrings: Dictionary = { + cnv: 'CNV', + smallMutation: 'Small Mutation', + structuralVariant: 'Structural Variant', + expression: 'Expression', +}; + const SummaryPrintTable = ({ data, labelKey, @@ -20,7 +30,9 @@ const SummaryPrintTable = ({ {data.filter((key) => (key.value !== null && key.value !== '')).map(({ [labelKey]: label, [valueKey]: value }) => ( - {label} + + {variantTypes.includes(String(label)) ? variantToStrings[String(label)] : label} + {renderValue ? renderValue(value) : value} diff --git a/app/components/TumourSummaryEdit/index.tsx b/app/components/TumourSummaryEdit/index.tsx index bfaf8322b..cafd99251 100644 --- a/app/components/TumourSummaryEdit/index.tsx +++ b/app/components/TumourSummaryEdit/index.tsx @@ -391,7 +391,7 @@ const TumourSummaryEdit = ({ return ( ( - BCCA Confidential - For Research Purposes Only + BC Cancer Confidential - For Research Purposes Only ); diff --git a/app/views/PrintView/index.scss b/app/views/PrintView/index.scss index 6f19d2339..d58afce84 100644 --- a/app/views/PrintView/index.scss +++ b/app/views/PrintView/index.scss @@ -46,6 +46,7 @@ &__header-left { display: flex; align-items: center; + padding-left: 20px; } &__header-right { diff --git a/app/views/PrintView/index.tsx b/app/views/PrintView/index.tsx index 763b03fcd..383f5cd89 100644 --- a/app/views/PrintView/index.tsx +++ b/app/views/PrintView/index.tsx @@ -94,7 +94,7 @@ const PrintTitleBar = ({ )}
- {`${title ? `${title} Report: ` : ''} ${subtitle}${subtitleSuffix ? ` - ${subtitleSuffix}` : ''}`} + {`${title ? `${title} Report: ` : ''} ${subtitle}${subtitleSuffix ? ` - ${subtitleSuffix}` : ''}`} {biopsyText}
diff --git a/app/views/ReportView/components/GenomicSummary/components/KeyAlterations/index.tsx b/app/views/ReportView/components/GenomicSummary/components/KeyAlterations/index.tsx index e2465e539..bcafe458c 100644 --- a/app/views/ReportView/components/GenomicSummary/components/KeyAlterations/index.tsx +++ b/app/views/ReportView/components/GenomicSummary/components/KeyAlterations/index.tsx @@ -204,10 +204,13 @@ const KeyAlterations = ({ data={categorizedDataArray} labelKey="key" valueKey="value" - renderValue={(val) => val.map(({ geneVariant }) => ( - - {geneVariant} - + renderValue={(val) => val.map(({ geneVariant }, index, arr) => ( + <> + + {geneVariant} + + {(index < arr.length - 1 ? ', ' : '')} + ))} /> diff --git a/app/views/ReportView/components/GenomicSummary/index.tsx b/app/views/ReportView/components/GenomicSummary/index.tsx index 92b89a9cf..377bfbfb9 100644 --- a/app/views/ReportView/components/GenomicSummary/index.tsx +++ b/app/views/ReportView/components/GenomicSummary/index.tsx @@ -279,7 +279,7 @@ const GenomicSummary = ({ value: msiStatus ?? null, }, { - term: 'Captiv 8 Score', + term: 'CAPTIV-8 Score', value: report.captiv8Score !== null ? `${report.captiv8Score}` : null,