Merge pull request #532 from lifeomic/fix-track-tile-bugs

Fix Track Tile Bugs
lifeomic · Feb 19, 2024 · a1df60c · a1df60c
2 parents 9c6c3a3 + 0d9ec4d
commit a1df60c
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 4 deletions.
diff --git a/src/components/TrackTile/PillarsTile/Pillar.tsx b/src/components/TrackTile/PillarsTile/Pillar.tsx
@@ -331,6 +331,7 @@ export const Pillar: FC<PillarProps> = (props) => {
       <TouchableOpacity
         testID={tID(`pillar-increment-${metricId}`)}
         onPress={() => onAddData(increment)}
+        disabled={loading}
       >
         <Indicator
           name="pillars-add-data-button-icon"

diff --git a/src/components/TrackTile/TrackerDetails/TrackerDetails.tsx b/src/components/TrackTile/TrackerDetails/TrackerDetails.tsx
@@ -145,7 +145,7 @@ export const TrackerDetails: FC<TrackerDetailsProps> = (props) => {
                   createDate: isToday(dateRange.start)
                     ? new Date()
                     : dateRange.start,
-                  ...activeValues[metricId]?.[0],
+                  ...trackerValue,
                   value: convertToPreferredUnit(resourceValue, tracker),
                   tracker,
                 }),

diff --git a/src/components/TrackTile/hooks/test/useAxiosTrackTileService.test.tsx b/src/components/TrackTile/hooks/test/useAxiosTrackTileService.test.tsx
@@ -342,6 +342,7 @@ describe('useAxiosTrackTileService', () => {
           dates: ['ge2021-07-23T00:00:00.000Z', 'le2021-07-30T00:00:00.000Z'],
           patientId: 'patient-id',
           codeBelow: valuesContext.codeBelow,
+          first: 200,
         },
         query: FETCH_TRACKER_VALUES_BY_DATES_QUERY,
       },
@@ -435,6 +436,7 @@ describe('useAxiosTrackTileService', () => {
           dates: ['ge2021-07-23T00:00:00.000Z', 'le2021-07-30T00:00:00.000Z'],
           codeBelow: customValuesContext.codeBelow,
           patientId: 'patient-id',
+          first: 200,
         },
         query: FETCH_TRACKER_VALUES_BY_DATES_QUERY,
       },
@@ -528,6 +530,7 @@ describe('useAxiosTrackTileService', () => {
           ],
           patientId: 'patient-id',
           codeBelow: valuesContext.codeBelow,
+          first: 200,
         },
         query: FETCH_TRACKER_VALUES_BY_DATES_QUERY,
       },
@@ -544,6 +547,7 @@ describe('useAxiosTrackTileService', () => {
           ],
           patientId: 'patient-id',
           codeBelow: valuesContext.codeBelow,
+          first: 200,
         },
         query: FETCH_TRACKER_VALUES_BY_DATES_QUERY,
       },
@@ -629,6 +633,7 @@ describe('useAxiosTrackTileService', () => {
           ],
           patientId: 'patient-id',
           codeBelow: pillarValuesContext.codeBelow,
+          first: 200,
         },
         query: FETCH_TRACKER_VALUES_BY_DATES_QUERY,
       },

diff --git a/src/components/TrackTile/hooks/useAxiosTrackTileService.ts b/src/components/TrackTile/hooks/useAxiosTrackTileService.ts
@@ -274,6 +274,7 @@ export const useAxiosTrackTileService = (): TrackTileService => {
             dates: [`ge${start}`, `le${end}`],
             codeBelow: valuesContext.codeBelow,
             patientId,
+            first: 200,
           },
           query: FETCH_TRACKER_VALUES_BY_DATES_QUERY,
         },
@@ -488,9 +489,9 @@ export type Procedure = {
 };
 
 export const FETCH_TRACKER_VALUES_BY_DATES_QUERY = `
-query GetObservations($dates: [String!], $codeBelow: String!, $patientId: String) {
+query GetObservations($dates: [String!], $codeBelow: String!, $patientId: String, $first: Int) {
   patient(id: $patientId) {
-    observationsConnection(dates: $dates, codeBelow: $codeBelow) {
+    observationsConnection(dates: $dates, codeBelow: $codeBelow, first: $first) {
       edges {
         node {
           id
@@ -509,7 +510,7 @@ query GetObservations($dates: [String!], $codeBelow: String!, $patientId: String
         }
       }
     }
-    proceduresConnection(dates: $dates, codeBelow: $codeBelow) {
+    proceduresConnection(dates: $dates, codeBelow: $codeBelow, first: $first) {
       edges {
         node {
           id