From b4c31b673e9c2767120edd98a7423feb4685537d Mon Sep 17 00:00:00 2001 From: Marcin Tojek Date: Mon, 24 Feb 2025 14:06:15 +0100 Subject: [PATCH 1/2] fix: display notification on schedule update --- .../WorkspaceSchedulePage.test.tsx | 12 ++++++++++++ .../WorkspaceSchedulePage/WorkspaceSchedulePage.tsx | 3 +++ 2 files changed, 15 insertions(+) diff --git a/site/src/pages/WorkspaceSettingsPage/WorkspaceSchedulePage/WorkspaceSchedulePage.test.tsx b/site/src/pages/WorkspaceSettingsPage/WorkspaceSchedulePage/WorkspaceSchedulePage.test.tsx index 944ffc5be4fdf..72f47bcb7770c 100644 --- a/site/src/pages/WorkspaceSettingsPage/WorkspaceSchedulePage/WorkspaceSchedulePage.test.tsx +++ b/site/src/pages/WorkspaceSettingsPage/WorkspaceSchedulePage/WorkspaceSchedulePage.test.tsx @@ -291,6 +291,12 @@ describe("WorkspaceSchedulePage", () => { name: /save/i, }); await user.click(submitButton); + + const notification = await screen.findByText( + "Workspace schedule updated", + ); + expect(notification).toBeInTheDocument(); + const dialog = await screen.findByText("Restart workspace?"); expect(dialog).toBeInTheDocument(); }); @@ -312,6 +318,12 @@ describe("WorkspaceSchedulePage", () => { name: /save/i, }); await user.click(submitButton); + + const notification = await screen.findByText( + "Workspace schedule updated", + ); + expect(notification).toBeInTheDocument(); + const dialog = screen.queryByText("Restart workspace?"); expect(dialog).not.toBeInTheDocument(); }); diff --git a/site/src/pages/WorkspaceSettingsPage/WorkspaceSchedulePage/WorkspaceSchedulePage.tsx b/site/src/pages/WorkspaceSettingsPage/WorkspaceSchedulePage/WorkspaceSchedulePage.tsx index 4ee96204dbdd5..14d600dd1a5c8 100644 --- a/site/src/pages/WorkspaceSettingsPage/WorkspaceSchedulePage/WorkspaceSchedulePage.tsx +++ b/site/src/pages/WorkspaceSettingsPage/WorkspaceSchedulePage/WorkspaceSchedulePage.tsx @@ -25,6 +25,7 @@ import { formValuesToAutostartRequest, formValuesToTTLRequest, } from "./formToRequest"; +import { displayError, displaySuccess } from "components/GlobalSnackbar/utils"; const permissionsToCheck = (workspace: TypesGen.Workspace) => ({ @@ -60,7 +61,9 @@ export const WorkspaceSchedulePage: FC = () => { params.workspace, ), ); + displaySuccess("Workspace schedule updated"); }, + onError: () => displayError("Failed to update workspace schedule"), }); const error = checkPermissionsError || getTemplateError; const isLoading = !template || !permissions; From 0a8d56065a0ba0f1d060c1fca85be79c695b478c Mon Sep 17 00:00:00 2001 From: Marcin Tojek Date: Mon, 24 Feb 2025 14:18:19 +0100 Subject: [PATCH 2/2] fmt/ts --- .../WorkspaceSchedulePage/WorkspaceSchedulePage.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/site/src/pages/WorkspaceSettingsPage/WorkspaceSchedulePage/WorkspaceSchedulePage.tsx b/site/src/pages/WorkspaceSettingsPage/WorkspaceSchedulePage/WorkspaceSchedulePage.tsx index 14d600dd1a5c8..20df1aa77c03d 100644 --- a/site/src/pages/WorkspaceSettingsPage/WorkspaceSchedulePage/WorkspaceSchedulePage.tsx +++ b/site/src/pages/WorkspaceSettingsPage/WorkspaceSchedulePage/WorkspaceSchedulePage.tsx @@ -6,6 +6,7 @@ import type * as TypesGen from "api/typesGenerated"; import { Alert } from "components/Alert/Alert"; import { ErrorAlert } from "components/Alert/ErrorAlert"; import { ConfirmDialog } from "components/Dialogs/ConfirmDialog/ConfirmDialog"; +import { displayError, displaySuccess } from "components/GlobalSnackbar/utils"; import { Loader } from "components/Loader/Loader"; import { PageHeader, PageHeaderTitle } from "components/PageHeader/PageHeader"; import dayjs from "dayjs"; @@ -25,7 +26,6 @@ import { formValuesToAutostartRequest, formValuesToTTLRequest, } from "./formToRequest"; -import { displayError, displaySuccess } from "components/GlobalSnackbar/utils"; const permissionsToCheck = (workspace: TypesGen.Workspace) => ({