Skip to content

fix: border fixes for workspace schedule button #3010

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 4 commits into from
Jul 15, 2022
Merged

fix: border fixes for workspace schedule button #3010

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
eb45886
border fixes for workspace schedule button
Kira-Pilot Jul 15, 2022
baad10f
fixing chromatic snapshots
Kira-Pilot Jul 15, 2022
939c10e
chromatic fix
Kira-Pilot Jul 15, 2022
70b09d6
Merge remote-tracking branch 'origin/main' into tweak-workspace-actio…
Kira-Pilot Jul 15, 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
37 changes: 19 additions & 18 deletions site/src/components/WorkspaceScheduleButton/WorkspaceScheduleButton.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,6 @@ import utc from "dayjs/plugin/utc"
import { useRef, useState } from "react"
import { Workspace } from "../../api/typesGenerated"
import { isWorkspaceOn } from "../../util/workspace"
import { Stack } from "../Stack/Stack"
import { WorkspaceSchedule } from "../WorkspaceSchedule/WorkspaceSchedule"
import { WorkspaceScheduleLabel } from "./WorkspaceScheduleLabel"

Expand All @@ -28,6 +27,7 @@ dayjs.extend(relativeTime)
dayjs.extend(timezone)

export const Language = {
schedule: "Schedule",
editDeadlineMinus: "Subtract one hour",
editDeadlinePlus: "Add one hour",
}
Expand Down Expand Up @@ -73,11 +73,11 @@ export const WorkspaceScheduleButton: React.FC<WorkspaceScheduleButtonProps> = (
}

return (
<div className={styles.wrapper}>
<div className={styles.label}>
<span className={styles.wrapper}>
<span className={styles.label}>
<WorkspaceScheduleLabel workspace={workspace} />
{canUpdateWorkspace && shouldDisplayPlusMinus(workspace) && (
<Stack direction="row" spacing={0}>
<span>
<IconButton
className={styles.iconButton}
size="small"
Expand All @@ -98,18 +98,19 @@ export const WorkspaceScheduleButton: React.FC<WorkspaceScheduleButtonProps> = (
<AddIcon />
</Tooltip>
</IconButton>
</Stack>
</span>
)}
</div>
<div>
</span>
<>
<Button
ref={anchorRef}
startIcon={<ScheduleIcon />}
onClick={() => {
setIsOpen(true)
}}
className={styles.scheduleButton}
>
Schedule
{Language.schedule}
</Button>
<Popover
classes={{ paper: styles.popoverPaper }}
Expand All @@ -128,33 +129,33 @@ export const WorkspaceScheduleButton: React.FC<WorkspaceScheduleButtonProps> = (
>
<WorkspaceSchedule workspace={workspace} canUpdateWorkspace={canUpdateWorkspace} />
</Popover>
</div>
</div>
</>
</span>
)
}

const useStyles = makeStyles((theme) => ({
wrapper: {
display: "flex",
alignItems: "center",
display: "inline-block",
border: `1px solid ${theme.palette.divider}`,
borderRadius: `${theme.shape.borderRadius}px`,
},

label: {
border: `1px solid ${theme.palette.divider}`,
borderRight: 0,
height: "100%",
display: "flex",
alignItems: "center",
padding: "0 8px 0 16px",
color: theme.palette.text.secondary,
// It is from the button props
minHeight: 42,
},

scheduleButton: {
border: "none",
borderLeft: `1px solid ${theme.palette.divider}`,
borderRadius: `0px ${theme.shape.borderRadius}px ${theme.shape.borderRadius}px 0px`,
},
iconButton: {
borderRadius: 2,
},

popoverPaper: {
padding: `${theme.spacing(2)}px ${theme.spacing(3)}px ${theme.spacing(3)}px`,
},
Expand Down