diff --git a/Makefile b/Makefile
index 25782ea852..3bb81d73fe 100644
--- a/Makefile
+++ b/Makefile
@@ -5,7 +5,7 @@ intl_imports = ./node_modules/.bin/intl-imports.js
i18n = ./src/i18n
transifex_input = $(i18n)/transifex_input.json
# This directory must match .babelrc .
-transifex_temp = ./temp/babel-plugin-react-intl
+transifex_temp = ./temp/babel-plugin-formatjs
shell: ## run a shell on the cookie-cutter container
docker exec -it /bin/bash
diff --git a/package.json b/package.json
index 0a8b756b70..c550d5aa0d 100644
--- a/package.json
+++ b/package.json
@@ -8,7 +8,7 @@
],
"scripts": {
"build": "fedx-scripts webpack",
- "i18n_extract": "BABEL_ENV=i18n fedx-scripts babel src --quiet > /dev/null",
+ "i18n_extract": "fedx-scripts formatjs extract",
"build:with-theme": "THEME=npm:@edx/brand-edx.org@latest npm run install-theme && fedx-scripts webpack",
"check-types": "tsc --noemit",
"lint": "fedx-scripts eslint --ext .js --ext .jsx .; npm run check-types",
diff --git a/src/components/ConfirmationModal/ConfirmationModal.test.jsx b/src/components/ConfirmationModal/ConfirmationModal.test.jsx
index aa7afb08f8..3c69d3100a 100644
--- a/src/components/ConfirmationModal/ConfirmationModal.test.jsx
+++ b/src/components/ConfirmationModal/ConfirmationModal.test.jsx
@@ -1,10 +1,9 @@
-import {
- render, screen,
-} from '@testing-library/react';
+import { screen } from '@testing-library/react';
import userEvent from '@testing-library/user-event';
import '@testing-library/jest-dom/extend-expect';
import ConfirmationModal from './index';
+import { renderWithI18nProvider } from '../test/testUtils';
describe('
- If you disable access via link, all links will be deactivated and your
- learners will no longer have access. Links cannot be reactivated.
+ If you disable a link, it cannot be reactivated.
+ Learners will browse and request courses from the associated catalog.
+ Generate a link to share with your learners (up to a maximum of {MAX_UNIVERSAL_LINKS} links).
+ Give learners with Single Sign-On access to the catalog.
+
- Select a subsidy type to distribute.
- Learners will browse and request courses from the associated catalog.
+
- Allow learners without a subsidy to browse the catalog and request enrollment to courses.
+
- Channels determine how learners access the catalog(s).
- You can select one or both and change your selection at any time.
+
- We were unable to {updateError?.action} your SSO configuration due to an internal error. Please
- {' '}try again in a couple of minutes. If the problem persists, contact enterprise customer
- {' '}support.
+
- Your SSO configuration failed due to an internal error. Please try again by selecting “Configure” below and
- {' '}verifying your integration details. Then reconfigure, reauthorize, and test your connection.
+
- Please verify integration details have been entered correctly. Select “Configure” below and verify your
- {' '}integration details. Then reconfigure, reauthorize, and test your connection.
+
- edX is configuring your SSO. This step takes approximately{' '}
- {notConfigured.length > 0 ? `five minutes. You will receive an email at ${contactEmail} when the configuration is complete` : 'fifteen seconds'}.
+ {notConfigured.length > 0 ? (
+
- Your SSO configuration has been completed,
- and you should have received an email with the following instructions:
- Great news! Your test was successful and your new SSO integration is live and ready to use.
+ SSO enables learners who are signed in to their enterprise LMS
- or other system to easily register and enroll in courses on edX without needing to
- sign in again. edX for Business uses SAML 2.0 to implement SSO between an enterprise
- system and edX.org.
+
+
- {stepperText}{' '}
- Please close this window and try again in a couple of minutes. If the problem persists, contact enterprise
- customer support.
+ {
+ stepperError ? (
+
- Helpful link:{' '}
- Enterprise Help Center: Single Sign-On
+ Your in-progress data will not be saved. Your SSO connection will not be active until you restart and complete the SSO configuration process.
+
+
- Only one SSO integration is supported at a time.
- 1. Download the edX Service Provider metadata as an XML file:
+
- 2.
- Return to this window and check the box once complete
+
- Please enter the SAML user attributes from your Identity Provider.
- All attributes are space and case sensitive.
+
- Select the "Finish" button below or close this form via the
- {' '}"X" in the upper right corner while you wait for your
- configuration email. Your SSO testing status will display on the following SSO settings screen.
+ Select a method to connect edX to your Identity Provider
+
Enable browsing on-demand
+
+
Subsidy type
+
+
{hasConfiguredSubsidyType ? (
Select access channel
+
+
+
+
+
- 1: Copy the URL for your Learner Portal dashboard below:
http://courses.edx.org/dashboard?tpa_hint={enterpriseSlug}
- 2: Launch a new incognito or private window and paste the copied URL into the URL bar to load your
- Learner Portal dashboard.
+
+
+
- 3: When prompted, enter login credentials supported by your IDP to test your connection to edX.
+
- Return to this window after completing the testing instructions.
- This window will automatically update when a successful test is detected.
You don't have any SSOs integrated yet.
-
+
+
- We're sorry.{' '}
- Something went wrong.
+
+
+
- To continue updating and editing your SSO integration, select "Cancel" and then
- "Configure" on the integration card. Creating a new SSO configuration will overwrite and delete
- your existing SSO configuration.
+
+ Single Sign-On (SSO) Integrations
+
+
Authorize edX as a Service Provider
+
+
Action required in a new window
- Return to this window after completing the following steps
- in a new window to finish configuring your integration.
+
+
+
- Enter user attributes
+
+
Enable learner account auto-registration
+
+
Wait for SSO configuration confirmation
+
+
Action required from email
- Great news! You have completed the configuration steps, edX is actively configuring your SSO connection.
- You will receive an email within about five minutes when the configuration is complete.
- The email will include instructions for testing.
+
+
+
- What to expect:
+
+
-
-
Connect edX to your Identity Provider
-
+
+