From 3a6d8eae8ed0c2b768b849724fef41b7efbde190 Mon Sep 17 00:00:00 2001
From: Aleksy Nowicki <aleksandar.pesic@xenit.eu>
Date: Tue, 17 Sep 2024 21:11:19 +0200
Subject: [PATCH] bugfix: Improve Encounter List for Practitioner

---
 src/components/SearchBar/index.tsx     | 21 ++++++++++++---------
 src/components/SearchBar/types.ts      |  1 +
 src/containers/EncounterList/index.tsx | 11 +++++++++++
 3 files changed, 24 insertions(+), 9 deletions(-)

diff --git a/src/components/SearchBar/index.tsx b/src/components/SearchBar/index.tsx
index d05ed73d..a7ea04b9 100644
--- a/src/components/SearchBar/index.tsx
+++ b/src/components/SearchBar/index.tsx
@@ -6,18 +6,21 @@ import { SearchBarColumn } from './SearchBarColumn';
 import { SearchBarData } from './types';
 
 export function SearchBar(props: SearchBarData) {
-    const { columnsFilterValues, onChangeColumnFilter, onResetFilters } = props;
-
+    const { columnsFilterValues, onChangeColumnFilter, onResetFilters, hideFilters = [] } = props;
     return (
         <S.Container>
             <Row gutter={[32, 16]}>
-                {columnsFilterValues.map((columnFilterValue) => (
-                    <SearchBarColumn
-                        key={`search-bar-column-${columnFilterValue.column.id}`}
-                        columnFilterValue={columnFilterValue}
-                        onChange={onChangeColumnFilter}
-                    />
-                ))}
+                {columnsFilterValues.map((columnFilterValue) => {
+                    if (!hideFilters.includes(columnFilterValue.column.id)) {
+                        return (
+                            <SearchBarColumn
+                                key={`search-bar-column-${columnFilterValue.column.id}`}
+                                columnFilterValue={columnFilterValue}
+                                onChange={onChangeColumnFilter}
+                            />
+                        );
+                    }
+                })}
             </Row>
 
             <Button onClick={onResetFilters}>
diff --git a/src/components/SearchBar/types.ts b/src/components/SearchBar/types.ts
index 51c65868..a1dcf0a4 100644
--- a/src/components/SearchBar/types.ts
+++ b/src/components/SearchBar/types.ts
@@ -107,4 +107,5 @@ export interface SearchBarData {
     columnsFilterValues: ColumnFilterValue[];
     onChangeColumnFilter: (value: ColumnFilterValue['value'], key: string) => void;
     onResetFilters: () => void;
+    hideFilters?: string[];
 }
diff --git a/src/containers/EncounterList/index.tsx b/src/containers/EncounterList/index.tsx
index 8bf32ce2..116b7cd0 100644
--- a/src/containers/EncounterList/index.tsx
+++ b/src/containers/EncounterList/index.tsx
@@ -1,5 +1,7 @@
 import { Trans } from '@lingui/macro';
 import { Col, Row } from 'antd';
+import moment from 'moment';
+import { useEffect } from 'react';
 import { Link } from 'react-router-dom';
 
 import { BasePageContent, BasePageHeader } from 'src/components/BaseLayout';
@@ -9,6 +11,7 @@ import { StatusBadge } from 'src/components/EncounterStatusBadge';
 import { SearchBar } from 'src/components/SearchBar';
 import { useSearchBar } from 'src/components/SearchBar/hooks';
 import { Title } from 'src/components/Typography';
+import { sharedAuthorizedUser } from 'src/sharedState';
 import { formatPeriodDateTime } from 'src/utils/date';
 import { renderHumanName } from 'src/utils/fhir';
 import { matchCurrentUserRole, Role } from 'src/utils/role';
@@ -17,9 +20,16 @@ import { useEncounterList } from './hooks';
 import { getEncounterListSearchBarColumns } from './searchBarUtils';
 
 export function EncounterList() {
+    const user = sharedAuthorizedUser.getSharedState();
+    const userRole = user?.role![0]!.name;
     const { columnsFilterValues, onChangeColumnFilter, onResetFilters } = useSearchBar({
         columns: getEncounterListSearchBarColumns(),
     });
+    const currentDate = moment();
+
+    useEffect(() => {
+        onChangeColumnFilter([currentDate, currentDate], 'date');
+    }, []);
 
     const roleSearchParams = matchCurrentUserRole({
         [Role.Admin]: () => {
@@ -107,6 +117,7 @@ export function EncounterList() {
                     columnsFilterValues={columnsFilterValues}
                     onChangeColumnFilter={onChangeColumnFilter}
                     onResetFilters={onResetFilters}
+                    hideFilters={userRole === Role.Practitioner ? ['practitioner'] : []}
                 />
             </BasePageHeader>