feat: add work experience field #971

attiyaIshaque · 2024-01-10T08:51:43Z

Description

I have added a work experience field that will be shown on the front-end account setting page.

Ticket

https://2u-internal.atlassian.net/browse/VAN-1790

How Has This Been Tested?
you can add settings in django admin site configuration like this

"extended_profile_fields": [
        "work_experience"
    ],
    "EXTRA_FIELD_OPTIONS": {
        "work_experience": [
            "0",
            "1",
            "2",
            "3",
            "4",
            "5",
            "6",
            "7",
            "8",
            "9",
            "10+"
        ]
    }

and the field will be shown of auth account settings. You can add or edit the field.

codecov · 2024-01-11T13:53:07Z

Codecov Report

Attention: 3 lines in your changes are missing coverage. Please review.

Comparison is base (11e144d) 46.70% compared to head (8ecdedc) 56.50%.

Files	Patch %	Lines
src/account-settings/data/sagas.js	0.00%	1 Missing and 1 partial ⚠️
src/account-settings/AccountSettingsPage.jsx	92.85%	1 Missing ⚠️

Additional details and impacted files

@@            Coverage Diff             @@
##           master     #971      +/-   ##
==========================================
+ Coverage   46.70%   56.50%   +9.80%     
==========================================
  Files         117      118       +1     
  Lines        2411     2435      +24     
  Branches      640      652      +12     
==========================================
+ Hits         1126     1376     +250     
+ Misses       1211      988     -223     
+ Partials       74       71       -3

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

zainab-amir · 2024-01-15T08:50:45Z

src/account-settings/AccountSettingsPage.jsx

    const { verifiedName } = this.props;

+    const hasWorkExperience = !!this.props.formValues?.extended_profile?.find(profile => profile.field_name === 'work_experience');


rename:

Suggested change

const hasWorkExperience = !!this.props.formValues?.extended_profile?.find(profile => profile.field_name === 'work_experience');

const showWorkExperience = !!this.props.formValues?.extended_profile?.find(field => field.field_name === 'work_experience');

Change it in handleSubmit too

zainab-amir · 2024-01-19T09:51:50Z

src/account-settings/AccountSettingsPage.messages.jsx

+  'account.settings.field.work.experience.options.0': {
+    id: 'account.settings.field.work.experience.options.0',
+    defaultMessage: '0',
+    description: 'The label for account settings work experience option.',
+  },
+  'account.settings.field.work.experience.options.1': {
+    id: 'account.settings.field.work.experience.options.1',
+    defaultMessage: '1',
+    description: 'The label for account settings work experience option.',
+  },
+  'account.settings.field.work.experience.options.2': {
+    id: 'account.settings.field.work.experience.options.2',
+    defaultMessage: '2',
+    description: 'The label for account settings work experience option.',
+  },
+  'account.settings.field.work.experience.options.3': {
+    id: 'account.settings.field.work.experience.options.3',
+    defaultMessage: '3',
+    description: 'The label for account settings work experience option.',
+  },
+  'account.settings.field.work.experience.options.4': {
+    id: 'account.settings.field.work.experience.options.4',
+    defaultMessage: '4',
+    description: 'The label for account settings work experience option.',
+  },
+  'account.settings.field.work.experience.options.5': {
+    id: 'account.settings.field.work.experience.options.5',
+    defaultMessage: '5',
+    description: 'The label for account settings work experience option.',
+  },
+  'account.settings.field.work.experience.options.6': {
+    id: 'account.settings.field.work.experience.options.6',
+    defaultMessage: '6',
+    description: 'The label for account settings work experience option.',
+  },
+  'account.settings.field.work.experience.options.7': {
+    id: 'account.settings.field.work.experience.options.7',
+    defaultMessage: '7',
+    description: 'The label for account settings work experience option.',
+  },
+  'account.settings.field.work.experience.options.8': {
+    id: 'account.settings.field.work.experience.options.8',
+    defaultMessage: '8',
+    description: 'The label for account settings work experience option.',
+  },
+  'account.settings.field.work.experience.options.9': {
+    id: 'account.settings.field.work.experience.options.9',
+    defaultMessage: '9',
+    description: 'The label for account settings work experience option.',
+  },
+  'account.settings.field.work.experience.options.10+': {
+    id: 'account.settings.field.work.experience.options.10+',
+    defaultMessage: '10+',
+    description: 'The label for account settings work experience option.',
+  },


We don't need these as translation strings because in every language "1" will be translated as "1". Please remove these from here and update code.

zainab-amir · 2024-01-19T10:07:15Z

src/account-settings/AccountSettingsPage.jsx

+          {hasWorkExperience && (
+          <EditableSelectField
+            name="work_experience"
+            type="select"
+            value={this.props.formValues?.extended_profile?.find(profile => profile.field_name === 'work_experience')?.field_value}
+            options={workExperienceOptions}
+            label={this.props.intl.formatMessage(messages['account.settings.field.work.experience'])}
+            emptyLabel={this.props.intl.formatMessage(messages['account.settings.field.work.experience.empty'])}
+            {...editableFieldProps}
+          />
+          )}


nit: fix formatting

Suggested change

