Skip to content

fix: enhance multi-select handling in key-value processing. #4733

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.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
leozhang2018 wants to merge 1 commit into
base: main
Choose a base branch
from
+14 −5
Open

fix: enhance multi-select handling in key-value processing. #4733

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
11 changes: 6 additions & 5 deletions pkg/microservice/aslan/core/workflow/service/workflow/controller/job/utils.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -196,12 +196,13 @@ func applyKeyVals(base, input commonmodels.RuntimeKeyValList, useInputKVSource b
if (item.Source != config.ParamSourceFixed && item.Source != config.ParamSourceReference) || useInputKVSource {
if item.Type == commonmodels.MultiSelectType {
item.ChoiceValue = inputKV.ChoiceValue
// TODO: move this logic to somewhere else
if inputKV.Value == "" {
item.Value = strings.Join(item.ChoiceValue, ",")
} else {
item.Value = inputKV.Value
// ChoiceValue is the canonical multi-select value. Keep Value as its
// comma-separated runtime representation so older consumers remain compatible.
if item.ChoiceValue == nil && inputKV.Value != "" {
// Older callers may only send Value, so backfill ChoiceValue before normalizing.
item.ChoiceValue = strings.Split(inputKV.Value, ",")
}
item.Value = strings.Join(item.ChoiceValue, ",")
} else if item.Type == commonmodels.FileType {
item.FileID = inputKV.FileID
item.FilePath = inputKV.FilePath
Expand Down
8 changes: 8 additions & 0 deletions pkg/microservice/aslan/core/workflow/service/workflow/types.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@ package workflow
import (
"errors"
"fmt"
"strings"

"github.com/koderover/zadig/v2/pkg/microservice/aslan/config"
commonmodels "github.com/koderover/zadig/v2/pkg/microservice/aslan/core/common/repository/models"
Expand Down Expand Up @@ -325,6 +326,13 @@ func OpenAPIKVInputToKeyValList(originalKvs commonmodels.RuntimeKeyValList, kvIn

if kvInput, ok := kvMap[kv.Key]; ok {
kv.Value = kvInput.Value
if kv.Type == commonmodels.MultiSelectType {
// OpenAPI only sends Value, so keep ChoiceValue in sync for multi-select consumers.
kv.ChoiceValue = nil
if kvInput.Value != "" {
kv.ChoiceValue = strings.Split(kvInput.Value, ",")
}
}
}
}

Expand Down
Loading