diff --git a/.env b/.env index 912f29cb..42282316 100644 --- a/.env +++ b/.env @@ -37,5 +37,4 @@ TWITTER_HASHTAG='' TWITTER_URL='' USER_INFO_COOKIE_NAME='' SESSION_COOKIE_DOMAIN='' -ENABLE_JUMPNAV='true' ENABLE_NOTICES='' diff --git a/.env.development b/.env.development index 16d6764d..2c32afb0 100644 --- a/.env.development +++ b/.env.development @@ -37,5 +37,4 @@ TWITTER_HASHTAG='myedxjourney' TWITTER_URL='https://twitter.com/edXOnline' USER_INFO_COOKIE_NAME='edx-user-info' SESSION_COOKIE_DOMAIN='localhost' -ENABLE_JUMPNAV='true' ENABLE_NOTICES='' diff --git a/.env.test b/.env.test index 24a5c93e..485d0704 100644 --- a/.env.test +++ b/.env.test @@ -36,5 +36,4 @@ TERMS_OF_SERVICE_URL='https://www.edx.org/edx-terms-service' TWITTER_HASHTAG='myedxjourney' TWITTER_URL='https://twitter.com/edXOnline' USER_INFO_COOKIE_NAME='edx-user-info' -ENABLE_JUMPNAV='true' ENABLE_NOTICES='' diff --git a/README.rst b/README.rst index 4af4a220..b19b4d00 100644 --- a/README.rst +++ b/README.rst @@ -109,9 +109,3 @@ TWITTER_URL unless this is set. Optional. Example: https://twitter.com/edXOnline - -ENABLE_JUMPNAV - Enables the new Jump Navigation feature in the course breadcrumbs, defaulted to the string 'true'. - Disable to have simple hyperlinks for breadcrumbs. Setting it to any other value but 'true' ('false','I love flags', 'etc' would disable the Jumpnav). - This feature flag is slated to be removed as jumpnav becomes default. Follow the progress of this ticket here: - https://openedx.atlassian.net/browse/TNL-8678 diff --git a/src/courseware/course/CourseBreadcrumbs.jsx b/src/courseware/course/CourseBreadcrumbs.jsx index d0148ef1..100a8f97 100644 --- a/src/courseware/course/CourseBreadcrumbs.jsx +++ b/src/courseware/course/CourseBreadcrumbs.jsx @@ -1,6 +1,5 @@ import React, { useMemo } from 'react'; import PropTypes from 'prop-types'; -import { getConfig } from '@edx/frontend-platform'; import { FormattedMessage } from '@edx/frontend-platform/i18n'; import { FontAwesomeIcon } from '@fortawesome/react-fontawesome'; import { faHome } from '@fortawesome/free-solid-svg-icons'; @@ -28,7 +27,7 @@ function CourseBreadcrumb({ whiteSpace: 'nowrap', }} > - { getConfig().ENABLE_JUMPNAV !== 'true' || content.length < 2 || !isStaff + {content.length < 2 || !isStaff ? ( {defaultContent.label} diff --git a/src/courseware/course/CourseBreadcrumbs.test.jsx b/src/courseware/course/CourseBreadcrumbs.test.jsx index ae5111b8..158a8aa7 100644 --- a/src/courseware/course/CourseBreadcrumbs.test.jsx +++ b/src/courseware/course/CourseBreadcrumbs.test.jsx @@ -1,7 +1,6 @@ import React from 'react'; import { screen, render } from '@testing-library/react'; import { getAuthenticatedUser } from '@edx/frontend-platform/auth'; -import { getConfig } from '@edx/frontend-platform'; import { useModel, useModels } from '../../generic/model-store'; import CourseBreadcrumbs from './CourseBreadcrumbs'; @@ -11,7 +10,6 @@ jest.mock('@edx/frontend-platform/analytics'); // Remove When Fully rolled out>>> jest.mock('../../generic/model-store'); jest.mock('@edx/frontend-platform/auth'); -getConfig.mockImplementation(() => ({ ENABLE_JUMPNAV: 'true' })); getAuthenticatedUser.mockImplementation(() => ({ administrator: true })); // ^^^^Remove When Fully rolled out diff --git a/src/index.jsx b/src/index.jsx index fd6d8c35..97e41359 100755 --- a/src/index.jsx +++ b/src/index.jsx @@ -95,7 +95,6 @@ initialize({ CONTACT_URL: process.env.CONTACT_URL || null, CREDENTIALS_BASE_URL: process.env.CREDENTIALS_BASE_URL || null, ENTERPRISE_LEARNER_PORTAL_HOSTNAME: process.env.ENTERPRISE_LEARNER_PORTAL_HOSTNAME || null, - ENABLE_JUMPNAV: process.env.ENABLE_JUMPNAV || null, ENABLE_NOTICES: process.env.ENABLE_NOTICES || null, INSIGHTS_BASE_URL: process.env.INSIGHTS_BASE_URL || null, SEARCH_CATALOG_URL: process.env.SEARCH_CATALOG_URL || null,