fix tile styles and last encounter fetch

openmrs · Sep 6, 2024 · 64b77fd · 64b77fd
1 parent 8037c58
commit 64b77fd
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 16 deletions.
diff --git a/packages/esm-patient-chart-app/src/encounter-tile/components/encounter-tile.component.tsx b/packages/esm-patient-chart-app/src/encounter-tile/components/encounter-tile.component.tsx
@@ -26,18 +26,18 @@ export interface EncounterValuesTileProps {
 
 export const EncounterTile: React.FC<EncounterTileProps> = ({ patientUuid, columns, headerTitle }) => {
   return (
-    // <>
-    <Tile className={styles.tile}>
-      <div className={styles.cardTitle}>
-        <h4 className={styles.title}> {headerTitle} </h4>
-      </div>
-      <Column className={styles.columnContainer}>
-        {columns.map((column, ind) => (
-          <EncounterValuesTile key={ind} patientUuid={patientUuid} column={column} />
-        ))}
-      </Column>
-    </Tile>
-    // </>
+    <div className={styles.tilesContainer}>
+      <Tile className={styles.tile}>
+        <div className={styles.cardTitle}>
+          <h4 className={styles.title}> {headerTitle} </h4>
+        </div>
+        <Column className={styles.columnContainer}>
+          {columns.map((column, ind) => (
+            <EncounterValuesTile key={column.key} patientUuid={patientUuid} column={column} />
+          ))}
+        </Column>
+      </Tile>
+    </div>
   );
 };
 

diff --git a/packages/esm-patient-chart-app/src/encounter-tile/components/tile.scss b/packages/esm-patient-chart-app/src/encounter-tile/components/tile.scss
@@ -21,7 +21,6 @@
 }
 
 .tile {
-  height: 35%;
   padding: layout.$spacing-01 0 layout.$spacing-05 layout.$spacing-05;
   margin: layout.$spacing-03;
   border: solid 1px #e0e0e0;
@@ -36,6 +35,10 @@
   display: block;
 }
 
+.tilesContainer {
+  height: fit-content;
+}
+
 .columnContainer {
   margin: 0px 0px layout.$spacing-06 layout.$spacing-06;
   font-size: 14px;

diff --git a/packages/esm-patient-chart-app/src/encounter-tile/hooks/useLastEncounter.ts b/packages/esm-patient-chart-app/src/encounter-tile/hooks/useLastEncounter.ts
@@ -1,4 +1,4 @@
-import { openmrsFetch } from '@openmrs/esm-framework';
+import { openmrsFetch, restBaseUrl } from '@openmrs/esm-framework';
 import { type OpenmrsEncounter } from '@openmrs/esm-patient-common-lib';
 
 import useSWR from 'swr';
@@ -11,15 +11,15 @@ export const encounterRepresentation =
 
 export function useLastEncounter(patientUuid: string, encounterType: string) {
   const query = `encounterType=${encounterType}&patient=${patientUuid}&limit=1&order=desc&startIndex=0`;
-  const endpointUrl = `/ws/rest/v1/encounter?${query}&v=${encounterRepresentation}`;
+  const endpointUrl = `${restBaseUrl}/encounter?${query}&v=${encounterRepresentation}`;
 
   const { data, error, isValidating } = useSWR<{ data: { results: Array<OpenmrsEncounter> } }, Error>(
     endpointUrl,
     openmrsFetch,
   );
 
   return {
-    lastEncounter: data ? data?.data?.results.shift() : null,
+    lastEncounter: data ? data?.data?.results[0] : null,
     error,
     isLoading: !data && !error,
     isValidating,