services: filter by labels ux enhancement

graphql2/graphqlapp/label.go

@@ -3,64 +3,132 @@ package graphqlapp
 import (
 	context "context"
 	"database/sql"
+
 	"github.com/target/goalert/config"
 	"github.com/target/goalert/graphql2"
 	"github.com/target/goalert/label"
 	"github.com/target/goalert/search"
 	"github.com/target/goalert/validation"
 )
 
-func (q *Query) Labels(ctx context.Context, input *graphql2.LabelSearchOptions) (conn *graphql2.LabelConnection, err error) {
+func (q *Query) LabelKeys(ctx context.Context, input *graphql2.LabelKeySearchOptions) (conn *graphql2.StringConnection, err error) {
 	if input == nil {
-		input = &graphql2.LabelSearchOptions{}
+		input = &graphql2.LabelKeySearchOptions{}
 	}
 
-	var searchOpts label.SearchOptions
+	var opts label.KeySearchOptions
 	if input.Search != nil {
-		searchOpts.Search = *input.Search
+		opts.Search = *input.Search
+	}
+	opts.Omit = input.Omit
+	if input.After != nil && *input.After != "" {
+		err = search.ParseCursor(*input.After, &opts)
+		if err != nil {
+			return conn, err
+		}
+	}
+	if input.First != nil {
+		opts.Limit = *input.First
 	}
-	searchOpts.Omit = input.Omit
-	if input.UniqueKeys != nil {
-		searchOpts.UniqueKeys = *input.UniqueKeys
+	if opts.Limit == 0 {
+		opts.Limit = 15
 	}
+
+	opts.Limit++
+	labelKeys, err := q.LabelStore.SearchKeys(ctx, &opts)
+	if err != nil {
+		return nil, err
+	}
+	conn = new(graphql2.StringConnection)
+	if len(labelKeys) == opts.Limit {
+		labelKeys = labelKeys[:len(labelKeys)-1]
+		conn.PageInfo.HasNextPage = true
+	}
+	if len(labelKeys) > 0 {
+		last := labelKeys[len(labelKeys)-1]
+		opts.After = last
+
+		cur, err := search.Cursor(opts)
+		if err != nil {
+			return nil, err
+		}
+		conn.PageInfo.EndCursor = &cur
+	}
+	conn.Nodes = labelKeys
+	return conn, err
+}
+
+func (q *Query) LabelValues(ctx context.Context, input *graphql2.LabelValueSearchOptions) (conn *graphql2.StringConnection, err error) {
+	if input == nil {
+		input = &graphql2.LabelValueSearchOptions{}
+	}
+
+	var opts label.ValueSearchOptions
+	if input.Search != nil {
+		opts.Search = *input.Search
+	}
+	opts.Omit = input.Omit
+	opts.Key = input.Key
 	if input.After != nil && *input.After != "" {
-		err = search.ParseCursor(*input.After, &searchOpts)
+		err = search.ParseCursor(*input.After, &opts)
 		if err != nil {
 			return conn, err
 		}
 	}
 	if input.First != nil {
-		searchOpts.Limit = *input.First
+		opts.Limit = *input.First
 	}
-	if searchOpts.Limit == 0 {
-		searchOpts.Limit = 15
+	if opts.Limit == 0 {
+		opts.Limit = 15
 	}
 
-	searchOpts.Limit++
-	labels, err := q.LabelStore.Search(ctx, &searchOpts)
+	opts.Limit++
+	values, err := q.LabelStore.SearchValues(ctx, &opts)
 	if err != nil {
 		return nil, err
 	}
-	conn = new(graphql2.LabelConnection)
-	if len(labels) == searchOpts.Limit {
-		labels = labels[:len(labels)-1]
+	conn = new(graphql2.StringConnection)
+	if len(values) == opts.Limit {
+		values = values[:len(values)-1]
 		conn.PageInfo.HasNextPage = true
 	}
-	if len(labels) > 0 {
-		last := labels[len(labels)-1]
-		searchOpts.After.Key = last.Key
-		searchOpts.After.TargetType = last.Target.TargetType()
-		searchOpts.After.TargetID = last.Target.TargetID()
+	if len(values) > 0 {
+		last := values[len(values)-1]
+		opts.After = last
 
-		cur, err := search.Cursor(searchOpts)
+		cur, err := search.Cursor(opts)
 		if err != nil {
 			return nil, err
 		}
 		conn.PageInfo.EndCursor = &cur
 	}
-	conn.Nodes = labels
+	conn.Nodes = values
 	return conn, err
 }
+
+func (q *Query) Labels(ctx context.Context, input *graphql2.LabelSearchOptions) (conn *graphql2.LabelConnection, err error) {
+	if input == nil {
+		input = &graphql2.LabelSearchOptions{}
+	}
+	keyConn, err := q.LabelKeys(ctx, &graphql2.LabelKeySearchOptions{
+		Search: input.Search,
+		After:  input.After,
+		Omit:   input.Omit,
+		First:  input.First,
+	})
+	if err != nil {
+		return nil, err
+	}
+
+	conn = new(graphql2.LabelConnection)
+	conn.PageInfo = keyConn.PageInfo
+	conn.Nodes = make([]label.Label, len(keyConn.Nodes))
+	for i, k := range keyConn.Nodes {
+		conn.Nodes[i].Key = k
+	}
+
+	return conn, nil
+}
 func (m *Mutation) SetLabel(ctx context.Context, input graphql2.SetLabelInput) (bool, error) {
 	err := withContextTx(ctx, m.DB, func(ctx context.Context, tx *sql.Tx) error {
 		cfg := config.FromContext(ctx)

graphql2/schema.graphql

@@ -62,6 +62,12 @@ type Query {
   # Allows searching for assigned labels.
   labels(input: LabelSearchOptions): LabelConnection!
 
+  # Allows searching for label keys.
+  labelKeys(input: LabelKeySearchOptions): StringConnection!
+
+  # Allows searching for label values.
+  labelValues(input: LabelValueSearchOptions): StringConnection!
+
   # Allows searching for user overrides.
   userOverrides(input: UserOverrideSearchOptions): UserOverrideConnection!
 
@@ -152,11 +158,31 @@ input LabelSearchOptions {
   omit: [ID!]
 }
 
+input LabelKeySearchOptions {
+  first: Int = 15
+  after: String = ""
+  search: String = ""
+  omit: [String!]
+}
+
+input LabelValueSearchOptions {
+  key: String!
+  first: Int = 15
+  after: String = ""
+  search: String = ""
+  omit: [String!]
+}
+
 type LabelConnection {
   nodes: [Label!]!
   pageInfo: PageInfo!
 }
 
+type StringConnection {
+  nodes: [String!]!
+  pageInfo: PageInfo!
+}
+
 type Mutation {
   addAuthSubject(input: AuthSubjectInput!): Boolean!
   deleteAuthSubject(input: AuthSubjectInput!): Boolean!