Remove lang suffix for FamilyName field

We no longer need the suffixes for the FamilyName field since we not really using it anywhere #6830
opencrvs · Oct 9, 2024 · 1ba35b7 · 1ba35b7
1 parent 306b4e9
commit 1ba35b7
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 15 deletions.
diff --git a/packages/client/src/forms/user/fieldDefinitions/createUser.ts b/packages/client/src/forms/user/fieldDefinitions/createUser.ts
@@ -78,9 +78,9 @@ export function userSectionFormType(): ISerializedFormSection {
         title: userFormMessages.userDetails,
         fields: [
           {
-            name: 'familyNameEng',
+            name: 'familyName',
             type: TEXT,
-            label: userFormMessages.lastNameEn,
+            label: userFormMessages.lastName,
             required: true,
             initialValue: '',
             validator: [{ operation: 'englishOnlyNameFormat' }],

diff --git a/packages/client/src/i18n/messages/views/userForm.ts b/packages/client/src/i18n/messages/views/userForm.ts
@@ -54,10 +54,10 @@ export const messages = {
     description: "User's English first name",
     id: 'form.field.label.firstNameEN'
   },
-  lastNameEn: {
+  lastName: {
     defaultMessage: "User's surname",
     description: "User's English surname",
-    id: 'form.field.label.lastNameEN'
+    id: 'form.field.label.lastName'
   },
   phoneNumber: {
     defaultMessage: 'Phone number',

diff --git a/packages/client/src/tests/util.tsx b/packages/client/src/tests/util.tsx
@@ -1446,8 +1446,7 @@ export const mockCompleteFormData = {
   accountDetails: '',
   assignedRegistrationOffice: '',
   device: '',
-  familyName: 'হোসেন',
-  familyNameEng: 'Hossain',
+  familyName: 'Hossain',
   firstNames: 'Jeff',
   firstNamesEng: 'Jeff',
   nid: '123456789',
@@ -1795,8 +1794,7 @@ export const mockDataWithRegistarRoleSelected = {
   accountDetails: '',
   assignedRegistrationOffice: '',
   device: '',
-  familyName: 'হোসেন',
-  familyNameEng: 'Hossain',
+  familyName: 'Hossain',
   firstNames: 'Jeff',
   firstNamesEng: 'Jeff',
   email: 'jeff@gmail.com',

diff --git a/packages/client/src/views/SysAdmin/Team/user/userCreation/CreateNewUser.test.tsx b/packages/client/src/views/SysAdmin/Team/user/userCreation/CreateNewUser.test.tsx
@@ -230,7 +230,7 @@ describe('create new user tests', () => {
       expect(
         testComponent
           .find(FormFieldGenerator)
-          .find('#familyNameEng_error')
+          .find('#familyName_error')
           .hostNodes()
           .text()
       ).toBe('Required to register a new user')
@@ -339,11 +339,6 @@ describe('edit user tests', () => {
             username: 'shakib1',
             mobile: '+8801662132163',
             email: 'jeff@gmail.com',
-            identifier: {
-              system: 'NATIONAL_ID',
-              value: '101488192',
-              __typename: 'Identifier'
-            },
             systemRole: 'NATIONAL_REGISTRAR',
             role: { _id: '63ef9466f708ea080777c27a' },
             status: 'active',

diff --git a/packages/client/src/views/SysAdmin/Team/user/userCreation/UserReviewForm.tsx b/packages/client/src/views/SysAdmin/Team/user/userCreation/UserReviewForm.tsx
@@ -249,7 +249,7 @@ class UserReviewFormComponent extends React.Component<
       (field) => field.name === 'firstNamesEng'
     ) as IFormField
     const familyNameEngField = fields.find(
-      (field) => field.name === 'familyNameEng'
+      (field) => field.name === 'familyName'
     ) as IFormField
 
     return `${this.getValue(firstNamesEngField)} ${this.getValue(