-
Notifications
You must be signed in to change notification settings - Fork 1
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Some glucose related component updates.
- Loading branch information
Showing
30 changed files
with
590 additions
and
271 deletions.
There are no files selected for viewing
Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
27 changes: 27 additions & 0 deletions
27
src/components/container/GlucoseDayCoordinator/GlucoseDayCoordinator.previewData.ts
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,27 @@ | ||
| import { generateGlucose, getDayKey, predictableRandomNumber, Reading } from '../../../helpers'; | ||
| import { add, isSameDay } from 'date-fns'; | ||
|
|
||
| export type GlucoseDayCoordinatorPreviewState = 'no data' | 'some data' | 'all data'; | ||
|
|
||
| export const previewData = async (previewState: GlucoseDayCoordinatorPreviewState, startDate: Date, endDate: Date): Promise<Reading[]> => { | ||
| if (previewState === 'no data') { | ||
| return []; | ||
| } | ||
| if (previewState === 'some data') { | ||
| let readings = await generateGlucose(startDate, endDate); | ||
|
|
||
| let currentDate = startDate; | ||
| while (currentDate <= endDate) { | ||
| if (await predictableRandomNumber(getDayKey(currentDate)) % 5 === 0) { | ||
| readings = readings.filter(reading => !isSameDay(currentDate, reading.timestamp)); | ||
| } | ||
| currentDate = add(currentDate, { days: 1 }); | ||
| } | ||
|
|
||
| return readings; | ||
| } | ||
| if (previewState === 'all data') { | ||
| return generateGlucose(startDate, endDate); | ||
| } | ||
| return []; | ||
| }; |
48 changes: 48 additions & 0 deletions
48
src/components/container/GlucoseDayCoordinator/GlucoseDayCoordinator.stories.tsx
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,48 @@ | ||
| import { Meta, StoryObj } from '@storybook/react'; | ||
| import React from 'react' | ||
| import { DateRangeTitle, Layout } from '../../presentational' | ||
| import GlucoseDayCoordinator from './GlucoseDayCoordinator'; | ||
| import { GlucoseDayCoordinatorPreviewState } from "./GlucoseDayCoordinator.previewData"; | ||
|
|
||
| type GlucoseDayCoordinatorStoryArgs = React.ComponentProps<typeof GlucoseDayCoordinator> & { | ||
| colorScheme: 'auto' | 'light' | 'dark' | ||
| state: GlucoseDayCoordinatorPreviewState | 'live'; | ||
| }; | ||
|
|
||
| const meta: Meta<GlucoseDayCoordinatorStoryArgs> = { | ||
| title: 'Container/GlucoseDayCoordinator', | ||
| component: GlucoseDayCoordinator, | ||
| parameters: { | ||
| layout: 'fullscreen' | ||
| }, | ||
| render: args => { | ||
| return <Layout colorScheme={args.colorScheme}> | ||
| <GlucoseDayCoordinator {...args} previewState={args.state !== 'live' ? args.state as GlucoseDayCoordinatorPreviewState : undefined}> | ||
| <DateRangeTitle defaultMargin /> | ||
| </GlucoseDayCoordinator> | ||
| </Layout>; | ||
| } | ||
| }; | ||
| export default meta; | ||
|
|
||
| type Story = StoryObj<GlucoseDayCoordinatorStoryArgs>; | ||
|
|
||
| export const Default: Story = { | ||
| args: { | ||
| colorScheme: 'auto', | ||
| state: 'all data' | ||
| }, | ||
| argTypes: { | ||
| colorScheme: { | ||
| name: 'color scheme', | ||
| control: 'radio', | ||
| options: ['auto', 'light', 'dark'] | ||
| }, | ||
| state: { | ||
| name: 'state', | ||
| control: 'radio', | ||
| options: ['no data', 'some data', 'all data', 'live'] | ||
| } | ||
| } | ||
| }; | ||
|
|
81 changes: 81 additions & 0 deletions
81
src/components/container/GlucoseDayCoordinator/GlucoseDayCoordinator.tsx
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,81 @@ | ||
| import React, { createContext, DependencyList, useContext, useState } from 'react'; | ||
| import { computeGlucoseReadingRanges, computeGlucoseReadingRecentAverage, getDayKey, getGlucoseReadings, Reading, ReadingRange } from '../../../helpers'; | ||
| import { add, startOfToday } from 'date-fns'; | ||
| import { DateRangeContext, DateRangeCoordinator, SparkRangeChart, SparkRangeChartRange } from '../../presentational'; | ||
| import { WeeklyDayNavigator } from '../../container'; | ||
| import { GlucoseDayCoordinatorPreviewState, previewData } from './GlucoseDayCoordinator.previewData'; | ||
|
|
||
| export interface GlucoseDayCoordinatorProps { | ||
| previewState?: GlucoseDayCoordinatorPreviewState; | ||
| children?: React.ReactNode; | ||
| innerRef?: React.Ref<HTMLDivElement>; | ||
| } | ||
|
|
||
| export interface GlucoseContext { | ||
| readings?: Reading[]; | ||
| recentAverage?: number; | ||
| } | ||
|
|
||
| export const GlucoseContext = createContext<GlucoseContext | null>(null); | ||
|
|
||
| export default function (props: GlucoseDayCoordinatorProps) { | ||
| const [glucoseReadings, setGlucoseReadings] = useState<Reading[]>(); | ||
| const [glucoseRanges, setGlucoseRanges] = useState<ReadingRange[]>(); | ||
| const [recentAverage, setRecentAverage] = useState<number>(); | ||
|
|
||
| const loadData = async (startDate: Date, endDate: Date): Promise<void> => { | ||
| const readings = props.previewState ? | ||
| await previewData(props.previewState, startDate, endDate) : | ||
| await getGlucoseReadings(startDate, endDate); | ||
|
|
||
| setGlucoseReadings(readings); | ||
| setGlucoseRanges(computeGlucoseReadingRanges(readings)); | ||
| setRecentAverage(computeGlucoseReadingRecentAverage(readings, add(startDate, { days: 14 }))); | ||
| }; | ||
|
|
||
| const glucoseRangeLookup = glucoseRanges?.reduce((lookup, range) => { | ||
| const dayKey = getDayKey(range.date); | ||
| lookup[dayKey] = range; | ||
| return lookup; | ||
| }, {} as { [key: string]: ReadingRange }); | ||
|
|
||
| const dayRenderer = (dayKey: string): React.JSX.Element | null => { | ||
| let sparkRanges: SparkRangeChartRange[] = []; | ||
| if (glucoseRangeLookup?.hasOwnProperty(dayKey)) { | ||
| sparkRanges.push({ ...(glucoseRangeLookup[dayKey]) }); | ||
| } | ||
| return <div style={{ paddingTop: '4px' }}> | ||
| <SparkRangeChart domain={[0, 240]} ranges={sparkRanges} reference={recentAverage} /> | ||
| </div>; | ||
| }; | ||
|
|
||
| return <div ref={props.innerRef}> | ||
| <GlucoseContext.Provider value={{ readings: glucoseReadings, recentAverage: recentAverage }}> | ||
| <DateRangeCoordinator initialIntervalStart={startOfToday()} intervalType="Day" useCustomNavigator={true}> | ||
| <CustomNavigator | ||
| loadData={loadData} | ||
| dayRenderer={dayRenderer} | ||
| dependencies={[props.previewState]} | ||
| /> | ||
| {glucoseRanges && props.children} | ||
| </DateRangeCoordinator> | ||
| </GlucoseContext.Provider> | ||
| </div>; | ||
| } | ||
|
|
||
| interface CustomNavigatorProps { | ||
| loadData: (startDate: Date, endDate: Date) => Promise<void>; | ||
| dayRenderer: (dayKey: string) => React.JSX.Element | null; | ||
| dependencies?: DependencyList; | ||
| } | ||
|
|
||
| function CustomNavigator(props: CustomNavigatorProps) { | ||
| const dateRangeContext = useContext(DateRangeContext) | ||
|
|
||
| return <WeeklyDayNavigator | ||
| selectedDate={dateRangeContext!.intervalStart} | ||
| loadData={props.loadData} | ||
| dayRenderer={props.dayRenderer} | ||
| dependencies={props.dependencies} | ||
| />; | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,2 @@ | ||
| export { default, GlucoseContext } from './GlucoseDayCoordinator'; | ||
| export { GlucoseDayCoordinatorPreviewState } from './GlucoseDayCoordinator.previewData'; |
Oops, something went wrong.