@@ -139,7 +151,12 @@ const Logistration = (props) => {
)}
{selectedPage === LOGIN_PAGE
- ?
+ ? (
+
+ )
: (
{
Logistration.propTypes = {
selectedPage: PropTypes.string,
- backupLoginForm: PropTypes.func.isRequired,
- backupRegistrationForm: PropTypes.func.isRequired,
- clearThirdPartyAuthContextErrorMessage: PropTypes.func.isRequired,
- tpaProviders: PropTypes.shape({
- providers: PropTypes.arrayOf(PropTypes.shape({})),
- secondaryProviders: PropTypes.arrayOf(PropTypes.shape({})),
- }),
-};
-
-Logistration.defaultProps = {
- tpaProviders: {
- providers: [],
- secondaryProviders: [],
- },
};
Logistration.defaultProps = {
selectedPage: REGISTER_PAGE,
};
-const mapStateToProps = state => ({
- tpaProviders: tpaProvidersSelector(state),
-});
-
-export default connect(
- mapStateToProps,
- {
- backupLoginForm,
- backupRegistrationForm,
- clearThirdPartyAuthContextErrorMessage,
- },
-)(Logistration);
+export default Logistration;
diff --git a/src/logistration/Logistration.test.jsx b/src/logistration/Logistration.test.jsx
index fa376aca..abdfb678 100644
--- a/src/logistration/Logistration.test.jsx
+++ b/src/logistration/Logistration.test.jsx
@@ -48,16 +48,26 @@ describe('Logistration', () => {
marketingEmailsOptIn: true,
},
formFields: {
- name: '', email: '', username: '', password: '',
+ name: '',
+ email: '',
+ username: '',
+ password: '',
},
emailSuggestion: {
- suggestion: '', type: '',
+ suggestion: '',
+ type: '',
},
errors: {
- name: '', email: '', username: '', password: '',
+ name: '',
+ email: '',
+ username: '',
+ password: '',
},
},
- registrationResult: { success: false, redirectUrl: '' },
+ registrationResult: {
+ success: false,
+ redirectUrl: '',
+ },
registrationError: {},
usernameSuggestions: [],
validationApiRateLimited: false,
@@ -69,7 +79,18 @@ describe('Logistration', () => {
},
},
login: {
- loginResult: { success: false, redirectUrl: '' },
+ loginResult: {
+ success: false,
+ redirectUrl: '',
+ },
+ loginFormData: {
+ formFields: {
+ emailOrUsername: '', password: '',
+ },
+ errors: {
+ emailOrUsername: '', password: '',
+ },
+ },
},
};
diff --git a/src/plugin-slots/LoginComponentSlot/README.md b/src/plugin-slots/LoginComponentSlot/README.md
new file mode 100644
index 00000000..eb6ac19f
--- /dev/null
+++ b/src/plugin-slots/LoginComponentSlot/README.md
@@ -0,0 +1,47 @@
+# Login Component Slot
+
+### Slot ID: `org.openedx.frontend.authn.login_component.v1`
+
+## Description
+
+This slot is used to replace/modify/hide the login component.
+
+## Example
+
+### Default content
+
+
+### With a prepended message
+
+
+The following `env.config.jsx` will add a message before the login component.
+
+```js
+import { DIRECT_PLUGIN, PLUGIN_OPERATIONS } from '@openedx/frontend-plugin-framework';
+
+// Load environment variables from .env file
+const config = {
+ ...process.env,
+ pluginSlots: {
+ 'org.openedx.frontend.authn.login_component.v1': {
+ keepDefault: true,
+ plugins: [
+ {
+ op: PLUGIN_OPERATIONS.Insert,
+ widget: {
+ id: 'test_plugin',
+ type: DIRECT_PLUGIN,
+ priority: 1,
+ RenderWidget: () => (
+ You're logging into TEST Instance.
+ )
+ },
+ },
+ ],
+ },
+ },
+};
+
+export default config;
+
+```
diff --git a/src/plugin-slots/LoginComponentSlot/component_with_prefix.png b/src/plugin-slots/LoginComponentSlot/component_with_prefix.png
new file mode 100644
index 00000000..394855fa
Binary files /dev/null and b/src/plugin-slots/LoginComponentSlot/component_with_prefix.png differ
diff --git a/src/plugin-slots/LoginComponentSlot/default_component.png b/src/plugin-slots/LoginComponentSlot/default_component.png
new file mode 100644
index 00000000..7c006703
Binary files /dev/null and b/src/plugin-slots/LoginComponentSlot/default_component.png differ
diff --git a/src/plugin-slots/LoginComponentSlot/index.jsx b/src/plugin-slots/LoginComponentSlot/index.jsx
new file mode 100644
index 00000000..96b7fcf4
--- /dev/null
+++ b/src/plugin-slots/LoginComponentSlot/index.jsx
@@ -0,0 +1,31 @@
+import React from 'react';
+
+import { PluginSlot } from '@openedx/frontend-plugin-framework';
+import PropTypes from 'prop-types';
+
+import LoginPage from '../../login/LoginPage';
+
+const LoginComponentSlot = ({
+ institutionLogin,
+ handleInstitutionLogin,
+}) => (
+
+
+
+);
+
+LoginComponentSlot.propTypes = {
+ institutionLogin: PropTypes.bool,
+ handleInstitutionLogin: PropTypes.func,
+};
+
+export default LoginComponentSlot;
diff --git a/src/recommendations/data/tests/hooks.test.jsx b/src/recommendations/data/tests/hooks.test.jsx
index e8033ac5..43c98988 100644
--- a/src/recommendations/data/tests/hooks.test.jsx
+++ b/src/recommendations/data/tests/hooks.test.jsx
@@ -1,10 +1,12 @@
-import { renderHook } from '@testing-library/react';
+import React from 'react';
+
+import { render } from '@testing-library/react';
import algoliasearchHelper from 'algoliasearch-helper';
import mockedRecommendedProducts from './mockedData';
-import CreateAlgoliaSearchHelperMock from './test_utils/test_utils';
import isOneTrustFunctionalCookieEnabled from '../../../data/oneTrust';
import useAlgoliaRecommendations from '../hooks/useAlgoliaRecommendations';
+import CreateAlgoliaSearchHelperMock from './test_utils/test_utils';
jest.mock('algoliasearch-helper');
@@ -17,6 +19,23 @@ jest.mock('../../../data/algolia', () => ({
jest.mock('../algoliaResultsParser', () => jest.fn((course) => course));
+const renderHook = (hookCallback) => {
+ const result = {
+ current: null,
+ };
+
+ const Component = () => {
+ const val = hookCallback();
+ React.useEffect(() => {
+ result.current = val;
+ });
+ return null;
+ };
+
+ render();
+ return { result };
+};
+
describe('useAlgoliaRecommendations Tests', () => {
const MockSearchHelperWithData = new CreateAlgoliaSearchHelperMock(mockedRecommendedProducts);
const MockSearchHelperWithoutData = new CreateAlgoliaSearchHelperMock();
@@ -28,8 +47,10 @@ describe('useAlgoliaRecommendations Tests', () => {
() => useAlgoliaRecommendations('PK', 'Introductory'),
);
- expect(result.current.recommendations).toEqual(mockedRecommendedProducts);
- expect(result.current.isLoading).toBe(false);
+ expect(result.current.recommendations)
+ .toEqual(mockedRecommendedProducts);
+ expect(result.current.isLoading)
+ .toBe(false);
});
it('should not fetch recommendations if functional cookies are not set', async () => {
@@ -39,8 +60,10 @@ describe('useAlgoliaRecommendations Tests', () => {
() => useAlgoliaRecommendations('PK', 'Introductory'),
);
- expect(result.current.recommendations).toEqual([]);
- expect(result.current.isLoading).toBe(false);
+ expect(result.current.recommendations)
+ .toEqual([]);
+ expect(result.current.isLoading)
+ .toBe(false);
});
it('should return empty list if no recommendations returned from Algolia', async () => {
@@ -50,7 +73,9 @@ describe('useAlgoliaRecommendations Tests', () => {
() => useAlgoliaRecommendations('PK', 'Introductory'),
);
- expect(result.current.recommendations).toEqual([]);
- expect(result.current.isLoading).toBe(false);
+ expect(result.current.recommendations)
+ .toEqual([]);
+ expect(result.current.isLoading)
+ .toBe(false);
});
});