feat(site): move history into sidebar #11413
Next
Next commit
WIP: Add base sidebar structure
- Loading branch information
commit e7d633dcf7d0f19d48d883dde4bbf5b703c69a19
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,66 @@ | ||
| import { Interpolation, Theme, useTheme } from "@mui/material/styles"; | ||
| import { HTMLAttributes } from "react"; | ||
| import { Link, LinkProps } from "react-router-dom"; | ||
|
|
||
| export const Sidebar = (props: HTMLAttributes<HTMLDivElement>) => { | ||
| const theme = useTheme(); | ||
| return ( | ||
| <div | ||
| css={{ | ||
| width: 260, | ||
| borderRight: `1px solid ${theme.palette.divider}`, | ||
| height: "100%", | ||
| overflow: "auto", | ||
| flexShrink: 0, | ||
| padding: "8px 0", | ||
| display: "flex", | ||
| flexDirection: "column", | ||
| gap: 1, | ||
| }} | ||
| {...props} | ||
| /> | ||
| ); | ||
| }; | ||
|
|
||
| export const SidebarLink = (props: LinkProps) => { | ||
| return <Link css={styles.sidebarItem} {...props} />; | ||
| }; | ||
|
|
||
| export const SidebarItem = (props: HTMLAttributes<HTMLButtonElement>) => { | ||
| return <button css={styles.sidebarItem} {...props} />; | ||
| }; | ||
|
|
||
| export const SidebarCaption = (props: HTMLAttributes<HTMLSpanElement>) => { | ||
| return ( | ||
| <span | ||
| css={{ | ||
| fontSize: 10, | ||
| lineHeight: 1.2, | ||
| padding: "12px 16px", | ||
| display: "block", | ||
| textTransform: "uppercase", | ||
| fontWeight: 500, | ||
| letterSpacing: 1, | ||
BrunoQuaresma marked this conversation as resolved.
Show resolved
Hide resolved
|
||
| }} | ||
| {...props} | ||
| /> | ||
| ); | ||
| }; | ||
|
|
||
| const styles = { | ||
| sidebarItem: (theme: Theme) => ({ | ||
BrunoQuaresma marked this conversation as resolved.
Show resolved
Hide resolved
|
||
| fontSize: 14, | ||
| lineHeight: 1.2, | ||
| color: theme.palette.text.primary, | ||
| textDecoration: "none", | ||
| padding: "8px 16px", | ||
| display: "block", | ||
| textAlign: "left", | ||
| background: "none", | ||
| border: 0, | ||
|
|
||
| "&:hover": { | ||
| backgroundColor: theme.palette.action.hover, | ||
| }, | ||
| }), | ||
| } satisfies Record<string, Interpolation<Theme>>; | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,76 @@ | ||
| import { Interpolation, Theme, useTheme } from "@emotion/react"; | ||
| import Skeleton from "@mui/material/Skeleton"; | ||
| import { WorkspaceBuild } from "api/typesGenerated"; | ||
| import { BuildIcon } from "components/BuildIcon/BuildIcon"; | ||
| import { | ||
| getDisplayWorkspaceBuildStatus, | ||
| getDisplayWorkspaceBuildInitiatedBy, | ||
| displayWorkspaceBuildDuration, | ||
| } from "utils/workspace"; | ||
|
|
||
| export const WorkspaceBuildData = ({ build }: { build: WorkspaceBuild }) => { | ||
| const theme = useTheme(); | ||
| const statusType = getDisplayWorkspaceBuildStatus(theme, build).type; | ||
|
|
||
| return ( | ||
| <div css={styles.root}> | ||
| <BuildIcon | ||
| transition={build.transition} | ||
| css={{ | ||
| width: 16, | ||
| height: 16, | ||
| color: theme.palette[statusType].light, | ||
| }} | ||
| /> | ||
| <div css={{ overflow: "hidden" }}> | ||
| <div | ||
| css={{ | ||
| textTransform: "capitalize", | ||
| color: theme.palette.text.primary, | ||
| textOverflow: "ellipsis", | ||
| overflow: "hidden", | ||
| whiteSpace: "nowrap", | ||
| }} | ||
| > | ||
| {build.transition} by{" "} | ||
| <strong>{getDisplayWorkspaceBuildInitiatedBy(build)}</strong> | ||
| </div> | ||
| <div | ||
| css={{ | ||
| fontSize: 12, | ||
| color: theme.palette.text.secondary, | ||
| marginTop: 2, | ||
| }} | ||
| > | ||
| {displayWorkspaceBuildDuration(build)} | ||
| </div> | ||
| </div> | ||
| </div> | ||
| ); | ||
| }; | ||
|
|
||
| export const WorkspaceBuildDataSkeleton = () => { | ||
| return ( | ||
| <div css={styles.root}> | ||
| <Skeleton variant="circular" width={16} height={16} /> | ||
| <div> | ||
| <Skeleton variant="text" width={94} height={16} /> | ||
| <Skeleton | ||
| variant="text" | ||
| width={60} | ||
| height={14} | ||
| css={{ marginTop: 2 }} | ||
| /> | ||
| </div> | ||
| </div> | ||
| ); | ||
| }; | ||
|
|
||
| const styles = { | ||
| root: { | ||
| display: "flex", | ||
| flexDirection: "row", | ||
| alignItems: "center", | ||
| gap: 8, | ||
| }, | ||
| } satisfies Record<string, Interpolation<Theme>>; |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,44 @@ | ||
| import { infiniteWorkspaceBuilds } from "api/queries/workspaceBuilds"; | ||
| import { Workspace } from "api/typesGenerated"; | ||
| import { | ||
| SidebarCaption, | ||
| SidebarItem, | ||
| SidebarLink, | ||
| } from "components/FullPageLayout/Sidebar"; | ||
| import { | ||
| WorkspaceBuildData, | ||
| WorkspaceBuildDataSkeleton, | ||
| } from "components/WorkspaceBuild/WorkspaceBuildData"; | ||
| import { useInfiniteQuery } from "react-query"; | ||
|
|
||
| export const HistorySidebarContent = ({ | ||
| workspace, | ||
| }: { | ||
| workspace: Workspace; | ||
| }) => { | ||
| const buildsQuery = useInfiniteQuery({ | ||
| ...infiniteWorkspaceBuilds(workspace?.id ?? ""), | ||
| enabled: workspace !== undefined, | ||
| }); | ||
| const builds = buildsQuery.data?.pages.flat(); | ||
|
|
||
| return ( | ||
| <> | ||
| <SidebarCaption>History</SidebarCaption> | ||
| {builds | ||
| ? builds.map((build) => ( | ||
| <SidebarLink | ||
| key={build.id} | ||
| to={`/@${build.workspace_owner_name}/${build.workspace_name}/builds/${build.build_number}`} | ||
| > | ||
| <WorkspaceBuildData build={build} /> | ||
| </SidebarLink> | ||
| )) | ||
| : Array.from({ length: 15 }, (_, i) => ( | ||
| <SidebarItem key={i}> | ||
| <WorkspaceBuildDataSkeleton /> | ||
| </SidebarItem> | ||
| ))} | ||
| </> | ||
| ); | ||
| }; |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,29 @@ | ||
| import { useTheme } from "@mui/material/styles"; | ||
| import { Workspace } from "api/typesGenerated"; | ||
| import { SidebarLink, SidebarCaption } from "components/FullPageLayout/Sidebar"; | ||
|
|
||
| export const ResourcesSidebarContent = ({ | ||
| workspace, | ||
| }: { | ||
| workspace: Workspace; | ||
| }) => { | ||
| const theme = useTheme(); | ||
|
|
||
| return ( | ||
| <> | ||
| <SidebarCaption>Resources</SidebarCaption> | ||
| {workspace.latest_build.resources.map((r) => ( | ||
| <SidebarLink | ||
| key={r.id} | ||
| to={{ search: `r=${r.id}` }} | ||
| css={{ display: "flex", flexDirection: "column", lineHeight: 1.6 }} | ||
| > | ||
| <span css={{ fontWeight: 500 }}>{r.name}</span> | ||
| <span css={{ fontSize: 13, color: theme.palette.text.secondary }}> | ||
| {r.type} | ||
| </span> | ||
| </SidebarLink> | ||
| ))} | ||
| </> | ||
| ); | ||
| }; |
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Just for future-proofing, do you think it's worth explicitly pulling the
typeattribute out and setting its default value tobutton?There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Not sure if I got it... do you have a code sample?
Uh oh!
There was an error while loading. Please reload this page.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Sorry, just realized that the comment got garbled by a stray backtick
Now that I'm a little more awake, I think my suggestion would be overkill, but I was talking about this: