Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commitd12221c

Browse files
feat(site): add build parameters option when starting or restarting a workspace (#8524)
1 parent2fae9b0 commitd12221c

File tree

19 files changed

+742
-314
lines changed

19 files changed

+742
-314
lines changed

‎site/src/api/api.ts

Lines changed: 23 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -519,11 +519,13 @@ export const startWorkspace = (
519519
workspaceId:string,
520520
templateVersionId:string,
521521
logLevel?:TypesGen.CreateWorkspaceBuildRequest["log_level"],
522+
buildParameters?:TypesGen.WorkspaceBuildParameter[],
522523
)=>
523524
postWorkspaceBuild(workspaceId,{
524525
transition:"start",
525526
template_version_id:templateVersionId,
526527
log_level:logLevel,
528+
rich_parameter_values:buildParameters,
527529
})
528530
exportconststopWorkspace=(
529531
workspaceId:string,
@@ -552,7 +554,13 @@ export const cancelWorkspaceBuild = async (
552554
returnresponse.data
553555
}
554556

555-
exportconstrestartWorkspace=async(workspace:TypesGen.Workspace)=>{
557+
exportconstrestartWorkspace=async({
558+
workspace,
559+
buildParameters,
560+
}:{
561+
workspace:TypesGen.Workspace
562+
buildParameters?:TypesGen.WorkspaceBuildParameter[]
563+
})=>{
556564
conststopBuild=awaitstopWorkspace(workspace.id)
557565
constawaitedStopBuild=awaitwaitForBuild(stopBuild)
558566

@@ -564,6 +572,8 @@ export const restartWorkspace = async (workspace: TypesGen.Workspace) => {
564572
conststartBuild=awaitstartWorkspace(
565573
workspace.id,
566574
workspace.latest_build.template_version_id,
575+
undefined,
576+
buildParameters,
567577
)
568578
awaitwaitForBuild(startBuild)
569579
}
@@ -1346,3 +1356,15 @@ export const issueReconnectingPTYSignedToken = async (
13461356
)
13471357
returnresponse.data
13481358
}
1359+
1360+
exportconstgetWorkspaceParameters=async(workspace:TypesGen.Workspace)=>{
1361+
constlatestBuild=workspace.latest_build
1362+
const[templateVersionRichParameters,buildParameters]=awaitPromise.all([
1363+
getTemplateVersionRichParameters(latestBuild.template_version_id),
1364+
getWorkspaceBuildParameters(latestBuild.id),
1365+
])
1366+
return{
1367+
templateVersionRichParameters,
1368+
buildParameters,
1369+
}
1370+
}
Lines changed: 12 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,25 @@
1-
import{FC}from"react"
1+
import{forwardRef}from"react"
22
importMuiLoadingButton,{
33
LoadingButtonPropsasMuiLoadingButtonProps,
44
}from"@mui/lab/LoadingButton"
55

66
exporttypeLoadingButtonProps=MuiLoadingButtonProps
77

8-
exportconstLoadingButton:FC<LoadingButtonProps>=({
9-
children,
10-
loadingIndicator,
11-
...buttonProps
12-
})=>{
8+
exportconstLoadingButton=forwardRef<
9+
HTMLButtonElement,
10+
MuiLoadingButtonProps
11+
>(({ children, loadingIndicator, ...buttonProps},ref)=>{
1312
return(
14-
<MuiLoadingButtonvariant="outlined"color="neutral"{...buttonProps}>
13+
<MuiLoadingButton
14+
variant="outlined"
15+
color="neutral"
16+
ref={ref}
17+
{...buttonProps}
18+
>
1519
{/* known issue: https://github.com/mui/material-ui/issues/27853 */}
1620
<span>
1721
{buttonProps.loading&&loadingIndicator ?loadingIndicator :children}
1822
</span>
1923
</MuiLoadingButton>
2024
)
21-
}
25+
})

‎site/src/components/Markdown/Markdown.tsx

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,17 +12,21 @@ import { Prism as SyntaxHighlighter } from "react-syntax-highlighter"
1212
importgfmfrom"remark-gfm"
1313
import{colors}from"theme/colors"
1414
import{darcula}from"react-syntax-highlighter/dist/cjs/styles/prism"
15+
import{combineClasses}from"utils/combineClasses"
1516

1617
exportinterfaceMarkdownProps{
1718
children:string
1819
}
1920

20-
exportconstMarkdown:FC<{children:string}>=({ children})=>{
21+
exportconstMarkdown:FC<{children:string;className?:string}>=({
22+
children,
23+
className,
24+
})=>{
2125
conststyles=useStyles()
2226

2327
return(
2428
<ReactMarkdown
25-
className={styles.markdown}
29+
className={combineClasses([styles.markdown,className])}
2630
remarkPlugins={[gfm]}
2731
components={{
2832
a:({ href, target, children})=>(

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp