chore: FK display name to remove ID if we are linking to a get action (…

…#1607)
teamkeel · Sep 24, 2024 · ae987d9 · ae987d9
1 parent 7a3d566
commit ae987d9
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 9 deletions.
diff --git a/tools/generator.go b/tools/generator.go
@@ -587,6 +587,10 @@ func (g *Generator) makeResponsesForModel(model *proto.Model, pathPrefix string,
 						},
 					},
 				}
+
+				// now that we have a link to retrieve the related model, the display name of the field should be the
+				// name of the related field without the ID suffix; e.g. "Category" instead of "Category id"
+				config.DisplayName = casing.ToSentenceCase(strings.TrimSuffix(f.Name, "Id"))
 			}
 		}
 

diff --git a/tools/testdata/blog/tools.json b/tools/testdata/blog/tools.json
@@ -178,7 +178,7 @@
             "path": "$.categoryId"
           },
           "fieldType": "TYPE_ID",
-          "displayName": "Category id",
+          "displayName": "Category",
           "displayOrder": 7,
           "visible": true,
           "link": {
@@ -411,7 +411,7 @@
             "path": "$.categoryId"
           },
           "fieldType": "TYPE_ID",
-          "displayName": "Category id",
+          "displayName": "Category",
           "displayOrder": 7,
           "visible": true,
           "link": {
@@ -652,7 +652,7 @@
             "path": "$.categoryId"
           },
           "fieldType": "TYPE_ID",
-          "displayName": "Category id",
+          "displayName": "Category",
           "displayOrder": 7,
           "visible": true,
           "link": {
@@ -1157,7 +1157,7 @@
             "path": "$.results[*].parentId"
           },
           "fieldType": "TYPE_ID",
-          "displayName": "Parent id",
+          "displayName": "Parent",
           "displayOrder": 1,
           "visible": true,
           "link": {
@@ -1426,7 +1426,7 @@
             "path": "$.results[*].categoryId"
           },
           "fieldType": "TYPE_ID",
-          "displayName": "Category id",
+          "displayName": "Category",
           "displayOrder": 7,
           "visible": true,
           "link": {
@@ -1761,7 +1761,7 @@
             "path": "$.results[*].author.categoryId"
           },
           "fieldType": "TYPE_ID",
-          "displayName": "Category id",
+          "displayName": "Category",
           "displayOrder": 7,
           "visible": true,
           "link": {
@@ -1901,7 +1901,7 @@
             "path": "$.results[*].category.categoryId"
           },
           "fieldType": "TYPE_ID",
-          "displayName": "Category id",
+          "displayName": "Category",
           "displayOrder": 7,
           "visible": true,
           "link": {
@@ -1948,7 +1948,7 @@
             "path": "$.results[*].categoryId"
           },
           "fieldType": "TYPE_ID",
-          "displayName": "Category id",
+          "displayName": "Category",
           "displayOrder": 7,
           "visible": true,
           "link": {
@@ -2330,7 +2330,7 @@
             "path": "$.categoryId"
           },
           "fieldType": "TYPE_ID",
-          "displayName": "Category id",
+          "displayName": "Category",
           "displayOrder": 7,
           "visible": true,
           "link": {