Handle PHI search

mskcc · Nov 1, 2024 · 253c2bb · 253c2bb
1 parent 52213a6
commit 253c2bb
Show file tree

Hide file tree

Showing 10 changed files with 116 additions and 161 deletions.
diff --git a/frontend/src/components/NewRecordsList.tsx b/frontend/src/components/NewRecordsList.tsx
@@ -13,21 +13,16 @@ import styles from "./records.module.scss";
 import "ag-grid-community/styles/ag-grid.css";
 import "ag-grid-community/styles/ag-theme-alpine.css";
 import "ag-grid-enterprise";
-import {
-  ColDef,
-  IServerSideGetRowsParams,
-  IServerSideGetRowsRequest,
-} from "ag-grid-community";
+import { ColDef, IServerSideGetRowsParams } from "ag-grid-community";
 import { DataName, useHookLazyGeneric } from "../shared/types";
 import SamplesList, { SampleContext } from "./SamplesList";
 import {
   DashboardRecordFilter,
   DashboardRecordSort,
+  PatientIdsTriplet,
   QueryDashboardPatientsArgs,
-  SortDirection,
 } from "../generated/graphql";
 import { defaultColDef } from "../shared/helpers";
-import { PatientIdsTriplet } from "../pages/patients/PatientsPage";
 import { ErrorMessage, Toolbar } from "../shared/tableElements";
 import { AgGridReact as AgGridReactType } from "ag-grid-react/lib/agGridReact";
 import { BreadCrumb } from "../shared/components/BreadCrumb";
@@ -42,29 +37,19 @@ interface INewRecordsListProps {
   dataName: DataName;
   enableInfiniteScroll?: boolean;
   lazyRecordsQuery: typeof useHookLazyGeneric;
-  lazyRecordsQueryAddlVariables?: Record<string, any>;
-  prepareDataForAgGrid?: (
-    data: any,
-    filterModel: IServerSideGetRowsRequest["filterModel"],
-    sortModel?: { [key: string]: SortDirection }[] | undefined
-  ) => any;
-  queryFilterWhereVariables: (
-    parsedSearchVals: string[]
-  ) => Record<string, any>[];
   defaultSort: DashboardRecordSort;
   userSearchVal: string;
   setUserSearchVal: Dispatch<SetStateAction<string>>;
-  parsedSearchVals: string[];
-  setParsedSearchVals: Dispatch<SetStateAction<string[]>>;
-  handleSearch: () => void;
+  customSearchStates?: PatientIdsTriplet[];
+  setCustomSearchStates?: Dispatch<SetStateAction<PatientIdsTriplet[]>>;
+  searchInterceptor?: (userSearchVal: string) => Promise<string[]>;
   showDownloadModal: boolean;
   setShowDownloadModal: Dispatch<SetStateAction<boolean>>;
   handleDownload: (recordCount: number) => void;
   samplesColDefs: ColDef[];
   sampleContext?: SampleContext;
   userEmail?: string | null;
   setUserEmail?: Dispatch<SetStateAction<string | null>>;
-  setCustomSearchVals?: Dispatch<SetStateAction<PatientIdsTriplet[]>>;
   customToolbarUI?: JSX.Element;
 }
 
