feat: add first and last name to settings page

openedx · Feb 20, 2024 · e4a806f · e4a806f
1 parent 3467534
commit e4a806f
Show file tree

Hide file tree

Showing 14 changed files with 1,066 additions and 24 deletions.
diff --git a/src/account-settings/AccountSettingsPage.jsx b/src/account-settings/AccountSettingsPage.jsx
@@ -52,6 +52,7 @@ import { fetchSiteLanguages } from './site-language';
 import DemographicsSection from './demographics/DemographicsSection';
 import { fetchCourseList } from '../notification-preferences/data/thunks';
 import { withLocation, withNavigate } from './hoc';
+import NameField from './NameField';
 
 class AccountSettingsPage extends React.Component {
   constructor(props, context) {
@@ -167,6 +168,34 @@ class AccountSettingsPage extends React.Component {
     this.props.saveSettings(formId, values, extendedProfileObject);
   };
 
+  handleSubmitFirstAndLastName = (formId, fullName, firstName, lastName) => {
+    const settingsToBeSaved = [];
+
+    if (Object.keys(this.props.drafts).includes('useVerifiedNameForCerts')) {
+      settingsToBeSaved.push({
+        formId: 'useVerifiedNameForCerts',
+        commitValues: this.props.formValues.useVerifiedNameForCerts,
+      });
+    }
+
+    settingsToBeSaved.push({
+      formId: 'first_name',
+      commitValues: firstName,
+    });
+
+    settingsToBeSaved.push({
+      formId: 'last_name',
+      commitValues: lastName,
+    });
+
+    settingsToBeSaved.push({
+      formId: 'name',
+      commitValues: fullName,
+    });
+
+    this.props.saveMultipleSettings(settingsToBeSaved, formId, false);
+  };
+
   handleSubmitProfileName = (formId, values) => {
     if (Object.keys(this.props.drafts).includes('useVerifiedNameForCerts')) {
       this.props.saveMultipleSettings([
@@ -552,37 +581,71 @@ class AccountSettingsPage extends React.Component {
             isEditable={false}
             {...editableFieldProps}
           />
-          <EditableField
-            name="name"
-            type="text"
-            value={
+          {(this.props.formValues?.first_name !== undefined && this.props.formValues?.last_name !== undefined) ? (
+            <NameField
+              name="name"
+              type="text"
+              verifiedName={verifiedName}
+              pendingNameChange={this.props.formValues.pending_name_change}
+              fullNameValue={this.props.formValues.name}
+              firstNameValue={this.props.formValues.first_name}
+              lastNameValue={this.props.formValues.last_name}
+              label={this.props.intl.formatMessage(messages['account.settings.field.full.name'])}
+              emptyLabel={
+              this.isEditable('name')
+                ? this.props.intl.formatMessage(messages['account.settings.field.full.name.empty'])
+                : this.renderEmptyStaticFieldMessage()
+            }
+              helpText={
+              verifiedName
+                ? this.renderFullNameHelpText(verifiedName.status, verifiedName.proctored_exam_attempt_id)
+                : this.props.intl.formatMessage(messages['account.settings.field.full.name.help.text'])
+            }
+              isEditable={
+              verifiedName
+                ? this.isEditable('verifiedName') && this.isEditable('name')
+                : this.isEditable('name')
+            }
+              isGrayedOut={
+              verifiedName && !this.isEditable('verifiedName')
+            }
+              onChange={this.handleEditableFieldChange}
+              onSubmit={this.handleSubmitFirstAndLastName}
+            />
+          ) : (
+            <EditableField
+              name="name"
+              type="text"
+              value={
               verifiedName?.status === 'submitted'
               && this.props.formValues.pending_name_change
                 ? this.props.formValues.pending_name_change
                 : this.props.formValues.name
               }
-            label={this.props.intl.formatMessage(messages['account.settings.field.full.name'])}
-            emptyLabel={
+              label={this.props.intl.formatMessage(messages['account.settings.field.full.name'])}
+              emptyLabel={
               this.isEditable('name')
                 ? this.props.intl.formatMessage(messages['account.settings.field.full.name.empty'])
                 : this.renderEmptyStaticFieldMessage()
             }
-            helpText={
+              helpText={
               verifiedName
                 ? this.renderFullNameHelpText(verifiedName.status, verifiedName.proctored_exam_attempt_id)
                 : this.props.intl.formatMessage(messages['account.settings.field.full.name.help.text'])
             }
-            isEditable={
+              isEditable={
               verifiedName
                 ? this.isEditable('verifiedName') && this.isEditable('name')
                 : this.isEditable('name')
             }
-            isGrayedOut={
+              isGrayedOut={
               verifiedName && !this.isEditable('verifiedName')
             }
-            onChange={this.handleEditableFieldChange}
-            onSubmit={this.handleSubmitProfileName}
-          />
+              onChange={this.handleEditableFieldChange}
+              onSubmit={this.handleSubmitProfileName}
+            />
+          )}
+
           {verifiedName
             && (
             <EditableField
@@ -872,6 +935,8 @@ AccountSettingsPage.propTypes = {
   formValues: PropTypes.shape({
     username: PropTypes.string,
     name: PropTypes.string,
+    first_name: PropTypes.string,
+    last_name: PropTypes.string,
     email: PropTypes.string,
     secondary_email: PropTypes.string,
     secondary_email_enabled: PropTypes.bool,

diff --git a/src/account-settings/AccountSettingsPage.messages.jsx b/src/account-settings/AccountSettingsPage.messages.jsx
@@ -81,6 +81,16 @@ const messages = defineMessages({
     defaultMessage: 'Full name',
     description: 'Label for account settings name field.',
   },
+  'account.settings.field.first.name': {
+    id: 'account.settings.field.first.name',
+    defaultMessage: 'First name',
+    description: 'Label for account settings first name field.',
+  },
+  'account.settings.field.last.name': {
+    id: 'account.settings.field.last.name',
+    defaultMessage: 'Last name',
+    description: 'Label for account settings last name field.',
+  },
   'account.settings.field.full.name.empty': {
     id: 'account.settings.field.full.name.empty',
     defaultMessage: 'Add name',