Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Rebase 2u-main with master #1146

Merged
merged 6 commits into from
Oct 25, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .env.development
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ ENABLE_COPPA_COMPLIANCE=''
ENABLE_ACCOUNT_DELETION=''
ENABLE_DOB_UPDATE=''
MARKETING_EMAILS_OPT_IN=''
SHOW_EMAIL_CHANNEL=''
SHOW_EMAIL_CHANNEL='true'
APP_ID=
MFE_CONFIG_API_URL=
PASSWORD_RESET_SUPPORT_LINK='mailto:support@example.com'
Expand Down
9 changes: 4 additions & 5 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@
],
"dependencies": {
"@edx/brand": "npm:@openedx/brand-openedx@^1.2.2",
"@edx/frontend-component-header": "5.5.0",
"@edx/frontend-component-header": "^5.6.0",
"@edx/frontend-platform": "8.1.2",
"@edx/openedx-atlas": "^0.6.0",
"@fortawesome/fontawesome-svg-core": "^6.6.0",
Expand Down
11 changes: 8 additions & 3 deletions src/account-settings/site-language/service.js
Original file line number Diff line number Diff line change
Expand Up @@ -23,10 +23,15 @@

export async function postSetLang(code) {
const formData = new FormData();
const requestConfig = {

Check warning on line 26 in src/account-settings/site-language/service.js

View check run for this annotation

Codecov / codecov/patch

src/account-settings/site-language/service.js#L26

Added line #L26 was not covered by tests
headers: {
Accept: 'application/json',
'X-Requested-With': 'XMLHttpRequest',
},
};
const url = `${getConfig().LMS_BASE_URL}/i18n/setlang/`;

Check warning on line 32 in src/account-settings/site-language/service.js

View check run for this annotation

Codecov / codecov/patch

src/account-settings/site-language/service.js#L32

Added line #L32 was not covered by tests
formData.append('language', code);

await getAuthenticatedHttpClient()
.post(`${getConfig().LMS_BASE_URL}/i18n/setlang/`, formData, {
headers: { 'X-Requested-With': 'XMLHttpRequest' },
});
.post(url, formData, requestConfig);
}
3 changes: 2 additions & 1 deletion src/account-settings/third-party-auth/data/service.js
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,9 @@
}

export async function postDisconnectAuth(url) {
const requestConfig = { headers: { Accept: 'application/json' } };

Check warning on line 19 in src/account-settings/third-party-auth/data/service.js

View check run for this annotation

Codecov / codecov/patch

src/account-settings/third-party-auth/data/service.js#L19

Added line #L19 was not covered by tests
const { data } = await getAuthenticatedHttpClient()
.post(url)
.post(url, {}, requestConfig)
.catch(handleRequestError);
return data;
}
1 change: 0 additions & 1 deletion src/notification-preferences/data/constants.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
const EMAIL_CADENCE = {
DAILY: 'Daily',
WEEKLY: 'Weekly',
NEVER: 'Never',
};

export default EMAIL_CADENCE;