Merge pull request #214 from bcgsc/release/v6.11.0

6.11.0

Author: kttkjl

app/common.d.ts

@@ -25,6 +25,16 @@ declare global {
       PUBLIC_PATH: string;
     };
   }
+  let CONFIG: {
+    ATTRS: {
+      NAME: string;
+    },
+    STORAGE: {
+      REFERRER: string;
+      KEYCLOAK: string;
+      DATABASE_TYPE: string;
+    },
+  };
 }
 
 type RecordDefaults = {
@@ -190,9 +200,12 @@ type ExpOutliersType = {
 } & RecordDefaults;
 
 type TemplateType = {
-  ident: string;
   name: string;
-};
+  headerImage: ImageType;
+  logoImage: ImageType;
+  organization: string;
+  sections: string[];
+} & RecordDefaults;
 
 type AppendixType = RecordDefaults & {
   text: string;

app/components/DataTable/components/ActionCellRenderer/index.tsx

@@ -82,6 +82,8 @@ const ActionCellRenderer = ({
     setAnchorEl(null);
   };
 
+  const hasImageData = Array.isArray(data.image) ? data.image.length > 0 : data.image;
+
   return (
     <>
       {canViewDetails && (
@@ -191,7 +193,7 @@ const ActionCellRenderer = ({
           onClose={handleSvgViewerClose}
         />
       )}
-      {data.image && (
+      {hasImageData && (
         <IconButton
           aria-label="View Image"
           data-testid="image"

app/components/DataTable/index.tsx

@@ -156,7 +156,7 @@ const DataTable = ({
         const rowNode = gridApi.getDisplayedRowAtIndex(highlightRow);
         const pageSize = gridApi.paginationGetPageSize();
         const navigateToPage = Math.floor((highlightRow) / pageSize);
-        
+
         if (navigateToPage !== gridApi.paginationGetCurrentPage()) {
           gridApi.paginationGoToPage(navigateToPage);
         }
@@ -278,7 +278,7 @@ const DataTable = ({
     colApi.setColumnsVisible(returnedHiddenCols, false);
 
     colApi.autoSizeColumns(returnedVisibleCols);
-    
+
     if (syncVisibleColumns) {
       syncVisibleColumns(returnedVisibleCols);
     }
@@ -424,7 +424,7 @@ const DataTable = ({
               pagination={isPaginated}
               paginationAutoPageSize={isFullLength}
               paginationPageSize={MAX_VISIBLE_ROWS}
-              autoSizePadding={0}
+              autoSizePadding={1}
               deltaRowDataMode={canReorder}
               getRowNodeId={(data) => data.ident}
               onRowDragEnd={canReorder ? onRowDragEnd : null}

app/views/ReportView/components/GenomicSummary/components/PatientEdit/index.scss renamed to app/components/PatientEdit/index.scss

@@ -35,8 +35,8 @@ const PatientEdit = ({
 }: PatientEditProps): JSX.Element => {
   const { isSigned } = useContext(ConfirmContext);
 
-  const [newPatientData, setNewPatientData] = useState();
-  const [newReportData, setNewReportData] = useState();
+  const [newPatientData, setNewPatientData] = useState<PatientEditProps['patientInformation']>();
+  const [newReportData, setNewReportData] = useState(null);
   const [patientDirty, setPatientDirty] = useState(false);
   const [reportDirty, setReportDirty] = useState(false);
   const [isApiCalling, setIsApiCalling] = useState(false);
@@ -51,6 +51,7 @@ const PatientEdit = ({
     if (report) {
       setNewReportData({
         alternateIdentifier: report.alternateIdentifier,
+        pediatricIds: report.pediatricIds,
         biopsyName: report.biopsyName,
       });
     }
@@ -80,7 +81,12 @@ const PatientEdit = ({
       const apiCalls = [];
 
       if (newPatientData) {
-        apiCalls.push(api.put(`/reports/${report.ident}/patient-information`, newPatientData, {}));
+        const {
+          caseType, biopsySite, physician, gender,
+        } = newPatientData;
+        apiCalls.push(api.put(`/reports/${report.ident}/patient-information`, {
+          caseType, biopsySite, physician, gender,
+        }, {}));
       }
 
       if (newReportData) {
@@ -115,6 +121,16 @@ const PatientEdit = ({
               multiline
               fullWidth
             />
+            <TextField
+              className="patient-dialog__text-field"
+              label="Pediatric Patient IDs"
+              value={newReportData.pediatricIds}
+              name="pediatricIds"
+              onChange={handleReportChange}
+              variant="outlined"
+              multiline
+              fullWidth
+            />
             <TextField
               className="patient-dialog__text-field"
               label="Case Type"

app/views/ReportView/components/GenomicSummary/components/PatientEdit/index.tsx renamed to app/components/PatientEdit/index.tsx

@@ -32,6 +32,7 @@ type UserRoleType = {
 
 type ReportType = {
   alternateIdentifier?: string;
+  pediatricIds?: string;
   analysisStartedAt: string | null;
   biopsyName?: string;
   expression_matrix: string;