@@ -76,9 +61,9 @@ export default function NewRecordsList({
   defaultSort,
   userSearchVal,
   setUserSearchVal,
-  parsedSearchVals,
-  setParsedSearchVals,
-  handleSearch,
+  customSearchStates,
+  setCustomSearchStates,
+  searchInterceptor,
   showDownloadModal,
   setShowDownloadModal,
   handleDownload,
@@ -87,7 +72,6 @@ export default function NewRecordsList({
   userEmail,
   setUserEmail,
   customToolbarUI,
-  setCustomSearchVals,
 }: INewRecordsListProps) {
   const [showClosingWarning, setShowClosingWarning] = useState(false);
   const [unsavedChanges, setUnsavedChanges] = useState(false);
@@ -114,7 +98,7 @@ export default function NewRecordsList({
   const recordCount = data?.[recordCountQueryName]?.totalCount;
 
   const getServerSideDatasource = useCallback(
-    ({ userSearchVal }) => {
+    ({ searchVals }) => {
       return {
         getRows: async (params: IServerSideGetRowsParams) => {
           let filter: DashboardRecordFilter | undefined;
@@ -129,7 +113,7 @@ export default function NewRecordsList({
           }
 
           const fetchInput = {
-            searchVals: parseUserSearchVal(userSearchVal),
+            searchVals,
             sort: params.request.sortModel[0] || defaultSort,
             filter,
             offset: params.request.startRow ?? -1,
@@ -160,11 +144,15 @@ export default function NewRecordsList({
     [defaultSort, refetch, fetchMore, recordsQueryName, recordCountQueryName]
   );
 
-  function refreshData(userSearchVal: string) {
-    const newDatasource = getServerSideDatasource({
-      userSearchVal,
-      sampleContext,
-    });
+  async function refreshData(userSearchVal: string) {
+    const extraSearchVals = searchInterceptor
+      ? await searchInterceptor(userSearchVal)
+      : [];
+    const searchVals = [
+      ...parseUserSearchVal(userSearchVal),
+      ...extraSearchVals,
+    ];
+    const newDatasource = getServerSideDatasource({ searchVals });
     gridRef.current?.api.setServerSideDatasource(newDatasource); // triggers a refresh
   }
 
@@ -268,11 +256,12 @@ export default function NewRecordsList({
         dataName={dataName}
         userSearchVal={userSearchVal}
         setUserSearchVal={setUserSearchVal}
-        refreshData={(userSearchVal) => refreshData(userSearchVal)}
+        setCustomSearchStates={setCustomSearchStates}
+        onSearch={async (userSearchVal) => refreshData(userSearchVal)}
         matchingResultsCount={`${
           recordCount !== undefined ? recordCount.toLocaleString() : "Loading"
         } matching ${dataName}`}
-        handleDownload={() => handleDownload(recordCount)}
+        onDownload={() => handleDownload(recordCount)}
         customUIRight={customToolbarUI}
       />
 

diff --git a/frontend/src/components/RecordsList.tsx b/frontend/src/components/RecordsList.tsx
@@ -18,9 +18,8 @@ import {
 } from "ag-grid-community";
 import { DataName, useHookLazyGeneric } from "../shared/types";
 import SamplesList, { SampleContext } from "./SamplesList";
-import { SortDirection } from "../generated/graphql";
+import { PatientIdsTriplet, SortDirection } from "../generated/graphql";
 import { defaultColDef } from "../shared/helpers";
-import { PatientIdsTriplet } from "../pages/patients/PatientsPage";
 import {
   ErrorMessage,
   LoadingSpinner,

diff --git a/frontend/src/components/SamplesList.tsx b/frontend/src/components/SamplesList.tsx
@@ -353,11 +353,11 @@ export default function SamplesList({
         dataName={"samples"}
         userSearchVal={userSearchVal}
         setUserSearchVal={setUserSearchVal}
-        refreshData={(userSearchVal) => refreshData(userSearchVal)}
+        onSearch={(userSearchVal) => refreshData(userSearchVal)}
         matchingResultsCount={`${
           sampleCount !== undefined ? sampleCount.toLocaleString() : "Loading"
         } matching samples`}
-        handleDownload={() => {
+        onDownload={() => {
           if (sampleCount && sampleCount > MAX_ROWS_EXPORT) {
             setAlertContent(MAX_ROWS_EXPORT_EXCEED_ALERT);
           } else {

diff --git a/frontend/src/generated/graphql.ts b/frontend/src/generated/graphql.ts
@@ -3209,9 +3209,9 @@ export type PatientHasSampleSamplesUpdateFieldInput = {
 
 export type PatientIdsTriplet = {
   __typename?: "PatientIdsTriplet";
-  CMO_ID?: Maybe<Scalars["String"]>;
+  CMO_ID: Scalars["String"];
   DMP_ID?: Maybe<Scalars["String"]>;
-  PT_MRN?: Maybe<Scalars["String"]>;
+  PT_MRN: Scalars["String"];
 };
 
 export type PatientOptions = {
@@ -12724,9 +12724,9 @@ export type GetPatientIdsTripletsQuery = {
   __typename?: "Query";
   patientIdsTriplets?: Array<{
     __typename?: "PatientIdsTriplet";
-    CMO_ID?: string | null;
+    CMO_ID: string;
     DMP_ID?: string | null;
-    PT_MRN?: string | null;
+    PT_MRN: string;
   } | null> | null;
 };