NotificationsYou must be signed in to change notification settings
Fork928
Star10.1k

Commiteaacc26

authored

fix(site): Fix missing parameters detection on update workspace (#6740)

1 parentdab4a0e commiteaacc26Copy full SHA for eaacc26

File tree

4 files changed

+17

-17

lines changed

site/src
- api
  - api.ts
- pages/WorkspacePage
  - UpdateBuildParametersDialog.tsx
  - WorkspaceReadyPage.tsx
- xServices/workspace
  - workspaceXService.ts

4 files changed

+17

-17

lines changed

`‎site/src/api/api.ts`

Lines changed: 4 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -977,7 +977,10 @@ const getMissingParameters = (`
`977`	`977`	`)=>{`
`978`	`978`	`constmissingParameters:TypesGen.TemplateVersionParameter[]=[]`
`979`	`979`	`constrequiredParameters=templateParameters.filter(`
`980`		`-(p)=>p.required&&p.mutable,`
	`980`	`+// It is required`
	`981`	`+// and it can be changed`
	`982`	`+// and it is not from a legacy variable`
	`983`	`+(p)=>p.required&&p.mutable&&p.legacy_variable_name===undefined,`
`981`	`984`	`)`
`982`	`985`
`983`	`986`	`for(constparameterofrequiredParameters){`

`‎site/src/pages/WorkspacePage/UpdateBuildParametersDialog.tsx`

Lines changed: 7 additions & 10 deletions

Original file line number	Diff line number	Diff line change
`@@ -25,21 +25,22 @@ import { useTranslation } from "react-i18next"`
`25`	`25`	`exporttypeUpdateBuildParametersDialogProps=DialogProps&{`
`26`	`26`	`onClose:()=>void`
`27`	`27`	`onUpdate:(buildParameters:WorkspaceBuildParameter[])=>void`
`28`		`-parameters?:TemplateVersionParameter[]`
	`28`	`+missedParameters?:TemplateVersionParameter[]`
`29`	`29`	`}`
`30`	`30`
`31`	`31`	`exportconstUpdateBuildParametersDialog:FC<`
`32`	`32`	`UpdateBuildParametersDialogProps`
`33`		`->=({parameters, onUpdate, ...dialogProps})=>{`
	`33`	`+>=({missedParameters, onUpdate, ...dialogProps})=>{`
`34`	`34`	`conststyles=useStyles()`
`35`	`35`	`constform=useFormik({`
`36`	`36`	`initialValues:{`
`37`		`-rich_parameter_values:selectInitialRichParametersValues(parameters),`
	`37`	`+rich_parameter_values:`
	`38`	`+selectInitialRichParametersValues(missedParameters),`
`38`	`39`	`},`
`39`	`40`	`validationSchema:Yup.object({`
`40`	`41`	`rich_parameter_values:useValidationSchemaForRichParameters(`
`41`	`42`	`"createWorkspacePage",`
`42`		`-parameters,`
	`43`	`+missedParameters,`
`43`	`44`	`),`
`44`	`45`	`}),`
`45`	`46`	`onSubmit:(values)=>{`
`@@ -72,13 +73,9 @@ export const UpdateBuildParametersDialog: FC<`
`72`	`73`	`onSubmit={form.handleSubmit}`
`73`	`74`	`id="updateParameters"`
`74`	`75`	`>`
`75`		`-{parameters&&parameters.filter((p)=>p.mutable).length>0&&(`
	`76`	`+{missedParameters&&(`
`76`	`77`	`<FormFields>`
`77`		`-{parameters.map((parameter,index)=>{`
`78`		`-if(!parameter.mutable){`
`79`		`-return<></>`
`80`		`-}`
`81`		`-`
	`78`	`+{missedParameters.map((parameter,index)=>{`
`82`	`79`	`return(`
`83`	`80`	`<RichParameterInput`
`84`	`81`	`{...getFieldHelpers(`

`‎site/src/pages/WorkspacePage/WorkspaceReadyPage.tsx`

Lines changed: 2 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -52,7 +52,7 @@ export const WorkspaceReadyPage = ({`
`52`	`52`	`cancellationError,`
`53`	`53`	`applicationsHost,`
`54`	`54`	`permissions,`
`55`		`-missingParameters,`
	`55`	`+missedParameters,`
`56`	`56`	`}=workspaceState.context`
`57`	`57`	`if(workspace===undefined){`
`58`	`58`	`throwError("Workspace is undefined")`
`@@ -140,7 +140,7 @@ export const WorkspaceReadyPage = ({`
`140`	`140`	`}}`
`141`	`141`	`/>`
`142`	`142`	`<UpdateBuildParametersDialog`
`143`		`-parameters={missingParameters}`
	`143`	`+missedParameters={missedParameters}`
`144`	`144`	`open={workspaceState.matches(`
`145`	`145`	`"ready.build.askingForMissedBuildParameters",`
`146`	`146`	`)}`

`‎site/src/xServices/workspace/workspaceXService.ts`

Lines changed: 4 additions & 4 deletions

Original file line number	Diff line number	Diff line change
`@@ -62,7 +62,7 @@ export interface WorkspaceContext {`
`62`	`62`	`// Builds`
`63`	`63`	`builds?:TypesGen.WorkspaceBuild[]`
`64`	`64`	`getBuildsError?:Error\|unknown`
`65`		`-missingParameters?:TypesGen.TemplateVersionParameter[]`
	`65`	`+missedParameters?:TypesGen.TemplateVersionParameter[]`
`66`	`66`	`// error creating a new WorkspaceBuild`
`67`	`67`	`buildError?:Error\|unknown`
`68`	`68`	`cancellationMessage?:Types.Message`
`@@ -302,7 +302,7 @@ export const workspaceMachine = createMachine(`
`302`	`302`	`{`
`303`	`303`	`target:"askingForMissedBuildParameters",`
`304`	`304`	`cond:"isMissingBuildParameterError",`
`305`		`-actions:["assignMissingParameters"],`
	`305`	`+actions:["assignMissedParameters"],`
`306`	`306`	`},`
`307`	`307`	`{`
`308`	`308`	`target:"idle",`
`@@ -597,8 +597,8 @@ export const workspaceMachine = createMachine(`
`597`	`597`	`}`
`598`	`598`	`},`
`599`	`599`	`}),`
`600`		`-assignMissingParameters:assign({`
`601`		`-missingParameters:(_,{ data})=>{`
	`600`	`+assignMissedParameters:assign({`
	`601`	`+missedParameters:(_,{ data})=>{`
`602`	`602`	`if(!(datainstanceofAPI.MissingBuildParameters)){`
`603`	`603`	`thrownewError("data is not a MissingBuildParameters error")`
`604`	`604`	`}`

0 commit comments

Comments

(0)

Movatterモバイル変換

Navigation Menu

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

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Commiteaacc26

File tree

4 files changed

4 files changed

`‎site/src/api/api.ts`

`‎site/src/pages/WorkspacePage/UpdateBuildParametersDialog.tsx`

`‎site/src/pages/WorkspacePage/WorkspaceReadyPage.tsx`

`‎site/src/xServices/workspace/workspaceXService.ts`

0 commit comments