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

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

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 ourterms of service andprivacy statement. We’ll occasionally send you account related emails.

Already on GitHub?Sign in to your account

Merged
bpmct merged 1 commit intomainfrombq/fix-template-update
Apr 20, 2023
Merged
Show file tree
Hide file tree
Changes fromall 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
14 changes: 12 additions & 2 deletionssite/src/api/api.test.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -173,7 +173,12 @@ describe("api.ts", () => {
expect(api.postWorkspaceBuild).toHaveBeenCalledWith(MockWorkspace.id,{
transition:"start",
template_version_id:MockTemplate.active_version_id,
rich_parameter_values:[],
rich_parameter_values:[
{
name:"first_parameter",
value:"mock-abc",
},
],
})
})

Expand DownExpand Up@@ -222,7 +227,12 @@ describe("api.ts", () => {
expect(api.postWorkspaceBuild).toHaveBeenCalledWith(MockWorkspace.id,{
transition:"start",
template_version_id:MockTemplate.active_version_id,
rich_parameter_values:[],
rich_parameter_values:[
{
name:"first_parameter",
value:"mock-abc",
},
],
})
})
})
Expand Down
11 changes: 10 additions & 1 deletionsite/src/api/api.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -1041,10 +1041,19 @@ export const updateWorkspace = async (
thrownewMissingBuildParameters(missingParameters)
}

// Merge parameters using name as key
constrichParameterValues=newBuildParameters
oldBuildParameters.forEach((oldParam)=>{
constnewParam=richParameterValues.find((p)=>p.name===oldParam.name)
if(newParam===undefined){
richParameterValues.push(oldParam)
}
})
Copy link
CollaboratorAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others.Learn more.

Basically, we were not passing the old values when there is new ones.


returnpostWorkspaceBuild(workspace.id,{
transition:"start",
template_version_id:activeVersionId,
rich_parameter_values:newBuildParameters,
rich_parameter_values:richParameterValues,
})
}

Expand Down
45 changes: 23 additions & 22 deletionssite/src/xServices/workspace/workspaceXService.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -117,31 +117,32 @@ export const checks = {
constpermissionsToCheck=(
workspace:TypesGen.Workspace,
template:TypesGen.Template,
)=>({
[checks.readWorkspace]:{
object:{
resource_type:"workspace",
resource_id:workspace.id,
owner_id:workspace.owner_id,
)=>
({
[checks.readWorkspace]:{
object:{
resource_type:"workspace",
resource_id:workspace.id,
owner_id:workspace.owner_id,
},
action:"read",
},
action:"read",
},
[checks.updateWorkspace]:{
object:{
resource_type:"workspace",
resource_id:workspace.id,
owner_id:workspace.owner_id,
[checks.updateWorkspace]:{
object:{
resource_type:"workspace",
resource_id:workspace.id,
owner_id:workspace.owner_id,
},
action:"update",
},
action:"update",
},
[checks.updateTemplate]:{
object:{
resource_type:"template",
resource_id:template.id,
[checks.updateTemplate]:{
object:{
resource_type:"template",
resource_id:template.id,
},
action:"update",
},
action:"update",
},
})
}asconst)

exportconstworkspaceMachine=createMachine(
{
Expand Down
[8]ページ先頭
©2009-2025 Movatter.jp