check on label metadata

packages/twenty-server/src/engine/metadata-modules/field-metadata/field-metadata.service.ts

@@ -44,6 +44,7 @@ import { isSelectOrMultiSelectFieldMetadata } from 'src/engine/metadata-modules/
 import { assertMutationNotOnRemoteObject } from 'src/engine/metadata-modules/object-metadata/utils/assert-mutation-not-on-remote-object.util';
 import { RelationOnDeleteAction } from 'src/engine/metadata-modules/relation-metadata/relation-on-delete-action.type';
 import { ObjectMetadataItemWithFieldMaps } from 'src/engine/metadata-modules/types/object-metadata-item-with-field-maps';
+import { ObjectMetadataMaps } from 'src/engine/metadata-modules/types/object-metadata-maps';
 import { InvalidMetadataException } from 'src/engine/metadata-modules/utils/exceptions/invalid-metadata.exception';
 import { validateFieldNameAvailabilityOrThrow } from 'src/engine/metadata-modules/utils/validate-field-name-availability.utils';
 import { validateMetadataNameOrThrow } from 'src/engine/metadata-modules/utils/validate-metadata-name.utils';
@@ -82,6 +83,7 @@ type ValidateFieldMetadataArgs<T extends UpdateFieldInput | CreateFieldInput> =
     fieldMetadataInput: T;
     objectMetadata: ObjectMetadataItemWithFieldMaps;
     existingFieldMetadata?: FieldMetadataInterface;
+    objectMetadataMaps: ObjectMetadataMaps;
   };
 
 @Injectable()
@@ -208,6 +210,7 @@ export class FieldMetadataService extends TypeOrmQueryService<FieldMetadataEntit
         existingFieldMetadata,
         fieldMetadataInput: fieldMetadataForUpdate,
         objectMetadata: objectMetadataItemWithFieldMaps,
+        objectMetadataMaps,
       });
 
       const isLabelSyncedWithName =
@@ -528,6 +531,7 @@ export class FieldMetadataService extends TypeOrmQueryService<FieldMetadataEntit
     fieldMetadataType,
     objectMetadata,
     existingFieldMetadata,
+    objectMetadataMaps,
   }: ValidateFieldMetadataArgs<T>): Promise<T> {
     if (fieldMetadataInput.name) {
       try {
@@ -602,6 +606,21 @@ export class FieldMetadataService extends TypeOrmQueryService<FieldMetadataEntit
         await this.fieldMetadataValidationService.validateRelationCreationPayloadOrThrow(
           relationCreationPayload,
         );
+        const computedMetadataNameFromLabel = computeMetadataNameFromLabel(
+          relationCreationPayload.targetFieldLabel,
+        );
+
+        validateMetadataNameOrThrow(computedMetadataNameFromLabel);
+
+        const objectMetadataTarget =
+          objectMetadataMaps.byId[
+            relationCreationPayload.targetObjectMetadataId
+          ];
+
+        validateFieldNameAvailabilityOrThrow(
+          computedMetadataNameFromLabel,
+          objectMetadataTarget,
+        );
       }
     }
 
@@ -728,6 +747,7 @@ export class FieldMetadataService extends TypeOrmQueryService<FieldMetadataEntit
     fieldMetadataInput: CreateFieldInput,
     objectMetadata: ObjectMetadataItemWithFieldMaps,
     fieldMetadataRepository: Repository<FieldMetadataEntity>,
+    objectMetadataMaps: ObjectMetadataMaps,
   ): Promise<FieldMetadataEntity[]> {
     if (!fieldMetadataInput.isRemoteCreation) {
       assertMutationNotOnRemoteObject(objectMetadata);
@@ -747,6 +767,7 @@ export class FieldMetadataService extends TypeOrmQueryService<FieldMetadataEntit
         relationCreationPayload: fieldMetadataInput.relationCreationPayload,
       },
       objectMetadata,
+      objectMetadataMaps,
     });
 
     if (fieldMetadataForCreate.isLabelSyncedWithName === true) {
@@ -773,13 +794,15 @@ export class FieldMetadataService extends TypeOrmQueryService<FieldMetadataEntit
       );
     }
 
