8000 refactor: Move schedule to the header by BrunoQuaresma · Pull Request #2775 · coder/coder · GitHub
[go: up one dir, main page]
Skip to content
< 8000 div hidden="hidden" data-view-component="true" class="js-stale-session-flash stale-session-flash flash flash-warn flash-full"> Dismiss alert

refactor: Move schedule to the header #2775

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 9 commits into from
Jul 1, 2022
Merged

refactor: Move schedule to the header #2775

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
c7d86ba
refactor: Move schedule to the header
BrunoQuaresma Jul 1, 2022
b383a0f
test: Add storybook
BrunoQuaresma Jul 1, 2022
ead1ff9
Move tests to the schedule button
BrunoQuaresma Jul 1, 2022
a564dcb
Cleaning up components
BrunoQuaresma Jul 1, 2022
f0d1481
Remove comment
BrunoQuaresma Jul 1, 2022
d4e38f5
Memoize workspace schedule button
BrunoQuaresma Jul 1, 2022
fcef0ae
Extract isShuttingDown logic
BrunoQuaresma Jul 1, 2022
700fb67
Ignores the label on workspace schedule button
BrunoQuaresma Jul 1, 2022
2280693
Remove memoization
BrunoQuaresma Jul 1, 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
Prev Previous commit
Next Next commit
test: Add storybook
  • Loading branch information
@BrunoQuaresma
BrunoQuaresma committed Jul 1, 2022
commit b383a0f8b63a0f87e63d019243e5a8d25340292a
117 changes: 117 additions & 0 deletions site/src/components/WorkspaceScheduleButton/WorkspaceScheduleButton.stories.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,117 @@
import { Story } from "@storybook/react"
import dayjs from "dayjs"
import utc from "dayjs/plugin/utc"
import * as Mocks from "../../testHelpers/entities"
import { WorkspaceScheduleButton, WorkspaceScheduleButtonProps } from "./WorkspaceScheduleButton"

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,
}

const Template: Story<WorkspaceScheduleButtonProps> = (args) => (
<WorkspaceScheduleButton {...args} />
)

export const NoScheduleNoTTL = Template.bind({})
NoScheduleNoTTL.args = {
workspace: {
...Mocks.MockWorkspace,

latest_build: {
...Mocks.MockWorkspaceBuild,
transition: "stop",
},
autostart_schedule: undefined,
ttl_ms: undefined,
},
}

export const NoTTL = Template.bind({})
NoTTL.args = {
workspace: {
...Mocks.MockWorkspace,
latest_build: {
...Mocks.MockWorkspaceBuild,
// a mannual shutdown has a deadline of '"0001-01-01T00:00:00Z"'
// SEE: #1834
deadline: "0001-01-01T00:00:00Z",
},
ttl_ms: undefined,
},
}

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: {
...Mocks.MockWorkspace,

latest_build: {
...Mocks.MockWorkspaceBuild,
transition: "stop",
},
ttl_ms: 2 * 60 * 60 * 1000, // 2 hours
},
}

export const WorkspaceOffLong = Template.bind({})
WorkspaceOffLong.args = {
workspace: {
...Mocks.MockWorkspace,

latest_build: {
...Mocks.MockWorkspaceBuild,
transition: "stop",
},
ttl_ms: 2 * 365 * 24 * 60 * 60 * 1000, // 2 years
},
}
8 changes: 5 additions & 3 deletions site/src/components/WorkspaceScheduleButton/WorkspaceScheduleButton.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -129,14 +129,14 @@ const WorkspaceScheduleLabel: React.FC<{ workspace: Workspace }> = ({ workspace
)
}

interface WorkspaceScheduleProps {
export interface WorkspaceScheduleButtonProps {
workspace: Workspace
onDeadlinePlus: () => void
onDeadlineMinus: () => void
now?: dayjs.Dayjs
}

export const WorkspaceScheduleButton: React.FC<WorkspaceScheduleProps> = ({
export const WorkspaceScheduleButton: React.FC<WorkspaceScheduleButtonProps> = ({
workspace,
onDeadlinePlus,
onDeadlineMinus,
Expand Down Expand Up @@ -227,14 +227,16 @@ const useStyles = makeStyles((theme) => ({
alignItems: "center",
padding: "0 8px 0 16px",
color: theme.palette.text.secondary,
// It is from the button props
minHeight: 42,
},

labelText: {
marginRight: theme.spacing(2),
},

labelStrong: {
marginRight: theme.spacing(0.25),
marginRight: theme.spacing(0.5),
},

iconButton: {
Expand Down
0