Show billing-related fields on the Cohort and Cohort Sample views (#117)

* Add billing field placeholders and correct typo in cohort sample coldef name * Rename Delivery Date for clarity and hide Complete Date field * Remove hour and minute marks from cohort-related dates * Regenerate GraphQl types for billing fields and display samples billing data * Make cohort samples' Billed field an editable dropdown * Set cohorts' Billed field to display value dynamically * Make cohort sample fields editable and all sample fields read-only by default * Add a status field to the Cohort Sample popup view * Rename cohort delivery date field to Initial Cohort Delivery Date * Support searching for select cohort sample billing fields * Remove the Status field from the Cohort Samples view
mskcc · Apr 4, 2024 · 749416e · 749416e
1 parent ba77d40
commit 749416e
Show file tree

Hide file tree

Showing 11 changed files with 34,033 additions and 27,432 deletions.
diff --git a/frontend/src/components/RecordsList.tsx b/frontend/src/components/RecordsList.tsx
@@ -14,7 +14,7 @@ import { ColDef, IServerSideGetRowsParams } from "ag-grid-community";
 import { DataName, useHookLazyGeneric } from "../shared/types";
 import SamplesList from "./SamplesList";
 import { Sample, SampleWhere } from "../generated/graphql";
-import { defaultReadOnlyColDef } from "../shared/helpers";
+import { defaultColDef } from "../shared/helpers";
 import { PatientIdsTriplet } from "../pages/patients/PatientsPage";
 import { ErrorMessage, LoadingSpinner, Toolbar } from "../shared/tableElements";
 
@@ -36,7 +36,6 @@ interface IRecordsListProps {
   setShowDownloadModal: Dispatch<SetStateAction<boolean>>;
   handleDownload: () => void;
   samplesQueryParam: string | undefined;
-  samplesDefaultColDef: ColDef;
   getSamplesRowData: (samples: Sample[]) => any[];
   samplesColDefs: ColDef[];
   samplesParentWhereVariables: SampleWhere;
@@ -63,7 +62,6 @@ export default function RecordsList({
   setShowDownloadModal,
   handleDownload,
   samplesQueryParam,
-  samplesDefaultColDef,
   getSamplesRowData,
   samplesColDefs,
   samplesParentWhereVariables,
@@ -214,7 +212,6 @@ export default function RecordsList({
                 <div className={styles.popupHeight}>
                   <SamplesList
                     columnDefs={samplesColDefs}
-                    defaultColDef={samplesDefaultColDef}
                     getRowData={getSamplesRowData}
                     parentWhereVariables={samplesParentWhereVariables}
                     refetchWhereVariables={samplesRefetchWhereVariables}
@@ -260,7 +257,7 @@ export default function RecordsList({
               context={{
                 navigateFunction: navigate,
               }}
-              defaultColDef={defaultReadOnlyColDef}
+              defaultColDef={defaultColDef}
               onGridReady={(params) => {
                 params.api.sizeColumnsToFit();
               }}

diff --git a/frontend/src/components/SamplesList.tsx b/frontend/src/components/SamplesList.tsx
@@ -14,6 +14,7 @@ import { CSVFormulate } from "../utils/CSVExport";
 import {
   SampleChange,
   SampleMetadataExtended,
+  defaultColDef,
   handleSearch,
 } from "../shared/helpers";
 import { AgGridReact } from "ag-grid-react";
@@ -30,7 +31,6 @@ const max_rows = 500;
 
 interface ISampleListProps {
   columnDefs: ColDef[];
-  defaultColDef: ColDef;
   getRowData: (samples: Sample[]) => any[];
   setUnsavedChanges?: (unsavedChanges: boolean) => void;
   parentWhereVariables?: SampleWhere;
@@ -40,7 +40,6 @@ interface ISampleListProps {
 
 export default function SamplesList({
   columnDefs,
-  defaultColDef,
   getRowData,
   parentWhereVariables,
   refetchWhereVariables,

diff --git a/frontend/src/generated/graphql.ts b/frontend/src/generated/graphql.ts
diff --git a/frontend/src/pages/cohorts/CohortsPage.tsx b/frontend/src/pages/cohorts/CohortsPage.tsx
@@ -7,10 +7,9 @@ import {
 } from "../../generated/graphql";
 import { useState } from "react";
 import {
-  CohortSamplesDetailsColumns,
+  CohortSampleDetailsColumns,
   CohortsListColumns,
   cohortSampleFilterWhereVariables,
-  defaultReadOnlyColDef,
   getSampleCohortDataFromSamplesQuery,
   handleSearch,
 } from "../../shared/helpers";
@@ -135,8 +134,7 @@ export default function CohortsPage() {
         showDownloadModal={showDownloadModal}
         setShowDownloadModal={setShowDownloadModal}
         handleDownload={() => setShowDownloadModal(true)}
-        samplesColDefs={CohortSamplesDetailsColumns}
-        samplesDefaultColDef={defaultReadOnlyColDef}
+        samplesColDefs={CohortSampleDetailsColumns}
         samplesQueryParam={
           sampleQueryParamValue &&
           `${sampleQueryParamHeaderName} "${sampleQueryParamValue}"`

diff --git a/frontend/src/pages/patients/PatientsPage.tsx b/frontend/src/pages/patients/PatientsPage.tsx
@@ -17,7 +17,6 @@ import { REACT_APP_EXPRESS_SERVER_ORIGIN } from "../../shared/constants";
 import {
   PatientsListColumns,
   SampleDetailsColumns,
-  defaultEditableColDef,
   getSampleMetadataFromSamplesQuery,
   sampleFilterWhereVariables,
 } from "../../shared/helpers";
@@ -287,7 +286,6 @@ export default function PatientsPage({
           setShowDownloadModal(true);
         }}
         samplesColDefs={SampleDetailsColumns}
-        samplesDefaultColDef={defaultEditableColDef}
         samplesQueryParam={
           sampleQueryParamValue &&
           `${sampleQueryParamHeaderName} ${sampleQueryParamValue}`

diff --git a/frontend/src/pages/requests/RequestsPage.tsx b/frontend/src/pages/requests/RequestsPage.tsx
@@ -7,7 +7,6 @@ import { useState } from "react";
 import {
   RequestsListColumns,
   SampleDetailsColumns,
-  defaultEditableColDef,
   getSampleMetadataFromSamplesQuery,
   handleSearch,
   sampleFilterWhereVariables,
@@ -85,7 +84,6 @@ export default function RequestsPage() {
         setShowDownloadModal={setShowDownloadModal}
         handleDownload={() => setShowDownloadModal(true)}
         samplesColDefs={SampleDetailsColumns}
-        samplesDefaultColDef={defaultEditableColDef}
         samplesQueryParam={
           sampleQueryParamValue &&
           `${sampleQueryParamHeaderName} ${sampleQueryParamValue}`

diff --git a/frontend/src/pages/samples/SamplesPage.tsx b/frontend/src/pages/samples/SamplesPage.tsx
@@ -2,7 +2,6 @@ import { PageHeader } from "../../shared/components/PageHeader";
 import SamplesList from "../../components/SamplesList";
 import {
   SampleDetailsColumns,
-  defaultEditableColDef,
   getSampleMetadataFromSamplesQuery,
   sampleFilterWhereVariables,
 } from "../../shared/helpers";
@@ -15,7 +14,6 @@ export default function SamplesPage() {
 
       <SamplesList
         columnDefs={SampleDetailsColumns}
-        defaultColDef={defaultEditableColDef}
         getRowData={getSampleMetadataFromSamplesQuery}
         refetchWhereVariables={(parsedSearchVals) => {
           return {