fix: undo mods to label system

Author: jippi

pkg/scm/gitlab/context.model.go

@@ -68,8 +68,6 @@ func nest(props []*Property) {
 	for _, field := range props {
 
 		if field.IsCustomType {
-			fmt.Println("nesting", field.Name, "of type", field.Type)
-
 			for _, nested := range PropMap[field.Type].Attributes {
 				field.AddAttribute(&Property{
 					Name:         nested.Name,
@@ -198,11 +196,9 @@ func mutateHook(b *modelgen.ModelBuild) *modelgen.ModelBuild {
 				}
 
 				fieldProperty.Type = strings.TrimPrefix(fieldType, "*")
-				fieldProperty.IsSlice = strings.HasPrefix(fieldType, "[]") || fieldType == "labels"
+				fieldProperty.IsSlice = strings.HasPrefix(fieldType, "[]") || fieldType == "label"
 
 				modelProperty.AddAttribute(fieldProperty)
-
-				fmt.Println(" ", fieldProperty.Name, "of type", fieldProperty.Type)
 			} // end expr tag is set
 
 			slices.SortFunc(modelProperty.Attributes, sortSlice)
@@ -214,13 +210,6 @@ func mutateHook(b *modelgen.ModelBuild) *modelgen.ModelBuild {
 			continue
 		}
 
-		if modelProperty.Type == "label" {
-			modelProperty.Type = "labels"
-			modelProperty.IsSlice = true
-		}
-
-		fmt.Println("Registering custom model", modelProperty.Name, "of type", modelProperty.Type)
-
 		Props = append(Props, modelProperty)
 		PropMap[modelProperty.Type] = modelProperty
 	} // end model loop

schema/gitlab.go

@@ -88,6 +88,3 @@ models:
   Duration:
     model:
       - github.com/99designs/gqlgen/graphql.Duration
-  ContextLabels:
-    model:
-      - ../pkg/scm/gitlab.ContextLabels

schema/gitlab.gqlgen.yml

@@ -21,8 +21,6 @@ scalar Time
 # Add time.Duration support
 scalar Duration
 
-scalar ContextLabels
-
 type Context {
   "The project the Merge Request belongs to"
   Project: ContextProject @graphql(key: "project(fullPath: $project_id)")
@@ -68,7 +66,7 @@ type ContextProject {
   # Connections
   #
 
-  Labels: ContextLabels @generated
+  Labels: [ContextLabel!] @generated
   ResponseLabels: ContextLabelNode @internal @graphql(key: "labels(first: 200)")
   MergeRequest: ContextMergeRequest @internal @graphql(key: "mergeRequest(iid: $mr_id)")
   ResponseGroup: ContextGroup @internal @graphql(key: "group")
@@ -180,7 +178,7 @@ type ContextMergeRequest {
   #
 
   DiffStats: [ContextDiffStat!]
-  Labels: ContextLabels @generated
+  Labels: [ContextLabel!] @generated
   ResponseLabels: ContextLabelNode @internal @graphql(key: "labels(first: 200)")
   ResponseFirstCommits: ContextCommitsNode @internal @graphql(key: "first_commit: commits(first:1)")
   ResponseLastCommits: ContextCommitsNode @internal @graphql(key: "last_commit: commits(last:1)")