From e9f6f5b097f7af1cfa7cc88fbad63ed3fc8c5de0 Mon Sep 17 00:00:00 2001
From: Jacky Li <jinglun.li@alumni.ubc.ca>
Date: Tue, 30 Jul 2024 17:46:33 -0700
Subject: [PATCH 01/21] bugfix: add report rule to allow edit on report state
 DEVSU-2408

---
 app/context/ResourceContext/index.tsx            | 12 ++++++++++++
 .../ReportView/components/Settings/index.tsx     | 16 ++++++++--------
 app/views/ReportView/index.tsx                   | 16 ++++++++++------
 3 files changed, 30 insertions(+), 14 deletions(-)

diff --git a/app/context/ResourceContext/index.tsx b/app/context/ResourceContext/index.tsx
index d423d09a7..e00f555ed 100644
--- a/app/context/ResourceContext/index.tsx
+++ b/app/context/ResourceContext/index.tsx
@@ -25,15 +25,27 @@ const REPORTS_BLOCK = [];
 const ADMIN_ACCESS = ['admin'];
 const ADMIN_BLOCK = [...ALL_ROLES, ...NO_GROUP_MATCH];
 
+/**
+ * Checks user permissions based on the groups they are assigned, nothing report-specific
+ */
 const useResources = (): ResourceContextType => {
   const { userDetails: { groups } } = useSecurity();
 
   const [germlineAccess, setGermlineAccess] = useState(false);
   const [reportsAccess, setReportsAccess] = useState(false);
+  /**
+   * Is the user allowed to edit the report
+   */
   const [reportEditAccess, setReportEditAccess] = useState(false);
+  /**
+   * Is the user allowed to assign users to the report
+   */
   const [reportAssignmentAccess, setReportAssignmentAccess] = useState(false);
   const [adminAccess, setAdminAccess] = useState(false);
   const [managerAccess, setManagerAccess] = useState(false);
+  /**
+   * Is the user allowed to see the settings page
+   */
   const [reportSettingAccess, setReportSettingAccess] = useState(false);
   const [unreviewedAccess, setUnreviewedAccess] = useState(false);
   const [nonproductionAccess, setNonproductionAccess] = useState(false);
diff --git a/app/views/ReportView/components/Settings/index.tsx b/app/views/ReportView/components/Settings/index.tsx
index a5fb49a80..a0d4e51be 100644
--- a/app/views/ReportView/components/Settings/index.tsx
+++ b/app/views/ReportView/components/Settings/index.tsx
@@ -16,7 +16,6 @@ import {
 
 import api from '@/services/api';
 import useReport from '@/hooks/useReport';
-import useResource from '@/hooks/useResource';
 import DemoDescription from '@/components/DemoDescription';
 import snackbar from '@/services/SnackbarUtils';
 import withLoading, { WithLoadingInjectedProps } from '@/hoc/WithLoading';
@@ -37,12 +36,13 @@ const Settings = ({
   isLoading,
   setIsLoading,
 }: SettingsProps): JSX.Element => {
-  /**
-   * Does not matter if they have report access, they need to be in admin or manager role to edit this section
-   */
   const { report, setReport } = useReport();
-  const { reportEditAccess } = useResource();
-  let { canEdit } = useReport();
+  const { canEdit: reportAllowEdit } = useReport();
+
+  /**
+ * If the report is completed, disable all fields except report state field on the front-end
+ */
+  let canEdit = reportAllowEdit;
   if (report.state === 'completed') {
     canEdit = false;
   }
@@ -210,7 +210,7 @@ const Settings = ({
               <FormControl variant="outlined">
                 <InputLabel id="settings-state">Report State</InputLabel>
                 <Select
-                  disabled={!reportEditAccess}
+                  disabled={!reportAllowEdit}
                   labelId="settings-state"
                   label="Report State"
                   onChange={handleStateChange}
@@ -266,7 +266,7 @@ const Settings = ({
                 Delete Report
               </Button>
               <Button
-                disabled={!reportEditAccess}
+                disabled={!reportAllowEdit}
                 color="secondary"
                 onClick={handleReportUpdate}
                 variant="outlined"
diff --git a/app/views/ReportView/index.tsx b/app/views/ReportView/index.tsx
index f6d56b803..36fff8cb9 100644
--- a/app/views/ReportView/index.tsx
+++ b/app/views/ReportView/index.tsx
@@ -49,7 +49,9 @@ const ReportView = (): JSX.Element => {
   }>();
   const theme = useTheme();
   const history = useHistory();
-  const { reportEditAccess, adminAccess, nonproductionAccess, unreviewedAccess, nonproductionStates, unreviewedStates } = useResource();
+  const {
+    reportEditAccess, adminAccess, nonproductionAccess, unreviewedAccess, nonproductionStates, unreviewedStates,
+  } = useResource();
   const { userDetails: { ident: userIdent } } = useSecurity();
 
   const [report, setReport] = useState<ReportType>(null);
@@ -114,13 +116,13 @@ const ReportView = (): JSX.Element => {
 
   const reportValue = useMemo(() => {
     if (!report) { return null; }
+    /**
+     * Note, this param should be used for report edit access first
+     */
     let canEdit = reportEditAccess;
     /**
-     * Check report specific permissions if user isn't admin or overall report access
+     * Checks if user is assigned to report, if not admin
      */
-    if (report.state === 'completed') {
-      canEdit = false;
-    }
     if (!adminAccess && !reportEditAccess) {
       if (report.users && report.users.some(({ user: { ident: i } }) => i === userIdent)) {
         canEdit = true;
@@ -129,7 +131,9 @@ const ReportView = (): JSX.Element => {
       }
     }
 
-    return ({ canEdit, report, setReport });
+    return ({
+      canEdit, report, setReport,
+    });
   }, [report, setReport, adminAccess, reportEditAccess, userIdent]);
   const isSignedValue = useMemo(() => ({ isSigned, setIsSigned }), [isSigned, setIsSigned]);
 

From 34e9708f228b193a96c5897417f225492816bcc6 Mon Sep 17 00:00:00 2001
From: bnguyen-bcgsc <bnguyen@bcgsc.ca>
Date: Wed, 31 Jul 2024 15:45:20 -0700
Subject: [PATCH 02/21] - DEVSU-2410 - Allow signing users with report
 assignment access but not admin and manager to sign report and be assigned
 dynamically to said report - If the user gets removed from report, they
 cannot delete signatures

---
 app/components/SignatureCard/index.tsx | 38 ++++++++++++++++++++------
 1 file changed, 30 insertions(+), 8 deletions(-)

diff --git a/app/components/SignatureCard/index.tsx b/app/components/SignatureCard/index.tsx
index 119fff6f8..bdae3713d 100644
--- a/app/components/SignatureCard/index.tsx
+++ b/app/components/SignatureCard/index.tsx
@@ -1,5 +1,5 @@
 import React, {
-  useState, useEffect, useMemo,
+  useState, useEffect, useMemo, useCallback,
 } from 'react';
 import {
   Paper,
@@ -7,11 +7,14 @@ import {
   IconButton,
   Button,
 } from '@mui/material';
+import api from '@/services/api';
 import GestureIcon from '@mui/icons-material/Gesture';
 import RemoveCircleIcon from '@mui/icons-material/RemoveCircle';
-
+import snackbar from '@/services/SnackbarUtils';
 import { UserType } from '@/common';
 import useReport from '@/hooks/useReport';
+import useResource from '@/hooks/useResource';
+import useSecurity from '@/hooks/useSecurity';
 import { formatDate } from '@/utils/date';
 import { SignatureType, SignatureUserType } from './types';
 
@@ -36,24 +39,43 @@ const SignatureCard = ({
   type,
   isPrint = false,
 }: SignatureCardProps): JSX.Element => {
-  const { canEdit } = useReport();
+  let { reportAssignmentAccess: canEdit } = useResource();
+  let { canEdit: canDeleteSignatures } = useReport();
   const [userSignature, setUserSignature] = useState<UserType>();
+  const [role, setRole] = useState('');
+  const { report, setReport } = useReport();
+  const { userDetails } = useSecurity();
 
   useEffect(() => {
     if (signatures && type) {
       if (type === 'author') {
         setUserSignature(signatures.authorSignature);
+        setRole('analyst');
       } else if (type === 'reviewer') {
         setUserSignature(signatures.reviewerSignature);
+        setRole('reviewer');
       } else if (type === 'creator') {
         setUserSignature(signatures.creatorSignature);
+        setRole('bioinformatician');
       }
     }
-  }, [signatures, type]);
+  }, [signatures, type, setRole]);
 
-  const handleSign = () => {
-    onClick(true, type);
-  };
+  const handleSign = useCallback(async () => {
+      try {
+        const newReport = await api.post(
+          `/reports/${report.ident}/user`,
+          { user: userDetails.ident, role: role },
+          {},
+        ).request();
+        setReport(newReport);
+        snackbar.success('User added!');
+        onClick(true, type);
+      } catch (err) {
+        snackbar.error(`Error adding user: ${err}`);
+      }
+    }, [report, onClick, userDetails, role, setReport]
+  );
 
   const handleRevoke = () => {
     onClick(false, type);
@@ -152,7 +174,7 @@ const SignatureCard = ({
         </Typography>
         )}
       </div>
-      {userSignature?.ident && canEdit && (
+      {userSignature?.ident && canDeleteSignatures && (
         <div className="signatures__button">
           <IconButton
             size="small"

From 820db15cdaa3cc2abba10568292197bcf5892e0e Mon Sep 17 00:00:00 2001
From: bnguyen-bcgsc <bnguyen@bcgsc.ca>
Date: Wed, 31 Jul 2024 16:10:56 -0700
Subject: [PATCH 03/21] - Retain canEdit from useReport and add report
 assignment access from useResource as additional canAddSignatures flag

---
 app/components/SignatureCard/index.tsx | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/app/components/SignatureCard/index.tsx b/app/components/SignatureCard/index.tsx
index bdae3713d..d3bc2178a 100644
--- a/app/components/SignatureCard/index.tsx
+++ b/app/components/SignatureCard/index.tsx
@@ -39,8 +39,8 @@ const SignatureCard = ({
   type,
   isPrint = false,
 }: SignatureCardProps): JSX.Element => {
-  let { reportAssignmentAccess: canEdit } = useResource();
-  let { canEdit: canDeleteSignatures } = useReport();
+  let { reportAssignmentAccess: canAddSignatures } = useResource();
+  let { canEdit } = useReport();
   const [userSignature, setUserSignature] = useState<UserType>();
   const [role, setRole] = useState('');
   const { report, setReport } = useReport();
@@ -151,7 +151,7 @@ const SignatureCard = ({
             {userSignature.lastName}
           </Typography>
         )}
-        {!userSignature?.ident && canEdit && (
+        {!userSignature?.ident && canEdit || canAddSignatures && (
           <Button
             onClick={handleSign}
             variant="text"
@@ -174,7 +174,7 @@ const SignatureCard = ({
         </Typography>
         )}
       </div>
-      {userSignature?.ident && canDeleteSignatures && (
+      {userSignature?.ident && canEdit && (
         <div className="signatures__button">
           <IconButton
             size="small"

From 37841853b3fabfdeea39ca509e4e06e4baa6fa71 Mon Sep 17 00:00:00 2001
From: Jacky Li <jinglun.li@alumni.ubc.ca>
Date: Wed, 31 Jul 2024 18:21:25 -0700
Subject: [PATCH 04/21] feat: allow report user assignment based on groups
 instead of report based DEVSU-2408

---
 .../components/Settings/components/AddUserCard/index.tsx | 9 ++-------
 .../Settings/components/AssociationCard/index.tsx        | 9 ++-------
 2 files changed, 4 insertions(+), 14 deletions(-)

diff --git a/app/views/ReportView/components/Settings/components/AddUserCard/index.tsx b/app/views/ReportView/components/Settings/components/AddUserCard/index.tsx
index fc8d8c85e..ccc877b45 100644
--- a/app/views/ReportView/components/Settings/components/AddUserCard/index.tsx
+++ b/app/views/ReportView/components/Settings/components/AddUserCard/index.tsx
@@ -1,9 +1,8 @@
-import React, { useContext } from 'react';
+import React from 'react';
 import {
   Button,
 } from '@mui/material';
 import AddIcon from '@mui/icons-material/Add';
-import ReportContext from '@/context/ReportContext';
 import useResource from '@/hooks/useResource';
 
 import './index.scss';
@@ -15,11 +14,7 @@ type AddUserCardProps = {
 const AddUserCard = ({
   onAdd,
 }: AddUserCardProps): JSX.Element => {
-  const { report } = useContext(ReportContext);
-  let { reportAssignmentAccess: canEdit } = useResource();
-  if (report.state === 'completed') {
-    canEdit = false;
-  }
+  const { reportAssignmentAccess: canEdit } = useResource();
 
   return (
     <div className="add-card">
diff --git a/app/views/ReportView/components/Settings/components/AssociationCard/index.tsx b/app/views/ReportView/components/Settings/components/AssociationCard/index.tsx
index 64d0b9436..4ce749dc7 100644
--- a/app/views/ReportView/components/Settings/components/AssociationCard/index.tsx
+++ b/app/views/ReportView/components/Settings/components/AssociationCard/index.tsx
@@ -1,4 +1,4 @@
-import React, { useContext } from 'react';
+import React from 'react';
 import {
   Button,
   Card,
@@ -11,7 +11,6 @@ import PersonIcon from '@mui/icons-material/Person';
 
 import { UserType, RecordDefaults } from '@/common';
 import startCase from '@/utils/startCase';
-import ReportContext from '@/context/ReportContext';
 import useResource from '@/hooks/useResource';
 
 import './index.scss';
@@ -28,11 +27,7 @@ const AssociationCard = ({
   user,
   onDelete,
 }: AssociationCardProps): JSX.Element => {
-  const { report } = useContext(ReportContext);
-  let { reportAssignmentAccess: canEdit } = useResource();
-  if (report.state === 'completed') {
-    canEdit = false;
-  }
+  const { reportAssignmentAccess: canEdit } = useResource();
 
   return (
     <Card className="association-card">

From 6d19017348defd82f7f6587bcbc435ab6d1edbf0 Mon Sep 17 00:00:00 2001
From: Jacky Li <jinglun.li@alumni.ubc.ca>
Date: Wed, 31 Jul 2024 20:43:11 -0700
Subject: [PATCH 05/21] bugfix: add JSONstringify to checking row keys for
 collapsed columns DEVSU-2411

---
 app/components/PrintTable/index.tsx | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/app/components/PrintTable/index.tsx b/app/components/PrintTable/index.tsx
index c5880ba2f..a26fbd2b5 100644
--- a/app/components/PrintTable/index.tsx
+++ b/app/components/PrintTable/index.tsx
@@ -86,8 +86,9 @@ function PrintTable({
       const rowIdxsToExpand = {};
 
       (collapseableCols?.length > 0 ? [...data].sort((aRow, bRow) => {
-        const aKey = collapseableCols.map((val) => aRow[val]);
-        const bKey = collapseableCols.map((val) => bRow[val]);
+        // Sort table by columns that are to be collapsed
+        const aKey = JSON.stringify(collapseableCols.map((val) => aRow[val]));
+        const bKey = JSON.stringify(collapseableCols.map((val) => bRow[val]));
         if (aKey === bKey) return 0;
         return aKey > bKey ? 1 : -1;
       }) : data).forEach((dataRow, rowIdx) => {

From 48250cbc3cb6f5f20415ddc7f313789965e53ff4 Mon Sep 17 00:00:00 2001
From: Eleanor Lewis <elewis@bcgsc.ca>
Date: Thu, 1 Aug 2024 09:45:56 -0700
Subject: [PATCH 06/21] addpto ttable custom sort to printview

---
 app/components/PrintTable/index.tsx | 37 +++++++++++++++++++++++++++--
 1 file changed, 35 insertions(+), 2 deletions(-)

diff --git a/app/components/PrintTable/index.tsx b/app/components/PrintTable/index.tsx
index c5880ba2f..c3e474dd7 100644
--- a/app/components/PrintTable/index.tsx
+++ b/app/components/PrintTable/index.tsx
@@ -8,6 +8,7 @@ import { ColDef, ValueGetterParams } from '@ag-grid-community/core';
 import { v7 as createUuid } from 'uuid';
 import { registerHandlers, Handler } from 'pagedjs';
 import './index.scss';
+import { InsertEmoticon } from '@mui/icons-material';
 
 export type PrintTableProps = {
   data: Record<string, unknown>[];
@@ -84,16 +85,48 @@ function PrintTable({
       const colIdxsToCombine = {};
       const rowIdxsToSkip = {};
       const rowIdxsToExpand = {};
+      const fieldList = columnDefs.map((item)=> item.field);
+      let outerRowsMaxEvidenceLevel = {};
+
+      if (fieldList.includes('evidenceLevel') && fieldList.includes('gene')) {
+        outerRowsMaxEvidenceLevel = data.reduce((map, row) => {
+          if (!map[row.gene] || row.evidenceLevel < map[row.gene]) {
+              map[row.gene] = row.evidenceLevel;
+          }
+          return map;
+      }, {});
+      }
 
       (collapseableCols?.length > 0 ? [...data].sort((aRow, bRow) => {
         const aKey = collapseableCols.map((val) => aRow[val]);
         const bKey = collapseableCols.map((val) => bRow[val]);
-        if (aKey === bKey) return 0;
-        return aKey > bKey ? 1 : -1;
+        // ordering inner rows (rows with matching aKey/bKey)
+        if (JSON.stringify(aKey) === JSON.stringify(bKey)) {
+          // order by evidence level if possible, then by therapy if necessary
+          if (fieldList.includes('evidenceLevel') && fieldList.includes('therapy')) {
+            if (aRow.evidenceLevel === bRow.evidenceLevel) {
+              return aRow.therapy > bRow.therapy ? 1 : -1;
+            }
+            return aRow.evidenceLevel > bRow.evidenceLevel ? 1 : -1;
+          }
+          return 0;
+        }
+        // ordering outer rows (rows with different aKey/bKey)
+        if (fieldList.includes('evidenceLevel') && fieldList.includes('gene') && fieldList.includes('therapy')) {
+          // order by evidence level if possible, then by outer row key if necessary
+          const maxA = outerRowsMaxEvidenceLevel[aRow.gene];
+          const maxB = outerRowsMaxEvidenceLevel[bRow.gene];
+          if (maxA === maxB) {
+            return JSON.stringify(aKey) > JSON.stringify(bKey) ? 1 : -1;
+          }
+          return maxA > maxB ? 1 : -1;
+        }
+        return JSON.stringify(aKey) > JSON.stringify(bKey) ? 1 : -1;
       }) : data).forEach((dataRow, rowIdx) => {
         const rowData = [];
         currRowKey = '';
 
+
         sortedColDefs.forEach((colD, cellIdx) => {
           // Data section
           const columnIdentifier = colD.colId || colD.field;

From a75da8e9e6de2b40ad26d39f049a975bfc3b2357 Mon Sep 17 00:00:00 2001
From: Bill Nguyen <bnguyen@bcgsc.ca>
Date: Thu, 1 Aug 2024 11:03:34 -0700
Subject: [PATCH 07/21] - Update handleSign logic and unit tests

---
 .../__tests__/SignatureCard.test.tsx          | 24 ++++++-----
 .../SignatureCard/__tests__/mockData.ts       | 31 ++++++++++++++
 app/components/SignatureCard/index.tsx        | 41 +++++++++----------
 3 files changed, 64 insertions(+), 32 deletions(-)

diff --git a/app/components/SignatureCard/__tests__/SignatureCard.test.tsx b/app/components/SignatureCard/__tests__/SignatureCard.test.tsx
index b4680738f..8a61c91e2 100644
--- a/app/components/SignatureCard/__tests__/SignatureCard.test.tsx
+++ b/app/components/SignatureCard/__tests__/SignatureCard.test.tsx
@@ -3,12 +3,14 @@ import { render, screen, fireEvent } from '@testing-library/react';
 
 import ReportContext from '@/context/ReportContext';
 import SignatureCard, { SignatureType } from '..';
-import { mockNullData, mockNullObjectData, mockObjectData } from './mockData';
+import {
+  mockNullData, mockNullObjectData, mockObjectData, mockReportData,
+} from './mockData';
 
 describe('SignatureCard', () => {
   test('Author and sign button are visible', async () => {
     render(
-      <ReportContext.Provider value={{ canEdit: true, report: null, setReport: () => {} }}>
+      <ReportContext.Provider value={{ canEdit: true, report: mockReportData, setReport: () => {} }}>
         <SignatureCard
           title="Author"
           type="author"
@@ -23,7 +25,7 @@ describe('SignatureCard', () => {
 
   test('Sign button is not visible without edit permissions', async () => {
     render(
-      <ReportContext.Provider value={{ canEdit: false, report: null, setReport: () => {} }}>
+      <ReportContext.Provider value={{ canEdit: false, report: mockReportData, setReport: () => {} }}>
         <SignatureCard
           title="Author"
           type="author"
@@ -36,25 +38,25 @@ describe('SignatureCard', () => {
   });
 
   test('Sign button calls onClick', async () => {
-    const handleClick = jest.fn();
+    const handleSign = jest.fn();
     render(
-      <ReportContext.Provider value={{ canEdit: true, report: null, setReport: () => {} }}>
+      <ReportContext.Provider value={{ canEdit: true, report: mockReportData, setReport: () => {} }}>
         <SignatureCard
           title="Author"
           type="author"
           signatures={null}
-          onClick={handleClick}
+          onClick={handleSign}
         />
       </ReportContext.Provider>,
     );
     fireEvent.click(await screen.findByRole('button', { name: 'Sign' }));
 
-    expect(handleClick).toHaveBeenCalledTimes(1);
+    expect(handleSign).toHaveBeenCalledTimes(1);
   });
 
   test('Sign button is visible when reviewerSignature is null', async () => {
     render(
-      <ReportContext.Provider value={{ canEdit: true, report: null, setReport: () => {} }}>
+      <ReportContext.Provider value={{ canEdit: true, report: mockReportData, setReport: () => {} }}>
         <SignatureCard
           title="Reviewer"
           type="reviewer"
@@ -69,7 +71,7 @@ describe('SignatureCard', () => {
 
   test('Sign button is visible when reviewerSignature has null data', async () => {
     render(
-      <ReportContext.Provider value={{ canEdit: true, report: null, setReport: () => {} }}>
+      <ReportContext.Provider value={{ canEdit: true, report: mockReportData, setReport: () => {} }}>
         <SignatureCard
           title="Reviewer"
           type="reviewer"
@@ -84,7 +86,7 @@ describe('SignatureCard', () => {
 
   test('Reviewer name & remove signature button are visible', async () => {
     render(
-      <ReportContext.Provider value={{ canEdit: true, report: null, setReport: () => {} }}>
+      <ReportContext.Provider value={{ canEdit: true, report: mockReportData, setReport: () => {} }}>
         <SignatureCard
           title="Reviewer"
           type="reviewer"
@@ -100,7 +102,7 @@ describe('SignatureCard', () => {
 
   test('No buttons are visible in print view', async () => {
     render(
-      <ReportContext.Provider value={{ canEdit: true, report: null, setReport: () => {} }}>
+      <ReportContext.Provider value={{ canEdit: true, report: mockReportData, setReport: () => {} }}>
         <SignatureCard
           title="Reviewer"
           type="reviewer"
diff --git a/app/components/SignatureCard/__tests__/mockData.ts b/app/components/SignatureCard/__tests__/mockData.ts
index cddb55374..2e309321a 100644
--- a/app/components/SignatureCard/__tests__/mockData.ts
+++ b/app/components/SignatureCard/__tests__/mockData.ts
@@ -48,8 +48,39 @@ const mockObjectData = {
   reviewerSignedAt: '2020',
 };
 
+const mockReportData = {
+  ident: 'mockIdent',
+  createdAt: '2020',
+  updatedAt: '2020',
+  alternateIdentifier: null,
+  pediatricIds: null,
+  analysisStartedAt: null,
+  biopsyName: null,
+  createdBy: null,
+  expression_matrix: null,
+  kbVersion: null,
+  patientId: null,
+  patientInformation: null,
+  ploidy: null,
+  projects: null,
+  reportVersion: null,
+  sampleInfo: null,
+  state: null,
+  subtyping: null,
+  template: null,
+  tumourContent: null,
+  type: null,
+  users: null,
+  oncotreeTumourType: null,
+  kbDiseaseMatch: null,
+  m1m2Score: null,
+  captiv8Score: null,
+  appendix: null,
+};
+
 export {
   mockNullData,
   mockNullObjectData,
   mockObjectData,
+  mockReportData,
 };
diff --git a/app/components/SignatureCard/index.tsx b/app/components/SignatureCard/index.tsx
index d3bc2178a..aac5b8d7d 100644
--- a/app/components/SignatureCard/index.tsx
+++ b/app/components/SignatureCard/index.tsx
@@ -1,5 +1,5 @@
 import React, {
-  useState, useEffect, useMemo, useCallback,
+  useState, useEffect, useMemo,
 } from 'react';
 import {
   Paper,
@@ -39,12 +39,12 @@ const SignatureCard = ({
   type,
   isPrint = false,
 }: SignatureCardProps): JSX.Element => {
-  let { reportAssignmentAccess: canAddSignatures } = useResource();
-  let { canEdit } = useReport();
+  const { reportAssignmentAccess: canAddSignatures } = useResource();
+  const { canEdit, report, setReport } = useReport();
+  const { userDetails } = useSecurity();
+
   const [userSignature, setUserSignature] = useState<UserType>();
   const [role, setRole] = useState('');
-  const { report, setReport } = useReport();
-  const { userDetails } = useSecurity();
 
   useEffect(() => {
     if (signatures && type) {
@@ -61,21 +61,20 @@ const SignatureCard = ({
     }
   }, [signatures, type, setRole]);
 
-  const handleSign = useCallback(async () => {
-      try {
-        const newReport = await api.post(
-          `/reports/${report.ident}/user`,
-          { user: userDetails.ident, role: role },
-          {},
-        ).request();
-        setReport(newReport);
-        snackbar.success('User added!');
-        onClick(true, type);
-      } catch (err) {
-        snackbar.error(`Error adding user: ${err}`);
-      }
-    }, [report, onClick, userDetails, role, setReport]
-  );
+  const handleSign = async () => {
+    try {
+      const newReport = await api.post(
+        `/reports/${report.ident}/user`,
+        { user: userDetails.ident, role },
+        {},
+      ).request();
+      setReport(newReport);
+      onClick(true, type);
+      snackbar.success('User assigned to report');
+    } catch (err) {
+      snackbar.error(`Error adding user: ${err}`);
+    }
+  };
 
   const handleRevoke = () => {
     onClick(false, type);
@@ -151,7 +150,7 @@ const SignatureCard = ({
             {userSignature.lastName}
           </Typography>
         )}
-        {!userSignature?.ident && canEdit || canAddSignatures && (
+        {!userSignature?.ident && (canEdit || canAddSignatures) && (
           <Button
             onClick={handleSign}
             variant="text"

From 9402053fd7e79e54b4b4893136f9a614de11ee11 Mon Sep 17 00:00:00 2001
From: Eleanor Lewis <elewis@bcgsc.ca>
Date: Thu, 1 Aug 2024 11:22:48 -0700
Subject: [PATCH 08/21] make it generic

---
 app/components/PrintTable/index.tsx           | 42 ++++++++++++-------
 .../components/TherapeuticTargets/index.tsx   |  5 ++-
 2 files changed, 30 insertions(+), 17 deletions(-)

diff --git a/app/components/PrintTable/index.tsx b/app/components/PrintTable/index.tsx
index c3e474dd7..59b2c334f 100644
--- a/app/components/PrintTable/index.tsx
+++ b/app/components/PrintTable/index.tsx
@@ -21,6 +21,8 @@ export type PrintTableProps = {
   collapseableCols?: string[];
   noRowsText?: string;
   fullWidth?: boolean;
+  orderByInternalCol?: string;
+  orderByInternalColBackup?: string;
 };
 
 /**
@@ -34,6 +36,8 @@ function PrintTable({
   noRowsText = '',
   collapseableCols = null,
   fullWidth = false,
+  orderByInternalCol = null,
+  orderByInternalColBackup = null,
 }: PrintTableProps): JSX.Element {
   const sortedColDefs = useMemo(() => columnDefs
     .filter((col) => (col.headerName && col.hide !== true && col.headerName !== 'Actions'))
@@ -86,36 +90,42 @@ function PrintTable({
       const rowIdxsToSkip = {};
       const rowIdxsToExpand = {};
       const fieldList = columnDefs.map((item)=> item.field);
-      let outerRowsMaxEvidenceLevel = {};
+      let outerRowsMaxRank = {};
 
-      if (fieldList.includes('evidenceLevel') && fieldList.includes('gene')) {
-        outerRowsMaxEvidenceLevel = data.reduce((map, row) => {
-          if (!map[row.gene] || row.evidenceLevel < map[row.gene]) {
-              map[row.gene] = row.evidenceLevel;
+      if (orderByInternalCol) {
+      outerRowsMaxRank = data.reduce((map, row) => {
+        const rowkey = JSON.stringify(collapseableCols.map((val) => row[val]));
+        if (!map[rowkey] || row[orderByInternalCol] < map[rowkey]) {
+              map[rowkey] = row[orderByInternalCol];
           }
           return map;
       }, {});
-      }
-
+    }
       (collapseableCols?.length > 0 ? [...data].sort((aRow, bRow) => {
         const aKey = collapseableCols.map((val) => aRow[val]);
         const bKey = collapseableCols.map((val) => bRow[val]);
         // ordering inner rows (rows with matching aKey/bKey)
         if (JSON.stringify(aKey) === JSON.stringify(bKey)) {
-          // order by evidence level if possible, then by therapy if necessary
-          if (fieldList.includes('evidenceLevel') && fieldList.includes('therapy')) {
-            if (aRow.evidenceLevel === bRow.evidenceLevel) {
-              return aRow.therapy > bRow.therapy ? 1 : -1;
+          // order by 'orderByInternalCol' if possible, then by 'orderByInternalColBackup' if necessary
+          if (orderByInternalCol) {
+            if (aRow[orderByInternalCol] === bRow[orderByInternalCol]) {
+              if (orderByInternalColBackup) {
+                if (aRow[orderByInternalColBackup] === bRow[orderByInternalColBackup]) {
+                  return 0;
+                }
+                return aRow[orderByInternalColBackup] > bRow[orderByInternalColBackup] ? 1 : -1;
+              }
+              return 0;
             }
-            return aRow.evidenceLevel > bRow.evidenceLevel ? 1 : -1;
+            return aRow[orderByInternalCol] > bRow[orderByInternalCol] ? 1 : -1;
           }
           return 0;
         }
         // ordering outer rows (rows with different aKey/bKey)
-        if (fieldList.includes('evidenceLevel') && fieldList.includes('gene') && fieldList.includes('therapy')) {
-          // order by evidence level if possible, then by outer row key if necessary
-          const maxA = outerRowsMaxEvidenceLevel[aRow.gene];
-          const maxB = outerRowsMaxEvidenceLevel[bRow.gene];
+        if (orderByInternalCol) {
+          // order by 'orderByInternalCol' if possible, then by outer row key if necessary
+          const maxA = outerRowsMaxRank[JSON.stringify(aKey)];
+          const maxB = outerRowsMaxRank[JSON.stringify(bKey)];
           if (maxA === maxB) {
             return JSON.stringify(aKey) > JSON.stringify(bKey) ? 1 : -1;
           }
diff --git a/app/views/ReportView/components/TherapeuticTargets/index.tsx b/app/views/ReportView/components/TherapeuticTargets/index.tsx
index 0279a97b0..2a5f05e42 100644
--- a/app/views/ReportView/components/TherapeuticTargets/index.tsx
+++ b/app/views/ReportView/components/TherapeuticTargets/index.tsx
@@ -225,6 +225,8 @@ const Therapeutic = ({
           data={therapeuticData}
           columnDefs={columnDefs}
           collapseableCols={['gene', 'variant']}
+          orderByInternalCol="evidenceLevel"
+          orderByInternalColBackup="therapy"
         />
         <Typography
           className="therapeutic-print__title"
@@ -237,7 +239,8 @@ const Therapeutic = ({
           data={chemoresistanceData}
           columnDefs={columnDefs}
           collapseableCols={['gene', 'variant']}
-        />
+          orderByInternalCol="evidenceLevel"
+/>
       </div>
     );
   }

From d03a64ee8eb9af45273e273fbe85beaa03249b2d Mon Sep 17 00:00:00 2001
From: Eleanor Lewis <elewis@bcgsc.ca>
Date: Thu, 1 Aug 2024 11:40:39 -0700
Subject: [PATCH 09/21] add props to both tos, fix ordering

---
 app/components/PrintTable/index.tsx                       | 8 ++++++++
 .../ReportView/components/TherapeuticTargets/index.tsx    | 3 +++
 2 files changed, 11 insertions(+)

diff --git a/app/components/PrintTable/index.tsx b/app/components/PrintTable/index.tsx
index 59b2c334f..c1dc69aeb 100644
--- a/app/components/PrintTable/index.tsx
+++ b/app/components/PrintTable/index.tsx
@@ -92,6 +92,9 @@ function PrintTable({
       const fieldList = columnDefs.map((item)=> item.field);
       let outerRowsMaxRank = {};
 
+      console.log('orderByInternalCols');
+      console.log(orderByInternalCol);
+      console.log(orderByInternalColBackup);
       if (orderByInternalCol) {
       outerRowsMaxRank = data.reduce((map, row) => {
         const rowkey = JSON.stringify(collapseableCols.map((val) => row[val]));
@@ -101,11 +104,13 @@ function PrintTable({
           return map;
       }, {});
     }
+    console.dir(outerRowsMaxRank);
       (collapseableCols?.length > 0 ? [...data].sort((aRow, bRow) => {
         const aKey = collapseableCols.map((val) => aRow[val]);
         const bKey = collapseableCols.map((val) => bRow[val]);
         // ordering inner rows (rows with matching aKey/bKey)
         if (JSON.stringify(aKey) === JSON.stringify(bKey)) {
+          console.log('here in inner row ordering');
           // order by 'orderByInternalCol' if possible, then by 'orderByInternalColBackup' if necessary
           if (orderByInternalCol) {
             if (aRow[orderByInternalCol] === bRow[orderByInternalCol]) {
@@ -123,9 +128,12 @@ function PrintTable({
         }
         // ordering outer rows (rows with different aKey/bKey)
         if (orderByInternalCol) {
+          console.log('here in outer row ordering')
           // order by 'orderByInternalCol' if possible, then by outer row key if necessary
           const maxA = outerRowsMaxRank[JSON.stringify(aKey)];
           const maxB = outerRowsMaxRank[JSON.stringify(bKey)];
+          console.dir(maxA);
+          console.dir(maxB);
           if (maxA === maxB) {
             return JSON.stringify(aKey) > JSON.stringify(bKey) ? 1 : -1;
           }
diff --git a/app/views/ReportView/components/TherapeuticTargets/index.tsx b/app/views/ReportView/components/TherapeuticTargets/index.tsx
index 2a5f05e42..c5117d0b1 100644
--- a/app/views/ReportView/components/TherapeuticTargets/index.tsx
+++ b/app/views/ReportView/components/TherapeuticTargets/index.tsx
@@ -261,6 +261,8 @@ const Therapeutic = ({
           data={therapeuticData}
           columnDefs={columnDefs}
           collapseableCols={['gene', 'variant']}
+          orderByInternalCol="evidenceLevel"
+          orderByInternalColBackup="therapy"
         />
         <br />
         <Typography
@@ -276,6 +278,7 @@ const Therapeutic = ({
           data={chemoresistanceData}
           columnDefs={columnDefs}
           collapseableCols={['gene', 'variant']}
+          orderByInternalCol="evidenceLevel"
         />
       </div>
     );

From 652d9144a07be7fce4de2f0b79a2d71e9f95774e Mon Sep 17 00:00:00 2001
From: Eleanor Lewis <elewis@bcgsc.ca>
Date: Thu, 1 Aug 2024 11:50:25 -0700
Subject: [PATCH 10/21] remove debugging code

---
 app/components/PrintTable/index.tsx | 8 --------
 1 file changed, 8 deletions(-)

diff --git a/app/components/PrintTable/index.tsx b/app/components/PrintTable/index.tsx
index c1dc69aeb..59b2c334f 100644
--- a/app/components/PrintTable/index.tsx
+++ b/app/components/PrintTable/index.tsx
@@ -92,9 +92,6 @@ function PrintTable({
       const fieldList = columnDefs.map((item)=> item.field);
       let outerRowsMaxRank = {};
 
-      console.log('orderByInternalCols');
-      console.log(orderByInternalCol);
-      console.log(orderByInternalColBackup);
       if (orderByInternalCol) {
       outerRowsMaxRank = data.reduce((map, row) => {
         const rowkey = JSON.stringify(collapseableCols.map((val) => row[val]));
@@ -104,13 +101,11 @@ function PrintTable({
           return map;
       }, {});
     }
-    console.dir(outerRowsMaxRank);
       (collapseableCols?.length > 0 ? [...data].sort((aRow, bRow) => {
         const aKey = collapseableCols.map((val) => aRow[val]);
         const bKey = collapseableCols.map((val) => bRow[val]);
         // ordering inner rows (rows with matching aKey/bKey)
         if (JSON.stringify(aKey) === JSON.stringify(bKey)) {
-          console.log('here in inner row ordering');
           // order by 'orderByInternalCol' if possible, then by 'orderByInternalColBackup' if necessary
           if (orderByInternalCol) {
             if (aRow[orderByInternalCol] === bRow[orderByInternalCol]) {
@@ -128,12 +123,9 @@ function PrintTable({
         }
         // ordering outer rows (rows with different aKey/bKey)
         if (orderByInternalCol) {
-          console.log('here in outer row ordering')
           // order by 'orderByInternalCol' if possible, then by outer row key if necessary
           const maxA = outerRowsMaxRank[JSON.stringify(aKey)];
           const maxB = outerRowsMaxRank[JSON.stringify(bKey)];
-          console.dir(maxA);
-          console.dir(maxB);
           if (maxA === maxB) {
             return JSON.stringify(aKey) > JSON.stringify(bKey) ? 1 : -1;
           }

From 651eaaab6cde76977b77f2fe8085663e82c72bf2 Mon Sep 17 00:00:00 2001
From: Bill Nguyen <bnguyen@bcgsc.ca>
Date: Thu, 1 Aug 2024 12:24:50 -0700
Subject: [PATCH 11/21] - Update unit test

---
 .../__tests__/SignatureCard.test.tsx              | 15 ++++++++++++---
 1 file changed, 12 insertions(+), 3 deletions(-)

diff --git a/app/components/SignatureCard/__tests__/SignatureCard.test.tsx b/app/components/SignatureCard/__tests__/SignatureCard.test.tsx
index 8a61c91e2..9952026a1 100644
--- a/app/components/SignatureCard/__tests__/SignatureCard.test.tsx
+++ b/app/components/SignatureCard/__tests__/SignatureCard.test.tsx
@@ -1,5 +1,7 @@
 import React from 'react';
-import { render, screen, fireEvent } from '@testing-library/react';
+import {
+  render, screen, fireEvent, waitFor,
+} from '@testing-library/react';
 
 import ReportContext from '@/context/ReportContext';
 import SignatureCard, { SignatureType } from '..';
@@ -7,6 +9,9 @@ import {
   mockNullData, mockNullObjectData, mockObjectData, mockReportData,
 } from './mockData';
 
+jest.mock('@/services/SnackbarUtils');
+jest.mock('@/services/api');
+
 describe('SignatureCard', () => {
   test('Author and sign button are visible', async () => {
     render(
@@ -51,7 +56,9 @@ describe('SignatureCard', () => {
     );
     fireEvent.click(await screen.findByRole('button', { name: 'Sign' }));
 
-    expect(handleSign).toHaveBeenCalledTimes(1);
+    waitFor(() => {
+      expect(handleSign).toHaveBeenCalledTimes(1);
+    });
   });
 
   test('Sign button is visible when reviewerSignature is null', async () => {
@@ -96,7 +103,9 @@ describe('SignatureCard', () => {
       </ReportContext.Provider>,
     );
 
-    expect(screen.queryByRole('button', { name: 'Sign' })).not.toBeInTheDocument();
+    waitFor(() => {
+      expect(screen.queryByRole('button', { name: 'Sign' })).not.toBeInTheDocument();
+    });
     expect(await screen.findByRole('button', { name: /^((?!Sign).)*$/ })).toBeInTheDocument();
   });
 

From 82368e2daf439051e71cb832bf64fab99ffd0a1e Mon Sep 17 00:00:00 2001
From: Eleanor Lewis <elewis@bcgsc.ca>
Date: Thu, 1 Aug 2024 13:13:15 -0700
Subject: [PATCH 12/21] minor fixes

---
 app/components/PrintTable/index.tsx | 16 +++++++---------
 1 file changed, 7 insertions(+), 9 deletions(-)

diff --git a/app/components/PrintTable/index.tsx b/app/components/PrintTable/index.tsx
index 65b716e45..8cd54b25a 100644
--- a/app/components/PrintTable/index.tsx
+++ b/app/components/PrintTable/index.tsx
@@ -8,7 +8,6 @@ import { ColDef, ValueGetterParams } from '@ag-grid-community/core';
 import { v7 as createUuid } from 'uuid';
 import { registerHandlers, Handler } from 'pagedjs';
 import './index.scss';
-import { InsertEmoticon } from '@mui/icons-material';
 
 export type PrintTableProps = {
   data: Record<string, unknown>[];
@@ -89,18 +88,17 @@ function PrintTable({
       const colIdxsToCombine = {};
       const rowIdxsToSkip = {};
       const rowIdxsToExpand = {};
-      const fieldList = columnDefs.map((item)=> item.field);
       let outerRowsMaxRank = {};
 
       if (orderByInternalCol) {
-      outerRowsMaxRank = data.reduce((map, row) => {
-        const rowkey = JSON.stringify(collapseableCols.map((val) => row[val]));
-        if (!map[rowkey] || row[orderByInternalCol] < map[rowkey]) {
-              map[rowkey] = row[orderByInternalCol];
+        outerRowsMaxRank = data.reduce((map, row) => {
+          const rowkey = JSON.stringify(collapseableCols.map((val) => row[val]));
+          if (!map[rowkey] || row[orderByInternalCol] < map[rowkey]) {
+            map[rowkey] = row[orderByInternalCol];
           }
           return map;
-      }, {});
-    }
+        }, {});
+      }
       (collapseableCols?.length > 0 ? [...data].sort((aRow, bRow) => {
         const aKey = JSON.stringify(collapseableCols.map((val) => aRow[val]));
         const bKey = JSON.stringify(collapseableCols.map((val) => bRow[val]));
@@ -220,7 +218,7 @@ function PrintTable({
       }
     }
     return component;
-  }, [sortedColDefs, noRowsText, data, collapseableCols]);
+  }, [sortedColDefs, noRowsText, data, collapseableCols, orderByInternalCol, orderByInternalColBackup]);
 
   const tableId = useMemo(() => {
     if (data?.length) {

From c3f9368ce57a8e1c5b582b5e5273acf92dae39c3 Mon Sep 17 00:00:00 2001
From: Eleanor Lewis <elewis@bcgsc.ca>
Date: Thu, 1 Aug 2024 15:03:46 -0700
Subject: [PATCH 13/21] use sorted list instead of max

---
 app/components/PrintTable/index.tsx | 30 +++++++++++++++++------------
 1 file changed, 18 insertions(+), 12 deletions(-)

diff --git a/app/components/PrintTable/index.tsx b/app/components/PrintTable/index.tsx
index 8cd54b25a..1717f3c27 100644
--- a/app/components/PrintTable/index.tsx
+++ b/app/components/PrintTable/index.tsx
@@ -88,22 +88,27 @@ function PrintTable({
       const colIdxsToCombine = {};
       const rowIdxsToSkip = {};
       const rowIdxsToExpand = {};
-      let outerRowsMaxRank = {};
+      let outerRowsRank = {};
 
       if (orderByInternalCol) {
-        outerRowsMaxRank = data.reduce((map, row) => {
+        outerRowsRank = data.reduce((acc, row) => {
           const rowkey = JSON.stringify(collapseableCols.map((val) => row[val]));
-          if (!map[rowkey] || row[orderByInternalCol] < map[rowkey]) {
-            map[rowkey] = row[orderByInternalCol];
+          if (!acc[rowkey]) {
+            acc[rowkey] = [];
           }
-          return map;
+          acc[rowkey].push(row[orderByInternalCol]);
+          return acc;
         }, {});
+
+        Object.keys(outerRowsRank).forEach(key => {
+          outerRowsRank[key] = JSON.stringify(outerRowsRank[key].sort()); // Sort and stringify the array
+        });
       }
       (collapseableCols?.length > 0 ? [...data].sort((aRow, bRow) => {
         const aKey = JSON.stringify(collapseableCols.map((val) => aRow[val]));
         const bKey = JSON.stringify(collapseableCols.map((val) => bRow[val]));
         // ordering inner rows (rows with matching aKey/bKey)
-        if (JSON.stringify(aKey) === JSON.stringify(bKey)) {
+        if (aKey === bKey) {
           // order by 'orderByInternalCol' if possible, then by 'orderByInternalColBackup' if necessary
           if (orderByInternalCol) {
             if (aRow[orderByInternalCol] === bRow[orderByInternalCol]) {
@@ -122,14 +127,15 @@ function PrintTable({
         // ordering outer rows (rows with different aKey/bKey)
         if (orderByInternalCol) {
           // order by 'orderByInternalCol' if possible, then by outer row key if necessary
-          const maxA = outerRowsMaxRank[JSON.stringify(aKey)];
-          const maxB = outerRowsMaxRank[JSON.stringify(bKey)];
-          if (maxA === maxB) {
-            return JSON.stringify(aKey) > JSON.stringify(bKey) ? 1 : -1;
+          const rankA = outerRowsRank[aKey];
+          const rankB = outerRowsRank[bKey];
+
+          if (rankA === rankB) {
+            return aKey > bKey ? 1 : -1;
           }
-          return maxA > maxB ? 1 : -1;
+          return rankA > rankB ? 1 : -1;
         }
-        return JSON.stringify(aKey) > JSON.stringify(bKey) ? 1 : -1;
+        return aKey > bKey ? 1 : -1;
       }) : data).forEach((dataRow, rowIdx) => {
         const rowData = [];
         currRowKey = '';

From 3e7d216fee66f91c87df5b593fcd274f6db9ee06 Mon Sep 17 00:00:00 2001
From: Jacky Li <jinglun.li@alumni.ubc.ca>
Date: Thu, 1 Aug 2024 16:25:10 -0700
Subject: [PATCH 14/21] feat: make orderByInternalCols be array instead of
 columnId to expand functionality DEVSU-2412

---
 app/components/PrintTable/index.tsx           | 32 +++++++++++--------
 .../components/TherapeuticTargets/index.tsx   | 12 +++----
 2 files changed, 23 insertions(+), 21 deletions(-)

diff --git a/app/components/PrintTable/index.tsx b/app/components/PrintTable/index.tsx
index 1717f3c27..f50a72a27 100644
--- a/app/components/PrintTable/index.tsx
+++ b/app/components/PrintTable/index.tsx
@@ -20,8 +20,7 @@ export type PrintTableProps = {
   collapseableCols?: string[];
   noRowsText?: string;
   fullWidth?: boolean;
-  orderByInternalCol?: string;
-  orderByInternalColBackup?: string;
+  orderByInternalCol?: string[];
 };
 
 /**
@@ -36,7 +35,6 @@ function PrintTable({
   collapseableCols = null,
   fullWidth = false,
   orderByInternalCol = null,
-  orderByInternalColBackup = null,
 }: PrintTableProps): JSX.Element {
   const sortedColDefs = useMemo(() => columnDefs
     .filter((col) => (col.headerName && col.hide !== true && col.headerName !== 'Actions'))
@@ -96,14 +94,22 @@ function PrintTable({
           if (!acc[rowkey]) {
             acc[rowkey] = [];
           }
-          acc[rowkey].push(row[orderByInternalCol]);
+          acc[rowkey].push(
+            row[orderByInternalCol[0]],
+            /**
+             * Note: Commented code below takes whole of orderByInternalCol and sorts the table with prio as
+             * defined in the array
+             */
+            // orderByInternalCol.reduce((buildingKey, colId) => [...buildingKey, row[colId]], [])
+          );
           return acc;
         }, {});
 
-        Object.keys(outerRowsRank).forEach(key => {
+        Object.keys(outerRowsRank).forEach((key) => {
           outerRowsRank[key] = JSON.stringify(outerRowsRank[key].sort()); // Sort and stringify the array
         });
       }
+
       (collapseableCols?.length > 0 ? [...data].sort((aRow, bRow) => {
         const aKey = JSON.stringify(collapseableCols.map((val) => aRow[val]));
         const bKey = JSON.stringify(collapseableCols.map((val) => bRow[val]));
@@ -111,16 +117,14 @@ function PrintTable({
         if (aKey === bKey) {
           // order by 'orderByInternalCol' if possible, then by 'orderByInternalColBackup' if necessary
           if (orderByInternalCol) {
-            if (aRow[orderByInternalCol] === bRow[orderByInternalCol]) {
-              if (orderByInternalColBackup) {
-                if (aRow[orderByInternalColBackup] === bRow[orderByInternalColBackup]) {
-                  return 0;
-                }
-                return aRow[orderByInternalColBackup] > bRow[orderByInternalColBackup] ? 1 : -1;
+            for (let i = 0; i < orderByInternalCol.length; i++) {
+              const col = orderByInternalCol[i];
+              if (aRow[col] === bRow[col]) {
+                continue; // if the current column values are equal, move to next column
+              } else {
+                return aRow[col] > bRow[col] ? 1 : -1;
               }
-              return 0;
             }
-            return aRow[orderByInternalCol] > bRow[orderByInternalCol] ? 1 : -1;
           }
           return 0;
         }
@@ -224,7 +228,7 @@ function PrintTable({
       }
     }
     return component;
-  }, [sortedColDefs, noRowsText, data, collapseableCols, orderByInternalCol, orderByInternalColBackup]);
+  }, [sortedColDefs, noRowsText, data, collapseableCols, orderByInternalCol]);
 
   const tableId = useMemo(() => {
     if (data?.length) {
diff --git a/app/views/ReportView/components/TherapeuticTargets/index.tsx b/app/views/ReportView/components/TherapeuticTargets/index.tsx
index c5117d0b1..cdbe24d45 100644
--- a/app/views/ReportView/components/TherapeuticTargets/index.tsx
+++ b/app/views/ReportView/components/TherapeuticTargets/index.tsx
@@ -225,8 +225,7 @@ const Therapeutic = ({
           data={therapeuticData}
           columnDefs={columnDefs}
           collapseableCols={['gene', 'variant']}
-          orderByInternalCol="evidenceLevel"
-          orderByInternalColBackup="therapy"
+          orderByInternalCol={['evidenceLevel', 'therapy']}
         />
         <Typography
           className="therapeutic-print__title"
@@ -239,8 +238,8 @@ const Therapeutic = ({
           data={chemoresistanceData}
           columnDefs={columnDefs}
           collapseableCols={['gene', 'variant']}
-          orderByInternalCol="evidenceLevel"
-/>
+          orderByInternalCol={['evidenceLevel']}
+        />
       </div>
     );
   }
@@ -261,8 +260,7 @@ const Therapeutic = ({
           data={therapeuticData}
           columnDefs={columnDefs}
           collapseableCols={['gene', 'variant']}
-          orderByInternalCol="evidenceLevel"
-          orderByInternalColBackup="therapy"
+          orderByInternalCol={['evidenceLevel', 'therapy']}
         />
         <br />
         <Typography
@@ -278,7 +276,7 @@ const Therapeutic = ({
           data={chemoresistanceData}
           columnDefs={columnDefs}
           collapseableCols={['gene', 'variant']}
-          orderByInternalCol="evidenceLevel"
+          orderByInternalCol={['evidenceLevel']}
         />
       </div>
     );

From c9f73262aacdf76a42b3ada0b8df616b4e4799ec Mon Sep 17 00:00:00 2001
From: Eleanor Lewis <elewis@bcgsc.ca>
Date: Fri, 2 Aug 2024 08:58:37 -0700
Subject: [PATCH 15/21] use diff lists for outer and inner row sorting

---
 app/components/PrintTable/index.tsx           | 64 ++++++++++---------
 .../components/TherapeuticTargets/index.tsx   | 12 ++--
 2 files changed, 42 insertions(+), 34 deletions(-)

diff --git a/app/components/PrintTable/index.tsx b/app/components/PrintTable/index.tsx
index f50a72a27..44746940b 100644
--- a/app/components/PrintTable/index.tsx
+++ b/app/components/PrintTable/index.tsx
@@ -20,7 +20,8 @@ export type PrintTableProps = {
   collapseableCols?: string[];
   noRowsText?: string;
   fullWidth?: boolean;
-  orderByInternalCol?: string[];
+  outerRowOrderByInternalCol?: string[];
+  innerRowOrderByInternalCol?: string[];
 };
 
 /**
@@ -34,7 +35,8 @@ function PrintTable({
   noRowsText = '',
   collapseableCols = null,
   fullWidth = false,
-  orderByInternalCol = null,
+  outerRowOrderByInternalCol = null,
+  innerRowOrderByInternalCol = null,
 }: PrintTableProps): JSX.Element {
   const sortedColDefs = useMemo(() => columnDefs
     .filter((col) => (col.headerName && col.hide !== true && col.headerName !== 'Actions'))
@@ -88,25 +90,27 @@ function PrintTable({
       const rowIdxsToExpand = {};
       let outerRowsRank = {};
 
-      if (orderByInternalCol) {
+      if (outerRowOrderByInternalCol) {
         outerRowsRank = data.reduce((acc, row) => {
           const rowkey = JSON.stringify(collapseableCols.map((val) => row[val]));
           if (!acc[rowkey]) {
-            acc[rowkey] = [];
+            acc[rowkey] = {};
           }
-          acc[rowkey].push(
-            row[orderByInternalCol[0]],
-            /**
-             * Note: Commented code below takes whole of orderByInternalCol and sorts the table with prio as
-             * defined in the array
-             */
-            // orderByInternalCol.reduce((buildingKey, colId) => [...buildingKey, row[colId]], [])
-          );
+          Object.keys(row).forEach((key) => {
+            if (outerRowOrderByInternalCol.includes(key)) {
+              if (!acc[rowkey][key]) {
+                acc[rowkey][key] = [];
+              }
+              acc[rowkey][key].push(row[key]);
+            }
+          })
           return acc;
         }, {});
 
         Object.keys(outerRowsRank).forEach((key) => {
-          outerRowsRank[key] = JSON.stringify(outerRowsRank[key].sort()); // Sort and stringify the array
+          Object.keys(outerRowsRank[key]).forEach((subkey) => {
+            outerRowsRank[key][subkey] = JSON.stringify(outerRowsRank[key][subkey].sort()); // Sort and stringify
+          });
         });
       }
 
@@ -115,13 +119,13 @@ function PrintTable({
         const bKey = JSON.stringify(collapseableCols.map((val) => bRow[val]));
         // ordering inner rows (rows with matching aKey/bKey)
         if (aKey === bKey) {
-          // order by 'orderByInternalCol' if possible, then by 'orderByInternalColBackup' if necessary
-          if (orderByInternalCol) {
-            for (let i = 0; i < orderByInternalCol.length; i++) {
-              const col = orderByInternalCol[i];
-              if (aRow[col] === bRow[col]) {
-                continue; // if the current column values are equal, move to next column
-              } else {
+          // order by 'innerRowOrderByInternalCol' index 0 if possible, then index 1, etc
+          if (innerRowOrderByInternalCol) {
+            for (let i = 0; i < innerRowOrderByInternalCol.length; i++) {
+              const col = innerRowOrderByInternalCol[i];
+              // if the current column values are equal, move to next column
+              // otherwise return rank based on these columns
+              if (!(aRow[col] === bRow[col])) {
                 return aRow[col] > bRow[col] ? 1 : -1;
               }
             }
@@ -129,17 +133,17 @@ function PrintTable({
           return 0;
         }
         // ordering outer rows (rows with different aKey/bKey)
-        if (orderByInternalCol) {
-          // order by 'orderByInternalCol' if possible, then by outer row key if necessary
-          const rankA = outerRowsRank[aKey];
-          const rankB = outerRowsRank[bKey];
-
-          if (rankA === rankB) {
-            return aKey > bKey ? 1 : -1;
+        if (outerRowOrderByInternalCol) {
+          // order by 'outerRowOrderByInternalCol' if possible, then by outer row key if necessary
+          for (let i = 0; i < outerRowOrderByInternalCol.length; i++) {
+            const rankA = outerRowsRank[aKey][outerRowOrderByInternalCol[i]];
+            const rankB = outerRowsRank[bKey][outerRowOrderByInternalCol[i]];
+            if (!(rankA === rankB)) {
+              return rankA > rankB ? 1 : -1;
+            }
           }
-          return rankA > rankB ? 1 : -1;
-        }
         return aKey > bKey ? 1 : -1;
+        }
       }) : data).forEach((dataRow, rowIdx) => {
         const rowData = [];
         currRowKey = '';
@@ -228,7 +232,7 @@ function PrintTable({
       }
     }
     return component;
-  }, [sortedColDefs, noRowsText, data, collapseableCols, orderByInternalCol]);
+  }, [sortedColDefs, noRowsText, data, collapseableCols, outerRowOrderByInternalCol, innerRowOrderByInternalCol]);
 
   const tableId = useMemo(() => {
     if (data?.length) {
diff --git a/app/views/ReportView/components/TherapeuticTargets/index.tsx b/app/views/ReportView/components/TherapeuticTargets/index.tsx
index cdbe24d45..092d2e248 100644
--- a/app/views/ReportView/components/TherapeuticTargets/index.tsx
+++ b/app/views/ReportView/components/TherapeuticTargets/index.tsx
@@ -225,7 +225,8 @@ const Therapeutic = ({
           data={therapeuticData}
           columnDefs={columnDefs}
           collapseableCols={['gene', 'variant']}
-          orderByInternalCol={['evidenceLevel', 'therapy']}
+          outerRowOrderByInternalCol={['evidenceLevel']}
+          innerRowOrderByInternalCol={['evidenceLevel', 'therapy']}
         />
         <Typography
           className="therapeutic-print__title"
@@ -238,7 +239,8 @@ const Therapeutic = ({
           data={chemoresistanceData}
           columnDefs={columnDefs}
           collapseableCols={['gene', 'variant']}
-          orderByInternalCol={['evidenceLevel']}
+          outerRowOrderByInternalCol={['evidenceLevel']}
+          innerRowOrderByInternalCol={['evidenceLevel']}
         />
       </div>
     );
@@ -260,7 +262,8 @@ const Therapeutic = ({
           data={therapeuticData}
           columnDefs={columnDefs}
           collapseableCols={['gene', 'variant']}
-          orderByInternalCol={['evidenceLevel', 'therapy']}
+          outerRowOrderByInternalCol={['evidenceLevel']}
+          innerRowOrderByInternalCol={['evidenceLevel', 'therapy']}
         />
         <br />
         <Typography
@@ -276,7 +279,8 @@ const Therapeutic = ({
           data={chemoresistanceData}
           columnDefs={columnDefs}
           collapseableCols={['gene', 'variant']}
-          orderByInternalCol={['evidenceLevel']}
+          outerRowOrderByInternalCol={['evidenceLevel']}
+          innerRowOrderByInternalCol={['evidenceLevel']}
         />
       </div>
     );

From 3dc967c3ff1478c9d3c161456ff3d52b30778ce0 Mon Sep 17 00:00:00 2001
From: Eleanor Lewis <elewis@bcgsc.ca>
Date: Fri, 2 Aug 2024 13:01:24 -0700
Subject: [PATCH 16/21] lint

---
 app/components/PrintTable/index.tsx | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/app/components/PrintTable/index.tsx b/app/components/PrintTable/index.tsx
index 44746940b..8219e617d 100644
--- a/app/components/PrintTable/index.tsx
+++ b/app/components/PrintTable/index.tsx
@@ -103,7 +103,7 @@ function PrintTable({
               }
               acc[rowkey][key].push(row[key]);
             }
-          })
+          });
           return acc;
         }, {});
 
@@ -142,8 +142,9 @@ function PrintTable({
               return rankA > rankB ? 1 : -1;
             }
           }
-        return aKey > bKey ? 1 : -1;
+          return aKey > bKey ? 1 : -1;
         }
+        return 0;
       }) : data).forEach((dataRow, rowIdx) => {
         const rowData = [];
         currRowKey = '';

From b11d64cc06df50807db0056404d76699a2c26e48 Mon Sep 17 00:00:00 2001
From: Eleanor Lewis <elewis@bcgsc.ca>
Date: Tue, 6 Aug 2024 15:45:15 -0700
Subject: [PATCH 17/21] allow setting users for tgr type report

---
 app/views/ReportView/components/Settings/index.tsx | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/app/views/ReportView/components/Settings/index.tsx b/app/views/ReportView/components/Settings/index.tsx
index a0d4e51be..c8690426f 100644
--- a/app/views/ReportView/components/Settings/index.tsx
+++ b/app/views/ReportView/components/Settings/index.tsx
@@ -120,7 +120,7 @@ const Settings = ({
 
   const handleReportUpdate = useCallback(async () => {
     const updateFields: {
-      template? : string;
+      template?: string;
       state?: string;
       reportVersion?: string;
       kbVersion?: string;
@@ -281,7 +281,7 @@ const Settings = ({
           </div>
           <Divider />
           <Analysis />
-          {!isProbe && (
+          {
             <>
               <Divider />
               <div className="settings__user-associations">
@@ -310,7 +310,7 @@ const Settings = ({
                 />
               </div>
             </>
-          )}
+          }
         </>
       )}
     </div>

From bd600fce65b7078dfecaf697c79e89e2687e2c37 Mon Sep 17 00:00:00 2001
From: bnguyen-bcgsc <bnguyen@bcgsc.ca>
Date: Wed, 7 Aug 2024 16:32:45 -0700
Subject: [PATCH 18/21] - Update signature api calls to be in signature card
 instead - Change handleSign() functions in all report summaries to carry
 updated signature prop instead of role - DEVSU-2410

---
 app/components/SignatureCard/index.tsx        | 30 ++++++++++++++-----
 .../components/AnalystComments/index.tsx      | 18 ++---------
 .../PharmacoGenomicSummary/index.tsx          | 12 ++------
 .../components/ProbeSummary/index.tsx         | 21 +++----------
 .../components/RapidSummary/index.tsx         | 21 +++----------
 5 files changed, 35 insertions(+), 67 deletions(-)

diff --git a/app/components/SignatureCard/index.tsx b/app/components/SignatureCard/index.tsx
index aac5b8d7d..8d83e2879 100644
--- a/app/components/SignatureCard/index.tsx
+++ b/app/components/SignatureCard/index.tsx
@@ -1,5 +1,6 @@
 import React, {
   useState, useEffect, useMemo,
+  useCallback,
 } from 'react';
 import {
   Paper,
@@ -27,7 +28,7 @@ const NON_BREAKING_SPACE = '\u00A0';
 export type SignatureCardProps = {
   title: string;
   signatures: SignatureType;
-  onClick: (isSigned: boolean, type: string) => void;
+  onClick: (isSigned: boolean, updatedSignature: SignatureType) => void;
   type: SignatureUserType;
   isPrint?: boolean;
 };
@@ -61,24 +62,39 @@ const SignatureCard = ({
     }
   }, [signatures, type, setRole]);
 
-  const handleSign = async () => {
+  const handleSign = useCallback(async () => {
     try {
       const newReport = await api.post(
         `/reports/${report.ident}/user`,
         { user: userDetails.ident, role },
         {},
       ).request();
+
+      const newSignature = await api.put(
+        `/reports/${report.ident}/signatures/sign/${role}`,
+        {},
+      ).request();
+
       setReport(newReport);
-      onClick(true, type);
+      onClick(true, newSignature);
       snackbar.success('User assigned to report');
     } catch (err) {
       snackbar.error(`Error adding user: ${err}`);
     }
-  };
+  }, [onClick, report.ident, role, setReport, userDetails.ident]);
 
-  const handleRevoke = () => {
-    onClick(false, type);
-  };
+  const handleRevoke = useCallback(async () => {
+    try {
+      const newSignature = await api.put(
+        `/reports/${report.ident}/signatures/revoke/${role}`,
+        {},
+      ).request();
+      onClick(false, newSignature);
+      snackbar.success('User removed from report');
+    } catch (err) {
+      snackbar.error(`Error removing user: ${err}`);
+    }
+  }, [onClick, report.ident, role]);
 
   const renderDate = useMemo(() => {
     if (signatures?.ident) {
diff --git a/app/views/ReportView/components/AnalystComments/index.tsx b/app/views/ReportView/components/AnalystComments/index.tsx
index d2fee9590..69ebd0dc3 100644
--- a/app/views/ReportView/components/AnalystComments/index.tsx
+++ b/app/views/ReportView/components/AnalystComments/index.tsx
@@ -75,23 +75,9 @@ const AnalystComments = ({
     }
   }, [report, setIsLoading, loadedDispatch]);
 
-  const handleSign = useCallback(async (signed: boolean, role: SignatureUserType) => {
-    let newSignature;
-
-    if (signed) {
-      newSignature = await api.put(
-        `/reports/${report.ident}/signatures/sign/${role}`,
-        {},
-      ).request();
-    } else {
-      newSignature = await api.put(
-        `/reports/${report.ident}/signatures/revoke/${role}`,
-        {},
-      ).request();
-    }
-
+  const handleSign = useCallback(async (signed: boolean, updatedSignature: SignatureType) => {
     setIsSigned(signed);
-    setSignatures(newSignature);
+    setSignatures(updatedSignature);
   }, [report, setIsSigned]);
 
   const handleEditorStart = () => {
diff --git a/app/views/ReportView/components/PharmacoGenomicSummary/index.tsx b/app/views/ReportView/components/PharmacoGenomicSummary/index.tsx
index fe879a5ff..f56c3f866 100644
--- a/app/views/ReportView/components/PharmacoGenomicSummary/index.tsx
+++ b/app/views/ReportView/components/PharmacoGenomicSummary/index.tsx
@@ -108,17 +108,9 @@ const PharmacoGenomicSummary = ({
     setTestInfoEdit(false);
   }, []);
 
-  const handleSign = useCallback(async (signed: boolean, role: SignatureUserType) => {
-    let newSignature: SignatureType;
-
-    if (signed) {
-      newSignature = await api.put(`/reports/${report.ident}/signatures/sign/${role}`, {}).request();
-    } else {
-      newSignature = await api.put(`/reports/${report.ident}/signatures/revoke/${role}`, {}).request();
-    }
-
+  const handleSign = useCallback(async (signed: boolean, updatedSignature: SignatureType) => {
     setIsSigned(signed);
-    setSignatures(newSignature);
+    setSignatures(updatedSignature);
   }, [report, setIsSigned]);
 
   const pharmacogenomicSection = useMemo(() => {
diff --git a/app/views/ReportView/components/ProbeSummary/index.tsx b/app/views/ReportView/components/ProbeSummary/index.tsx
index ee42d66ee..632a99de1 100644
--- a/app/views/ReportView/components/ProbeSummary/index.tsx
+++ b/app/views/ReportView/components/ProbeSummary/index.tsx
@@ -109,23 +109,10 @@ const ProbeSummary = ({
     }
   }, [loadedDispatch, report, setIsLoading]);
 
-  const handleSign = useCallback((signed: boolean, role: SignatureUserType) => {
-    let cancelled;
-    const sign = async (s: boolean, r: SignatureUserType) => {
-      let newSignature;
-      if (s) {
-        newSignature = await api.put(`/reports/${report.ident}/signatures/sign/${r}`, {}).request();
-      } else {
-        newSignature = await api.put(`/reports/${report.ident}/signatures/revoke/${r}`, {}).request();
-      }
-      if (!cancelled) {
-        setIsSigned(signed);
-        setSignatures(newSignature);
-      }
-    };
-    sign(signed, role);
-    return function cleanup() { cancelled = true; };
-  }, [report.ident, setIsSigned]);
+  const handleSign = useCallback(async (signed: boolean, updatedSignature: SignatureType) => {
+    setIsSigned(signed);
+    setSignatures(updatedSignature);
+  }, [report, setIsSigned]);
 
   const handleEditStart = useCallback((rowData) => {
     setShowEventsDialog(true);
diff --git a/app/views/ReportView/components/RapidSummary/index.tsx b/app/views/ReportView/components/RapidSummary/index.tsx
index 7f2a599df..dc1772e3c 100644
--- a/app/views/ReportView/components/RapidSummary/index.tsx
+++ b/app/views/ReportView/components/RapidSummary/index.tsx
@@ -351,23 +351,10 @@ const RapidSummary = ({
   }, [microbial, primaryBurden, tmburMutBur, report.m1m2Score, report.sampleInfo, report.tumourContent, tCellCd8?.percentile, tCellCd8?.score, report.captiv8Score,
     tCellCd8?.percentileHidden, tCellCd8, tCellCd8?.pedsScoreComment, tmburMutBur?.adjustedTmb, tmburMutBur?.tmbHidden, tCellCd8?.pedsScore, tCellCd8?.pedsPercentile]);
 
-  const handleSign = useCallback((signed: boolean, role: SignatureUserType) => {
-    let cancelled;
-    const sign = async (s: boolean, r: SignatureUserType) => {
-      let newSignature;
-      if (s) {
-        newSignature = await api.put(`/reports/${report.ident}/signatures/sign/${r}`, {}).request();
-      } else {
-        newSignature = await api.put(`/reports/${report.ident}/signatures/revoke/${r}`, {}).request();
-      }
-      if (!cancelled) {
-        setIsSigned(signed);
-        setSignatures(newSignature);
-      }
-    };
-    sign(signed, role);
-    return function cleanup() { cancelled = true; };
-  }, [report.ident, setIsSigned]);
+    const handleSign = useCallback(async (signed: boolean, updatedSignature: SignatureType) => {
+      setIsSigned(signed);
+      setSignatures(updatedSignature);
+    }, [report, setIsSigned]);
 
   const handleMatchedTumourEditStart = useCallback((rowData) => {
     setShowMatchedTumourEditDialog(true);

From b3e3cd7008fb2a524018db3f00ec2964d74b5be4 Mon Sep 17 00:00:00 2001
From: Jacky Li <jinglun.li@alumni.ubc.ca>
Date: Thu, 8 Aug 2024 12:56:58 -0700
Subject: [PATCH 19/21] feat: add error handler for 409 status, update summary
 callback dependencies DEVSU-2410

---
 app/services/errors/errorHandler.js                       | 4 ++++
 app/services/errors/errors.js                             | 7 +++++++
 .../components/PharmacoGenomicSummary/index.tsx           | 2 +-
 app/views/ReportView/components/ProbeSummary/index.tsx    | 2 +-
 app/views/ReportView/components/RapidSummary/index.tsx    | 8 ++++----
 5 files changed, 17 insertions(+), 6 deletions(-)

diff --git a/app/services/errors/errorHandler.js b/app/services/errors/errorHandler.js
index 3590f8372..bfd74f57c 100644
--- a/app/services/errors/errorHandler.js
+++ b/app/services/errors/errorHandler.js
@@ -3,6 +3,7 @@ import {
   AuthorizationError,
   BadRequestError,
   APIConnectionFailureError,
+  RecordConflictError,
 } from './errors';
 
 const errorHandler = async (response) => {
@@ -26,6 +27,9 @@ const errorHandler = async (response) => {
   if (status === 404) {
     throw new APIConnectionFailureError(error);
   }
+  if (status === 409) {
+    throw new RecordConflictError(error);
+  }
   throw new Error(`Unexpected Error [${status}]: ${statusText}`);
 };
 
diff --git a/app/services/errors/errors.js b/app/services/errors/errors.js
index edb78a158..ed28a746b 100644
--- a/app/services/errors/errors.js
+++ b/app/services/errors/errors.js
@@ -62,6 +62,12 @@ class APIConnectionFailureError extends ErrorMixin {
     this.name = 'APIConnectionFailureError';
   }
 }
+class RecordConflictError extends ErrorMixin {
+  constructor(content) {
+    super(content);
+    this.name = 'RecordConflictError';
+  }
+}
 
 export {
   AbortError,
@@ -69,4 +75,5 @@ export {
   AuthorizationError,
   BadRequestError,
   APIConnectionFailureError,
+  RecordConflictError,
 };
diff --git a/app/views/ReportView/components/PharmacoGenomicSummary/index.tsx b/app/views/ReportView/components/PharmacoGenomicSummary/index.tsx
index f56c3f866..04db02160 100644
--- a/app/views/ReportView/components/PharmacoGenomicSummary/index.tsx
+++ b/app/views/ReportView/components/PharmacoGenomicSummary/index.tsx
@@ -111,7 +111,7 @@ const PharmacoGenomicSummary = ({
   const handleSign = useCallback(async (signed: boolean, updatedSignature: SignatureType) => {
     setIsSigned(signed);
     setSignatures(updatedSignature);
-  }, [report, setIsSigned]);
+  }, [setIsSigned]);
 
   const pharmacogenomicSection = useMemo(() => {
     let component = (
diff --git a/app/views/ReportView/components/ProbeSummary/index.tsx b/app/views/ReportView/components/ProbeSummary/index.tsx
index 632a99de1..18a37bb5d 100644
--- a/app/views/ReportView/components/ProbeSummary/index.tsx
+++ b/app/views/ReportView/components/ProbeSummary/index.tsx
@@ -112,7 +112,7 @@ const ProbeSummary = ({
   const handleSign = useCallback(async (signed: boolean, updatedSignature: SignatureType) => {
     setIsSigned(signed);
     setSignatures(updatedSignature);
-  }, [report, setIsSigned]);
+  }, [setIsSigned]);
 
   const handleEditStart = useCallback((rowData) => {
     setShowEventsDialog(true);
diff --git a/app/views/ReportView/components/RapidSummary/index.tsx b/app/views/ReportView/components/RapidSummary/index.tsx
index dc1772e3c..80a2fd9d6 100644
--- a/app/views/ReportView/components/RapidSummary/index.tsx
+++ b/app/views/ReportView/components/RapidSummary/index.tsx
@@ -351,10 +351,10 @@ const RapidSummary = ({
   }, [microbial, primaryBurden, tmburMutBur, report.m1m2Score, report.sampleInfo, report.tumourContent, tCellCd8?.percentile, tCellCd8?.score, report.captiv8Score,
     tCellCd8?.percentileHidden, tCellCd8, tCellCd8?.pedsScoreComment, tmburMutBur?.adjustedTmb, tmburMutBur?.tmbHidden, tCellCd8?.pedsScore, tCellCd8?.pedsPercentile]);
 
-    const handleSign = useCallback(async (signed: boolean, updatedSignature: SignatureType) => {
-      setIsSigned(signed);
-      setSignatures(updatedSignature);
-    }, [report, setIsSigned]);
+  const handleSign = useCallback(async (signed: boolean, updatedSignature: SignatureType) => {
+    setIsSigned(signed);
+    setSignatures(updatedSignature);
+  }, [setIsSigned]);
 
   const handleMatchedTumourEditStart = useCallback((rowData) => {
     setShowMatchedTumourEditDialog(true);

From dc435ed815347ccdbaa850d36f02590d753adeb0 Mon Sep 17 00:00:00 2001
From: Jacky Li <jinglun.li@alumni.ubc.ca>
Date: Thu, 8 Aug 2024 12:59:05 -0700
Subject: [PATCH 20/21] bugfix: add guard when user assigned to report already,
 forced role as analyst DEVSU-2410

---
 app/components/SignatureCard/index.tsx | 22 ++++++++++++++++++----
 1 file changed, 18 insertions(+), 4 deletions(-)

diff --git a/app/components/SignatureCard/index.tsx b/app/components/SignatureCard/index.tsx
index 8d83e2879..df8cb9b46 100644
--- a/app/components/SignatureCard/index.tsx
+++ b/app/components/SignatureCard/index.tsx
@@ -51,7 +51,7 @@ const SignatureCard = ({
     if (signatures && type) {
       if (type === 'author') {
         setUserSignature(signatures.authorSignature);
-        setRole('analyst');
+        setRole('author');
       } else if (type === 'reviewer') {
         setUserSignature(signatures.reviewerSignature);
         setRole('reviewer');
@@ -63,19 +63,33 @@ const SignatureCard = ({
   }, [signatures, type, setRole]);
 
   const handleSign = useCallback(async () => {
+    let newReport = null;
+
+    // Assign user
     try {
-      const newReport = await api.post(
+      newReport = await api.post(
         `/reports/${report.ident}/user`,
-        { user: userDetails.ident, role },
+        // Hardcode analyst role here because report does not accept 'author'
+        { user: userDetails.ident, role: 'analyst' },
         {},
       ).request();
+    } catch (e) {
+      // If user already assigned, silent fail this add
+      if (e.content?.status !== 409) {
+        snackbar.error('Error assigning user to report: ', e.message);
+      }
+    }
 
+    // Do signature
+    try {
       const newSignature = await api.put(
         `/reports/${report.ident}/signatures/sign/${role}`,
         {},
       ).request();
 
-      setReport(newReport);
+      if (newReport) {
+        setReport(newReport);
+      }
       onClick(true, newSignature);
       snackbar.success('User assigned to report');
     } catch (err) {

From 5194ecbf78d9798bf6c28c409bc06bacc0a90992 Mon Sep 17 00:00:00 2001
From: Jacky Li <jinglun.li@alumni.ubc.ca>
Date: Thu, 8 Aug 2024 14:50:14 -0700
Subject: [PATCH 21/21] 6.31.0

---
 package-lock.json | 4 ++--
 package.json      | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 8723957c4..bccb28a1c 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "ipr-client",
-  "version": "6.30.0",
+  "version": "6.31.0",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
     "": {
       "name": "ipr-client",
-      "version": "6.30.0",
+      "version": "6.31.0",
       "license": "GPL-3.0",
       "dependencies": {
         "@ag-grid-community/client-side-row-model": "~25.3.0",
diff --git a/package.json b/package.json
index 6f51794d9..e1c323164 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "private": true,
   "name": "ipr-client",
-  "version": "6.30.0",
+  "version": "6.31.0",
   "keywords": [],
   "license": "GPL-3.0",
   "sideEffects": false,