Skip to content
Snippets Groups Projects
Unverified Commit 912bb125 authored by Tim Macdonald's avatar Tim Macdonald Committed by GitHub
Browse files

Fix null day-of-week in SchedulePicker (#14525)

[Fixes #14405]
parent f1e2a869
Branches
Tags
No related merge requests found
......@@ -63,6 +63,8 @@ export default class SchedulePicker extends Component {
minutesOnHourPicker: PropTypes.bool,
};
DEFAULT_DAY = "mon";
handleChangeProperty(name, value) {
let newSchedule = {
...this.props.schedule,
......@@ -102,7 +104,7 @@ export default class SchedulePicker extends Component {
if (value === "weekly") {
newSchedule = {
...newSchedule,
schedule_day: "mon",
schedule_day: this.DEFAULT_DAY,
schedule_frame: null,
};
}
......@@ -112,13 +114,19 @@ export default class SchedulePicker extends Component {
newSchedule = {
...newSchedule,
schedule_frame: "first",
schedule_day: "mon",
schedule_day: this.DEFAULT_DAY,
};
}
} else if (name === "schedule_frame") {
// when the monthly schedule frame is the 15th, clear out the schedule_day
if (value === "mid") {
newSchedule = { ...newSchedule, schedule_day: null };
} else {
// first or last, needs a day of the week
newSchedule = {
...newSchedule,
schedule_day: newSchedule.schedule_day || this.DEFAULT_DAY,
};
}
}
......
......@@ -77,7 +77,7 @@ describe("scenarios > dashboard > subscriptions", () => {
});
});
it.skip("should not display 'null' day of the week (metabase#14405)", () => {
it("should not display 'null' day of the week (metabase#14405)", () => {
assignRecipient();
cy.findByText("To:").click();
cy.get(".AdminSelect")
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment