diff --git a/src/course-checklist/ChecklistSection/ChecklistItemComment.jsx b/src/course-checklist/ChecklistSection/ChecklistItemComment.jsx index aa0e3f3010..b2c8ec234a 100644 --- a/src/course-checklist/ChecklistSection/ChecklistItemComment.jsx +++ b/src/course-checklist/ChecklistSection/ChecklistItemComment.jsx @@ -3,8 +3,6 @@ import { FormattedMessage, FormattedNumber } from '@edx/frontend-platform/i18n'; import { Icon } from '@openedx/paragon'; import { Link } from 'react-router-dom'; import { ModeComment } from '@openedx/paragon/icons'; -import { getConfig } from '@edx/frontend-platform'; -import { useWaffleFlags } from '../../data/apiHooks'; import messages from './messages'; const ChecklistItemComment = ({ @@ -12,11 +10,7 @@ const ChecklistItemComment = ({ checkId, data, }) => { - const waffleFlags = useWaffleFlags(courseId); - - const getPathToCourseOutlinePage = (assignmentId) => (waffleFlags.useNewCourseOutlinePage - ? `/course/${courseId}#${assignmentId}` : - `${getConfig().STUDIO_BASE_URL}/course/${courseId}#${assignmentId}`); + const getPathToCourseOutlinePage = (assignmentId) => `/course/${courseId}#${assignmentId}`; const commentWrapper = (comment) => (
diff --git a/src/custom-pages/CustomPages.tsx b/src/custom-pages/CustomPages.tsx index dddb9091eb..3f12009ed2 100644 --- a/src/custom-pages/CustomPages.tsx +++ b/src/custom-pages/CustomPages.tsx @@ -28,7 +28,6 @@ import DraggableList, { SortableItem } from '@src/generic/DraggableList'; import ErrorAlert from '@src/editors/sharedComponents/ErrorAlerts/ErrorAlert'; import { RequestStatus } from '@src/data/constants'; import { useModels } from '@src/generic/model-store'; -import { useWaffleFlags } from '@src/data/apiHooks'; import getPageHeadTitle from '@src/generic/utils'; import { getPagePath } from '@src/utils'; import { DeprecatedReduxState } from '@src/store'; @@ -70,8 +69,6 @@ const CustomPages = () => { const deletePageStatus = useSelector((state: DeprecatedReduxState) => state.customPages.deletingStatus); const savingStatus = useSelector(getSavingStatus); const loadingStatus = useSelector(getLoadingStatus); - const waffleFlags = useWaffleFlags(courseId); - const pages = useModels('customPages', customPagesIds); const handleAddPage = () => { @@ -128,9 +125,7 @@ const CustomPages = () => { links={[ { label: 'Content', - to: waffleFlags.useNewCourseOutlinePage - ? `/course/${courseId}` - : `${config.STUDIO_BASE_URL}/course/${courseId}`, + to: `/course/${courseId}`, }, { label: 'Pages and Resources', to: getPagePath(courseId, 'true', 'tabs') }, ]} diff --git a/src/studio-home/card-item/index.tsx b/src/studio-home/card-item/index.tsx index c076792de4..317631d455 100644 --- a/src/studio-home/card-item/index.tsx +++ b/src/studio-home/card-item/index.tsx @@ -18,7 +18,6 @@ import { FormattedMessage, useIntl } from '@edx/frontend-platform/i18n'; import { getConfig } from '@edx/frontend-platform'; import { Link } from 'react-router-dom'; -import { useWaffleFlags } from '@src/data/apiHooks'; import { COURSE_CREATOR_STATES } from '@src/constants'; import classNames from 'classnames'; import { getStudioHomeData } from '../data/selectors'; @@ -248,11 +247,10 @@ export const CardItem: React.FC = ({ courseCreatorStatus, rerunCreatorStatus, } = useSelector(getStudioHomeData); - const waffleFlags = useWaffleFlags(); const cardRef = useRef(null); const destinationUrl: string = path ?? ( - waffleFlags.useNewCourseOutlinePage && !isLibraries + !isLibraries ? url : new URL(url, getConfig().STUDIO_BASE_URL).toString() ); diff --git a/src/textbooks/Textbooks.jsx b/src/textbooks/Textbooks.jsx index 228d1d4d22..859be4a3ae 100644 --- a/src/textbooks/Textbooks.jsx +++ b/src/textbooks/Textbooks.jsx @@ -12,7 +12,6 @@ import { Link } from 'react-router-dom'; import { useCourseAuthoringContext } from '@src/CourseAuthoringContext'; import { RequestStatus } from '@src/data/constants'; -import { useWaffleFlags } from '../data/apiHooks'; import { SavingErrorAlert } from '../generic/saving-error-alert'; import { LoadingSpinner } from '../generic/Loading'; import SubHeader from '../generic/sub-header/SubHeader'; @@ -28,7 +27,6 @@ import messages from './messages'; const Textbooks = () => { const intl = useIntl(); const { courseId, courseDetails } = useCourseAuthoringContext(); - const waffleFlags = useWaffleFlags(courseId); const { textbooks, @@ -44,7 +42,7 @@ const Textbooks = () => { handleSavingStatusDispatch, handleTextbookEditFormSubmit, handleTextbookDeleteSubmit, - } = useTextbooks(courseId, waffleFlags); + } = useTextbooks(courseId); if (isLoadingFailed) { return ( diff --git a/src/textbooks/hooks.jsx b/src/textbooks/hooks.jsx index 0d9de3ae3e..07681a554d 100644 --- a/src/textbooks/hooks.jsx +++ b/src/textbooks/hooks.jsx @@ -1,6 +1,5 @@ import { useDispatch, useSelector } from 'react-redux'; -import { useContext, useEffect } from 'react'; -import { AppContext } from '@edx/frontend-platform/react'; +import { useEffect } from 'react'; import { useIntl } from '@edx/frontend-platform/i18n'; import { useToggle } from '@openedx/paragon'; @@ -20,10 +19,9 @@ import { } from './data/thunk'; import messages from './messages'; -const useTextbooks = (courseId, waffleFlags) => { +const useTextbooks = (courseId) => { const intl = useIntl(); const dispatch = useDispatch(); - const { config } = useContext(AppContext); const textbooks = useSelector(getTextbooksData); const loadingStatus = useSelector(getLoadingStatus); @@ -35,7 +33,7 @@ const useTextbooks = (courseId, waffleFlags) => { const breadcrumbs = [ { label: intl.formatMessage(messages.breadcrumbContent), - to: waffleFlags.useNewCourseOutlinePage ? `/course/${courseId}` : `${config.STUDIO_BASE_URL}/course/${courseId}`, + to: `/course/${courseId}`, }, { label: intl.formatMessage(messages.breadcrumbPagesAndResources),