Merge pull request #456 from bcgsc/release/v6.29.2

IPR Client Release v6.29.2
bcgsc · Apr 23, 2024 · 6b905db · 6b905db
2 parents bab5c18 + 91a06a5
commit 6b905db
Show file tree

Hide file tree

Showing 8 changed files with 11 additions and 7 deletions.
diff --git a/app/components/TumourSummaryEdit/index.tsx b/app/components/TumourSummaryEdit/index.tsx
@@ -391,7 +391,7 @@ const TumourSummaryEdit = ({
         return (
           <TextField
             className="tumour-dialog__text-field"
-            label="CAPTIV-8 Score"
+            label="Preliminary CAPTIV-8 Score"
             value={newReportData.captiv8Score}
             name="captiv8Score"
             onChange={handleReportChange}

diff --git a/app/statics/images/pathway_legend_v3.png b/app/statics/images/pathway_legend_v3.png
diff --git a/app/views/ReportView/components/PathwayAnalysis/components/Legend/index.tsx b/app/views/ReportView/components/PathwayAnalysis/components/Legend/index.tsx
@@ -93,7 +93,7 @@ const Legend = ({
       {imageError && (
         <Typography align="center" color="error">{imageError}</Typography>
       )}
-      {/* Case where v1 or v2 legend is used */}
+      {/* Case where v1 or v2 or v3 legend is used */}
       {legend && typeof legend === 'string' && (
         <img src={legend} className="pathway__legend" alt="Pathway Legend" />
       )}

diff --git a/app/views/ReportView/components/PathwayAnalysis/index.tsx b/app/views/ReportView/components/PathwayAnalysis/index.tsx
@@ -47,6 +47,8 @@ const PathwayAnalysis = ({
             setLegend('img/pathway_legend_v1.png');
           } else if (type === 'v2') {
             setLegend('img/pathway_legend_v2.png');
+          } else if (type === 'v3') {
+            setLegend('img/pathway_legend_v3.png');
           } else if (type === 'custom') {
             const legendResp = await api.get(
               `/reports/${report.ident}/image/retrieve/pathwayAnalysis.legend`,
@@ -73,6 +75,8 @@ const PathwayAnalysis = ({
         setLegend('img/pathway_legend_v1.png');
       } else if (type === 'v2') {
         setLegend('img/pathway_legend_v2.png');
+      } else if (type === 'v3') {
+        setLegend('img/pathway_legend_v3.png');
       } else if (type === 'custom') {
         const legendResp = await api.get(
           `/reports/${report.ident}/image/retrieve/pathwayAnalysis.legend`,

diff --git a/app/views/ReportView/components/PathwayAnalysis/types.d.ts b/app/views/ReportView/components/PathwayAnalysis/types.d.ts
@@ -1,7 +1,7 @@
 import { RecordDefaults } from '@/common';
 
 type PathwayImageType = {
-  legend: 'v1' | 'v2' | 'custom' | null;
+  legend: 'v1' | 'v2' | 'v3' | 'custom' | null;
   original: 'string' | null;
   pathway: 'string' | null;
 } & RecordDefaults;

diff --git a/app/views/ReportView/components/RapidSummary/index.tsx b/app/views/ReportView/components/RapidSummary/index.tsx
@@ -335,7 +335,7 @@ const RapidSummary = ({
           : null,
       },
       {
-        term: 'CAPTIV-8 Score',
+        term: 'Preliminary CAPTIV-8 Score',
         value: report.captiv8Score !== null
           ? `${report.captiv8Score}`
           : null,

diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,7 +1,7 @@
 {
   "private": true,
   "name": "ipr-client",
-  "version": "6.29.1",
+  "version": "6.29.2",
   "keywords": [],
   "license": "GPL-3.0",
   "sideEffects": false,