feat/DEVSU-2192-print-report-name-updates

bnguyen-bcgsc · bnguyen-bcgsc · commit f1e921759012 · 2024-02-29T09:24:01.000-08:00
- DEVSU-2191
- DEVSU-2192
- DEVSU-2210
- Revise default file name for printed report (remove time zone, add 'report' after report name, and change 'probe' to 'targeted_gene')
- General code clean up for Genonic and Rapid report views
diff --git a/app/components/SignatureCard/SignatureCard.stories.tsx b/app/components/SignatureCard/SignatureCard.stories.tsx
@@ -1,6 +1,6 @@
 import React, { useMemo } from 'react';
 import { action } from '@storybook/addon-actions';
-import { Story } from '@storybook/react/types-6-0';
+import { StoryFn } from '@storybook/react';
 
 import ReportContext from '@/context/ReportContext';
 import SignatureCard, { SignatureCardProps } from '.';
@@ -24,7 +24,7 @@ const Template = (args) => {
   );
 };
 
-export const Unsigned: Story<SignatureCardProps> = Template.bind({});
+export const Unsigned: StoryFn<SignatureCardProps> = Template.bind({});
 
 Unsigned.args = {
   title: 'Author',
@@ -36,7 +36,7 @@ Unsigned.args = {
 
 const signedAt = '2021-12-02T22:05:15.326Z';
 
-export const Signed: Story<SignatureCardProps> = Template.bind({});
+export const Signed: StoryFn<SignatureCardProps> = Template.bind({});
 
 Signed.args = {
   title: 'Author',
@@ -59,6 +59,8 @@ Signed.args = {
     reviewerSignature: null,
     reviewerSignedAt: null,
     updatedAt: signedAt,
+    creatorSignature: null,
+    creatorSignedAt: signedAt,
   },
   type: 'author',
   isPrint: false,
diff --git a/app/components/TumourSummaryEdit/index.tsx b/app/components/TumourSummaryEdit/index.tsx
@@ -236,7 +236,6 @@ const TumourSummaryEdit = ({
           );
         } catch (callSetError) {
           snackbar.error(`Error updating Tumour Summary: ${callSetError?.message}`);
-          console.error(callSetError);
         } finally {
           setIsApiCalling(false);
         }
diff --git a/app/views/PrintView/index.tsx b/app/views/PrintView/index.tsx
@@ -166,18 +166,21 @@ const Print = ({
       const showPrint = async () => {
         const paged = new Previewer();
         await paged.preview(document.getElementById('root'), ['index.css'], document.body);
+        const templateName = report.template.name === 'probe' ? 'targeted_gene' : report.template.name;
         const currentDate = new Date();
         const year = currentDate.getFullYear();
         const month = (currentDate.getMonth() + 1).toString().padStart(2, '0');
         const day = currentDate.getDate().toString().padStart(2, '0');
         const hours = currentDate.getHours().toString().padStart(2, '0');
         const minutes = currentDate.getMinutes().toString().padStart(2, '0');
         const seconds = currentDate.getSeconds().toString().padStart(2, '0');
-        const { timeZone } = new Intl.DateTimeFormat().resolvedOptions();
+        // const serverName = process.env.NODE_ENV === 'production' ? '' : process.env.NODE_ENV === 'development' ? '_iprdev' : '_iprstaging';
 
-        const formattedDate = `${year}-${month}-${day}-${hours}:${minutes}:${seconds}-${timeZone.replace(/\//g, '_')}`;
+        const formattedDate = `${year}-${month}-${day}_${hours}h${minutes}m${seconds}s`;
+
+        // document.title = `${report.patientId}${serverName}_${report.template.name}_report_${formattedDate}`;
+        document.title = `${report.patientId}_${templateName}_report_${formattedDate}`;
 
-        document.title = `${report.patientId}_${report.template.name}_${formattedDate}`;
         window.print();
         setIsPrintDialogShown(true);
       };
@@ -228,7 +231,11 @@ const Print = ({
     return null;
   }, [report, theme, template, printVersion]);
 
-  const reportContextValue = useMemo(() => ({ report, setReport }), [report, setReport]);
+  const reportContextValue = useMemo(() => ({
+    canEdit: false,
+    report,
+    setReport,
+  }), [report, setReport]);
 
   return (
     <ReportContext.Provider value={reportContextValue}>
diff --git a/app/views/ReportView/components/GenomicSummary/index.tsx b/app/views/ReportView/components/GenomicSummary/index.tsx
@@ -13,7 +13,6 @@ import sortBy from 'lodash/sortBy';
 
 import api, { ApiCallSet } from '@/services/api';
 import { formatDate } from '@/utils/date';
-import useReport from '@/hooks/useReport';
 import ConfirmContext from '@/context/ConfirmContext';
 import ReadOnlyTextField from '@/components/ReadOnlyTextField';
 import DemoDescription from '@/components/DemoDescription';
@@ -27,8 +26,8 @@ import TumourSummaryEdit from '@/components/TumourSummaryEdit';
 import {
   TumourSummaryType, MicrobialType, ImmuneType, MutationBurdenType, TmburType, MsiType,
 } from '@/common';
-import { SummaryProps } from '@/commonComponents';
 import SummaryPrintTable from '@/components/SummaryPrintTable';
+import useReport from '@/hooks/useReport';
 
 import VariantChips from './components/VariantChips';
 import VariantCounts from './components/VariantCounts';
@@ -72,7 +71,11 @@ const customTypeSort = (variant) => {
   return 3;
 };
 
-type GenomicSummaryProps = Omit<SummaryProps, 'templateName'> & WithLoadingInjectedProps;
+type GenomicSummaryProps = {
+  loadedDispatch?: ({ type }: { type: string }) => void;
+  isPrint: boolean;
+  printVersion?: 'stable' | 'beta' | null;
+} & WithLoadingInjectedProps;
 
 const GenomicSummary = ({
   isPrint = false,
@@ -368,7 +371,6 @@ const GenomicSummary = ({
         snackbar.success('Entry deleted');
       }
     } catch (err) {
-      console.error(err);
       snackbar.error('Entry NOT deleted due to an error');
     }
   }, [report, isSigned, showConfirmDialog]);
@@ -384,7 +386,6 @@ const GenomicSummary = ({
       setVariants((prevVal) => ([...prevVal, categorizedVariantEntry]));
       snackbar.success('Entry added');
     } catch (err) {
-      console.error(err);
       snackbar.error('Entry NOT added due to an error');
     }
   }, [report]);
@@ -610,7 +611,7 @@ const GenomicSummary = ({
         {dataSection}
       </div>
     );
-  }, [canEdit, classNamePrefix, handleTumourSummaryEditClose, microbial, primaryBurden, tmburMutBur, report, showTumourSummaryEdit, tumourSummary, printVersion]);
+  }, [canEdit, classNamePrefix, handleTumourSummaryEditClose, microbial, tCellCd8, primaryBurden, tmburMutBur, report, showTumourSummaryEdit, tumourSummary, printVersion]);
 
   const alterationsSection = useMemo(() => {
     let titleSection = (
diff --git a/app/views/ReportView/components/MutationBurden/index.tsx b/app/views/ReportView/components/MutationBurden/index.tsx
@@ -101,7 +101,7 @@ const TMBUR_FIELD_TO_LABEL = {
   totalGenomeIndels: 'Total genome Indels',
   genomeSnvTmb: 'Genome SNV TMB (mut/mb)',
   genomeIndelTmb: 'Genome Indel TMB (mut/mb)',
-  genomeTmb: 'Genome TMB (mut/mb) ',
+  genomeTmb: 'Genome TMB (mut/mb)',
   cdsBasesIn1To22AndXAndY: 'CDS bases in 1-22,X,Y',
   cdsSnvs: 'CDS SNVs',
   cdsIndels: 'CDS Indels',
diff --git a/app/views/ReportView/components/RapidSummary/index.tsx b/app/views/ReportView/components/RapidSummary/index.tsx
@@ -7,7 +7,6 @@ import {
   Grid,
 } from '@mui/material';
 import EditIcon from '@mui/icons-material/Edit';
-import cloneDeep from 'lodash/cloneDeep';
 
 import api, { ApiCallSet } from '@/services/api';
 import snackbar from '@/services/SnackbarUtils';
@@ -30,7 +29,6 @@ import DescriptionList from '@/components/DescriptionList';
 import {
   KbMatchType, TumourSummaryType, ImmuneType, MutationBurdenType, MicrobialType, TmburType,
 } from '@/common';
-import useConfirmDialog from '@/hooks/useConfirmDialog';
 import { Box } from '@mui/system';
 import {
   therapeuticAssociationColDefs, cancerRelevanceColDefs, sampleColumnDefs, getGenomicEvent,
@@ -134,9 +132,9 @@ const RapidSummary = ({
   setIsLoading,
 }: RapidSummaryProps): JSX.Element => {
   const { report, setReport } = useContext(ReportContext);
-  const { isSigned, setIsSigned } = useContext(ConfirmContext);
+  const { setIsSigned } = useContext(ConfirmContext);
   const { canEdit } = useReport();
-  const { showConfirmDialog } = useConfirmDialog();
+  // const { showConfirmDialog } = useConfirmDialog();
 
   const [signatures, setSignatures] = useState<SignatureType | null>();
   const [therapeuticAssociationResults, setTherapeuticAssociationResults] = useState<RapidVariantType[] | null>();
@@ -281,7 +279,6 @@ const RapidSummary = ({
           ]);
         } catch (err) {
           snackbar.error(`Unknown error: ${err}`);
-          console.error(err);
         } finally {
           setIsLoading(false);
           if (loadedDispatch) {
@@ -368,8 +365,6 @@ const RapidSummary = ({
   }, [microbial, primaryBurden, tmburMutBur, report.m1m2Score, report.sampleInfo, report.tumourContent, tCellCd8?.percentile, tCellCd8?.score, report.captiv8Score]);
 
   const handlePatientEditClose = useCallback((
-    // TODO: Argument not being used, leading to OnClose flag on line 744 having too few arguments
-    isSaved: boolean,
     newPatientData: PatientInformationType,
     newReportData: ReportType,
   ) => {

Original file line number	Diff line number	Diff line change
`@@ -236,7 +236,6 @@ const TumourSummaryEdit = ({`
`236`	`236`	`);`
`237`	`237`	`} catch (callSetError) {`
`238`	`238`	snackbar.error(`Error updating Tumour Summary: ${callSetError?.message}`);
`239`		`- console.error(callSetError);`
`240`	`239`	`} finally {`
`241`	`240`	`setIsApiCalling(false);`
`242`	`241`	`}`