Remove singular/plural from field-metadata (#2085)

* Remove singular/plural from field-metadata

* revert removing id from create input

* remove console log

* remove console log

* codegen

* missing files

* fix tests

server/src/tenant/entity-resolver/utils/__tests__/convert-arguments.spec.ts

@@ -10,21 +10,21 @@ describe('convertArguments', () => {
   beforeEach(() => {
     fields = [
       {
-        nameSingular: 'firstName',
+        name: 'firstName',
         targetColumnMap: {
           value: 'column_1randomFirstNameKey',
         } as FieldMetadataTargetColumnMap,
         type: 'text',
       },
       {
-        nameSingular: 'age',
+        name: 'age',
         targetColumnMap: {
           value: 'column_randomAgeKey',
         } as FieldMetadataTargetColumnMap,
         type: 'text',
       },
       {
-        nameSingular: 'website',
+        name: 'website',
         targetColumnMap: {
           link: 'column_randomLinkKey',
           text: 'column_randomTex7Key',

server/src/tenant/entity-resolver/utils/__tests__/convert-fields-to-graphql.spec.ts

@@ -12,13 +12,13 @@ describe('convertFieldsToGraphQL', () => {
   beforeEach(() => {
     fields = [
       {
-        nameSingular: 'simpleField',
+        name: 'simpleField',
         targetColumnMap: {
           value: 'column_RANDOMSTRING1',
         } as FieldMetadataTargetColumnMap,
       },
       {
-        nameSingular: 'complexField',
+        name: 'complexField',
         targetColumnMap: {
           link: 'column_RANDOMSTRING2',
           text: 'column_RANDOMSTRING3',
@@ -74,7 +74,7 @@ describe('convertFieldsToGraphQL', () => {
 
   test('should handle empty targetColumnMap gracefully', () => {
     const emptyField = {
-      nameSingular: 'emptyField',
+      name: 'emptyField',
       targetColumnMap: {},
     } as FieldMetadata;
 

server/src/tenant/entity-resolver/utils/__tests__/get-fields-aliases.spec.ts

@@ -11,15 +11,13 @@ describe('getFieldAliases', () => {
     // Setup sample field metadata
     fields = [
       {
-        nameSingular: 'singleValueField',
-        namePlural: 'singleValueFields',
+        name: 'singleValueField',
         targetColumnMap: {
           value: 'column_singleValue',
         } as FieldMetadataTargetColumnMap,
       },
       {
-        nameSingular: 'multipleValuesField',
-        namePlural: 'multipleValuesFields',
+        name: 'multipleValuesField',
         targetColumnMap: {
           link: 'column_value1',
           text: 'column_value2',
@@ -47,8 +45,7 @@ describe('getFieldAliases', () => {
     const fieldsWithEmptyMap = [
       ...fields,
       {
-        nameSingular: 'emptyField',
-        namePlural: 'emptyFields',
+        name: 'emptyField',
         targetColumnMap: {} as FieldMetadataTargetColumnMap,
       },
     ] as FieldMetadata[];

server/src/tenant/entity-resolver/utils/convert-arguments.util.ts

@@ -4,8 +4,7 @@ import { FieldMetadata } from 'src/metadata/field-metadata/field-metadata.entity
 
 export const convertArguments = (args: any, fields: FieldMetadata[]): any => {
   const fieldsMap = new Map(
-    // TODO: Handle plural for fields when we add relations
-    fields.map((metadata) => [metadata.nameSingular, metadata]),
+    fields.map((metadata) => [metadata.name, metadata]),
   );
 
   if (Array.isArray(args)) {

server/src/tenant/entity-resolver/utils/convert-fields-to-graphql.util.ts

@@ -8,8 +8,7 @@ export const convertFieldsToGraphQL = (
   acc = '',
 ) => {
   const fieldsMap = new Map(
-    // TODO: Handle plural for fields when we add relations
-    fields.map((metadata) => [metadata.nameSingular, metadata]),
+    fields.map((metadata) => [metadata.name, metadata]),
   );
 
   for (const [key, value] of Object.entries(select)) {
@@ -29,9 +28,7 @@ export const convertFieldsToGraphQL = (
           // Otherwise it means it's a special type with multiple values, so we need fetch all fields
           fieldAlias = `
           ${entries
-            .map(
-              ([key, value]) => `___${metadata.nameSingular}_${key}: ${value}`,
-            )
+            .map(([key, value]) => `___${metadata.name}_${key}: ${value}`)
             .join('\n')}
         `;
         }

server/src/tenant/entity-resolver/utils/get-fields-aliases.util.ts

@@ -7,8 +7,7 @@ export const getFieldAliases = (fields: FieldMetadata[]) => {
     if (values.length === 1) {
       return {
         ...acc,
-        // TODO: Handle plural for fields when we add relations
-        [column.nameSingular]: values[0],
+        [column.name]: values[0],
       };
     } else {
       return {