Merge pull request #198 from bcgsc/develop

Hotfix/v6.10.1

Author: kttkjl

app/components/Image/index.tsx

@@ -39,14 +39,14 @@ const Image = ({
     }
   }, [isZoomable]);
 
-  return (
-    data && (
+  if (data) {
+    return (
       <>
         <div className="image">
           {showTitle && title && (
-            <Typography variant="h3">
-              {title}
-            </Typography>
+          <Typography variant="h3">
+            {title}
+          </Typography>
           )}
           <Button
             classes={{ root: 'image__button' }}
@@ -64,44 +64,45 @@ const Image = ({
             />
           </Button>
           {showCaption && caption && (
-            <Typography className="image__caption" variant="caption">
-              {caption}
-            </Typography>
+          <Typography className="image__caption" variant="caption">
+            {caption}
+          </Typography>
           )}
         </div>
         {isZoomed && (
-          <Fade in={isZoomed}>
-            <button
-              className="image__dialog-background"
-              onClick={handleZoom}
-              type="button"
+        <Fade in={isZoomed}>
+          <button
+            className="image__dialog-background"
+            onClick={handleZoom}
+            type="button"
+          >
+            <div
+              className="image__dialog-button"
             >
-              <div
-                className="image__dialog-button"
-              >
-                {showTitle && title && (
-                  <Typography variant="h3">
-                    {title}
-                  </Typography>
-                )}
-                <img
-                  className={`image__data ${isZoomable && isZoomed ? 'image__zoom--out' : ''}`}
-                  src={`data:image/${format};base64,${data}`}
-                  alt={title}
-                  key={key}
-                />
-                {showCaption && caption && (
-                  <Typography className="image__caption" variant="caption">
-                    {caption}
-                  </Typography>
-                )}
-              </div>
-            </button>
-          </Fade>
+              {showTitle && title && (
+              <Typography variant="h3">
+                {title}
+              </Typography>
+              )}
+              <img
+                className={`image__data ${isZoomable && isZoomed ? 'image__zoom--out' : ''}`}
+                src={`data:image/${format};base64,${data}`}
+                alt={title}
+                key={key}
+              />
+              {showCaption && caption && (
+              <Typography className="image__caption" variant="caption">
+                {caption}
+              </Typography>
+              )}
+            </div>
+          </button>
+        </Fade>
         )}
       </>
-    )
-  );
+    );
+  }
+  return null;
 };
 
 export default Image;

app/views/ReportView/components/PharmacoGenomicSummary/columnDefs.ts

@@ -263,9 +263,9 @@ const cancerPredisPrintColumnDefs = [
     colId: 'context',
   },
   {
-    headerName: 'Evidence',
-    field: 'evidenceLevel',
-    colId: 'evidenceLevel',
+    headerName: 'Source',
+    field: 'externalSource',
+    colId: 'externalSource',
   },
 ];
 const cancerPredisColumnDefs = [
@@ -274,8 +274,8 @@ const cancerPredisColumnDefs = [
     field: 'context',
   },
   {
-    headerName: 'Evidence',
-    field: 'evidenceLevel',
+    headerName: 'Source',
+    field: 'externalSource',
     minWidth: 90,
   },
   ACTIONS_COL_DEF,

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

@@ -205,29 +205,34 @@ const PharmacoGenomicSummary = ({
         No pharmacogenomic variants found
       </div>
     );
+
     if (pharmacoGenomic.length > 0) {
+      let tableComponent = null;
       if (isPrint) {
-        component = (
+        tableComponent = (
           <PrintTable
             columnDefs={pharmacoGenomicPrintColumnDefs}
             data={pharmacoGenomic}
           />
         );
       } else {
-        component = (
-          <>
-            <DataTable
-              columnDefs={pharmacoGenomicColumnDefs}
-              rowData={pharmacoGenomic}
-              isPrint={isPrint}
-              isPaginated={!isPrint}
-            />
-            <Alert className="summary--max-width" severity="warning">
-              Positive Pharmacogenomic Result: At least one pharmacogenomic variant was identified in this sample. Further clinical testing to determine risk of toxicity is recommended for this patient.
-            </Alert>
-          </>
+        tableComponent = (
+          <DataTable
+            columnDefs={pharmacoGenomicColumnDefs}
+            rowData={pharmacoGenomic}
+            isPrint={isPrint}
+            isPaginated={!isPrint}
+          />
         );
       }
+      component = (
+        <>
+          {tableComponent}
+          <Alert className="summary--max-width" severity="warning">
+            Positive Pharmacogenomic Result: At least one pharmacogenomic variant was identified in this sample. Further clinical testing to determine risk of toxicity is recommended for this patient.
+          </Alert>
+        </>
+      );
     }
     return component;
   }, [pharmacoGenomic, isPrint]);
@@ -238,23 +243,28 @@ const PharmacoGenomicSummary = ({
         No cancer predisposition variants found
       </div>
     );
-    if (isPrint) {
-      component = (
-        <PrintTable
-          columnDefs={cancerPredisPrintColumnDefs}
-          data={cancerPredisposition}
-        />
-      );
-    } else if (cancerPredisposition.length > 0) {
-      component = (
-        <>
+    if (cancerPredisposition.length > 0) {
+      let tableComponent = null;
+      if (isPrint) {
+        tableComponent = (
+          <PrintTable
+            columnDefs={cancerPredisPrintColumnDefs}
+            data={cancerPredisposition}
+          />
+        );
+      } else {
+        tableComponent = (
           <DataTable
-            // Shares same column definitions as pharmacogenomic
             columnDefs={cancerPredisColumnDefs}
             rowData={cancerPredisposition}
             isPrint={isPrint}
             isPaginated={!isPrint}
           />
+        );
+      }
+      component = (
+        <>
+          {tableComponent}
           <Alert className="summary--max-width" severity="warning">
             Positive Cancer Predisposition Result: At least one pathogenic cancer predisposition variant was identified in this sample. A referral to the Hereditary Cancer Program is recommended for this patient.
           </Alert>

package-lock.json

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