Compare commits

...

7 Commits

Author SHA1 Message Date
AhtishamShahid
2db3a5b68e fix: resolved linter issues 2022-12-19 11:25:05 +05:00
AhtishamShahid
202fd3315a fix: resolved misc issues with navigation 2022-12-19 11:25:05 +05:00
AhtishamShahid
fe8ffbd345 fix: resolved linter issues 2022-12-19 11:25:05 +05:00
AhtishamShahid
2913de47ac fix: updated sidebar logic 2022-12-19 11:25:05 +05:00
AhtishamShahid
9a26173b7f fix: updated logic to show sidebar 2022-12-19 11:25:05 +05:00
AhtishamShahid
ad3346ea09 fix: updated logic to show sidebar 2022-12-19 11:25:05 +05:00
AhtishamShahid
545b69376f fix: removed side bar incase there are no posts 2022-12-19 11:25:05 +05:00

View File

@@ -10,12 +10,13 @@ import { getAuthenticatedUser } from '@edx/frontend-platform/auth';
import { AppContext } from '@edx/frontend-platform/react'; import { AppContext } from '@edx/frontend-platform/react';
import { breakpoints, useWindowSize } from '@edx/paragon'; import { breakpoints, useWindowSize } from '@edx/paragon';
import { Routes } from '../../data/constants'; import { RequestStatus, Routes } from '../../data/constants';
import { selectTopicsUnderCategory } from '../../data/selectors'; import { selectTopicsUnderCategory } from '../../data/selectors';
import { fetchCourseBlocks } from '../../data/thunks'; import { fetchCourseBlocks } from '../../data/thunks';
import { DiscussionContext } from '../common/context'; import { DiscussionContext } from '../common/context';
import { clearRedirect } from '../posts/data'; import { clearRedirect } from '../posts/data';
import { selectTopics } from '../topics/data/selectors'; import { threadsLoadingStatus } from '../posts/data/selectors';
import { selectTopics, topicsLoadingStatus } from '../topics/data/selectors';
import { fetchCourseTopics } from '../topics/data/thunks'; import { fetchCourseTopics } from '../topics/data/thunks';
import { discussionsPath, inBlackoutDateRange } from '../utils'; import { discussionsPath, inBlackoutDateRange } from '../utils';
import { import {
@@ -48,14 +49,27 @@ export function useTotalTopicThreadCount() {
export const useSidebarVisible = () => { export const useSidebarVisible = () => {
const isFiltered = useSelector(selectAreThreadsFiltered); const isFiltered = useSelector(selectAreThreadsFiltered);
const totalThreads = useSelector(selectPostThreadCount); const totalThreads = useSelector(selectPostThreadCount);
const isViewingTopics = useRouteMatch(Routes.TOPICS.PATH); const threadsCallStatus = useSelector(threadsLoadingStatus);
const isViewingSpecificTopic = useRouteMatch(Routes.TOPICS.TOPIC);
const isViewingTopics = useRouteMatch(Routes.TOPICS.ALL);
const isViewingLearners = useRouteMatch(Routes.LEARNERS.PATH); const isViewingLearners = useRouteMatch(Routes.LEARNERS.PATH);
const topicsLoading = useSelector(topicsLoadingStatus);
if (
isViewingSpecificTopic
&& isViewingSpecificTopic.isExact
&& totalThreads > 0
&& topicsLoading === RequestStatus.SUCCESSFUL
&& threadsCallStatus === RequestStatus.SUCCESSFUL
) {
return false;
}
if (isFiltered) { if (isFiltered) {
return true; return true;
} }
if (isViewingTopics || isViewingLearners) { if ((isViewingTopics && isViewingTopics.isExact) || isViewingLearners) {
return true; return true;
} }