Skip to content
Draft
Show file tree
Hide file tree
Changes from all 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
17 changes: 14 additions & 3 deletions pkg/jira/create.go
Original file line number Diff line number Diff line change
Expand Up @@ -247,14 +247,25 @@ func constructCustomFields(fields map[string]string, configuredFields []IssueTyp
case customFieldFormatProject:
data.Fields.M.customFields[configured.Key] = customFieldTypeProject{Value: val}
case customFieldFormatArray:
pieces := strings.Split(strings.TrimSpace(val), ",")
if configured.Schema.Items == customFieldFormatOption {
switch configured.Schema.Items {
case customFieldFormatCMDBObject:
// CMDB object fields require JSON array format.
var jsonVal interface{}
if err := json.Unmarshal([]byte(val), &jsonVal); err == nil {
data.Fields.M.customFields[configured.Key] = jsonVal
} else {
// If JSON parsing fails, pass as-is and let Jira API handle it.
data.Fields.M.customFields[configured.Key] = val
}
case customFieldFormatOption:
pieces := strings.Split(strings.TrimSpace(val), ",")
items := make([]customFieldTypeOption, 0)
for _, p := range pieces {
items = append(items, customFieldTypeOption{Value: p})
}
data.Fields.M.customFields[configured.Key] = items
} else {
default:
pieces := strings.Split(strings.TrimSpace(val), ",")
data.Fields.M.customFields[configured.Key] = pieces
}
case customFieldFormatNumber:
Expand Down
9 changes: 5 additions & 4 deletions pkg/jira/customfield.go
Original file line number Diff line number Diff line change
@@ -1,10 +1,11 @@
package jira

const (
customFieldFormatOption = "option"
customFieldFormatArray = "array"
customFieldFormatNumber = "number"
customFieldFormatProject = "project"
customFieldFormatOption = "option"
customFieldFormatArray = "array"
customFieldFormatNumber = "number"
customFieldFormatProject = "project"
customFieldFormatCMDBObject = "cmdb-object-field"
)

type customField map[string]interface{}
Expand Down
18 changes: 15 additions & 3 deletions pkg/jira/edit.go
Original file line number Diff line number Diff line change
Expand Up @@ -378,8 +378,19 @@ func constructCustomFieldsForEdit(fields map[string]string, configuredFields []I
case customFieldFormatProject:
data.Update.M.customFields[configured.Key] = []customFieldTypeProjectSet{{Set: customFieldTypeProject{Value: val}}}
case customFieldFormatArray:
pieces := strings.Split(strings.TrimSpace(val), ",")
if configured.Schema.Items == customFieldFormatOption {
switch configured.Schema.Items {
case customFieldFormatCMDBObject:
// CMDB object fields require JSON array format.
var jsonVal interface{}
if err := json.Unmarshal([]byte(val), &jsonVal); err == nil {
// For edit operations, wrap in a "set" operation.
data.Update.M.customFields[configured.Key] = []map[string]interface{}{{"set": jsonVal}}
} else {
// If JSON parsing fails, pass as-is and let Jira API handle it.
data.Update.M.customFields[configured.Key] = []customFieldTypeStringSet{{Set: val}}
}
case customFieldFormatOption:
pieces := strings.Split(strings.TrimSpace(val), ",")
items := make([]customFieldTypeOptionAddRemove, 0)
for _, p := range pieces {
if strings.HasPrefix(p, separatorMinus) {
Expand All @@ -389,7 +400,8 @@ func constructCustomFieldsForEdit(fields map[string]string, configuredFields []I
}
}
data.Update.M.customFields[configured.Key] = items
} else {
default:
pieces := strings.Split(strings.TrimSpace(val), ",")
data.Update.M.customFields[configured.Key] = pieces
}
case customFieldFormatNumber:
Expand Down