Skip to content

Commit 4269722

Browse files
committed
feat: Update getMaxDate to be static prop
1 parent 40c77d2 commit 4269722

4 files changed

Lines changed: 13 additions & 13 deletions

File tree

src/shared/features/AppletSettings/ExportDataSetting/ExportDataSetting.tsx

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,16 @@
1+
import { yupResolver } from '@hookform/resolvers/yup';
12
import { useCallback, useEffect, useMemo, useState } from 'react';
23
import { FormProvider, useForm } from 'react-hook-form';
34
import { ObjectSchema } from 'yup';
4-
import { yupResolver } from '@hookform/resolvers/yup';
55

66
import { DataExportPopup } from 'shared/features/AppletSettings/ExportDataSetting/Popups/DataExportPopup';
7-
import { applet } from 'shared/state/Applet';
8-
import { getNormalizedTimezoneDate } from 'shared/utils/dateTimezone';
9-
import { UniqueTuple } from 'shared/types';
107
import { useFeatureFlags } from 'shared/hooks';
118
import { FeatureFlagDefaults } from 'shared/hooks/useFeatureFlags.const';
9+
import { applet } from 'shared/state/Applet';
10+
import { UniqueTuple } from 'shared/types';
11+
import { getNormalizedTimezoneDate } from 'shared/utils/dateTimezone';
1212

13+
import { exportDataSettingSchema } from './ExportDataSetting.schema';
1314
import {
1415
ExportDataExported,
1516
ExportDataFormValues,
@@ -18,7 +19,6 @@ import {
1819
SupplementaryFiles,
1920
SupplementaryFilesWithFeatureFlag,
2021
} from './ExportDataSetting.types';
21-
import { exportDataSettingSchema } from './ExportDataSetting.schema';
2222
import { ExportSettingsPopup } from './Popups/ExportSettingsPopup/ExportSettingsPopup';
2323

2424
export const ExportDataSetting = ({
@@ -39,21 +39,21 @@ export const ExportDataSetting = ({
3939
const canExportEhrHealthData = featureFlags.enableEhrHealthData !== 'unavailable';
4040

4141
const minDate = useMemo(() => new Date(appletData?.createdAt ?? ''), [appletData]);
42-
const getMaxDate = () => getNormalizedTimezoneDate(new Date().toString());
42+
const maxDate = useMemo(() => getNormalizedTimezoneDate(new Date().toString()), []);
4343
const defaultValues: ExportDataFormValues = useMemo(
4444
() => ({
4545
dataExported: canExportEhrHealthData
4646
? ExportDataExported.ResponsesAndEhrData
4747
: ExportDataExported.ResponsesOnly,
4848
dateType: ExportDateType.AllTime,
4949
fromDate: minDate,
50-
toDate: getMaxDate(),
50+
toDate: maxDate,
5151
supplementaryFiles: SupplementaryFiles.reduce(
5252
(acc, fileType) => ({ ...acc, [fileType]: false }),
5353
{} as Record<SupplementaryFiles, boolean>,
5454
),
5555
}),
56-
[minDate, canExportEhrHealthData],
56+
[minDate, maxDate, canExportEhrHealthData],
5757
);
5858
const methods = useForm<ExportDataFormValues>({
5959
resolver: yupResolver(exportDataSettingSchema() as ObjectSchema<ExportDataFormValues>),
@@ -117,7 +117,7 @@ export const ExportDataSetting = ({
117117
onExportSettingsClose();
118118
}}
119119
minDate={minDate}
120-
getMaxDate={getMaxDate}
120+
maxDate={maxDate}
121121
appletName={appletName}
122122
supportedSupplementaryFiles={filteredSupportedSupplementaryFiles}
123123
canExportEhrHealthData={canExportEhrHealthData}

src/shared/features/AppletSettings/ExportDataSetting/Popups/ExportSettingsPopup/ExportSettingsPopup.test.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ const commonProps = {
6161
onClose: mockOnClose,
6262
onExport: mockOnExport,
6363
minDate: date,
64-
getMaxDate: () => getNormalizedTimezoneDate(new Date().toString()),
64+
maxDate: getNormalizedTimezoneDate(new Date().toString()),
6565
appletName: mockedApplet.displayName,
6666
'data-testid': DATA_TESTID_EXPORT_DATA_SETTINGS_POPUP,
6767
};

src/shared/features/AppletSettings/ExportDataSetting/Popups/ExportSettingsPopup/ExportSettingsPopup.tsx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ export const ExportSettingsPopup = ({
3232
onClose,
3333
onExport,
3434
minDate,
35-
getMaxDate,
35+
maxDate,
3636
appletName,
3737
supportedSupplementaryFiles,
3838
canExportEhrHealthData,
@@ -48,7 +48,7 @@ export const ExportSettingsPopup = ({
4848
const hasCustomDate = dateType === ExportDateType.ChooseDates;
4949

5050
const commonProps = {
51-
maxDate: getMaxDate(),
51+
maxDate,
5252
control,
5353
inputSx: {
5454
'& .MuiInputLabel-outlined': {

src/shared/features/AppletSettings/ExportDataSetting/Popups/ExportSettingsPopup/ExportSettingsPopup.types.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ export type ExportSettingsPopupProps = {
55
onClose: () => void;
66
onExport: () => void;
77
minDate: Date;
8-
getMaxDate: () => Date;
8+
maxDate: Date;
99
appletName: string;
1010
supportedSupplementaryFiles?: SupplementaryFiles[];
1111
canExportEhrHealthData?: boolean;

0 commit comments

Comments
 (0)