fix(ui): New activity button won't show up if there's not activity present (#6077)

This commit is contained in:
Chirag Madlani 2022-07-14 14:13:35 +05:30 committed by GitHub
parent 07761c7e81
commit 199f239a0e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 24 additions and 16 deletions

View File

@ -272,7 +272,7 @@ const ActivityFeedList: FC<ActivityFeedListProp> = ({
<Fragment>
{entityName && feedFilter === FeedFilter.ALL && !threadType ? (
<NoFeedPlaceholder entityName={entityName} />
) : (
) : !refreshFeedCount ? (
<Fragment>
<FeedListSeparator
className="tw-relative tw-mt-1 tw-mb-3.5 tw-pb-5"
@ -280,7 +280,7 @@ const ActivityFeedList: FC<ActivityFeedListProp> = ({
/>
<>No conversations found. Try changing the filter.</>
</Fragment>
)}
) : null}
</Fragment>
)}
{confirmationState.state && (

View File

@ -18,6 +18,7 @@ import React, {
RefObject,
useCallback,
useEffect,
useMemo,
useRef,
useState,
} from 'react';
@ -227,26 +228,33 @@ const MyData: React.FC<MyDataProps> = ({
const newFeedsLength = activityFeeds && activityFeeds.length;
// Check if feedFilter or ThreadType filter is applied or not
const filtersApplied = useMemo(
() => feedFilter === FeedFilter.ALL && !threadType,
[feedFilter, threadType]
);
return (
<PageLayout leftPanel={getLeftPanel()} rightPanel={getRightPanel()}>
{error ? (
<ErrorPlaceHolderES errorMessage={error} type="error" />
) : (
<Fragment>
{feedData?.length > 0 ||
feedFilter !== FeedFilter.ALL ||
threadType ? (
<ActivityFeedList
withSidePanel
className=""
deletePostHandler={deletePostHandler}
feedList={feedData}
postFeedHandler={postFeedHandler}
refreshFeedCount={newFeedsLength}
updateThreadHandler={updateThreadHandler}
onFeedFiltersUpdate={handleFeedFilterChange}
onRefreshFeeds={onRefreshFeeds}
/>
{feedData?.length > 0 || !filtersApplied || newFeedsLength ? (
<>
<ActivityFeedList
withSidePanel
className="tw-mt-3"
deletePostHandler={deletePostHandler}
feedList={feedData}
postFeedHandler={postFeedHandler}
refreshFeedCount={newFeedsLength}
updateThreadHandler={updateThreadHandler}
onFeedFiltersUpdate={handleFeedFilterChange}
onRefreshFeeds={onRefreshFeeds}
/>
{filtersApplied && feedData?.length <= 0 ? <Onboarding /> : null}
</>
) : (
!isFeedLoading && <Onboarding />
)}