Commit9abfe97

authored

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

This reverts commit7d9a763.

1 parenta5a5c4d commit9abfe97Copy full SHA for 9abfe97

File tree

+25

-45

lines changed

+25

-45

lines changed

Lines changed: 2 additions & 12 deletions

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

Lines changed: 1 addition & 10 deletions

Original file line number	Diff line number	Diff line change
`@@ -1041,19 +1041,10 @@ 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`		`-`
`1053`	`1044`	`returnpostWorkspaceBuild(workspace.id,{`
`1054`	`1045`	`transition:"start",`
`1055`	`1046`	`template_version_id:activeVersionId,`
`1056`		`-rich_parameter_values:richParameterValues,`
	`1047`	`+rich_parameter_values:newBuildParameters,`
`1057`	`1048`	`})`
`1058`	`1049`	`}`
`1059`	`1050`

Lines changed: 22 additions & 23 deletions

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

Comments

(0)