feat: merge 2u-main into master by awais-ansari · Pull Request #1231 · openedx/frontend-app-profile

awais-ansari · 2025-07-09T06:09:59Z

Ticket: INF-2009

This PR is to clear the divergence between master and 2u-main by merging 2u-main into master.

The following major changes from the 2u-main branch will be merged into master:

Embargo changes: disabling and restricting specific countries.
Fixed reloading issue.
Reskin of Profile MFE.
Making Profile editable regardless of age and DOB os the user.
Added new test cases in multiple places to improve test coverage.

* feat: added country disabling feature * fix: lint errors * test: added test case for disabled countries * refactor: combined test cases

… aansari/rebase-with-master

chore: rebase 2u-main with master

… inf-renovate-reselect-5

Rebase with 2u-main

… inf-rebase-dep-0001

Rebase 2u-main

* feat: reskin of Profile MFE main page * feat: reskin of Profile MFE main page * test: updated tests according to the changes * fix: added missing name property * test: updated test snapshot * test: added tests for reducers * feat: moved reskin logic behind env variable * test: updated tests * refactor: refactored code according to requested changes * fix: fixed lint errors * refactor: refactored code according to requested changes * refactor: refactored code according to requested changes

* fix: fixed reponsiveness issues on mobile view * test: updated tests * refactor: refactored code as requested

feat: fixed reloading issue

… aansari/sync-with-master

chore: sync with master

…nges feat: added restricted country functionality

* feat: readded editable fields to new profile view * feat: made fullname editable and updated design * test: updated test cases * refactor: refactored code based on reviews

* feat: made fullname uneditable and added redirect link * refactor: refactored code * refactor: refactored code

