diff --git a/openmetadata-ui/src/main/resources/ui/src/assets/svg/no-conversations.svg b/openmetadata-ui/src/main/resources/ui/src/assets/svg/no-conversations.svg
new file mode 100644
index 00000000000..953b86e6efa
--- /dev/null
+++ b/openmetadata-ui/src/main/resources/ui/src/assets/svg/no-conversations.svg
@@ -0,0 +1,6 @@
+
diff --git a/openmetadata-ui/src/main/resources/ui/src/components/ActivityFeed/ActivityFeedTab/ActivityFeedTab.component.tsx b/openmetadata-ui/src/main/resources/ui/src/components/ActivityFeed/ActivityFeedTab/ActivityFeedTab.component.tsx
index 2b952b57607..b28b74c983d 100644
--- a/openmetadata-ui/src/main/resources/ui/src/components/ActivityFeed/ActivityFeedTab/ActivityFeedTab.component.tsx
+++ b/openmetadata-ui/src/main/resources/ui/src/components/ActivityFeed/ActivityFeedTab/ActivityFeedTab.component.tsx
@@ -29,6 +29,7 @@ import { ReactComponent as MentionIcon } from '../../../assets/svg/ic-mention.sv
import { ReactComponent as TaskOpenIcon } from '../../../assets/svg/ic-open-task.svg';
import { ReactComponent as TaskFilterIcon } from '../../../assets/svg/ic-task-filter-button.svg';
import { ReactComponent as TaskIcon } from '../../../assets/svg/ic-task-new.svg';
+import { ReactComponent as NoConversationsIcon } from '../../../assets/svg/no-conversations.svg';
import { ReactComponent as MyTaskIcon } from '../../../assets/svg/task.svg';
import { ReactComponent as AllActivityIcon } from '../../../assets/svg/all-activity-v2.svg';
@@ -40,6 +41,7 @@ import {
} from '../../../constants/constants';
import { FEED_COUNT_INITIAL_DATA } from '../../../constants/entity.constants';
import { observerOptions } from '../../../constants/Mydata.constants';
+import { ERROR_PLACEHOLDER_TYPE } from '../../../enums/common.enum';
import { EntityTabs, EntityType } from '../../../enums/entity.enum';
import { FeedFilter } from '../../../enums/mydata.enum';
import {
@@ -60,6 +62,7 @@ import {
getEntityUserLink,
} from '../../../utils/EntityUtils';
import { showErrorToast } from '../../../utils/ToastUtils';
+import ErrorPlaceHolderNew from '../../common/ErrorWithPlaceholder/ErrorPlaceHolderNew';
import Loader from '../../common/Loader/Loader';
import { TaskTabNew } from '../../Entity/Task/TaskTab/TaskTabNew.component';
import '../../MyData/Widgets/FeedsWidget/feeds-widget.less';
@@ -282,9 +285,12 @@ export const ActivityFeedTab = ({
const handleFeedClick = useCallback(
(feed: Thread) => {
+ if (!feed && (isTaskActiveTab || isMentionTabSelected)) {
+ setIsFullWidth(false);
+ }
setActiveThread(feed);
},
- [setActiveThread]
+ [setActiveThread, isTaskActiveTab, isMentionTabSelected]
);
useEffect(() => {
@@ -430,6 +436,82 @@ export const ActivityFeedTab = ({
setIsFullWidth(isFullWidth);
};
+ const getRightPanelContent = (selectedThread: Thread) => {
+ if (
+ activeTab !== ActivityFeedTabs.TASKS &&
+ selectedThread?.type !== ThreadType.Task
+ ) {
+ return (
+
+
+
+ );
+ }
+
+ return (
+
+ {entityType === EntityType.TABLE ? (
+
+ ) : (
+
+ )}
+
+ );
+ };
+
+ const getRightPanelPlaceholder = useMemo(() => {
+ if (activeTab === ActivityFeedTabs.MENTIONS) {
+ return (
+
+ {t('message.no-mentions')}
+
+ );
+ }
+
+ return (
+
+
+ {t('message.no-conversations')}
+
+
+ {t('message.no-conversations-description')}
+
+
+ );
+ }, [activeTab, selectedThread]);
+
return (
{layoutType === ActivityFeedLayoutType.THREE_PANEL && (
@@ -554,56 +636,19 @@ export const ActivityFeedTab = ({
layoutType === ActivityFeedLayoutType.THREE_PANEL,
})}>
{loader}
- {selectedThread &&
- !loading &&
- (activeTab !== ActivityFeedTabs.TASKS &&
- selectedThread?.type !== ThreadType.Task ? (
-
-
-
+ {selectedThread && !loading
+ ? getRightPanelContent(selectedThread)
+ : !loading && (
+
+ }
+ type={ERROR_PLACEHOLDER_TYPE.CUSTOM}>
+
+ {getRightPanelPlaceholder}
+
+
-
- ) : (
-
- {entityType === EntityType.TABLE ? (
-
- ) : (
-
- )}
-
- ))}
+ )}