Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions src/components/form/fields/DatePickerField.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ import { useFormFields } from '@/src/context';
import { cn } from '@/src/lib/utils';
import { Components, JSFField } from '@/src/types/remoteFlows';
import { getMinStartDate } from '@/src/components/form/utils';
import { format } from 'date-fns';
import { format, parse } from 'date-fns';

export type DatePickerFieldProps = JSFField & {
onChange?: (value: any) => void;
Expand All @@ -45,7 +45,7 @@ export function DatePickerField({
if (rest.meta?.mot && typeof rest.meta.mot === 'number') {
minDateValue = getMinStartDate(rest.meta.mot);
} else if (minDate) {
minDateValue = new Date(minDate);
minDateValue = parse(minDate, 'yyyy-MM-dd', new Date());
}

return (
Expand Down
19 changes: 15 additions & 4 deletions src/flows/Termination/hooks.tsx
Original file line number Diff line number Diff line change
@@ -1,11 +1,13 @@
import { $TSFixMe, createHeadlessForm } from '@remoteoss/json-schema-form';
import omitBy from 'lodash.omitby';
import isNull from 'lodash.isnull';
import { format } from 'date-fns';
import { useMemo } from 'react';
import {
CreateOffboardingParams,
TerminationDetailsParams,
} from '@/src/client';
import { mutationToPromise } from '@/src/lib/mutations';
import { $TSFixMe, createHeadlessForm } from '@remoteoss/json-schema-form';
import omitBy from 'lodash.omitby';
import isNull from 'lodash.isnull';
import { parseJSFToValidate } from '@/src/components/form/utils';
import {
TerminationFlowProps,
Expand All @@ -17,7 +19,6 @@ import { useStepState } from '@/src/flows/useStepState';
import { STEPS } from '@/src/flows/Termination/utils';
import { jsonSchema } from '@/src/flows/Termination/json-schemas/jsonSchema';
import { useCreateTermination, useTerminationSchema } from '@/src/flows/api';
import { useMemo } from 'react';
import { createInformationField } from '@/src/components/form/jsf-utils/createFields';
import { cn, ZendeskTriggerButton } from '@/src/internals';
import { zendeskArticles } from '@/src/components/shared/zendesk-drawer/utils';
Expand Down Expand Up @@ -120,6 +121,16 @@ export const useTermination = ({
)?.['x-jsf-presentation']?.className,
},
),
proposed_termination_date: {
...(options?.jsfModify?.fields
?.proposed_termination_date as $TSFixMe),
'x-jsf-presentation': {
...(
options?.jsfModify?.fields?.proposed_termination_date as $TSFixMe
)?.['x-jsf-presentation'],
minDate: format(new Date(), 'yyyy-MM-dd'),
},
},
paid_time_off_info: {
...(options?.jsfModify?.fields?.paid_time_off_info as $TSFixMe),
'x-jsf-presentation': {
Expand Down
Loading