Merge branch '354-generic-resource-list' into update-app-layout

beda-software · Dec 6, 2024 · 27d933b · 27d933b
2 parents 86dc77c + 73fc700
commit 27d933b
Show file tree

Hide file tree

Showing 4 changed files with 37 additions and 32 deletions.
diff --git a/src/components/SearchBar/types.ts b/src/components/SearchBar/types.ts
@@ -17,48 +17,48 @@ export enum SearchBarColumnType {
 export interface SearchBarProps {
     columns: SearchBarColumn[];
 }
-export type SearchBarStringColumn = {
+
+type SearchBarColumnBase = {
     id: string;
+    searchParam?: string;
+};
+
+export type SearchBarStringColumn = SearchBarColumnBase & {
     type: SearchBarColumnType.STRING;
     placeholder: string;
 };
-export type SearchBarDateColumn = {
-    id: string;
+export type SearchBarDateColumn = SearchBarColumnBase & {
     type: SearchBarColumnType.DATE;
     placeholder: [string, string];
 };
-export type SearchBarSingleDateColumn = {
-    id: string;
+export type SearchBarSingleDateColumn = SearchBarColumnBase & {
     type: SearchBarColumnType.SINGLEDATE;
     placeholder: string;
     defaultValue?: moment.Moment;
 };
-export type SearchBarReferenceColumn = {
-    id: string;
+export type SearchBarReferenceColumn = SearchBarColumnBase & {
     type: SearchBarColumnType.REFERENCE;
     expression: Expression['expression'];
     path: QuestionnaireItemChoiceColumn['path'];
     placeholder: string;
 };
-export type SearchBarChoiceColumn = {
-    id: string;
+export type SearchBarChoiceColumn = SearchBarColumnBase & {
     type: SearchBarColumnType.CHOICE;
     repeats?: boolean;
     placeholder: string;
     defaultValue?: ValueSetOption;
 } & (
-    | {
-          options: ValueSetOption[];
-          valueSet?: never;
-      }
-    | {
-          options?: never;
-          valueSet: ValueSet['id'];
-      }
-);
+        | {
+              options: ValueSetOption[];
+              valueSet?: never;
+          }
+        | {
+              options?: never;
+              valueSet: ValueSet['id'];
+          }
+    );
 
-export type SearchBarSolidChoiceColumn = {
-    id: string;
+export type SearchBarSolidChoiceColumn = SearchBarColumnBase & {
     type: SearchBarColumnType.SOLIDCHOICE;
     repeats?: boolean;
     placeholder: string;

diff --git a/src/containers/PatientResourceListExample/index.tsx b/src/containers/PatientResourceListExample/index.tsx
@@ -36,7 +36,7 @@ export function PatientResourceListExample() {
             headerTitle={t`Patients`}
             resourceType="Patient"
             searchParams={searchParams}
-            tableColumns={[
+            getTableColumns={() => [
                 {
                     title: <Trans>Name</Trans>,
                     dataIndex: 'name',
@@ -59,9 +59,10 @@ export function PatientResourceListExample() {
                     width: '25%',
                 },
             ]}
-            searchBarColumns={[
+            getFilters={() => [
                 {
                     id: 'name',
+                    searchParam: 'name',
                     type: SearchBarColumnType.STRING,
                     placeholder: t`Find patient`,
                 },

diff --git a/src/uberComponents/ResourceListPage/hooks.ts b/src/uberComponents/ResourceListPage/hooks.ts
@@ -23,7 +23,7 @@ export function useResourceListPage<R extends Resource>(
     const searchBarSearchParams = {
         ...Object.fromEntries(
             debouncedFilterValues.map((filterValue) => [
-                filterValue.column.id,
+                filterValue.column.searchParam ?? filterValue.column.id,
                 getSearchBarColumnFilterValue(filterValue),
             ]),
         ),

diff --git a/src/uberComponents/ResourceListPage/index.tsx b/src/uberComponents/ResourceListPage/index.tsx
@@ -32,7 +32,7 @@ import { SearchBarColumn } from '../../components/SearchBar/types';
 
 type RecordType<R extends Resource> = { resource: R; bundle: Bundle };
 
-interface ActionManager {
+interface TableManager {
     reload: () => void;
 }
 
@@ -57,19 +57,19 @@ interface ResourceListPageProps<R extends Resource> {
     /* Default search params */
     searchParams?: SearchParams;
 
-    /* Search bar columns that displayed before the table */
-    searchBarColumns?: SearchBarColumn[];
+    /* Filter that are displayed in the search bar and inside table columns */
+    getFilters?: () => SearchBarColumn[];
 
     /* Table columns without action column - action column is generated based on `getRecordActions` */
-    tableColumns: ColumnsType<RecordType<R>>;
+    getTableColumns: (manager: TableManager) => ColumnsType<RecordType<R>>;
 
     /**
      * Record actions list that is displayed in the table per record
      * (for example, edit organization)
      */
     getRecordActions?: (
         record: RecordType<R>,
-        manager: ActionManager,
+        manager: TableManager,
     ) => Array<QuestionnaireActionType | NavigationActionType | CustomActionType>;
 
     /**
@@ -102,10 +102,14 @@ export function ResourceListPage<R extends Resource>({
     getRecordActions,
     getHeaderActions,
     getBatchActions,
-    searchBarColumns,
-    tableColumns,
+    getFilters,
+    getTableColumns,
     defaultLaunchContext,
 }: ResourceListPageProps<R>) {
+    const allFilters = getFilters?.() ?? [];
+    // TODO: filter out column filters
+    const searchBarColumns = allFilters;
+
     const { columnsFilterValues, onChangeColumnFilter, onResetFilters } = useSearchBar({
         columns: searchBarColumns ?? [],
     });
@@ -200,7 +204,7 @@ export function ResourceListPage<R extends Resource>({
                 rowKey={(p) => p.resource.id!}
                 dataSource={isSuccess(recordResponse) ? recordResponse.data : []}
                 columns={[
-                    ...tableColumns,
+                    ...getTableColumns({ reload }),
                     ...(getRecordActions
                         ? [
                               getRecordActionsColumn({
@@ -224,7 +228,7 @@ function getRecordActionsColumn<R extends Resource>({
 }: {
     getRecordActions: (
         record: RecordType<R>,
-        manager: ActionManager,
+        manager: TableManager,
     ) => Array<QuestionnaireActionType | NavigationActionType | CustomActionType>;
     defaultLaunchContext?: ParametersParameter[];
     reload: () => void;