Merge branch 'develop' into dependabot-npm_and_yarn-apps-backend-multi-c66b7f6fbe

Author: Scott-James-Hurley

apps/frontend/src/components/fap/Proposals/ProposalsView/FapProposalsAndAssignmentsTable.tsx

@@ -35,6 +35,7 @@ import {
   standardDeviation,
 } from 'utils/mathFunctions';
 import useDataApiWithFeedback from 'utils/useDataApiWithFeedback';
+import { getFullUserName } from 'utils/user';
 import withConfirm, { WithConfirmType } from 'utils/withConfirm';
 
 type FapProposalsAndAssignmentsTableProps = {
@@ -82,6 +83,18 @@ const FapProposalColumns: Column<FapProposalType>[] = [
     title: 'Title',
     field: 'proposal.title',
   },
+  {
+    title: 'Principal Investigator',
+    render: (rowData) => {
+      return getFullUserName(rowData.proposal.proposer);
+    },
+    customSort(a, b) {
+      const name1 = getFullUserName(a.proposal.proposer);
+      const name2 = getFullUserName(b.proposal.proposer);
+
+      return name1 < name2 ? -1 : 1;
+    },
+  },
   {
     title: 'Status',
     field: 'proposal.status.name',
@@ -93,6 +106,8 @@ const FapProposalColumns: Column<FapProposalType>[] = [
   {
     title: 'Reviewers',
     render: (data) => data.assignments?.length,
+    customSort: (a, b) =>
+      (a.assignments?.length || 0) - (b.assignments?.length || 0),
   },
   {
     title: 'Reviews',
@@ -106,6 +121,29 @@ const FapProposalColumns: Column<FapProposalType>[] = [
 
       return totalReviews === 0 ? '-' : `${countReviews} / ${totalReviews}`;
     },
+    customSort: (a, b) => {
+      const totalReviewsA = a.assignments?.length || 0;
+      const totalReviewsB = b.assignments?.length || 0;
+      const gradedProposalsA =
+        a.assignments?.filter(
+          (assignment) =>
+            assignment.review !== null && assignment.review.grade !== null
+        ).length || 0;
+      const gradedProposalsB =
+        b.assignments?.filter(
+          (assignment) =>
+            assignment.review !== null && assignment.review.grade !== null
+        ).length || 0;
+
+      const incompleteReviewsA = totalReviewsA - gradedProposalsA;
+      const incompleteReviewsB = totalReviewsB - gradedProposalsB;
+
+      if (incompleteReviewsA === incompleteReviewsB) {
+        return totalReviewsB - totalReviewsA;
+      }
+
+      return incompleteReviewsA - incompleteReviewsB;
+    },
   },
   {
     title: 'Average grade',
@@ -459,6 +497,7 @@ const FapProposalsAndAssignmentsTable = ({
           ]}
           actions={tableActions}
           options={{
+            columnsButton: true,
             search: true,
             selection: true,
             pageSize: pageSize ? +pageSize : Math.min(10, maxPageLength),

apps/frontend/src/graphql/fap/getFapProposals.graphql

@@ -11,6 +11,9 @@ query getFapProposals($fapId: Int!, $callId: Int, $instrumentId: Int, $legacy: B
       proposalId
       proposer {
         id
+        firstname
+        lastname
+        preferredname
         institutionId
       }
       status {