{hasWorkExperience && (

<EditableSelectField

name="work_experience"

type="select"

value={this.props.formValues?.extended_profile?.find(profile => profile.field_name === 'work_experience')?.field_value}

options={workExperienceOptions}

label={this.props.intl.formatMessage(messages['account.settings.field.work.experience'])}

emptyLabel={this.props.intl.formatMessage(messages['account.settings.field.work.experience.empty'])}

{...editableFieldProps}

/>

)}

{hasWorkExperience

&& (

<EditableSelectField

name="work_experience"

type="select"

value={this.props.formValues?.extended_profile?.find(profile => profile.field_name === 'work_experience')?.field_value}

options={workExperienceOptions}

label={this.props.intl.formatMessage(messages['account.settings.field.work.experience'])}

emptyLabel={this.props.intl.formatMessage(messages['account.settings.field.work.experience.empty'])}

{...editableFieldProps}

/>

)}

zainab-amir · 2024-01-19T10:21:37Z

src/account-settings/certificate-preference/test/CertificatePreference.test.jsx

@@ -151,7 +151,7 @@ describe('NameChange', () => {
    const submitButton = screen.getByText('Choose name');
    fireEvent.click(submitButton);
    expect(mockDispatch).toHaveBeenCalledWith({
-      payload: { formId, commitValues: false },
+      payload: { formId, commitValues: false, extendedProfile: null },


Please use same default value as you have used in handleSubmit because you check following in Sagas file and it will break with null

Object.keys(extendedProfile).length > 0

Change default to empty dict

Suggested change

payload: { formId, commitValues: false, extendedProfile: null },

payload: { formId, commitValues: false, extendedProfile: {} },

zainab-amir · 2024-01-19T10:21:46Z

src/account-settings/data/actions.js

@@ -77,9 +77,9 @@ export const beginNameChange = (formId) => ({
 });
 // SAVE SETTINGS ACTIONS

-export const saveSettings = (formId, commitValues) => ({
+export const saveSettings = (formId, commitValues, extendedProfile = null) => ({


Suggested change

export const saveSettings = (formId, commitValues, extendedProfile = null) => ({

export const saveSettings = (formId, commitValues, extendedProfile = {}) => ({

attiyaIshaque force-pushed the attiya/VAN-1790 branch from 819d671 to 9ca4c25 Compare January 11, 2024 13:49

attiyaIshaque force-pushed the attiya/VAN-1790 branch from 9ca4c25 to 9395fd2 Compare January 12, 2024 14:42

attiyaIshaque marked this pull request as ready for review January 12, 2024 14:46

attiyaIshaque force-pushed the attiya/VAN-1790 branch 4 times, most recently from be331a9 to 5850743 Compare January 17, 2024 15:03

zainab-amir suggested changes Jan 19, 2024

View reviewed changes

feat: add work experience field

8ecdedc

attiyaIshaque force-pushed the attiya/VAN-1790 branch from 5850743 to 8ecdedc Compare January 19, 2024 11:03

zainab-amir approved these changes Jan 19, 2024

View reviewed changes

attiyaIshaque requested a review from abdullahwaheed January 19, 2024 11:25

abdullahwaheed approved these changes Jan 19, 2024

View reviewed changes

attiyaIshaque merged commit 594ffe4 into master Jan 19, 2024
9 checks passed

attiyaIshaque deleted the attiya/VAN-1790 branch January 19, 2024 13:44

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

feat: add work experience field #971

feat: add work experience field #971

attiyaIshaque commented Jan 10, 2024 •

edited

Loading

codecov bot commented Jan 11, 2024 •

edited

Loading

zainab-amir Jan 15, 2024 •

edited

Loading

zainab-amir Jan 19, 2024

zainab-amir Jan 19, 2024 •

edited

Loading

zainab-amir Jan 19, 2024

zainab-amir Jan 19, 2024

		const { verifiedName } = this.props;

		const hasWorkExperience = !!this.props.formValues?.extended_profile?.find(profile => profile.field_name === 'work_experience');

	const hasWorkExperience = !!this.props.formValues?.extended_profile?.find(profile => profile.field_name === 'work_experience');
	const showWorkExperience = !!this.props.formValues?.extended_profile?.find(field => field.field_name === 'work_experience');

	payload: { formId, commitValues: false, extendedProfile: null },
	payload: { formId, commitValues: false, extendedProfile: {} },

	export const saveSettings = (formId, commitValues, extendedProfile = null) => ({
	export const saveSettings = (formId, commitValues, extendedProfile = {}) => ({

feat: add work experience field #971

feat: add work experience field #971

Conversation

attiyaIshaque commented Jan 10, 2024 • edited Loading

Description

Ticket

codecov bot commented Jan 11, 2024 • edited Loading

Codecov Report

zainab-amir Jan 15, 2024 • edited Loading

Choose a reason for hiding this comment

zainab-amir Jan 19, 2024

Choose a reason for hiding this comment

zainab-amir Jan 19, 2024 • edited Loading

Choose a reason for hiding this comment

zainab-amir Jan 19, 2024

Choose a reason for hiding this comment

zainab-amir Jan 19, 2024

Choose a reason for hiding this comment

attiyaIshaque commented Jan 10, 2024 •

edited

Loading

codecov bot commented Jan 11, 2024 •

edited

Loading

zainab-amir Jan 15, 2024 •

edited

Loading

zainab-amir Jan 19, 2024 •

edited

Loading