+    const targetFieldMetadataName = computeMetadataNameFromLabel(
+      relationCreationPayload.targetFieldLabel,
+    );
+
     const targetFieldMetadataToCreate =
       this.prepareCustomFieldMetadataForCreation({
         objectMetadataId: relationCreationPayload.targetObjectMetadataId,
         type: FieldMetadataType.RELATION,
-        name: computeMetadataNameFromLabel(
-          relationCreationPayload.targetFieldLabel,
-        ),
+        name: targetFieldMetadataName,
         label: relationCreationPayload.targetFieldLabel,
         icon: relationCreationPayload.targetFieldIcon,
         workspaceId: fieldMetadataForCreate.workspaceId,
@@ -900,6 +923,7 @@ export class FieldMetadataService extends TypeOrmQueryService<FieldMetadataEntit
               fieldMetadataInput,
               objectMetadata,
               fieldMetadataRepository,
+              objectMetadataMaps,
             );
 
           createdFieldMetadatas.push(...createdFieldMetadataItems);

packages/twenty-server/src/engine/metadata-modules/object-metadata/utils/__tests__/__snapshots__/validate-object-metadata-input.util.spec.ts.snap

@@ -8,12 +8,12 @@ exports[`validateObjectMetadataInputOrThrow should fail when namePlural is a res
 
 exports[`validateObjectMetadataInputOrThrow should fail when namePlural is an empty string 1`] = `"Input is too short: """`;
 
-exports[`validateObjectMetadataInputOrThrow should fail when namePlural is not camelCased 1`] = `"Name should be in camelCase: Not_Camel_Case"`;
+exports[`validateObjectMetadataInputOrThrow should fail when namePlural is not camelCased 1`] = `"Not_Camel_Case should be in camelCase"`;
 
 exports[`validateObjectMetadataInputOrThrow should fail when nameSingular has invalid characters 1`] = `"String "μ" is not valid: must start with lowercase letter and contain only alphanumeric letters"`;
 
 exports[`validateObjectMetadataInputOrThrow should fail when nameSingular is a reserved keyword 1`] = `"The name "user" is not available"`;
 
 exports[`validateObjectMetadataInputOrThrow should fail when nameSingular is an empty string 1`] = `"Input is too short: """`;
 
-exports[`validateObjectMetadataInputOrThrow should fail when nameSingular is not camelCased 1`] = `"Name should be in camelCase: Not_Camel_Case"`;
+exports[`validateObjectMetadataInputOrThrow should fail when nameSingular is not camelCased 1`] = `"Not_Camel_Case should be in camelCase"`;

packages/twenty-server/src/engine/metadata-modules/utils/__tests__/__snapshots__/validate-metadata-name.spec.ts.snap

@@ -1,17 +1,17 @@
 // Jest Snapshot v1, https://goo.gl/fbAQLP
 
-exports[`validateMetadataNameOrThrow throw error when string is not in camel case 1`] = `"Name should be in camelCase: TestName"`;
+exports[`validateMetadataNameOrThrow throw error when string is not in camel case 1`] = `"TestName should be in camelCase"`;
 
-exports[`validateMetadataNameOrThrow throws error when starts with digits 1`] = `"Name should be in camelCase: 123string"`;
+exports[`validateMetadataNameOrThrow throws error when starts with digits 1`] = `"123string should be in camelCase"`;
 
 exports[`validateMetadataNameOrThrow throws error when string has non latin characters 1`] = `"String "בְרִבְרִ" is not valid: must start with lowercase letter and contain only alphanumeric letters"`;
 
-exports[`validateMetadataNameOrThrow throws error when string has spaces 1`] = `"Name should be in camelCase: name with spaces"`;
+exports[`validateMetadataNameOrThrow throws error when string has spaces 1`] = `"name with spaces should be in camelCase"`;
 
 exports[`validateMetadataNameOrThrow throws error when string is a reserved word 1`] = `"The name "role" is not available"`;
 
 exports[`validateMetadataNameOrThrow throws error when string is above 63 characters 1`] = `"String "aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa" exceeds 63 characters limit"`;
 
 exports[`validateMetadataNameOrThrow throws error when string is empty 1`] = `"Input is too short: """`;
 
-exports[`validateMetadataNameOrThrow throws error when string starts with capital letter 1`] = `"Name should be in camelCase: StringStartingWithCapitalLetter"`;
+exports[`validateMetadataNameOrThrow throws error when string starts with capital letter 1`] = `"StringStartingWithCapitalLetter should be in camelCase"`;

packages/twenty-server/src/engine/metadata-modules/utils/exceptions/invalid-metadata.exception.ts

@@ -12,6 +12,7 @@ export enum InvalidMetadataExceptionCode {
   EXCEEDS_MAX_LENGTH = 'Exceeds max length',
   RESERVED_KEYWORD = 'Reserved keyword',
   NOT_CAMEL_CASE = 'Not camel case',
+  NOT_FIRST_LETTER_UPPER_CASE = 'Not first letter upper case',
   INVALID_LABEL = 'Invalid label',
   NAME_NOT_SYNCED_WITH_LABEL = 'Name not synced with label',
   INVALID_STRING = 'Invalid string',

packages/twenty-server/src/engine/metadata-modules/utils/validate-metadata-name-is-camel-case.utils.ts

@@ -8,7 +8,7 @@ import {
 export const validateMetadataNameIsCamelCaseOrThrow = (name: string) => {
   if (name !== camelCase(name)) {
     throw new InvalidMetadataException(
-      `Name should be in camelCase: ${name}`,
+      `${name} should be in camelCase`,
       InvalidMetadataExceptionCode.NOT_CAMEL_CASE,
     );
   }

packages/twenty-server/test/integration/metadata/suites/object-metadata/__snapshots__/failing-create-one-object-metadata.integration-spec.ts.snap

@@ -24,20 +24,20 @@ exports[`Object metadata creation should fail when namePlural is a reserved keyw
 
 exports[`Object metadata creation should fail when namePlural is an empty string 1`] = `"Input is too short: """`;
 
-exports[`Object metadata creation should fail when namePlural is not camelCased 1`] = `"Name should be in camelCase: Not_Camel_Case"`;
+exports[`Object metadata creation should fail when namePlural is not camelCased 1`] = `"Not_Camel_Case should be in camelCase"`;
 
-exports[`Object metadata creation should fail when nameSingular contains only one char and whitespaces 1`] = `"Name should be in camelCase:      a        a    "`;
+exports[`Object metadata creation should fail when nameSingular contains only one char and whitespaces 1`] = `"     a        a     should be in camelCase"`;
 
-exports[`Object metadata creation should fail when nameSingular contains only whitespaces 1`] = `"Name should be in camelCase:                  "`;
+exports[`Object metadata creation should fail when nameSingular contains only whitespaces 1`] = `"                  should be in camelCase"`;
 
 exports[`Object metadata creation should fail when nameSingular has invalid characters 1`] = `"String "μ" is not valid: must start with lowercase letter and contain only alphanumeric letters"`;
 
 exports[`Object metadata creation should fail when nameSingular is a reserved keyword 1`] = `"The name "user" is not available"`;
 
 exports[`Object metadata creation should fail when nameSingular is an empty string 1`] = `"Input is too short: """`;
 
-exports[`Object metadata creation should fail when nameSingular is not camelCased 1`] = `"Name should be in camelCase: Not_Camel_Case"`;
+exports[`Object metadata creation should fail when nameSingular is not camelCased 1`] = `"Not_Camel_Case should be in camelCase"`;
 
 exports[`Object metadata creation should fail when names are identical 1`] = `"The singular and plural names cannot be the same for an object"`;
 
-exports[`Object metadata creation should fail when names with whitespaces result to be identical 1`] = `"Name should be in camelCase:       fooBar               "`;
+exports[`Object metadata creation should fail when names with whitespaces result to be identical 1`] = `"      fooBar                should be in camelCase"`;