Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: update minDate conditional logic (M2-8317, M2-8275, M2-8032) #2023

Merged
merged 4 commits into from
Feb 4, 2025
Merged

fix: update minDate conditional logic (M2-8317, M2-8275, M2-8032) #2023

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
a9da1c9
fix date parse errors in Date type conditions
ChaconC Jan 29, 2025
33321e9
update minDate value in DatePicker
ChaconC Jan 29, 2025
3ff2bea
add maxDate value to DatePicker
ChaconC Jan 29, 2025
ac1141e
add parseDateToMidnightUTC to dateFormat utils
ChaconC Feb 4, 2025
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
3 changes: 2 additions & 1 deletion src/modules/Builder/components/ConditionRow/Condition/SwitchCondition/SwitchCondition.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -245,13 +245,14 @@ export const SwitchCondition = ({
onCloseCallback={onCloseStartDateCallback}
data-testid={`${dataTestid}-start-date-value`}
skipMinDate
maxDate={maxDateValue}
{...commonDateInputProps}
/>
<StyledBodyLarge sx={{ m: theme.spacing(0, 0.4) }}>{t('and')}</StyledBodyLarge>
<DatePicker
name={maxDateValueName}
key={`max-date-value-${isRangeValueShown}`}
minDate={minValue as Date}
minDate={minDateValue}
data-testid={`${dataTestid}-end-date-value`}
{...commonDateInputProps}
/>
Expand Down
10 changes: 10 additions & 0 deletions src/modules/Builder/pages/BuilderApplet/BuilderApplet.const.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,16 @@ export const TIME_INTERVAL_CONDITION_TYPES = [
ConditionType.BetweenTimesRange,
ConditionType.OutsideOfTimesRange,
];
export const DATE_SINGLE_CONDITION_TYPES = [
ConditionType.GreaterThanDate,
ConditionType.LessThanDate,
ConditionType.EqualToDate,
ConditionType.NotEqualToDate,
];
export const DATE_INTERVAL_CONDITION_TYPES = [
ConditionType.BetweenDates,
ConditionType.OutsideOfDates,
];
export const SLIDER_ROWS_CONDITION_TYPES = [
ConditionType.GreaterThanSliderRows,
ConditionType.LessThanSliderRows,
Expand Down
27 changes: 27 additions & 0 deletions src/modules/Builder/pages/BuilderApplet/BuilderApplet.utils.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,8 @@ import {
TimeRangeIntervalValueCondition,
TimeSingleValueCondition,
TimeRangeSingleValueCondition,
DateSingleValueCondition,
DateRangeValueCondition,
} from 'shared/state';
import {
createArray,
Expand Down Expand Up @@ -96,6 +98,8 @@ import {
import {
ALLOWED_TYPES_IN_VARIABLES,
CONDITION_TYPES_TO_HAVE_OPTION_ID,
DATE_INTERVAL_CONDITION_TYPES,
DATE_SINGLE_CONDITION_TYPES,
defaultFlankerBtnObj,
ordinalStrings,
SAMPLE_SIZE,
Expand Down Expand Up @@ -783,8 +787,31 @@ const formatTime = (hours: number, minutes: number) => {
return `${formattedHours}:${formattedMinutes}`;
};

const formatDate = (dateValue: string) => {
const date = dateValue ? new Date(`${dateValue}T00:00:00`) : undefined;

return date;
};
ChaconC marked this conversation as resolved.
Show resolved Hide resolved

const getConditionPayload = (item: Item, condition: Condition) => {
const conditionType = condition.type as ConditionType;
if (DATE_SINGLE_CONDITION_TYPES.includes(conditionType)) {
const conditionPayload = condition.payload as DateSingleValueCondition['payload'];

return {
...conditionPayload,
date: formatDate(conditionPayload.date),
};
}
if (DATE_INTERVAL_CONDITION_TYPES.includes(conditionType)) {
const conditionPayload = condition.payload as DateRangeValueCondition['payload'];

return {
...conditionPayload,
minDate: formatDate(conditionPayload.minDate),
maxDate: formatDate(conditionPayload.maxDate),
};
}
if (TIME_SINGLE_CONDITION_TYPES.includes(conditionType)) {
const conditionPayload = condition.payload as
| TimeSingleValueCondition<string>['payload']
Expand Down
Loading