Merge pull request #222 from bcgsc/release/v6.11.1

Release/v6.11.1

Author: kttkjl

app/components/ReportToolbar/index.jsx

@@ -7,6 +7,10 @@ import {
 import KeyboardArrowLeftIcon from '@mui/icons-material/KeyboardArrowLeft';
 import KeyboardArrowRightIcon from '@mui/icons-material/KeyboardArrowRight';
 import startCase from '@/utils/startCase';
+import {
+  REPORT_TYPE_TO_TITLE,
+  REPORT_TYPE_TO_SUFFIX,
+} from '@/constants';
 
 import './index.scss';
 
@@ -21,16 +25,10 @@ function ReportToolbar(props) {
   } = props;
 
   const reportTitle = useMemo(() => {
-    if (type === 'probe') {
-      return 'Targeted Gene';
-    }
-    if (type === 'genomic') {
-      return 'Genomic';
-    }
-    if (type === 'pharmacogenomic') {
-      return 'Pharmacogenomic and Germline Targeted Gene';
-    }
-    return '';
+    const titleFirstPart = REPORT_TYPE_TO_SUFFIX[type];
+    const titleSecondPart = REPORT_TYPE_TO_TITLE[type];
+    if (!titleFirstPart && !titleSecondPart) return '';
+    return `${titleFirstPart}${titleFirstPart ? ` - ${titleSecondPart}` : titleSecondPart}`;
   }, [type]);
 
   return (

app/constants/index.js

@@ -11,7 +11,21 @@ const CNVSTATE = {
   AMP: ['Amp', 'amplification'],
 };
 
+const REPORT_TYPE_TO_TITLE = {
+  genomic: 'Genomic',
+  probe: 'Targeted Gene',
+  pharmacogenomic: 'Pharmacogenomic and Cancer Predisposition Targeted Gene',
+};
+
+const REPORT_TYPE_TO_SUFFIX = {
+  genomic: '',
+  probe: 'Somatic',
+  pharmacogenomic: 'Germline',
+};
+
 export {
+  REPORT_TYPE_TO_TITLE,
+  REPORT_TYPE_TO_SUFFIX,
   EXPLEVEL,
   CNVSTATE,
 };

app/views/PrintView/index.tsx

@@ -12,6 +12,10 @@ import PageBreak from '@/components/PageBreak';
 import startCase from '@/utils/startCase';
 import { ReportType } from '@/context/ReportContext/types';
 import { TemplateType } from '@/common';
+import {
+  REPORT_TYPE_TO_TITLE,
+  REPORT_TYPE_TO_SUFFIX,
+} from '@/constants';
 import Summary from '../ReportView/components/Summary';
 import RunningLeft from './components/RunningLeft';
 import RunningCenter from './components/RunningCenter';
@@ -25,16 +29,6 @@ const TherapeuticTargets = lazy(() => import('../ReportView/components/Therapeut
 const Slides = lazy(() => import('../ReportView/components/Slides'));
 const Appendices = lazy(() => import('../ReportView/components/Appendices'));
 
-const REPORT_TYPE_TO_PRINT_TITLE = {
-  probe: 'Targeted Gene Report',
-  pharmacogenomic: 'Pharmacogenomic and Cancer Predisposition Targeted Gene Report',
-};
-
-const REPORT_TYPE_TO_PRINT_SUFFIX = {
-  probe: 'Somatic',
-  pharmacogenomic: 'Germline',
-};
-
 const reducer = (state, action) => {
   switch (action.type) {
     case 'summary':
@@ -152,9 +146,9 @@ const Print = (): JSX.Element => {
 
   const titleBar = useMemo(() => {
     if (report && template) {
-      const printTitle = REPORT_TYPE_TO_PRINT_TITLE[template.name];
+      const printTitle = REPORT_TYPE_TO_TITLE[template.name];
       const headerSubtitle = report.patientId;
-      const headerSubtitleSuffix = REPORT_TYPE_TO_PRINT_SUFFIX[template.name];
+      const headerSubtitleSuffix = REPORT_TYPE_TO_SUFFIX[template.name];
       return (
         <div className="print__headers">
           <div className="print__header-left">
@@ -163,7 +157,7 @@ const Print = (): JSX.Element => {
             )}
           </div>
           <div className="print__header-right">
-            {printTitle && <Typography variant="h1">{printTitle}</Typography>}
+            {printTitle && (<Typography variant="h1">{`${printTitle} Report`}</Typography>)}
             <Typography variant="h2">
               {`${headerSubtitle}${headerSubtitleSuffix ? ` - ${headerSubtitleSuffix}` : ''}`}
             </Typography>

app/views/ReportView/components/PathwayAnalysis/components/Pathway/index.tsx

@@ -1,5 +1,5 @@
 import React, {
-  useEffect, useState, useContext, useCallback,
+  useEffect, useState, useContext, useCallback, useMemo,
 } from 'react';
 import { useSnackbar } from 'notistack';
 import {
@@ -59,6 +59,7 @@ const Pathway = ({
       const newPathway = new FormData();
 
       newPathway.append('pathway', uploadedFile);
+      newPathway.set('legend', 'v2');
 
       let pathwayResp: PathwayImageType;
       if (initialPathway) {
@@ -76,7 +77,7 @@ const Pathway = ({
           true,
         ).request(isSigned);
       }
-      
+
       setPathwayImage(pathwayResp);
       setIsPathwayLoading(false);
       onChange(pathwayResp);
@@ -86,53 +87,61 @@ const Pathway = ({
     }
   }, [initialPathway, isSigned, onChange, report, snackbar]);
 
+  const pathwayUpload = useMemo(() => {
+    let component = null;
+    if (canEdit && !isPrint) {
+      component = (
+        <Button
+          className="pathway__legend-button"
+          component="label"
+          color="secondary"
+          variant="outlined"
+        >
+          {!isPathwayLoading && (
+          <>
+            Upload Pathway Image
+            <PublishIcon />
+            <input
+              accept=".svg"
+              onChange={handlePathwayUpload}
+              type="file"
+              hidden
+            />
+          </>
+          )}
+          {isPathwayLoading && (
+          <CircularProgress size="small" color="secondary" />
+          )}
+        </Button>
+      );
+      if (pathwayImage?.pathway) {
+        component = (
+          <IconButton
+            className="pathway__button"
+            color="secondary"
+            component="label"
+            size="large"
+          >
+            <PublishIcon />
+            <input
+              accept=".svg"
+              onChange={handlePathwayUpload}
+              type="file"
+              hidden
+            />
+          </IconButton>
+        );
+      }
+    }
+    return component;
+  }, [handlePathwayUpload, canEdit, isPrint, pathwayImage?.pathway, isPathwayLoading]);
+
   return (
     <div>
       {imageError && (
         <Typography align="center" color="error">{imageError}</Typography>
       )}
-      {canEdit && !isPrint && (
-        <>
-          {pathwayImage?.pathway ? (
-            <IconButton
-              className="pathway__button"
-              color="secondary"
-              component="label"
-              size="large">
-              <PublishIcon />
-              <input
-                accept=".svg"
-                onChange={handlePathwayUpload}
-                type="file"
-                hidden
-              />
-            </IconButton>
-          ) : (
-            <Button
-              className="pathway__legend-button"
-              component="label"
-              color="secondary"
-              variant="outlined"
-            >
-              {!isPathwayLoading && (
-                <>
-                  Upload Pathway Image
-                  <PublishIcon />
-                  <input
-                    accept=".svg"
-                    onChange={handlePathwayUpload}
-                    type="file"
-                    hidden
-                  />
-                </>
-              )}
-              {isPathwayLoading && (
-                <CircularProgress size="small" color="secondary" />
-              )}
-            </Button>
-          )}
-        </>
-      )}
+      {pathwayUpload}
       {pathwayImage?.pathway && (
         <SvgImage image={pathwayImage.pathway} isPrint={isPrint} />
       )}

package-lock.json

@@ -1,7 +1,7 @@
 {
   "private": true,
   "name": "ipr-client",
-  "version": "6.11.0",
+  "version": "6.11.1",
   "keywords": [],
   "license": "GPL-3.0",
   "sideEffects": false,