yujunjun/OpenMetadata
1
0
Fork 0
mirror of https://github.com/open-metadata/OpenMetadata.git synced 2025-08-25 17:37:57 +00:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source
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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
openmetadata-ui/src/main/resources/ui/src/components/ActivityFeed/ActivityFeedList/ActivityFeedList.tsx
View File

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

16
openmetadata-ui/src/main/resources/ui/src/components/MyData/MyData.component.tsx
View File

@ -18,6 +18,7 @@ import React, {
RefObject, RefObject,
useCallback, useCallback,
useEffect, useEffect,
useMemo,
useRef, useRef,
useState, useState,
} from 'react'; } from 'react';
@ -227,18 +228,23 @@ const MyData: React.FC<MyDataProps> = ({
const newFeedsLength = activityFeeds && activityFeeds.length; 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 ( return (
<PageLayout leftPanel={getLeftPanel()} rightPanel={getRightPanel()}> <PageLayout leftPanel={getLeftPanel()} rightPanel={getRightPanel()}>
{error ? ( {error ? (
<ErrorPlaceHolderES errorMessage={error} type="error" /> <ErrorPlaceHolderES errorMessage={error} type="error" />
) : ( ) : (
<Fragment> <Fragment>
{feedData?.length > 0 || {feedData?.length > 0 || !filtersApplied || newFeedsLength ? (
feedFilter !== FeedFilter.ALL || <>
threadType ? (
<ActivityFeedList <ActivityFeedList
withSidePanel withSidePanel
className="" className="tw-mt-3"
deletePostHandler={deletePostHandler} deletePostHandler={deletePostHandler}
feedList={feedData} feedList={feedData}
postFeedHandler={postFeedHandler} postFeedHandler={postFeedHandler}
@ -247,6 +253,8 @@ const MyData: React.FC<MyDataProps> = ({
onFeedFiltersUpdate={handleFeedFilterChange} onFeedFiltersUpdate={handleFeedFilterChange}
onRefreshFeeds={onRefreshFeeds} onRefreshFeeds={onRefreshFeeds}
/> />
{filtersApplied && feedData?.length <= 0 ? <Onboarding /> : null}
</>
) : ( ) : (
!isFeedLoading && <Onboarding /> !isFeedLoading && <Onboarding />
)} )}