From fc890a03fab815aa40e69536a6125ea10437b3da Mon Sep 17 00:00:00 2001 From: kira-pilot Date: Mon, 11 Jul 2022 14:29:55 +0000 Subject: [PATCH 1/2] fix: removing noisy shutdown snapshots resolves #2685 --- .../WorkspaceSchedule/WorkspaceSchedule.tsx | 6 +-- .../WorkspaceScheduleButton.stories.tsx | 47 ------------------- 2 files changed, 2 insertions(+), 51 deletions(-) diff --git a/site/src/components/WorkspaceSchedule/WorkspaceSchedule.tsx b/site/src/components/WorkspaceSchedule/WorkspaceSchedule.tsx index 8878f1b33b072..edd84a76b1a10 100644 --- a/site/src/components/WorkspaceSchedule/WorkspaceSchedule.tsx +++ b/site/src/components/WorkspaceSchedule/WorkspaceSchedule.tsx @@ -54,16 +54,14 @@ export const WorkspaceSchedule: FC = ({
{ScheduleLanguage.autoStartLabel} - + {autoStartDisplay(workspace.autostart_schedule)}
{ScheduleLanguage.autoStopLabel} - - {autoStopDisplay(workspace)} - + {autoStopDisplay(workspace)}
{canUpdateWorkspace && ( diff --git a/site/src/components/WorkspaceScheduleButton/WorkspaceScheduleButton.stories.tsx b/site/src/components/WorkspaceScheduleButton/WorkspaceScheduleButton.stories.tsx index 32ff5668783ce..94d0b8b332160 100644 --- a/site/src/components/WorkspaceScheduleButton/WorkspaceScheduleButton.stories.tsx +++ b/site/src/components/WorkspaceScheduleButton/WorkspaceScheduleButton.stories.tsx @@ -6,13 +6,6 @@ import { WorkspaceScheduleButton, WorkspaceScheduleButtonProps } from "./Workspa dayjs.extend(utc) -// REMARK: There's a known problem with storybook and using date libraries that -// call string.toLowerCase -// SEE: https:github.com/storybookjs/storybook/issues/12208#issuecomment-697044557 -const ONE = 1 -const SEVEN = 7 -const THIRTY = 30 - export default { title: "components/WorkspaceScheduleButton", component: WorkspaceScheduleButton, @@ -55,46 +48,6 @@ NoTTL.args = { }, } -export const ShutdownRealSoon = Template.bind({}) -ShutdownRealSoon.args = { - workspace: { - ...Mocks.MockWorkspace, - latest_build: { - ...Mocks.MockWorkspaceBuild, - deadline: dayjs().add(THIRTY, "minute").utc().format(), - transition: "start", - }, - ttl_ms: 2 * 60 * 60 * 1000, // 2 hours - }, -} - -export const ShutdownSoon = Template.bind({}) -ShutdownSoon.args = { - workspace: { - ...Mocks.MockWorkspace, - latest_build: { - ...Mocks.MockWorkspaceBuild, - deadline: dayjs().add(ONE, "hour").utc().format(), - transition: "start", - }, - ttl_ms: 2 * 60 * 60 * 1000, // 2 hours - }, -} - -export const ShutdownLong = Template.bind({}) -ShutdownLong.args = { - workspace: { - ...Mocks.MockWorkspace, - - latest_build: { - ...Mocks.MockWorkspaceBuild, - deadline: dayjs().add(SEVEN, "days").utc().format(), - transition: "start", - }, - ttl_ms: 7 * 24 * 60 * 60 * 1000, // 7 days - }, -} - export const WorkspaceOffShort = Template.bind({}) WorkspaceOffShort.args = { workspace: { From 7ffc4cb6b4b4229ac5b5c4bd6992ee8ef546cfba Mon Sep 17 00:00:00 2001 From: kira-pilot Date: Mon, 11 Jul 2022 14:47:42 +0000 Subject: [PATCH 2/2] removing workspaceSchedule stories --- .../WorkspaceSchedule.stories.tsx | 47 ------------------- 1 file changed, 47 deletions(-) diff --git a/site/src/components/WorkspaceSchedule/WorkspaceSchedule.stories.tsx b/site/src/components/WorkspaceSchedule/WorkspaceSchedule.stories.tsx index 4878c0910a8e3..f93e09398a2c9 100644 --- a/site/src/components/WorkspaceSchedule/WorkspaceSchedule.stories.tsx +++ b/site/src/components/WorkspaceSchedule/WorkspaceSchedule.stories.tsx @@ -6,13 +6,6 @@ import { WorkspaceSchedule, WorkspaceScheduleProps } from "./WorkspaceSchedule" dayjs.extend(utc) -// REMARK: There's a known problem with storybook and using date libraries that -// call string.toLowerCase -// SEE: https:github.com/storybookjs/storybook/issues/12208#issuecomment-697044557 -const ONE = 1 -const SEVEN = 7 -const THIRTY = 30 - export default { title: "components/WorkspaceSchedule", component: WorkspaceSchedule, @@ -53,46 +46,6 @@ NoTTL.args = { }, } -export const ShutdownRealSoon = Template.bind({}) -ShutdownRealSoon.args = { - workspace: { - ...Mocks.MockWorkspace, - latest_build: { - ...Mocks.MockWorkspaceBuild, - deadline: dayjs().add(THIRTY, "minute").utc().format(), - transition: "start", - }, - ttl_ms: 2 * 60 * 60 * 1000, // 2 hours - }, -} - -export const ShutdownSoon = Template.bind({}) -ShutdownSoon.args = { - workspace: { - ...Mocks.MockWorkspace, - latest_build: { - ...Mocks.MockWorkspaceBuild, - deadline: dayjs().add(ONE, "hour").utc().format(), - transition: "start", - }, - ttl_ms: 2 * 60 * 60 * 1000, // 2 hours - }, -} - -export const ShutdownLong = Template.bind({}) -ShutdownLong.args = { - workspace: { - ...Mocks.MockWorkspace, - - latest_build: { - ...Mocks.MockWorkspaceBuild, - deadline: dayjs().add(SEVEN, "days").utc().format(), - transition: "start", - }, - ttl_ms: 7 * 24 * 60 * 60 * 1000, // 7 days - }, -} - export const WorkspaceOffShort = Template.bind({}) WorkspaceOffShort.args = { workspace: {