Skip to content

feat(site): add build parameters option when starting or restarting a workspace #8524

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.

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 15 commits into from
Jul 18, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
24 changes: 23 additions & 1 deletion site/src/api/api.ts
Original file line number Diff line number Diff line change
Expand Up @@ -519,11 +519,13 @@ export const startWorkspace = (
workspaceId: string,
templateVersionId: string,
logLevel?: TypesGen.CreateWorkspaceBuildRequest["log_level"],
buildParameters?: TypesGen.WorkspaceBuildParameter[],
) =>
postWorkspaceBuild(workspaceId, {
transition: "start",
template_version_id: templateVersionId,
log_level: logLevel,
rich_parameter_values: buildParameters,
})
export const stopWorkspace = (
workspaceId: string,
Expand Down Expand Up @@ -552,7 +554,13 @@ export const cancelWorkspaceBuild = async (
return response.data
}

export const restartWorkspace = async (workspace: TypesGen.Workspace) => {
export const restartWorkspace = async ({
workspace,
buildParameters,
}: {
workspace: TypesGen.Workspace
buildParameters?: TypesGen.WorkspaceBuildParameter[]
}) => {
const stopBuild = await stopWorkspace(workspace.id)
const awaitedStopBuild = await waitForBuild(stopBuild)

Expand All @@ -564,6 +572,8 @@ export const restartWorkspace = async (workspace: TypesGen.Workspace) => {
const startBuild = await startWorkspace(
workspace.id,
workspace.latest_build.template_version_id,
undefined,
buildParameters,
)
await waitForBuild(startBuild)
}
Expand Down Expand Up @@ -1346,3 +1356,15 @@ export const issueReconnectingPTYSignedToken = async (
)
return response.data
}

export const getWorkspaceParameters = async (workspace: TypesGen.Workspace) => {
const latestBuild = workspace.latest_build
const [templateVersionRichParameters, buildParameters] = await Promise.all([
getTemplateVersionRichParameters(latestBuild.template_version_id),
getWorkspaceBuildParameters(latestBuild.id),
])
return {
templateVersionRichParameters,
buildParameters,
}
}
20 changes: 12 additions & 8 deletions site/src/components/LoadingButton/LoadingButton.tsx
Original file line number Diff line number Diff line change
@@ -1,21 +1,25 @@
import { FC } from "react"
import { forwardRef } from "react"
import MuiLoadingButton, {
LoadingButtonProps as MuiLoadingButtonProps,
} from "@mui/lab/LoadingButton"

export type LoadingButtonProps = MuiLoadingButtonProps

export const LoadingButton: FC<LoadingButtonProps> = ({
children,
loadingIndicator,
...buttonProps
}) => {
export const LoadingButton = forwardRef<
HTMLButtonElement,
MuiLoadingButtonProps
>(({ children, loadingIndicator, ...buttonProps }, ref) => {
return (
<MuiLoadingButton variant="outlined" color="neutral" {...buttonProps}>
<MuiLoadingButton
variant="outlined"
color="neutral"
ref={ref}
{...buttonProps}
>
{/* known issue: https://github.com/mui/material-ui/issues/27853 */}
<span>
{buttonProps.loading && loadingIndicator ? loadingIndicator : children}
</span>
</MuiLoadingButton>
)
}
})
8 changes: 6 additions & 2 deletions site/src/components/Markdown/Markdown.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -12,17 +12,21 @@ import { Prism as SyntaxHighlighter } from "react-syntax-highlighter"
import gfm from "remark-gfm"
import { colors } from "theme/colors"
import { darcula } from "react-syntax-highlighter/dist/cjs/styles/prism"
import { combineClasses } from "utils/combineClasses"

export interface MarkdownProps {
children: string
}

export const Markdown: FC<{ children: string }> = ({ children }) => {
export const Markdown: FC<{ children: string; className?: string }> = ({
children,
className,
}) => {
const styles = useStyles()

return (
<ReactMarkdown
className={styles.markdown}
className={combineClasses([styles.markdown, className])}
remarkPlugins={[gfm]}
components={{
a: ({ href, target, children }) => (
Expand Down
Loading