Merge branch 'develop' into feat/DEVSU-2829-display-flags-column-in-reports

Author: sshugsc

app/views/ReportView/components/RapidSummary/index.tsx

@@ -383,18 +383,20 @@ const RapidSummary = ({
       const { genomeTmb } = report;
 
       let tmbDisplayValue = 'No data available';
+
+      if (genomeTmb) {
+        tmbDisplayValue = genomeTmb.toFixed(2);
+      }
 
       if (tmburMutBur) {
         const { tmbHidden, adjustedTmb } = tmburMutBur;
         if (tmbHidden) {
           tmbDisplayValue = null;
         } else if (adjustedTmb != null) {
           tmbDisplayValue = adjustedTmb.toFixed(2);
-        } else if (genomeTmb) {
-          tmbDisplayValue = genomeTmb.toFixed(2);
         }
       }
-
+      
       return ([
         {
           term: 'Pathology Tumour Content',

app/views/ReportView/index.tsx

@@ -170,10 +170,10 @@ const ReportView = (): JSX.Element => {
           <div className="report__content-container">
             {Boolean(report) && (
               <ReportToolbar
-                diagnosis={report.patientInformation.diagnosis}
-                patientId={report.patientId}
-                type={report.template.name}
-                state={report.state}
+                diagnosis={report?.patientInformation?.diagnosis}
+                patientId={report?.patientId}
+                type={report?.template.name}
+                state={report?.state}
                 isSidebarVisible={isSidebarVisible}
                 onSidebarToggle={setIsSidebarVisible}
               />

package-lock.json

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