feat: added country disabling feature (#1116 )

* feat: added country disabling feature * refactor: removed isDisabledCountry additional call
Merge pull request #1132 from openedx/INF-1653
2024-10-10 12:07:58 +05:00 · 2024-10-10 12:02:05 +05:00 · 2024-10-09 16:20:58 +05:00 · 2024-10-07 06:48:36 +00:00 · 2024-10-07 04:49:32 +00:00 · 2024-10-07 04:49:08 +00:00
9 changed files with 146 additions and 40 deletions
--- a/.env
+++ b/.env
@@ -1,4 +1,5 @@
 ACCESS_TOKEN_COOKIE_NAME=''
+ACCOUNT_PROFILE_URL=''
 BASE_URL=''
 CREDENTIALS_BASE_URL=''
 CSRF_TOKEN_API_PATH=''
--- a/.env.development
+++ b/.env.development
@@ -1,4 +1,5 @@
 ACCESS_TOKEN_COOKIE_NAME='edx-jwt-cookie-header-payload'
+ACCOUNT_PROFILE_URL='http://localhost:1995'
 BASE_URL='localhost:1997'
 CREDENTIALS_BASE_URL='http://localhost:18150'
 CSRF_TOKEN_API_PATH='/csrf/api/v1/token'
--- a/package-lock.json
+++ b/package-lock.json
@@ -10,8 +10,8 @@
      "license": "AGPL-3.0",
      "dependencies": {
        "@edx/brand": "npm:@openedx/brand-openedx@^1.2.2",
-        "@edx/frontend-component-header": "5.3.4",
-        "@edx/frontend-platform": "8.1.1",
+        "@edx/frontend-component-header": "5.5.0",
+        "@edx/frontend-platform": "8.1.2",
        "@edx/openedx-atlas": "^0.6.0",
        "@fortawesome/fontawesome-svg-core": "^6.6.0",
        "@fortawesome/free-brands-svg-icons": "^6.6.0",
@@ -66,8 +66,8 @@
      "devDependencies": {
        "@edx/browserslist-config": "1.2.0",
        "@edx/reactifex": "1.1.0",
-        "@openedx/frontend-build": "14.1.2",
-        "@testing-library/jest-dom": "6.4.8",
+        "@openedx/frontend-build": "14.1.5",
+        "@testing-library/jest-dom": "6.5.0",
        "@testing-library/react": "12.1.5",
        "react-test-renderer": "17.0.2",
        "reactifex": "1.1.1",
@@ -2010,7 +2010,9 @@
      }
    },
    "node_modules/@edx/frontend-component-header": {
-      "version": "5.3.4",
+      "version": "5.5.0",
+      "resolved": "https://registry.npmjs.org/@edx/frontend-component-header/-/frontend-component-header-5.5.0.tgz",
+      "integrity": "sha512-nvpuTIx1o27LUGJ17HpOOm+PX0gg/YumWUMsrl1gSjbrTksyDLOxS1Y4thqlrWzD+dAgk5YKMowZM2BLiRDguQ==",
      "license": "AGPL-3.0",
      "dependencies": {
        "@fortawesome/fontawesome-svg-core": "6.6.0",
@@ -2018,8 +2020,10 @@
        "@fortawesome/free-regular-svg-icons": "6.6.0",
        "@fortawesome/free-solid-svg-icons": "6.6.0",
        "@fortawesome/react-fontawesome": "^0.2.0",
+        "@openedx/frontend-plugin-framework": "^1.3.0",
        "axios-mock-adapter": "1.22.0",
        "babel-polyfill": "6.26.0",
+        "classnames": "^2.5.1",
        "jest-environment-jsdom": "^29.7.0",
        "react-responsive": "8.2.0",
        "react-transition-group": "4.4.5"
@@ -2033,7 +2037,9 @@
      }
    },
    "node_modules/@edx/frontend-platform": {
-      "version": "8.1.1",
+      "version": "8.1.2",
+      "resolved": "https://registry.npmjs.org/@edx/frontend-platform/-/frontend-platform-8.1.2.tgz",
+      "integrity": "sha512-xkSpzoxSp3bC4rrOHkHb/tj5bZQjZrOe5t3/kNzJVqqvziFGRU0fTAhh+Pv0aHboDAS8mAEhqZrJFpdeAFe1Tg==",
      "license": "AGPL-3.0",
      "dependencies": {
        "@cospired/i18n-iso-languages": "4.2.0",
@@ -2053,7 +2059,7 @@
        "lodash.merge": "4.6.2",
        "lodash.snakecase": "4.1.1",
        "pubsub-js": "1.9.4",
-        "react-intl": "6.6.8",
+        "react-intl": "6.7.0",
        "universal-cookie": "4.0.4"
      },
      "bin": {
@@ -2073,6 +2079,8 @@
    },
    "node_modules/@edx/frontend-platform/node_modules/axios": {
      "version": "1.6.7",
+      "resolved": "https://registry.npmjs.org/axios/-/axios-1.6.7.tgz",
+      "integrity": "sha512-/hDJGff6/c7u0hDkvkGxR/oy6CbCs8ziCsC7SqmhjfozqiJGc8Z11wrv9z9lYfY4K8l+H9TpjcMDX0xOZmx+RA==",
      "license": "MIT",
      "dependencies": {
        "follow-redirects": "^1.15.4",
@@ -2082,6 +2090,8 @@
    },
    "node_modules/@edx/frontend-platform/node_modules/form-urlencoded": {
      "version": "4.1.4",
+      "resolved": "https://registry.npmjs.org/form-urlencoded/-/form-urlencoded-4.1.4.tgz",
+      "integrity": "sha512-R7Vytos0gMYuPQTMwnNzvK9PBItNV+Qkm/pvghEZI3j2kMrzZmJlczAgHFmt12VV+IRYQXgTlSGP1PKAsMCIUA==",
      "license": "MIT"
    },
    "node_modules/@edx/new-relic-source-map-webpack-plugin": {
@@ -2279,6 +2289,8 @@
    },
    "node_modules/@formatjs/fast-memoize": {
      "version": "2.2.0",
+      "resolved": "https://registry.npmjs.org/@formatjs/fast-memoize/-/fast-memoize-2.2.0.tgz",
+      "integrity": "sha512-hnk/nY8FyrL5YxwP9e4r9dqeM6cAbo8PeU9UjyXojZMNvVad2Z06FAVHyR3Ecw6fza+0GH7vdJgiKIVXTMbSBA==",
      "license": "MIT",
      "dependencies": {
        "tslib": "^2.4.0"
@@ -2332,7 +2344,9 @@
      }
    },
    "node_modules/@formatjs/intl": {
-      "version": "2.10.4",
+      "version": "2.10.5",
+      "resolved": "https://registry.npmjs.org/@formatjs/intl/-/intl-2.10.5.tgz",
+      "integrity": "sha512-f9qPNNgLrh2KvoFvHGIfcPTmNGbyy7lyyV4/P6JioDqtTE7Akdmgt+ZzVndr+yMLZnssUShyTMXxM/6aV9eVuQ==",
      "license": "MIT",
      "dependencies": {
        "@formatjs/ecma402-abstract": "2.0.0",
@@ -2354,6 +2368,8 @@
    },
    "node_modules/@formatjs/intl-displaynames": {
      "version": "6.6.8",
+      "resolved": "https://registry.npmjs.org/@formatjs/intl-displaynames/-/intl-displaynames-6.6.8.tgz",
+      "integrity": "sha512-Lgx6n5KxN16B3Pb05z3NLEBQkGoXnGjkTBNCZI+Cn17YjHJ3fhCeEJJUqRlIZmJdmaXQhjcQVDp6WIiNeRYT5g==",
      "license": "MIT",
      "dependencies": {
        "@formatjs/ecma402-abstract": "2.0.0",
@@ -2363,6 +2379,8 @@
    },
    "node_modules/@formatjs/intl-displaynames/node_modules/@formatjs/ecma402-abstract": {
      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/@formatjs/ecma402-abstract/-/ecma402-abstract-2.0.0.tgz",
+      "integrity": "sha512-rRqXOqdFmk7RYvj4khklyqzcfQl9vEL/usogncBHRZfZBDOwMGuSRNFl02fu5KGHXdbinju+YXyuR+Nk8xlr/g==",
      "license": "MIT",
      "dependencies": {
        "@formatjs/intl-localematcher": "0.5.4",
@@ -2371,6 +2389,8 @@
    },
    "node_modules/@formatjs/intl-displaynames/node_modules/@formatjs/intl-localematcher": {
      "version": "0.5.4",
+      "resolved": "https://registry.npmjs.org/@formatjs/intl-localematcher/-/intl-localematcher-0.5.4.tgz",
+      "integrity": "sha512-zTwEpWOzZ2CiKcB93BLngUX59hQkuZjT2+SAQEscSm52peDW/getsawMcWF1rGRpMCX6D7nSJA3CzJ8gn13N/g==",
      "license": "MIT",
      "dependencies": {
        "tslib": "^2.4.0"
@@ -2378,6 +2398,8 @@
    },
    "node_modules/@formatjs/intl-listformat": {
      "version": "7.5.7",
+      "resolved": "https://registry.npmjs.org/@formatjs/intl-listformat/-/intl-listformat-7.5.7.tgz",
+      "integrity": "sha512-MG2TSChQJQT9f7Rlv+eXwUFiG24mKSzmF144PLb8m8OixyXqn4+YWU+5wZracZGCgVTVmx8viCf7IH3QXoiB2g==",
      "license": "MIT",
      "dependencies": {
        "@formatjs/ecma402-abstract": "2.0.0",
@@ -2387,6 +2409,8 @@
    },
    "node_modules/@formatjs/intl-listformat/node_modules/@formatjs/ecma402-abstract": {
      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/@formatjs/ecma402-abstract/-/ecma402-abstract-2.0.0.tgz",
+      "integrity": "sha512-rRqXOqdFmk7RYvj4khklyqzcfQl9vEL/usogncBHRZfZBDOwMGuSRNFl02fu5KGHXdbinju+YXyuR+Nk8xlr/g==",
      "license": "MIT",
      "dependencies": {
        "@formatjs/intl-localematcher": "0.5.4",
@@ -2395,6 +2419,8 @@
    },
    "node_modules/@formatjs/intl-listformat/node_modules/@formatjs/intl-localematcher": {
      "version": "0.5.4",
+      "resolved": "https://registry.npmjs.org/@formatjs/intl-localematcher/-/intl-localematcher-0.5.4.tgz",
+      "integrity": "sha512-zTwEpWOzZ2CiKcB93BLngUX59hQkuZjT2+SAQEscSm52peDW/getsawMcWF1rGRpMCX6D7nSJA3CzJ8gn13N/g==",
      "license": "MIT",
      "dependencies": {
        "tslib": "^2.4.0"
@@ -2427,6 +2453,8 @@
    },
    "node_modules/@formatjs/intl/node_modules/@formatjs/ecma402-abstract": {
      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/@formatjs/ecma402-abstract/-/ecma402-abstract-2.0.0.tgz",
+      "integrity": "sha512-rRqXOqdFmk7RYvj4khklyqzcfQl9vEL/usogncBHRZfZBDOwMGuSRNFl02fu5KGHXdbinju+YXyuR+Nk8xlr/g==",
      "license": "MIT",
      "dependencies": {
        "@formatjs/intl-localematcher": "0.5.4",
@@ -2435,6 +2463,8 @@
    },
    "node_modules/@formatjs/intl/node_modules/@formatjs/intl-localematcher": {
      "version": "0.5.4",
+      "resolved": "https://registry.npmjs.org/@formatjs/intl-localematcher/-/intl-localematcher-0.5.4.tgz",
+      "integrity": "sha512-zTwEpWOzZ2CiKcB93BLngUX59hQkuZjT2+SAQEscSm52peDW/getsawMcWF1rGRpMCX6D7nSJA3CzJ8gn13N/g==",
      "license": "MIT",
      "dependencies": {
        "tslib": "^2.4.0"
@@ -3086,9 +3116,9 @@
      }
    },
    "node_modules/@openedx/frontend-build": {
-      "version": "14.1.2",
-      "resolved": "https://registry.npmjs.org/@openedx/frontend-build/-/frontend-build-14.1.2.tgz",
-      "integrity": "sha512-pLTcY/BLjCFn2qsBmUY0on2qB4PNShlg8scTYjrsz5fCASuSAJk000jOF5ys6bg6i8krSOIJlcZXPgrq0ywsUg==",
+      "version": "14.1.5",
+      "resolved": "https://registry.npmjs.org/@openedx/frontend-build/-/frontend-build-14.1.5.tgz",
+      "integrity": "sha512-QEdl55jNitdQL7RDAuX/EgfxsyBeEZfW3fc9Df4Py5KY6NKjRE7wNLeBMxYCFagEgXwaR1Btiw5NxzByAdlnfg==",
      "license": "AGPL-3.0",
      "dependencies": {
        "@babel/cli": "7.24.8",
@@ -3109,7 +3139,7 @@
        "@types/jest": "29.5.12",
        "@typescript-eslint/eslint-plugin": "^5.58.0",
        "@typescript-eslint/parser": "^5.58.0",
-        "autoprefixer": "10.4.19",
+        "autoprefixer": "10.4.20",
        "babel-jest": "29.6.1",
        "babel-loader": "9.1.3",
        "babel-plugin-formatjs": "^10.4.0",
@@ -3138,7 +3168,7 @@
        "jest-environment-jsdom": "29.6.1",
        "mini-css-extract-plugin": "1.6.2",
        "parse5": "7.1.2",
-        "postcss": "8.4.39",
+        "postcss": "8.4.47",
        "postcss-custom-media": "10.0.8",
        "postcss-loader": "7.3.4",
        "postcss-rtlcss": "5.1.2",
@@ -3280,7 +3310,9 @@
      }
    },
    "node_modules/@openedx/frontend-plugin-framework": {
-      "version": "1.2.2",
+      "version": "1.3.0",
+      "resolved": "https://registry.npmjs.org/@openedx/frontend-plugin-framework/-/frontend-plugin-framework-1.3.0.tgz",
+      "integrity": "sha512-qLtX/4HIuWXiIhBdtBuL6mPVbV2un0rsFYx3I5+3tIUf7+T7WRq81a6JHU5QGyAmZy9dfiv7QwbqwiEQOVXVuQ==",
      "license": "AGPL-3.0",
      "dependencies": {
        "@edx/brand": "npm:@openedx/brand-openedx@^1.2.2",
@@ -3304,6 +3336,7 @@
      "resolved": "https://registry.npmjs.org/core-js/-/core-js-3.37.1.tgz",
      "integrity": "sha512-Xn6qmxrQZyB0FFY8E3bgRXei3lWDJHhvI+u0q9TKIYM49G8pAr0FgnnrFRAmsbptZL1yxRADVXn+x5AGsbBfyw==",
      "hasInstallScript": true,
+      "license": "MIT",
      "funding": {
        "type": "opencollective",
        "url": "https://opencollective.com/core-js"
@@ -3520,7 +3553,9 @@
      "license": "MIT"
    },
    "node_modules/@remix-run/router": {
-      "version": "1.19.0",
+      "version": "1.19.2",
+      "resolved": "https://registry.npmjs.org/@remix-run/router/-/router-1.19.2.tgz",
+      "integrity": "sha512-baiMx18+IMuD1yyvOGaHM9QrVUPGGG0jC+z+IPHnRJWUAUvaKuWKyE8gjDj2rzv3sz9zOGoRSPgeBVHRhZnBlA==",
      "license": "MIT",
      "engines": {
        "node": ">=14.0.0"
@@ -3858,12 +3893,13 @@
      "license": "MIT"
    },
    "node_modules/@testing-library/jest-dom": {
-      "version": "6.4.8",
+      "version": "6.5.0",
+      "resolved": "https://registry.npmjs.org/@testing-library/jest-dom/-/jest-dom-6.5.0.tgz",
+      "integrity": "sha512-xGGHpBXYSHUUr6XsKBfs85TWlYKpTc37cSBBVrXcib2MkHLboWlkClhWF37JKlDb9KEq3dHs+f2xR7XJEWGBxA==",
      "dev": true,
      "license": "MIT",
      "dependencies": {
        "@adobe/css-tools": "^4.4.0",
-        "@babel/runtime": "^7.9.2",
        "aria-query": "^5.0.0",
        "chalk": "^3.0.0",
        "css.escape": "^1.5.1",
@@ -3879,6 +3915,8 @@
    },
    "node_modules/@testing-library/jest-dom/node_modules/chalk": {
      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/chalk/-/chalk-3.0.0.tgz",
+      "integrity": "sha512-4D3B6Wf41KOYRFdszmDqMCGq5VV/uMAB273JILmO+3jAlh8X4qDtdtgCR3fxtbLEMzSx22QdhnDcJvu2u1fVwg==",
      "dev": true,
      "license": "MIT",
      "dependencies": {
@@ -5084,7 +5122,9 @@
      }
    },
    "node_modules/autoprefixer": {
-      "version": "10.4.19",
+      "version": "10.4.20",
+      "resolved": "https://registry.npmjs.org/autoprefixer/-/autoprefixer-10.4.20.tgz",
+      "integrity": "sha512-XY25y5xSv/wEoqzDyXXME4AFfkZI0P23z6Fs3YgymDnKJkCGOnkL0iTxCa85UTqaSgfcqyf3UA6+c7wUvx/16g==",
      "funding": [
        {
          "type": "opencollective",
@@ -5101,11 +5141,11 @@
      ],
      "license": "MIT",
      "dependencies": {
-        "browserslist": "^4.23.0",
-        "caniuse-lite": "^1.0.30001599",
+        "browserslist": "^4.23.3",
+        "caniuse-lite": "^1.0.30001646",
        "fraction.js": "^4.3.7",
        "normalize-range": "^0.1.2",
-        "picocolors": "^1.0.0",
+        "picocolors": "^1.0.1",
        "postcss-value-parser": "^4.2.0"
      },
      "bin": {
@@ -9411,6 +9451,8 @@
    },
    "node_modules/intl-messageformat": {
      "version": "10.5.14",
+      "resolved": "https://registry.npmjs.org/intl-messageformat/-/intl-messageformat-10.5.14.tgz",
+      "integrity": "sha512-IjC6sI0X7YRjjyVH9aUgdftcmZK7WXdHeil4KwbjDnRWjnVitKpAx3rr6t6di1joFp5188VqKcobOPA6mCLG/w==",
      "license": "BSD-3-Clause",
      "dependencies": {
        "@formatjs/ecma402-abstract": "2.0.0",
@@ -9421,6 +9463,8 @@
    },
    "node_modules/intl-messageformat/node_modules/@formatjs/ecma402-abstract": {
      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/@formatjs/ecma402-abstract/-/ecma402-abstract-2.0.0.tgz",
+      "integrity": "sha512-rRqXOqdFmk7RYvj4khklyqzcfQl9vEL/usogncBHRZfZBDOwMGuSRNFl02fu5KGHXdbinju+YXyuR+Nk8xlr/g==",
      "license": "MIT",
      "dependencies": {
        "@formatjs/intl-localematcher": "0.5.4",
@@ -9429,6 +9473,8 @@
    },
    "node_modules/intl-messageformat/node_modules/@formatjs/intl-localematcher": {
      "version": "0.5.4",
+      "resolved": "https://registry.npmjs.org/@formatjs/intl-localematcher/-/intl-localematcher-0.5.4.tgz",
+      "integrity": "sha512-zTwEpWOzZ2CiKcB93BLngUX59hQkuZjT2+SAQEscSm52peDW/getsawMcWF1rGRpMCX6D7nSJA3CzJ8gn13N/g==",
      "license": "MIT",
      "dependencies": {
        "tslib": "^2.4.0"
@@ -12060,7 +12106,9 @@
      }
    },
    "node_modules/picocolors": {
-      "version": "1.0.1",
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/picocolors/-/picocolors-1.1.0.tgz",
+      "integrity": "sha512-TQ92mBOW0l3LeMeyLV6mzy/kWr8lkd/hp3mTg7wYK7zJhuBStmGMBG0BdeDZS/dZx1IukaX6Bk11zcln25o1Aw==",
      "license": "ISC"
    },
    "node_modules/picomatch": {
@@ -12265,7 +12313,9 @@
      }
    },
    "node_modules/postcss": {
-      "version": "8.4.39",
+      "version": "8.4.47",
+      "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.4.47.tgz",
+      "integrity": "sha512-56rxCq7G/XfB4EkXq9Egn5GCqugWvDFjafDOThIdMBsI15iqPqR5r15TfSr1YPYeEI19YeaXMCbY6u88Y76GLQ==",
      "funding": [
        {
          "type": "opencollective",
@@ -12283,8 +12333,8 @@
      "license": "MIT",
      "dependencies": {
        "nanoid": "^3.3.7",
-        "picocolors": "^1.0.1",
-        "source-map-js": "^1.2.0"
+        "picocolors": "^1.1.0",
+        "source-map-js": "^1.2.1"
      },
      "engines": {
        "node": "^10 || ^12 || >=14"
@@ -13372,12 +13422,14 @@
      }
    },
    "node_modules/react-intl": {
-      "version": "6.6.8",
+      "version": "6.7.0",
+      "resolved": "https://registry.npmjs.org/react-intl/-/react-intl-6.7.0.tgz",
+      "integrity": "sha512-f5QhjuKb+WEqiAbL5hDqUs2+sSRkF0vxkTbJ4A8ompt55XTyOHcrDlCXGq4o73ywFFrpgz+78C9IXegSLlya2A==",
      "license": "BSD-3-Clause",
      "dependencies": {
        "@formatjs/ecma402-abstract": "2.0.0",
        "@formatjs/icu-messageformat-parser": "2.7.8",
-        "@formatjs/intl": "2.10.4",
+        "@formatjs/intl": "2.10.5",
        "@formatjs/intl-displaynames": "6.6.8",
        "@formatjs/intl-listformat": "7.5.7",
        "@types/hoist-non-react-statics": "^3.3.1",
@@ -13551,10 +13603,12 @@
      }
    },
    "node_modules/react-router": {
-      "version": "6.26.0",
+      "version": "6.26.2",
+      "resolved": "https://registry.npmjs.org/react-router/-/react-router-6.26.2.tgz",
+      "integrity": "sha512-tvN1iuT03kHgOFnLPfLJ8V95eijteveqdOSk+srqfePtQvqCExB8eHOYnlilbOcyJyKnYkr1vJvf7YqotAJu1A==",
      "license": "MIT",
      "dependencies": {
-        "@remix-run/router": "1.19.0"
+        "@remix-run/router": "1.19.2"
      },
      "engines": {
        "node": ">=14.0.0"
@@ -13564,11 +13618,13 @@
      }
    },
    "node_modules/react-router-dom": {
-      "version": "6.26.0",
+      "version": "6.26.2",
+      "resolved": "https://registry.npmjs.org/react-router-dom/-/react-router-dom-6.26.2.tgz",
+      "integrity": "sha512-z7YkaEW0Dy35T3/QKPYB1LjMK2R1fxnHO8kWpUMTBdfVzZrWOiY9a7CtN8HqdWtDUWd5FY6Dl8HFsqVwH4uOtQ==",
      "license": "MIT",
      "dependencies": {
-        "@remix-run/router": "1.19.0",
-        "react-router": "6.26.0"
+        "@remix-run/router": "1.19.2",
+        "react-router": "6.26.2"
      },
      "engines": {
        "node": ">=14.0.0"
@@ -14600,7 +14656,9 @@
      }
    },
    "node_modules/source-map-js": {
-      "version": "1.2.0",
+      "version": "1.2.1",
+      "resolved": "https://registry.npmjs.org/source-map-js/-/source-map-js-1.2.1.tgz",
+      "integrity": "sha512-UXWMKhLOwVKb728IUtQPXxfYU+usdybtUrK/8uGE8CQMvrhOpwvzDBwj0QhSL7MQc7vIsISBG8VQ8+IDQxpfQA==",
      "license": "BSD-3-Clause",
      "engines": {
        "node": ">=0.10.0"
--- a/package.json
+++ b/package.json
@@ -29,8 +29,8 @@
  ],
  "dependencies": {
    "@edx/brand": "npm:@openedx/brand-openedx@^1.2.2",
-    "@edx/frontend-component-header": "5.3.4",
-    "@edx/frontend-platform": "8.1.1",
+    "@edx/frontend-component-header": "5.5.0",
+    "@edx/frontend-platform": "8.1.2",
    "@edx/openedx-atlas": "^0.6.0",
    "@fortawesome/fontawesome-svg-core": "^6.6.0",
    "@fortawesome/free-brands-svg-icons": "^6.6.0",
@@ -85,8 +85,8 @@
  "devDependencies": {
    "@edx/browserslist-config": "1.2.0",
    "@edx/reactifex": "1.1.0",
-    "@openedx/frontend-build": "14.1.2",
-    "@testing-library/jest-dom": "6.4.8",
+    "@openedx/frontend-build": "14.1.5",
+    "@testing-library/jest-dom": "6.5.0",
    "@testing-library/react": "12.1.5",
    "react-test-renderer": "17.0.2",
    "reactifex": "1.1.1",
--- a/src/account-settings/AccountSettingsPage.jsx
+++ b/src/account-settings/AccountSettingsPage.jsx
@@ -120,7 +120,15 @@ class AccountSettingsPage extends React.Component {
    countryOptions: [{
      value: '',
      label: this.props.intl.formatMessage(messages['account.settings.field.country.options.empty']),
-    }].concat(getCountryList(locale).map(({ code, name }) => ({ value: code, label: name }))),
+    }].concat(
+      this.removeDisabledCountries(
+        getCountryList(locale).map(({ code, name }) => ({
+          value: code,
+          label: name,
+          disabled: this.isDisabledCountry(code),
+        })),
+      ),
+    ),
    stateOptions: [{
      value: '',
      label: this.props.intl.formatMessage(messages['account.settings.field.state.options.empty']),
@@ -147,11 +155,28 @@ class AccountSettingsPage extends React.Component {
    })),
  }));

+  removeDisabledCountries = (countryList) => {
+    const { disabledCountries, committedValues } = this.props;
+
+    if (!disabledCountries.length) {
+      return countryList;
+    }
+
+    return countryList.filter(({ value, disabled }) => {
+      const isUserCountry = value === committedValues.country;
+      return !disabled || isUserCountry;
+    });
+  };
+
  handleEditableFieldChange = (name, value) => {
    this.props.updateDraft(name, value);
  };

  handleSubmit = (formId, values) => {
+    if (formId === 'country' && this.isDisabledCountry(values)) {
+      return;
+    }
+
    const { formValues } = this.props;
    let extendedProfileObject = {};

@@ -193,6 +218,11 @@ class AccountSettingsPage extends React.Component {
    }
  };

+  isDisabledCountry = (country) => {
+    const { disabledCountries } = this.props;
+    return disabledCountries.includes(country);
+  };
+
  isEditable(fieldName) {
    return !this.props.staticFields.includes(fieldName);
  }
@@ -476,7 +506,8 @@ class AccountSettingsPage extends React.Component {
    } = this.getLocalizedOptions(this.context.locale, this.props.formValues.country);

    // Show State field only if the country is US (could include Canada later)
-    const showState = this.props.formValues.country === COUNTRY_WITH_STATES;
+    const { country } = this.props.formValues;
+    const showState = country === COUNTRY_WITH_STATES && !this.isDisabledCountry(country);
    const { verifiedName } = this.props;

    const hasWorkExperience = !!this.props.formValues?.extended_profile?.find(field => field.field_name === 'work_experience');
@@ -880,6 +911,7 @@ AccountSettingsPage.propTypes = {
    name: PropTypes.string,
    useVerifiedNameForCerts: PropTypes.bool,
    verified_name: PropTypes.string,
+    country: PropTypes.string,
  }),
  drafts: PropTypes.shape({}),
  formErrors: PropTypes.shape({
@@ -938,6 +970,7 @@ AccountSettingsPage.propTypes = {
  ),
  navigate: PropTypes.func.isRequired,
  location: PropTypes.string.isRequired,
+  disabledCountries: PropTypes.arrayOf(PropTypes.string),
 };

 AccountSettingsPage.defaultProps = {
@@ -947,6 +980,7 @@ AccountSettingsPage.defaultProps = {
  committedValues: {
    useVerifiedNameForCerts: false,
    verified_name: null,
+    country: '',
  },
  drafts: {},
  formErrors: {},
@@ -963,6 +997,7 @@ AccountSettingsPage.defaultProps = {
  verifiedName: null,
  mostRecentVerifiedName: {},
  verifiedNameHistory: [],
+  disabledCountries: [],
 };

 export default withLocation(withNavigate(connect(accountSettingsPageSelector, {
--- a/src/account-settings/EditableSelectField.jsx
+++ b/src/account-settings/EditableSelectField.jsx
@@ -107,6 +107,7 @@ const EditableSelectField = (props) => {
            <option
              value={subOption.value}
              key={`${subOption.value}-${subOption.label}`}
+              disabled={subOption?.disabled}
            >
              {subOption.label}
            </option>
@@ -115,7 +116,7 @@ const EditableSelectField = (props) => {
      );
    }
    return (
-      <option value={option.value} key={`${option.value}-${option.label}`}>
+      <option value={option.value} key={`${option.value}-${option.label}`} disabled={option?.disabled}>
        {option.label}
      </option>
    );
--- a/src/account-settings/data/reducers.js
+++ b/src/account-settings/data/reducers.js
@@ -39,6 +39,7 @@ export const defaultState = {
  verifiedName: null,
  mostRecentVerifiedName: {},
  verifiedNameHistory: {},
+  disabledCountries: ['RU'],
 };

 const reducer = (state = defaultState, action = {}) => {
--- a/src/account-settings/data/selectors.js
+++ b/src/account-settings/data/selectors.js
@@ -206,6 +206,11 @@ const activeAccountSelector = createSelector(
  accountSettings => accountSettings.values.is_active,
 );

+const disabledCountriesSelector = createSelector(
+  accountSettingsSelector,
+  accountSettings => accountSettings.disabledCountries,
+);
+
 export const siteLanguageSelector = createSelector(
  previousSiteLanguageSelector,
  draftsSelector,
@@ -237,6 +242,7 @@ export const accountSettingsPageSelector = createSelector(
  mostRecentApprovedVerifiedNameValueSelector,
  mostRecentVerifiedNameSelector,
  sortedVerifiedNameHistorySelector,
+  disabledCountriesSelector,
  (
    accountSettings,
    siteLanguageOptions,
@@ -254,6 +260,7 @@ export const accountSettingsPageSelector = createSelector(
    verifiedName,
    mostRecentVerifiedName,
    verifiedNameHistory,
+    disabledCountries,
  ) => ({
    siteLanguageOptions,
    siteLanguage,
@@ -274,6 +281,7 @@ export const accountSettingsPageSelector = createSelector(
    verifiedName,
    mostRecentVerifiedName,
    verifiedNameHistory,
+    disabledCountries,
  }),
 );

--- a/src/notification-preferences/messages.js
+++ b/src/notification-preferences/messages.js
@@ -28,6 +28,7 @@ const messages = defineMessages({
      contentReported {Reported content}
      courseUpdates {Course updates}
      oraStaffNotification {ORA new submissions}
+      oraGradeAssigned {Essay assignment grade received}
      other {{text}}
    }`,
    description: 'Display text for Notification Types',
Author	SHA1	Message	Date
Awais Ansari	511211e7b1	feat: added country disabling feature (#1116 ) * feat: added country disabling feature * refactor: removed isDisabledCountry additional call	2024-10-10 12:07:58 +05:00
Eemaan Amir	c31e1648bf	Merge pull request #1132 from openedx/INF-1653 chore: updated notificationTitle for oraGradeAssigned	2024-10-10 12:02:05 +05:00
eemaanamir	379d2df2fc	chore: updated notificationTitle for oraGradeAssigned	2024-10-09 16:20:58 +05:00
renovate[bot]	5933ae3034	fix(deps): update dependency @edx/frontend-platform to v8.1.2	2024-10-07 06:48:36 +00:00
renovate[bot]	d1269197ac	fix(deps): update dependency @edx/frontend-component-header to v5.5.0	2024-10-07 04:49:32 +00:00
renovate[bot]	12438e79f5	fix(deps): update dependency @openedx/frontend-plugin-framework to v1.3.0	2024-10-07 04:49:08 +00:00
renovate[bot]	57317a4bb6	chore(deps): update dependency @testing-library/jest-dom to v6.5.0	2024-09-30 09:57:32 +00:00
renovate[bot]	3bbc068a73	chore(deps): update dependency @openedx/frontend-build to v14.1.5	2024-09-30 07:44:46 +00:00
Justin Hynes	4179aa798a	Merge pull request #1124 from openedx/jhynes/APER-3582_add-missing-setting-default chore: add missing ACCOUNT_PROFILE_URL setting to the Account MFE	2024-09-24 11:43:27 -04:00
Justin Hynes	a1877bb499	chore: add missing ACCOUNT_PROFILE_URL setting to the Account MFE This PR adds the `ACCOUNT_PROFILE_URL` setting to the `.env` and `.env.development` settings files in order to make it easier to configure the communication between the Profile and Account MFEs in Open edX development environments.	2024-09-24 15:14:29 +00:00
Eemaan Amir	cd44f15634	Merge pull request #1121 from openedx/INF-1580 chore: added notificationTitle for oraGradeAssigned	2024-09-23 18:05:53 +05:00
eemaanamir	83242b1042	chore: added notificationTitle for oraGradeAssigned	2024-09-23 16:57:01 +05:00
renovate[bot]	116c30663b	fix(deps): update react-router monorepo to v6.26.2	2024-09-23 06:29:11 +00:00
renovate[bot]	0ed92cc7e8	chore(deps): update dependency @openedx/frontend-build to v14.1.4	2024-09-23 06:29:02 +00:00