Compare commits
5 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
64fc8adeed | ||
|
|
a49b06349e | ||
|
|
aa13b4946c | ||
|
|
cff78e021c | ||
|
|
62bf038a06 |
@@ -12,7 +12,7 @@ TERMS_OF_SERVICE_URL=null
|
||||
PRIVACY_POLICY_URL=null
|
||||
SUPPORT_EMAIL=null
|
||||
STUDIO_BASE_URL=http://localhost:18010
|
||||
SHOW_ACCESSIBILITY_PAGE=false
|
||||
ENABLE_ACCESSIBILITY_PAGE=false
|
||||
ORDER_HISTORY_URL=localhost:1996/orders
|
||||
REFRESH_ACCESS_TOKEN_ENDPOINT=http://localhost:18000/login_refresh
|
||||
SEGMENT_KEY=null
|
||||
|
||||
1
.github/workflows/release.yml
vendored
1
.github/workflows/release.yml
vendored
@@ -3,6 +3,7 @@ on:
|
||||
push:
|
||||
branches:
|
||||
- master
|
||||
- alpha
|
||||
jobs:
|
||||
release:
|
||||
name: Release
|
||||
|
||||
@@ -1,5 +1,8 @@
|
||||
{
|
||||
"branch": "master",
|
||||
"branches": [
|
||||
"master",
|
||||
{name: "alpha", prerelease: true}
|
||||
],
|
||||
"tagFormat": "v${version}",
|
||||
"verifyConditions": [
|
||||
"@semantic-release/npm",
|
||||
|
||||
16
package-lock.json
generated
16
package-lock.json
generated
@@ -30,7 +30,7 @@
|
||||
"react": "17.0.2",
|
||||
"react-dom": "17.0.2",
|
||||
"react-redux": "7.2.9",
|
||||
"react-router-dom": "6.21.2",
|
||||
"react-router-dom": "6.21.3",
|
||||
"react-test-renderer": "17.0.2",
|
||||
"redux": "4.2.1",
|
||||
"semantic-release": "21.1.2"
|
||||
@@ -27295,9 +27295,9 @@
|
||||
}
|
||||
},
|
||||
"node_modules/react-router": {
|
||||
"version": "6.21.2",
|
||||
"resolved": "https://registry.npmjs.org/react-router/-/react-router-6.21.2.tgz",
|
||||
"integrity": "sha512-jJcgiwDsnaHIeC+IN7atO0XiSRCrOsQAHHbChtJxmgqG2IaYQXSnhqGb5vk2CU/wBQA12Zt+TkbuJjIn65gzbA==",
|
||||
"version": "6.21.3",
|
||||
"resolved": "https://registry.npmjs.org/react-router/-/react-router-6.21.3.tgz",
|
||||
"integrity": "sha512-a0H638ZXULv1OdkmiK6s6itNhoy33ywxmUFT/xtSoVyf9VnC7n7+VT4LjVzdIHSaF5TIh9ylUgxMXksHTgGrKg==",
|
||||
"dev": true,
|
||||
"dependencies": {
|
||||
"@remix-run/router": "1.14.2"
|
||||
@@ -27310,13 +27310,13 @@
|
||||
}
|
||||
},
|
||||
"node_modules/react-router-dom": {
|
||||
"version": "6.21.2",
|
||||
"resolved": "https://registry.npmjs.org/react-router-dom/-/react-router-dom-6.21.2.tgz",
|
||||
"integrity": "sha512-tE13UukgUOh2/sqYr6jPzZTzmzc70aGRP4pAjG2if0IP3aUT+sBtAKUJh0qMh0zylJHGLmzS+XWVaON4UklHeg==",
|
||||
"version": "6.21.3",
|
||||
"resolved": "https://registry.npmjs.org/react-router-dom/-/react-router-dom-6.21.3.tgz",
|
||||
"integrity": "sha512-kNzubk7n4YHSrErzjLK72j0B5i969GsuCGazRl3G6j1zqZBLjuSlYBdVdkDOgzGdPIffUOc9nmgiadTEVoq91g==",
|
||||
"dev": true,
|
||||
"dependencies": {
|
||||
"@remix-run/router": "1.14.2",
|
||||
"react-router": "6.21.2"
|
||||
"react-router": "6.21.3"
|
||||
},
|
||||
"engines": {
|
||||
"node": ">=14.0.0"
|
||||
|
||||
@@ -47,7 +47,7 @@
|
||||
"react": "17.0.2",
|
||||
"react-dom": "17.0.2",
|
||||
"react-redux": "7.2.9",
|
||||
"react-router-dom": "6.21.2",
|
||||
"react-router-dom": "6.21.3",
|
||||
"react-test-renderer": "17.0.2",
|
||||
"redux": "4.2.1",
|
||||
"semantic-release": "21.1.2"
|
||||
|
||||
@@ -2,7 +2,7 @@ import React from 'react';
|
||||
import PropTypes from 'prop-types';
|
||||
import { injectIntl, intlShape } from '@edx/frontend-platform/i18n';
|
||||
import { sendTrackEvent } from '@edx/frontend-platform/analytics';
|
||||
import { ensureConfig } from '@edx/frontend-platform/config';
|
||||
import { ensureConfig } from '@edx/frontend-platform';
|
||||
import { AppContext } from '@edx/frontend-platform/react';
|
||||
|
||||
import messages from './Footer.messages';
|
||||
|
||||
@@ -22,7 +22,7 @@ ensureConfig([
|
||||
'SUPPORT_EMAIL',
|
||||
'SITE_NAME',
|
||||
'STUDIO_BASE_URL',
|
||||
'SHOW_ACCESSIBILITY_PAGE',
|
||||
'ENABLE_ACCESSIBILITY_PAGE',
|
||||
], 'Studio Footer component');
|
||||
|
||||
const StudioFooter = ({
|
||||
@@ -105,7 +105,7 @@ const StudioFooter = ({
|
||||
{intl.formatMessage(messages.privacyPolicyLinkLabel)}
|
||||
</Hyperlink>
|
||||
)}
|
||||
{config.SHOW_ACCESSIBILITY_PAGE === 'true' && (
|
||||
{config.ENABLE_ACCESSIBILITY_PAGE === 'true' && (
|
||||
<Hyperlink
|
||||
destination={`${config.STUDIO_BASE_URL}/accessibility`}
|
||||
data-testid="accessibilityRequest"
|
||||
|
||||
@@ -15,7 +15,7 @@ const config = {
|
||||
SUPPORT_EMAIL: process.env.SUPPORT_EMAIL,
|
||||
SITE_NAME: process.env.SITE_NAME,
|
||||
STUDIO_BASE_URL: process.env.STUDIO_BASE_URL,
|
||||
SHOW_ACCESSIBILITY_PAGE: process.env.SHOW_ACCESSIBILITY_PAGE,
|
||||
ENABLE_ACCESSIBILITY_PAGE: process.env.ENABLE_ACCESSIBILITY_PAGE,
|
||||
};
|
||||
|
||||
let currentConfig = config;
|
||||
@@ -111,7 +111,7 @@ describe('Footer', () => {
|
||||
expect(screen.queryByTestId('accessibilityRequest')).toBeNull();
|
||||
});
|
||||
it('should show accessibilty request link', () => {
|
||||
render(<Component updateVariable={['SHOW_ACCESSIBILITY_PAGE', 'true']} />);
|
||||
render(<Component updateVariable={['ENABLE_ACCESSIBILITY_PAGE', 'true']} />);
|
||||
expect(screen.getByText('LMS')).toBeVisible();
|
||||
expect(screen.queryByTestId('termsOfService')).toBeNull();
|
||||
expect(screen.queryByTestId('privacyPolicy')).toBeNull();
|
||||
|
||||
@@ -19,3 +19,4 @@ process.env.LOGO_URL = 'https://edx-cdn.org/v3/default/logo.svg';
|
||||
process.env.LOGO_TRADEMARK_URL = 'https://edx-cdn.org/v3/default/logo-trademark.svg';
|
||||
process.env.LOGO_WHITE_URL = 'https://edx-cdn.org/v3/default/logo-white.svg';
|
||||
process.env.FAVICON_URL = 'https://edx-cdn.org/v3/default/favicon.ico';
|
||||
process.env.ENABLE_ACCESSIBILITY_PAGE = 'false';
|
||||
|
||||
Reference in New Issue
Block a user