Commit7d9a763

authored

fix(site): Fix update when missing parameters (#7221)

1 parent93d0956 commit7d9a763Copy full SHA for 7d9a763

File tree

+45

-25

lines changed

+45

-25

lines changed

Lines changed: 12 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -173,7 +173,12 @@ describe("api.ts", () => {`
`173`	`173`	`expect(api.postWorkspaceBuild).toHaveBeenCalledWith(MockWorkspace.id,{`
`174`	`174`	`transition:"start",`
`175`	`175`	`template_version_id:MockTemplate.active_version_id,`
`176`		`-rich_parameter_values:[],`
	`176`	`+rich_parameter_values:[`
	`177`	`+{`
	`178`	`+name:"first_parameter",`
	`179`	`+value:"mock-abc",`
	`180`	`+},`
	`181`	`+],`
`177`	`182`	`})`
`178`	`183`	`})`
`179`	`184`
`@@ -222,7 +227,12 @@ describe("api.ts", () => {`
`222`	`227`	`expect(api.postWorkspaceBuild).toHaveBeenCalledWith(MockWorkspace.id,{`
`223`	`228`	`transition:"start",`
`224`	`229`	`template_version_id:MockTemplate.active_version_id,`
`225`		`-rich_parameter_values:[],`
	`230`	`+rich_parameter_values:[`
	`231`	`+{`
	`232`	`+name:"first_parameter",`
	`233`	`+value:"mock-abc",`
	`234`	`+},`
	`235`	`+],`
`226`	`236`	`})`
`227`	`237`	`})`
`228`	`238`	`})`

Lines changed: 10 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -1041,10 +1041,19 @@ export const updateWorkspace = async (`
`1041`	`1041`	`thrownewMissingBuildParameters(missingParameters)`
`1042`	`1042`	`}`
`1043`	`1043`
	`1044`	`+// Merge parameters using name as key`
	`1045`	`+constrichParameterValues=newBuildParameters`
	`1046`	`+oldBuildParameters.forEach((oldParam)=>{`
	`1047`	`+constnewParam=richParameterValues.find((p)=>p.name===oldParam.name)`
	`1048`	`+if(newParam===undefined){`
	`1049`	`+richParameterValues.push(oldParam)`
	`1050`	`+}`
	`1051`	`+})`
	`1052`	`+`
`1044`	`1053`	`returnpostWorkspaceBuild(workspace.id,{`
`1045`	`1054`	`transition:"start",`
`1046`	`1055`	`template_version_id:activeVersionId,`
`1047`		`-rich_parameter_values:newBuildParameters,`
	`1056`	`+rich_parameter_values:richParameterValues,`
`1048`	`1057`	`})`
`1049`	`1058`	`}`
`1050`	`1059`

Lines changed: 23 additions & 22 deletions

Original file line number	Diff line number	Diff line change
`@@ -117,31 +117,32 @@ export const checks = {`
`117`	`117`	`constpermissionsToCheck=(`
`118`	`118`	`workspace:TypesGen.Workspace,`
`119`	`119`	`template:TypesGen.Template,`
`120`		`-)=>({`
`121`		`-[checks.readWorkspace]:{`
`122`		`-object:{`
`123`		`-resource_type:"workspace",`
`124`		`-resource_id:workspace.id,`
`125`		`-owner_id:workspace.owner_id,`
	`120`	`+)=>`
	`121`	`+({`
	`122`	`+[checks.readWorkspace]:{`
	`123`	`+object:{`
	`124`	`+resource_type:"workspace",`
	`125`	`+resource_id:workspace.id,`
	`126`	`+owner_id:workspace.owner_id,`
	`127`	`+},`
	`128`	`+action:"read",`
`126`	`129`	`},`
`127`		`-action:"read",`
`128`		`-},`
`129`		`-[checks.updateWorkspace]:{`
`130`		`-object:{`
`131`		`-resource_type:"workspace",`
`132`		`-resource_id:workspace.id,`
`133`		`-owner_id:workspace.owner_id,`
	`130`	`+[checks.updateWorkspace]:{`
	`131`	`+object:{`
	`132`	`+resource_type:"workspace",`
	`133`	`+resource_id:workspace.id,`
	`134`	`+owner_id:workspace.owner_id,`
	`135`	`+},`
	`136`	`+action:"update",`
`134`	`137`	`},`
`135`		`-action:"update",`
`136`		`-},`
`137`		`-[checks.updateTemplate]:{`
`138`		`-object:{`
`139`		`-resource_type:"template",`
`140`		`-resource_id:template.id,`
	`138`	`+[checks.updateTemplate]:{`
	`139`	`+object:{`
	`140`	`+resource_type:"template",`
	`141`	`+resource_id:template.id,`
	`142`	`+},`
	`143`	`+action:"update",`
`141`	`144`	`},`
`142`		`-action:"update",`
`143`		`-},`
`144`		`-})`
	`145`	`+}asconst)`
`145`	`146`
`146`	`147`	`exportconstworkspaceMachine=createMachine(`
`147`	`148`	`{`

Comments

(0)