Skip to content

feat: add quiet hours settings page #9676

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

Merged
merged 19 commits into from
Sep 15, 2023
Merged

feat: add quiet hours settings page #9676

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
19 commits
Select commit Hold shift + click to select a range
37e26da
feat: add user quiet hours settings page
deansheather Sep 5, 2023
a4faf5b
fixup! feat: add user quiet hours settings page
deansheather Sep 5, 2023
36f0b5d
fixup! feat: add user quiet hours settings page
deansheather Sep 5, 2023
fbaaff8
fixup! feat: add user quiet hours settings page
deansheather Sep 5, 2023
6b188cd
fixup! feat: add user quiet hours settings page
deansheather Sep 5, 2023
4d65381
fixup! feat: add user quiet hours settings page
deansheather Sep 6, 2023
532b73e
Merge branch 'main' into dean/user-quiet-hours-page
aslilac Sep 13, 2023
e3fc58f
merge leftovers
aslilac Sep 13, 2023
c600664
:axe: i18next stuff
aslilac Sep 13, 2023
644e565
Merge branch 'main' into quiet-hours-page
aslilac Sep 13, 2023
0574f44
update stories
aslilac Sep 13, 2023
759c5ef
mostly sorted out
aslilac Sep 13, 2023
f3c7c9b
finish porting over to react-query
aslilac Sep 14, 2023
c83255e
:broom:
aslilac Sep 14, 2023
1cb15db
YAY
aslilac Sep 14, 2023
a6abf2e
:broom: one more time
aslilac Sep 14, 2023
22366e4
🧹🧹🧹 I'm done now I swear
aslilac Sep 14, 2023
96f6eb3
Merge branch 'main' into quiet-hours-page
aslilac Sep 15, 2023
409efff
🧹
aslilac Sep 15, 2023
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
Prev Previous commit
Next Next commit
🧹🧹🧹 I'm done now I swear
  • Loading branch information
@aslilac
aslilac committed Sep 14, 2023
commit 22366e406c384d80ab920046910c3b44f513e00f
30 changes: 10 additions & 20 deletions site/src/pages/UserSettingsPage/SchedulePage/ScheduleForm.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,12 +17,12 @@ import { Alert } from "components/Alert/Alert";
import { timeToCron, quietHoursDisplay } from "utils/schedule";

export interface ScheduleFormValues {
startTime: string;
time: string;
timezone: string;
}

const validationSchema = Yup.object({
startTime: Yup.string()
time: Yup.string()
.ensure()
.test("is-time-string", "Time must be in HH:mm format.", (value) => {
if (value === "") {
Expand Down Expand Up @@ -64,17 +64,11 @@ export const ScheduleForm: FC<React.PropsWithChildren<ScheduleFormProps>> = ({
};
}, []);

const preferredTimezone = getPreferredTimezone();

// If the user has a custom schedule, use that as the initial values.
// Otherwise, use midnight in their preferred timezone.
const formInitialValues = {
startTime: "00:00",
timezone: preferredTimezone,
};
if (initialValues.user_set) {
formInitialValues.startTime = initialValues.time;
formInitialValues.timezone = initialValues.timezone;
// Otherwise, use the default time, with their local timezone.
const formInitialValues = { ...initialValues };
if (!initialValues.user_set) {
formInitialValues.timezone = getPreferredTimezone();
}

const form: FormikContextType<ScheduleFormValues> =
Expand All @@ -83,7 +77,7 @@ export const ScheduleForm: FC<React.PropsWithChildren<ScheduleFormProps>> = ({
validationSchema,
onSubmit: async (values) => {
onSubmit({
schedule: timeToCron(values.startTime, values.timezone),
schedule: timeToCron(values.time, values.timezone),
});
},
});
Expand All @@ -107,7 +101,7 @@ export const ScheduleForm: FC<React.PropsWithChildren<ScheduleFormProps>> = ({

<Stack direction="row">
<TextField
{...getFieldHelpers("startTime")}
{...getFieldHelpers("time")}
disabled={isLoading}
label="Start time"
type="time"
Expand All @@ -132,18 +126,14 @@ export const ScheduleForm: FC<React.PropsWithChildren<ScheduleFormProps>> = ({
disabled
fullWidth
label="Cron schedule"
value={timeToCron(form.values.startTime, form.values.timezone)}
value={timeToCron(form.values.time, form.values.timezone)}
/>

<TextField
disabled
fullWidth
label="Next occurrence"
value={quietHoursDisplay(
form.values.startTime,
form.values.timezone,
now,
)}
value={quietHoursDisplay(form.values.time, form.values.timezone, now)}
/>

<div>
Expand Down
12 changes: 6 additions & 6 deletions site/src/pages/WorkspaceSettingsPage/WorkspaceSchedulePage/WorkspaceSchedulePage.test.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,20 +1,20 @@
import { renderWithWorkspaceSettingsLayout } from "testHelpers/renderHelpers";
import userEvent from "@testing-library/user-event";
import { screen } from "@testing-library/react";
import { rest } from "msw";
import { server } from "testHelpers/server";
import { MockUser, MockWorkspace } from "testHelpers/entities";
import {
formValuesToAutostartRequest,
formValuesToTTLRequest,
} from "pages/WorkspaceSettingsPage/WorkspaceSchedulePage/formToRequest";
import { scheduleToAutostart } from "pages/WorkspaceSettingsPage/WorkspaceSchedulePage/schedule";
import { ttlMsToAutostop } from "pages/WorkspaceSettingsPage/WorkspaceSchedulePage/ttl";
} from "./formToRequest";
import { scheduleToAutostart } from "./schedule";
import { ttlMsToAutostop } from "./ttl";
import {
WorkspaceScheduleFormValues,
Language as FormLanguage,
} from "./WorkspaceScheduleForm";
import { WorkspaceSchedulePage } from "./WorkspaceSchedulePage";
import { server } from "testHelpers/server";
import { rest } from "msw";
import { MockUser, MockWorkspace } from "testHelpers/entities";

const validValues: WorkspaceScheduleFormValues = {
autostartEnabled: true,
Expand Down