Skip to content

fix: ws schedule as 12-hour format #2209

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 8 commits into from
Jun 9, 2022
Merged

fix: ws schedule as 12-hour format #2209

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
38ee675
fix: ws schedule as 12-hour format
greyscaled Jun 9, 2022
618f13d
fixup! fix: ws schedule as 12-hour format
greyscaled Jun 9, 2022
de183b7
fixup! fix: ws schedule as 12-hour format
greyscaled Jun 9, 2022
51c92a6
fixup! fix: ws schedule as 12-hour format
greyscaled Jun 9, 2022
ccb543c
fixup! fix: ws schedule as 12-hour format
greyscaled Jun 9, 2022
7bfc0b8
fixup! fix: ws schedule as 12-hour format
greyscaled Jun 9, 2022
af27a3a
Merge origin/main
greyscaled Jun 9, 2022
c92bbb5
Merge origin/main
greyscaled Jun 9, 2022
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
30 changes: 11 additions & 19 deletions site/src/components/WorkspaceSchedule/WorkspaceSchedule.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ import { FC } from "react"
import { Link as RouterLink } from "react-router-dom"
import { Workspace } from "../../api/typesGenerated"
import { MONOSPACE_FONT_FAMILY } from "../../theme/constants"
import { extractTimezone, stripTimezone } from "../../util/schedule"
import { stripTimezone } from "../../util/schedule"
import { isWorkspaceOn } from "../../util/workspace"
import { Stack } from "../Stack/Stack"

Expand All @@ -31,20 +31,11 @@ export const Language = {
return "Manual"
}
},
autoStartLabel: (schedule: string | undefined): string => {
const prefix = "Start"
const timezone = schedule ? extractTimezone(schedule) : dayjs.tz.guess()

if (schedule) {
return `${prefix} (${dayjs().tz(timezone).format("z")})`
} else {
return prefix
}
},
autoStartLabel: "START",
autoStopLabel: "SHUTDOWN",
autoStopDisplay: (workspace: Workspace): string => {
const schedule = workspace.autostart_schedule
const deadline = dayjs(workspace.latest_build.deadline).utc()
// a mannual shutdown has a deadline of '"0001-01-01T00:00:00Z"'
// a manual shutdown has a deadline of '"0001-01-01T00:00:00Z"'
// SEE: #1834
const hasDeadline = deadline.year() > 1
const ttl = workspace.ttl_ms
Expand All @@ -59,8 +50,7 @@ export const Language = {
if (now.isAfter(deadline)) {
return "Workspace is shutting down"
} else {
const timezone = schedule ? extractTimezone(schedule) : dayjs.tz.guess()
return deadline.tz(timezone).format("HH:mm A")
return deadline.tz(dayjs.tz.guess()).format("hh:mm A")
}
} else if (!ttl || ttl < 1) {
// If the workspace is not on, and the ttl is 0 or undefined, then the
Expand All @@ -74,7 +64,7 @@ export const Language = {
}
},
editScheduleLink: "Edit schedule",
schedule: "Schedule",
schedule: `Schedule (${dayjs.tz.guess()})`,
}

export interface WorkspaceScheduleProps {
Expand All @@ -92,11 +82,13 @@ export const WorkspaceSchedule: FC<WorkspaceScheduleProps> = ({ workspace }) =>
{Language.schedule}
</Typography>
<div>
<span className={styles.scheduleLabel}>{Language.autoStartLabel(workspace.autostart_schedule)}</span>
<span className={styles.scheduleValue}>{Language.autoStartDisplay(workspace.autostart_schedule)}</span>
<span className={styles.scheduleLabel}>{Language.autoStartLabel}</span>
<span className={styles.scheduleValue} data-chromatic="ignore">
{Language.autoStartDisplay(workspace.autostart_schedule)}
</span>
</div>
<div>
<span className={styles.scheduleLabel}>Shutdown</span>
<span className={styles.scheduleLabel}>{Language.autoStopLabel}</span>
<span className={styles.scheduleValue} data-chromatic="ignore">
{Language.autoStopDisplay(workspace)}
</span>
Expand Down
4 changes: 3 additions & 1 deletion site/src/pages/WorkspacePage/WorkspacePage.test.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,9 @@ const renderWorkspacePage = async () => {

const testButton = async (label: string, actionMock: jest.SpyInstance) => {
await renderWorkspacePage()
const button = await screen.findByText(label)
// REMARK: exact here because the "Start" button and "START" label for
// workspace schedule could otherwise conflict.
const button = await screen.findByText(label, { exact: true })
await waitFor(() => fireEvent.click(button))
expect(actionMock).toBeCalled()
}
Expand Down