EdX, Open edX, and MicroMasters are registered trademarks of edX Inc. | 深圳市恒宇博科技有限公司 粤ICP备17044299号-2
+ )}
+ />
)).toJSON();
expect(tree).toMatchSnapshot();
});
@@ -216,7 +330,8 @@ describe(' ', () => {
const footer = mount((completeSiteFooterComponent(mockHandleAllTrackEvents)));
const externalLinks = footer.find("a[target='_blank']");
- expect(externalLinks).toHaveLength(8);
+ expect(externalLinks.length).toEqual(socialLinks.length + 2);
+
externalLinks.forEach((externalLink) => {
const callIndex = mockHandleAllTrackEvents.mock.calls.length;
externalLink.simulate('click');
diff --git a/src/lib/components/SiteFooter/__snapshots__/SiteFooter.test.jsx.snap b/src/lib/components/SiteFooter/__snapshots__/SiteFooter.test.jsx.snap
index 9b66359a..817a68f1 100644
--- a/src/lib/components/SiteFooter/__snapshots__/SiteFooter.test.jsx.snap
+++ b/src/lib/components/SiteFooter/__snapshots__/SiteFooter.test.jsx.snap
@@ -1,255 +1,5 @@
// Jest Snapshot v1, https://goo.gl/fbAQLP
-exports[` renders correctly does not render business links 1`] = `
-
-
-
-
-
-
-
-
-
-
- © 2012–2019 example Inc.
-
-
-
- EdX, Open edX, and MicroMasters are registered trademarks of edX Inc. | 深圳市恒宇博科技有限公司
-
- 粤ICP备17044299号-2
-
-
-
-
-
-
-`;
-
exports[` renders correctly does not render language selector 1`] = `
renders correctly does not render language selector 1`]
className="area-1"
>
@@ -278,7 +28,7 @@ exports[` renders correctly does not render language selector 1`]
className="area-2"
>
- example
+ edX
renders correctly does not render language selector 1`]
-
- About
-
+ About
+
+
+
+
+ edX for Business
-
- Affiliates
-
+ Affiliates
-
- Open example
-
+ Open edX
-
- Careers
-
+ Careers
-
- News
-
+ News
@@ -334,9 +81,7 @@ exports[` renders correctly does not render language selector 1`]
className="area-3"
>
-
- Legal
-
+ Legal
renders correctly does not render language selector 1`]
-
- Terms of Service & Honor Code
-
+ Terms of Service & Honor Code
-
- Privacy Policy
-
+ Privacy Policy
-
- Accessibility Policy
-
+ Accessibility Policy
-
- Trademark Policy
-
+ Trademark Policy
-
- Sitemap
-
+ Sitemap
@@ -392,9 +127,7 @@ exports[` renders correctly does not render language selector 1`]
className="area-4"
>
-
- Connect
-
+ Connect
renders correctly does not render language selector 1`]
-
- Blog
-
+ Blog
-
- Contact Us
-
+ Contact Us
-
- Help Center
-
+ Help Center
-
- Media Kit
-
+ Media Kit
-
- Donate
-
+ Donate
@@ -449,6 +172,170 @@ exports[` renders correctly does not render language selector 1`]
+
@@ -460,7 +347,7 @@ exports[` renders correctly does not render language selector 1`]
target="_blank"
>
@@ -474,7 +361,7 @@ exports[` renders correctly does not render language selector 1`]
target="_blank"
>
@@ -482,18 +369,14 @@ exports[` renders correctly does not render language selector 1`]
-
- © 2012–2019 example Inc.
-
+ © 2012–2019 edX Inc.
-
- EdX, Open edX, and MicroMasters are registered trademarks of edX Inc. | 深圳市恒宇博科技有限公司
-
- 粤ICP备17044299号-2
-
-
+ EdX, Open edX, and MicroMasters are registered trademarks of edX Inc. | 深圳市恒宇博科技有限公司
+
+ 粤ICP备17044299号-2
+
@@ -513,13 +396,13 @@ exports[` renders correctly does not render mobile links 1`] = `
className="area-1"
>
@@ -586,7 +469,7 @@ exports[` renders correctly does not render mobile links 1`] = `
className="area-2"
>
- example
+ edX
renders correctly does not render mobile links 1`] = `
-
- About
-
+ About
+
+
+
+
+ edX for Business
-
- Affiliates
-
+ Affiliates
-
- Open example
-
+ Open edX
-
- Careers
-
+ Careers
-
- News
-
+ News
@@ -642,9 +522,7 @@ exports[` renders correctly does not render mobile links 1`] = `
className="area-3"
>
-
- Legal
-
+ Legal
renders correctly does not render mobile links 1`] = `
-
- Terms of Service & Honor Code
-
+ Terms of Service & Honor Code
-
- Privacy Policy
-
+ Privacy Policy
-
- Accessibility Policy
-
+ Accessibility Policy
-
- Trademark Policy
-
+ Trademark Policy
-
- Sitemap
-
+ Sitemap
@@ -700,9 +568,7 @@ exports[` renders correctly does not render mobile links 1`] = `
className="area-4"
>
-
- Connect
-
+ Connect
renders correctly does not render mobile links 1`] = `
-
- Blog
-
+ Blog
-
- Contact Us
-
+ Contact Us
-
- Help Center
-
+ Help Center
-
- Media Kit
-
+ Media Kit
-
- Donate
-
+ Donate
@@ -888,38 +744,6 @@ exports[` renders correctly does not render mobile links 1`] = `
-
-
-
-
-
-
- Follow edX on Google+
-
-
-
renders correctly does not render mobile links 1`] = `
-
- © 2012–2019 example Inc.
-
+ © 2012–2019 edX Inc.
-
- EdX, Open edX, and MicroMasters are registered trademarks of edX Inc. | 深圳市恒宇博科技有限公司
-
- 粤ICP备17044299号-2
-
-
+ EdX, Open edX, and MicroMasters are registered trademarks of edX Inc. | 深圳市恒宇博科技有限公司
+
+ 粤ICP备17044299号-2
+
@@ -985,13 +805,13 @@ exports[` renders correctly does not render social links 1`] = `
className="area-1"
>
@@ -1058,7 +878,7 @@ exports[` renders correctly does not render social links 1`] = `
className="area-2"
>
- example
+ edX
renders correctly does not render social links 1`] = `
-
- About
-
+ About
-
- example for Business
-
+ edX for Business
-
- Affiliates
-
+ Affiliates
-
- Open example
-
+ Open edX
-
- Careers
-
+ Careers
-
- News
-
+ News
@@ -1123,9 +931,7 @@ exports[` renders correctly does not render social links 1`] = `
className="area-3"
>
-
- Legal
-
+ Legal
renders correctly does not render social links 1`] = `
-
- Terms of Service & Honor Code
-
+ Terms of Service & Honor Code
-
- Privacy Policy
-
+ Privacy Policy
-
- Accessibility Policy
-
+ Accessibility Policy
-
- Trademark Policy
-
+ Trademark Policy
-
- Sitemap
-
+ Sitemap
@@ -1181,9 +977,7 @@ exports[` renders correctly does not render social links 1`] = `
className="area-4"
>
-
- Connect
-
+ Connect
renders correctly does not render social links 1`] = `
-
- Blog
-
+ Blog
-
- Contact Us
-
+ Contact Us
-
- Help Center
-
+ Help Center
-
- Media Kit
-
+ Media Kit
-
- Donate
-
+ Donate
@@ -1249,7 +1033,7 @@ exports[` renders correctly does not render social links 1`] = `
target="_blank"
>
@@ -1263,7 +1047,7 @@ exports[` renders correctly does not render social links 1`] = `
target="_blank"
>
@@ -1271,18 +1055,14 @@ exports[` renders correctly does not render social links 1`] = `
-
- © 2012–2019 example Inc.
-
+ © 2012–2019 edX Inc.
-
- EdX, Open edX, and MicroMasters are registered trademarks of edX Inc. | 深圳市恒宇博科技有限公司
-
- 粤ICP备17044299号-2
-
-
+ EdX, Open edX, and MicroMasters are registered trademarks of edX Inc. | 深圳市恒宇博科技有限公司
+
+ 粤ICP备17044299号-2
+
@@ -1302,13 +1082,13 @@ exports[` renders correctly renders with social and mobile links 1
className="area-1"
>
@@ -1375,7 +1155,7 @@ exports[` renders correctly renders with social and mobile links 1
className="area-2"
>
- example
+ edX
renders correctly renders with social and mobile links 1
-
- About
-
+ About
-
- example for Business
-
+ edX for Business
-
- Affiliates
-
+ Affiliates
-
- Open example
-
+ Open edX
-
- Careers
-
+ Careers
-
- News
-
+ News
@@ -1440,9 +1208,7 @@ exports[` renders correctly renders with social and mobile links 1
className="area-3"
>
-
- Legal
-
+ Legal
renders correctly renders with social and mobile links 1
-
- Terms of Service & Honor Code
-
+ Terms of Service & Honor Code
-
- Privacy Policy
-
+ Privacy Policy
-
- Accessibility Policy
-
+ Accessibility Policy
-
- Trademark Policy
-
+ Trademark Policy
-
- Sitemap
-
+ Sitemap
@@ -1498,9 +1254,7 @@ exports[` renders correctly renders with social and mobile links 1
className="area-4"
>
-
- Connect
-
+ Connect
renders correctly renders with social and mobile links 1
-
- Blog
-
+ Blog
-
- Contact Us
-
+ Contact Us
-
- Help Center
-
+ Help Center
-
- Media Kit
-
+ Media Kit
-
- Donate
-
+ Donate
@@ -1686,38 +1430,6 @@ exports[` renders correctly renders with social and mobile links 1
-
-
-
-
-
-
- Follow edX on Google+
-
-
-
renders correctly renders with social and mobile links 1
target="_blank"
>
@@ -1776,7 +1488,7 @@ exports[` renders correctly renders with social and mobile links 1
target="_blank"
>
@@ -1784,18 +1496,14 @@ exports[` renders correctly renders with social and mobile links 1
-
- © 2012–2019 example Inc.
-
+ © 2012–2019 edX Inc.
-
- EdX, Open edX, and MicroMasters are registered trademarks of edX Inc. | 深圳市恒宇博科技有限公司
-
- 粤ICP备17044299号-2
-
-
+ EdX, Open edX, and MicroMasters are registered trademarks of edX Inc. | 深圳市恒宇博科技有限公司
+
+ 粤ICP备17044299号-2
+
diff --git a/src/lib/components/SiteFooter/index.jsx b/src/lib/components/SiteFooter/index.jsx
index 3df0ba22..86aec0cd 100644
--- a/src/lib/components/SiteFooter/index.jsx
+++ b/src/lib/components/SiteFooter/index.jsx
@@ -1,11 +1,8 @@
import React from 'react';
import PropTypes from 'prop-types';
-import { FormattedMessage, injectIntl, intlShape } from '@edx/frontend-i18n';
import { Hyperlink } from '@edx/paragon';
import qs from 'query-string';
-import messages from './SiteFooter.messages';
-
const EVENT_NAMES = {
FOOTER_LINK: 'edx.bi.footer.link',
};
@@ -35,62 +32,57 @@ class SiteFooter extends React.Component {
this.props.handleAllTrackEvents(eventName, properties);
}
- renderSiteLogo() {
- return (
-
- );
- }
-
- renderMarketingSiteUrl(path) {
- return `${this.props.marketingSiteBaseUrl}${path}`;
- }
-
- renderEnterpriseMarketingSiteUrl(enterpriseLinkData) {
+ formatUrl(linkData) {
const {
queryParams,
url,
- } = enterpriseLinkData;
+ } = linkData;
return queryParams ? `${url}/?${qs.stringify(queryParams)}` : url;
}
+ renderLinkList({ title, linkList }) {
+ if (linkList.length > 0) {
+ return (
+
+ {title}
+
+
+ );
+ }
+
+ return null;
+ }
+
renderMobileLinks() {
const {
- intl,
- siteName,
showMobileLinks,
- appleAppStoreUrl,
- googlePlayUrl,
+ appleAppStore,
+ googlePlay,
} = this.props;
- let mobileLinks = null;
+
if (showMobileLinks) {
- mobileLinks = (
+ return (
-
+
-
+
@@ -98,55 +90,38 @@ class SiteFooter extends React.Component {
);
}
- return mobileLinks;
- }
- renderBusinessMarketingListItem() {
- const { siteName, enterpriseMarketingLink } = this.props;
- return enterpriseMarketingLink && (
-
-
-
-
-
- );
+ return null;
}
render() {
const {
- intl,
- siteName,
- openSourceUrl,
- termsOfServiceUrl,
- privacyPolicyUrl,
- contactUrl,
- supportUrl,
+ ariaLabel,
+ linkSectionOne,
+ linkSectionTwo,
+ linkSectionThree,
+ siteLogo,
socialLinks,
supportedLanguages,
languageForm,
+ marketingSiteBaseUrl,
+ copyright,
+ trademark,
} = this.props;
const showLanguageSelector = supportedLanguages.length > 0 &&
languageForm;
return (