* fix(deps): update dependency @edx/frontend-platform to v8.3.3 (#1187) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> * fix(deps): update dependency core-js to v3.41.0 (#1188) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> * chore(deps): update `@openedx` dependencies to versions that support React 18 (#1189) * chore(deps): update dependency @openedx/frontend-build to v14.4.1 (#1191) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> * fix(deps): update react-router monorepo to v6.30.0 (#1192) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> * feat: upgrade react to v18 (#1190) * fix(deps): update dependency @edx/frontend-platform to v8.3.4 (#1195) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> * fix(deps): update dependency @edx/frontend-component-footer to v14.4.0 (#1196) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> * fix(deps): update dependency @edx/frontend-component-header to v6.3.0 (#1197) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> * fix(deps): update dependency @edx/frontend-component-footer to v14.6.0 (#1199) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> * fix(deps): update dependency @edx/openedx-atlas to ^0.7.0 (#1200) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> * fix(deps): update dependency @edx/frontend-component-header to v6.4.0 (#1201) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> * feat: import `FooterSlot` from component package instead of slot package (#1198) * chore(deps): update dependency glob to v11.0.2 (#1202) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> * fix(deps): update dependency @edx/frontend-component-footer to v14.7.0 (#1203) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> * fix(deps): update dependency @edx/frontend-component-footer to v14.7.1 (#1204) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> * fix(deps): update dependency core-js to v3.42.0 (#1205) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> * fix(deps): update dependency @edx/frontend-platform to v8.3.6 (#1207) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> * chore(deps): update commitlint monorepo to v19.8.1 (#1206) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> * fix(deps): update dependency @edx/frontend-platform to v8.3.7 (#1209) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> * fix(deps): update dependency @edx/frontend-component-footer to v14.7.2 (#1213) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> * fix(deps): update react-router monorepo to v6.30.1 (#1214) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> * fix(deps): update dependency @edx/frontend-platform to v8.3.9 (#1216) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> * fix(deps): update dependency @edx/frontend-component-footer to v14.9.0 (#1217) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> * feat!: add design tokens support (#1220) BREAKING CHANGE: Pre-design-tokens theming is no longer supported. Co-authored-by: Diana Olarte <diana.olarte@edunext.co> * fix: fixed lint issues --------- Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> Co-authored-by: Brian Smith <112954497+brian-smith-tcril@users.noreply.github.com> Co-authored-by: Hunia Fatima <huniafatima99@gmail.com> Co-authored-by: Diana Olarte <diana.olarte@edunext.co> Co-authored-by: sundasnoreen12 <sundasnoreen12@gmail.com>

codecov · 2025-07-09T09:30:06Z

Codecov Report

Attention: Patch coverage is 72.43511% with 223 lines in your changes missing coverage. Please review.

Project coverage is 69.52%. Comparing base (fa7267f) to head (6e5672d).
Report is 1 commits behind head on master.

Files with missing lines	Patch %	Lines
src/profile-v2/data/services.js	20.27%	55 Missing and 4 partials ⚠️
src/profile-v2/data/sagas.js	63.01%	26 Missing and 1 partial ⚠️
src/profile-v2/forms/SocialLinks.jsx	47.05%	27 Missing ⚠️
src/profile-v2/forms/elements/SwitchContent.jsx	40.90%	13 Missing ⚠️
src/profile-v2/ProfilePage.jsx	86.04%	10 Missing and 2 partials ⚠️
src/profile-v2/data/selectors.js	89.62%	11 Missing ⚠️
src/profile/data/services.js	0.00%	10 Missing and 1 partial ⚠️
src/profile-v2/forms/ProfileAvatar.jsx	71.42%	9 Missing and 1 partial ⚠️
src/profile-v2/forms/elements/FormControls.jsx	25.00%	9 Missing ⚠️
src/index.jsx	0.00%	8 Missing ⚠️
... and 16 more

Additional details and impacted files

@@            Coverage Diff             @@
##           master    #1231      +/-   ##
==========================================
+ Coverage   66.82%   69.52%   +2.70%     
==========================================
  Files          51       92      +41     
  Lines         856     1657     +801     
  Branches      176      406     +230     
==========================================
+ Hits          572     1152     +580     
- Misses        273      483     +210     
- Partials       11       22      +11

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

🚀 New features to boost your workflow:

❄️ Test Analytics: Detect flaky tests, report on failures, and find test suite problems.
📦 JS Bundle Analysis: Save yourself from yourself by tracking and limiting bundle sizes in JS merges.

#1232) This reverts commit a9159f6.

awais-ansari and others added 24 commits October 1, 2024 22:19

feat: added country disabling feature (#1084)

776cd12

* feat: added country disabling feature * fix: lint errors * test: added test case for disabled countries * refactor: combined test cases

Merge branch 'master' of github.com:openedx/frontend-app-profile into…

2cbdc5e

… aansari/rebase-with-master

Merge pull request #1102 from openedx/aansari/rebase-with-master

ca2a79d

chore: rebase 2u-main with master

Merge branch 'master' of github.com:openedx/frontend-app-profile into…

2a99330

… inf-renovate-reselect-5

Merge pull request #1121 from openedx/inf-renovate-reselect-5

a03cdc8

Rebase with 2u-main

Merge branch 'master' of github.com:openedx/frontend-app-profile into…

cd73616

… inf-rebase-dep-0001

Merge pull request #1122 from openedx/inf-rebase-dep-0001

f3a328c

Rebase 2u-main

feat: fixed reloading issue

b92efcd

fix: fixed responsiveness issues on mobile view (#1133)

c9b3fb9

* fix: fixed reponsiveness issues on mobile view * test: updated tests * refactor: refactored code as requested

test: added not found test case

e8be5b5

Merge pull request #1137 from openedx/sundasNew/INF-1594

1d0059e

feat: fixed reloading issue

Merge branch 'master' of github.com:openedx/frontend-app-profile into…

acfcfb4

… aansari/sync-with-master

test: updated test cases

2216c1b

Merge pull request #1184 from openedx/aansari/sync-with-master

adb12b4

chore: sync with master

feat: added restricted country functionality

29edfa9

fix: fixed test cases

7e3571e

test: updated snapshot

3fffbfe

test: updated test cases

896f2ce

Merge pull request #1185 from openedx/sundas/restricted-countries-cha…

bf5dd5b

…nges feat: added restricted country functionality

feat: made profile editable (#1212)

82ce644

* feat: readded editable fields to new profile view * feat: made fullname editable and updated design * test: updated test cases * refactor: refactored code based on reviews

feat: made fullname uneditable and added redirect link (#1215)

8d2bd72

* feat: made fullname uneditable and added redirect link * refactor: refactored code * refactor: refactored code

fix: fixed font sizing issue after applying elm theme (#1228)

a9159f6

awais-ansari requested a review from a team as a code owner July 9, 2025 06:10

eemaanamir changed the title ~~2u main~~ feat: merge 2u-main into master Jul 9, 2025

fix: resolved merge conflicts

cbca014

Revert "fix: fixed font sizing issue after applying elm theme (#1228)" (

6e5672d

#1232) This reverts commit a9159f6.

eemaanamir approved these changes Jul 9, 2025

View reviewed changes

ayesha-waris approved these changes Jul 9, 2025

View reviewed changes

awais-ansari merged commit 762e290 into master Jul 10, 2025
8 checks passed

awais-ansari deleted the 2u-main branch July 10, 2025 05:12

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

feat: merge 2u-main into master#1231

feat: merge 2u-main into master#1231
awais-ansari merged 26 commits intomasterfrom
2u-main

awais-ansari commented Jul 9, 2025 •

edited by eemaanamir

Loading

Uh oh!

codecov Bot commented Jul 9, 2025 •

edited

Loading

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

5 participants

Conversation

awais-ansari commented Jul 9, 2025 • edited by eemaanamir Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

codecov Bot commented Jul 9, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Codecov Report

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

5 participants

awais-ansari commented Jul 9, 2025 •

edited by eemaanamir

Loading

codecov Bot commented Jul 9, 2025 •

edited

Loading