From ad3346ea09de675a520fae3ef2c0ddf1d012d864 Mon Sep 17 00:00:00 2001 From: AhtishamShahid Date: Thu, 1 Dec 2022 12:13:31 +0500 Subject: [PATCH] fix: updated logic to show sidebar --- src/discussions/data/hooks.js | 2 +- src/discussions/posts/PostsList.jsx | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/src/discussions/data/hooks.js b/src/discussions/data/hooks.js index 0c6ad576..775d039b 100644 --- a/src/discussions/data/hooks.js +++ b/src/discussions/data/hooks.js @@ -55,7 +55,7 @@ export const useSidebarVisible = () => { return true; } - if (isViewingTopics || isViewingLearners) { + if ((isViewingTopics || isViewingLearners) && totalThreads > 0) { return true; } diff --git a/src/discussions/posts/PostsList.jsx b/src/discussions/posts/PostsList.jsx index ac349442..9573afdb 100644 --- a/src/discussions/posts/PostsList.jsx +++ b/src/discussions/posts/PostsList.jsx @@ -21,6 +21,7 @@ import { import { fetchThreads } from './data/thunks'; import NoResults from './NoResults'; import { PostLink } from './post'; +import { selectTopicFilter } from '../topics/data/selectors'; function PostsList({ posts, topics, intl, isTopicTab, @@ -88,6 +89,7 @@ function PostsList({ <> {postInstances(pinnedPosts)} {postInstances(unpinnedPosts)} + {posts?.length === 0 && loadingStatus === RequestStatus.SUCCESSFUL && } {loadingStatus === RequestStatus.IN_PROGRESS ? (