Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -3,20 +3,14 @@ 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 = ({
courseId,
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) => (
<div className="row m-0 mt-3 pt-3 border-top align-items-center" data-identifier="comment">
Expand Down
7 changes: 1 addition & 6 deletions src/custom-pages/CustomPages.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -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';
Expand Down Expand Up @@ -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 = () => {
Expand Down Expand Up @@ -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') },
]}
Expand Down
4 changes: 1 addition & 3 deletions src/studio-home/card-item/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -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';
Expand Down Expand Up @@ -248,11 +247,10 @@ export const CardItem: React.FC<Props> = ({
courseCreatorStatus,
rerunCreatorStatus,
} = useSelector(getStudioHomeData);
const waffleFlags = useWaffleFlags();
const cardRef = useRef<HTMLDivElement>(null);

const destinationUrl: string = path ?? (
waffleFlags.useNewCourseOutlinePage && !isLibraries
!isLibraries
? url
: new URL(url, getConfig().STUDIO_BASE_URL).toString()
);
Expand Down
4 changes: 1 addition & 3 deletions src/textbooks/Textbooks.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -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';
Expand All @@ -28,7 +27,6 @@ import messages from './messages';
const Textbooks = () => {
const intl = useIntl();
const { courseId, courseDetails } = useCourseAuthoringContext();
const waffleFlags = useWaffleFlags(courseId);

const {
textbooks,
Expand All @@ -44,7 +42,7 @@ const Textbooks = () => {
handleSavingStatusDispatch,
handleTextbookEditFormSubmit,
handleTextbookDeleteSubmit,
} = useTextbooks(courseId, waffleFlags);
} = useTextbooks(courseId);

if (isLoadingFailed) {
return (
Expand Down
8 changes: 3 additions & 5 deletions src/textbooks/hooks.jsx
Original file line number Diff line number Diff line change
@@ -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';

Expand All @@ -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);
Expand All @@ -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),
Expand Down