Merge pull request #586 from code4romania/fix/582

fix: [582] phone number validation required on optional fields
code4romania · Jul 18, 2024 · 250c4cd · 250c4cd
2 parents 0935ab4 + dcb4b2b
commit 250c4cd
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 51 deletions.
diff --git a/backend/package-lock.json b/backend/package-lock.json
diff --git a/backend/src/modules/organization/dto/create-organization-general.dto.ts b/backend/src/modules/organization/dto/create-organization-general.dto.ts
@@ -87,12 +87,12 @@ export class CreateOrganizationGeneralDto {
 
   /* Organization short description */
   @IsString()
-  @Length(50, 250)
+  @Length(50, 275) // In the frontend there should be a 250 limit, but due to '\r\n' characters being counted, we need to increase the limit
   shortDescription?: string;
 
   /* Organization long description */
   @IsString()
-  @Length(500, 2000)
+  @Length(500, 2100) // In the frontend there should be a 2000 limit, but due to '\r\n' characters being counted, we need to increase the limit
   description?: string;
 
   /* 

diff --git a/frontend/src/pages/organization/components/OrganizationLegal/OrganizationLegalConfig.ts b/frontend/src/pages/organization/components/OrganizationLegal/OrganizationLegalConfig.ts
@@ -88,7 +88,7 @@ export const OrganizationLegalConfig: Record<string, any> = {
         message: translations.phone.minim,
       },
       validate: (value: string) => {
-        return isValidPhoneNumber(value || '') || translations.phone.invalid;
+        return value ? isValidPhoneNumber(value || '') || translations.phone.invalid : null;
       },
     },
     config: {

diff --git a/frontend/src/pages/organization/components/OrganizationLegal/components/DirectorConfig.ts b/frontend/src/pages/organization/components/OrganizationLegal/components/DirectorConfig.ts
@@ -88,7 +88,7 @@ export const DirectorConfig: Record<string, any> = {
         message: translations.phone.minim,
       },
       validate: (value: string) => {
-        return isValidPhoneNumber(value || '') || translations.phone.invalid;
+        return value ? isValidPhoneNumber(value || '') || translations.phone.invalid : null;
       },
     },
     config: {