Handle new updated_on date in json (#910)

transitmatters · Dec 19, 2023 · ebecaca · ebecaca
1 parent f627e66
commit ebecaca
Show file tree

Hide file tree

Showing 5 changed files with 35 additions and 10 deletions.
diff --git a/common/api/slowzones.ts b/common/api/slowzones.ts
@@ -1,14 +1,22 @@
-import type { DayDelayTotals, SlowZoneResponse, SpeedRestriction } from '../types/dataPoints';
+import type {
+  DayDelayTotals,
+  SlowZoneAllSlowResponse,
+  SlowZoneDayTotalsResponse,
+  SlowZoneResponse,
+  SpeedRestriction,
+} from '../types/dataPoints';
 import type { FetchSpeedRestrictionsOptions, FetchSpeedRestrictionsResponse } from '../types/api';
 import { getGtfsRailLineId } from '../utils/lines';
 import { apiFetch } from './utils/fetch';
 
-export const fetchDelayTotals = (): Promise<DayDelayTotals[]> => {
+// TODO: Remove the Array option once the slowzone change is mature
+export const fetchDelayTotals = (): Promise<SlowZoneDayTotalsResponse | DayDelayTotals[]> => {
   const url = new URL(`/static/slowzones/delay_totals.json`, window.location.origin);
   return fetch(url.toString()).then((resp) => resp.json());
 };
 
-export const fetchAllSlow = (): Promise<SlowZoneResponse[]> => {
+// TODO: Remove the Array option once the slowzone change is mature
+export const fetchAllSlow = (): Promise<SlowZoneAllSlowResponse | SlowZoneResponse[]> => {
   const all_slow_url = new URL(`/static/slowzones/all_slow.json`, window.location.origin);
   return fetch(all_slow_url.toString()).then((resp) => resp.json());
 };

diff --git a/common/types/dataPoints.ts b/common/types/dataPoints.ts
@@ -71,6 +71,16 @@ export type SlowZoneResponse = {
   to_id: string;
 };
 
+export interface SlowZoneAllSlowResponse {
+  data: SlowZoneResponse[];
+  updated_on: string;
+}
+
+export interface SlowZoneDayTotalsResponse {
+  data: DayDelayTotals[];
+  updated_on: string;
+}
+
 export interface SpeedDataPoint {
   count: number;
   date: string;

diff --git a/modules/slowzones/SlowZonesDetails.tsx b/modules/slowzones/SlowZonesDetails.tsx
@@ -4,6 +4,7 @@ import React, { useState } from 'react';
 import dayjs from 'dayjs';
 import utc from 'dayjs/plugin/utc';
 
+import { isArray } from 'lodash';
 import { useDelimitatedRoute } from '../../common/utils/router';
 import { WidgetTitle } from '../dashboard/WidgetTitle';
 import { ChartPlaceHolder } from '../../common/components/graphics/ChartPlaceHolder';
@@ -63,7 +64,7 @@ export function SlowZonesDetails() {
           <div className="relative flex flex-col">
             {totalSlowTimeReady ? (
               <TotalSlowTimeWrapper
-                data={delayTotals.data}
+                data={isArray(delayTotals.data) ? delayTotals.data : delayTotals.data.data}
                 startDateUTC={startDateUTC}
                 endDateUTC={endDateUTC}
                 line={line}
@@ -82,7 +83,7 @@ export function SlowZonesDetails() {
             {allSlow.data && speedRestrictions.data && canShowSlowZonesMap ? (
               <SlowZonesMap
                 key={lineShort}
-                slowZones={allSlow.data}
+                slowZones={isArray(allSlow.data) ? allSlow.data : allSlow.data.data}
                 speedRestrictions={speedRestrictions.data}
                 lineName={lineShort}
                 direction="horizontal-on-desktop"
@@ -105,7 +106,7 @@ export function SlowZonesDetails() {
           <div className="relative flex flex-col">
             {segmentsReady ? (
               <SlowZonesSegmentsWrapper
-                data={allSlow.data}
+                data={isArray(allSlow.data) ? allSlow.data : allSlow.data.data}
                 lineShort={lineShort}
                 linePath={linePath}
                 endDateUTC={endDateUTC}

diff --git a/modules/slowzones/SlowZonesWidget.tsx b/modules/slowzones/SlowZonesWidget.tsx
@@ -2,6 +2,7 @@
 import React from 'react';
 import dayjs from 'dayjs';
 import utc from 'dayjs/plugin/utc';
+import { isArray } from 'lodash';
 import { useDelimitatedRoute } from '../../common/utils/router';
 import { HomescreenWidgetTitle } from '../dashboard/HomescreenWidgetTitle';
 import { ChartPlaceHolder } from '../../common/components/graphics/ChartPlaceHolder';
@@ -31,7 +32,7 @@ export const SlowZonesWidget: React.FC = () => {
         <HomescreenWidgetTitle title="Slow zones" tab="slowzones" />
         {totalSlowTimeReady ? (
           <TotalSlowTimeWrapper
-            data={delayTotals.data}
+            data={isArray(delayTotals.data) ? delayTotals.data : delayTotals.data.data}
             startDateUTC={startDateUTC}
             endDateUTC={endDateUTC}
             line={line}

diff --git a/modules/slowzones/SystemSlowZonesDetails.tsx b/modules/slowzones/SystemSlowZonesDetails.tsx
@@ -1,6 +1,7 @@
 import dayjs from 'dayjs';
 import React, { useMemo, useState } from 'react';
 
+import { isArray } from 'lodash';
 import {
   useSlowzoneAllData,
   useSlowzoneDelayTotalData,
@@ -51,7 +52,11 @@ export function SystemSlowZonesDetails({ showTitle = false }: SystemSlowZonesDet
   const lineSegmentsReady = !allData.isError && allData.data && startDateUTC && endDateUTC;
   const graphData = useMemo(() => {
     if (allData.data && startDateUTC && endDateUTC) {
-      const fitleredData = filterAllSlow(allData.data, startDateUTC, endDateUTC);
+      const fitleredData = filterAllSlow(
+        isArray(allData.data) ? allData.data : allData.data.data,
+        startDateUTC,
+        endDateUTC
+      );
       return formatSegments(fitleredData, startDateUTC, direction);
     } else return [];
   }, [allData.data, endDateUTC, startDateUTC, direction]);
@@ -66,7 +71,7 @@ export function SystemSlowZonesDetails({ showTitle = false }: SystemSlowZonesDet
           <div className="relative flex flex-col">
             {totalSlowTimeReady ? (
               <TotalSlowTime
-                data={delayTotals.data}
+                data={isArray(delayTotals.data) ? delayTotals.data : delayTotals.data.data}
                 startDateUTC={startDateUTC}
                 endDateUTC={endDateUTC}
                 showTitle={showTitle}
@@ -84,7 +89,7 @@ export function SystemSlowZonesDetails({ showTitle = false }: SystemSlowZonesDet
             {allData.data && speedRestrictions.data && canShowSlowZonesMap ? (
               <SlowZonesMap
                 key={lineShort}
-                slowZones={allData.data}
+                slowZones={isArray(allData.data) ? allData.data : allData.data.data}
                 speedRestrictions={speedRestrictions.data}
                 lineName={lineShort}
                 direction="horizontal-on-desktop"