@@ -12,14 +12,14 @@ import { LearningHeader as Header } from '@edx/frontend-component-header';
12
12
13
13
import { Spinner } from '../../components' ;
14
14
import selectCourseTabs from '../../components/NavigationBar/data/selectors' ;
15
- import { LOADED } from '../../components/NavigationBar/data/slice' ;
15
+ import { LOADING } from '../../components/NavigationBar/data/slice' ;
16
16
import { ALL_ROUTES , DiscussionProvider , Routes as ROUTES } from '../../data/constants' ;
17
17
import DiscussionContext from '../common/context' ;
18
18
import ContentUnavailable from '../course-content-unavailable/CourseContentUnavailable' ;
19
19
import {
20
20
useCourseDiscussionData , useIsOnDesktop , useRedirectToThread , useSidebarVisible ,
21
21
} from '../data/hooks' ;
22
- import { selectDiscussionProvider , selectEnableInContext } from '../data/selectors' ;
22
+ import { selectDiscussionProvider , selectEnableInContext , selectIsUserLearner } from '../data/selectors' ;
23
23
import { EmptyLearners , EmptyTopics } from '../empty-posts' ;
24
24
import EmptyPosts from '../empty-posts/EmptyPosts' ;
25
25
import { EmptyTopic as InContextEmptyTopics } from '../in-context-topics/components' ;
@@ -46,6 +46,7 @@ const DiscussionsHome = () => {
46
46
const {
47
47
courseNumber, courseTitle, org, courseStatus, isEnrolled,
48
48
} = useSelector ( selectCourseTabs ) ;
49
+ const isUserLearner = useSelector ( selectIsUserLearner ) ;
49
50
const pageParams = useMatch ( ROUTES . COMMENTS . PAGE ) ?. params ;
50
51
const page = pageParams ?. page || null ;
51
52
const matchPattern = ALL_ROUTES . find ( ( route ) => matchPath ( { path : route } , location . pathname ) ) ;
@@ -84,7 +85,7 @@ const DiscussionsHome = () => {
84
85
) }
85
86
< main className = "container-fluid d-flex flex-column p-0 w-100" id = "main" tabIndex = "-1" >
86
87
{ ! enableInContextSidebar && < CourseTabsNavigation activeTab = "discussion" courseId = { courseId } /> }
87
- { ( isEnrolled || enableInContextSidebar ) && (
88
+ { ( isEnrolled || ! isUserLearner || enableInContextSidebar ) && (
88
89
< div
89
90
className = { classNames ( 'header-action-bar bg-white position-sticky' , {
90
91
'shadow-none border-light-300 border-bottom' : enableInContextSidebar ,
@@ -125,9 +126,9 @@ const DiscussionsHome = () => {
125
126
</ Routes >
126
127
</ Suspense >
127
128
) }
128
- { ( courseStatus === LOADED || enableInContextSidebar ) && (
129
+ { ( courseStatus !== LOADING || enableInContextSidebar ) && (
129
130
< div >
130
- { isEnrolled === false ? (
131
+ { isEnrolled === false && isUserLearner ? (
131
132
< Suspense fallback = { ( < Spinner /> ) } >
132
133
< Routes >
133
134
{ ALL_ROUTES . map ( ( route ) => (
0 commit comments