Skip to content

Commit cfdb0e2

Browse files
authored
Merge pull request #73 from ConductorOne/lauren/issue-components-pick-multiple-no-values
Use pick multiple object values custom field type for components
2 parents d37b327 + 67dba18 commit cfdb0e2

File tree

1 file changed

+5
-15
lines changed

1 file changed

+5
-15
lines changed

pkg/connector/tickets.go

Lines changed: 5 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -284,7 +284,11 @@ func (d *Connector) getCustomFieldsForIssueType(ctx context.Context, projectId s
284284
case !isMultiSelect && hasAllowedValues:
285285
customField = sdkTicket.PickObjectValueFieldSchema(id, field.Name, field.Required, allowedValues)
286286
case isMultiSelect && !hasAllowedValues:
287-
customField = sdkTicket.StringsFieldSchema(id, field.Name, field.Required)
287+
if field.Schema.Items == "component" {
288+
customField = sdkTicket.PickMultipleObjectValuesFieldSchema(id, field.Name, field.Required, allowedValues)
289+
} else {
290+
customField = sdkTicket.StringsFieldSchema(id, field.Name, field.Required)
291+
}
288292
default:
289293
customField = sdkTicket.StringFieldSchema(id, field.Name, field.Required)
290294
}
@@ -490,20 +494,6 @@ func (d *Connector) CreateTicket(ctx context.Context, ticket *v2.Ticket, schema
490494

491495
for id, cf := range schema.GetCustomFields() {
492496
switch id {
493-
case "components":
494-
comps, err := sdkTicket.GetPickMultipleObjectValues(ticketFields[id])
495-
if err != nil {
496-
if errors.Is(err, sdkTicket.ErrFieldNil) {
497-
continue
498-
}
499-
return nil, nil, err
500-
}
501-
502-
componentIDs := make([]string, 0, len(comps))
503-
for _, component := range comps {
504-
componentIDs = append(componentIDs, component.GetId())
505-
}
506-
ticketOptions = append(ticketOptions, client.WithComponents(componentIDs...))
507497
case "issue_type":
508498
// If issueTypeID is empty, the config has not been updated to use issue type as schema
509499
// So issue type is still stored in the custom fields

0 commit comments

Comments
 (0)