diff --git a/openmetadata-ui/src/main/resources/ui/src/components/ActivityFeed/Shared/ActivityFeedActions.tsx b/openmetadata-ui/src/main/resources/ui/src/components/ActivityFeed/Shared/ActivityFeedActions.tsx
index 96cb4aca6c6..1754603037f 100644
--- a/openmetadata-ui/src/main/resources/ui/src/components/ActivityFeed/Shared/ActivityFeedActions.tsx
+++ b/openmetadata-ui/src/main/resources/ui/src/components/ActivityFeed/Shared/ActivityFeedActions.tsx
@@ -119,6 +119,8 @@ const ActivityFeedActions = ({
const editCheck = useMemo(() => {
if (feed.type === ThreadType.Announcement && !isPost) {
return false;
+ } else if (feed.type === ThreadType.Task && !isPost) {
+ return false;
} else if (isAuthor || currentUser?.isAdmin) {
return true;
}
diff --git a/openmetadata-ui/src/main/resources/ui/src/components/ActivityFeed/TaskFeedCard/TaskFeedCard.component.tsx b/openmetadata-ui/src/main/resources/ui/src/components/ActivityFeed/TaskFeedCard/TaskFeedCard.component.tsx
new file mode 100644
index 00000000000..4c1d3b7e4ea
--- /dev/null
+++ b/openmetadata-ui/src/main/resources/ui/src/components/ActivityFeed/TaskFeedCard/TaskFeedCard.component.tsx
@@ -0,0 +1,218 @@
+/*
+ * Copyright 2023 Collate.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+import { Col, Row, Tooltip, Typography } from 'antd';
+import classNames from 'classnames';
+import AssigneeList from 'components/common/AssigneeList/AssigneeList';
+import EntityPopOverCard from 'components/common/PopOverCard/EntityPopOverCard';
+import UserPopOverCard from 'components/common/PopOverCard/UserPopOverCard';
+import ProfilePicture from 'components/common/ProfilePicture/ProfilePicture';
+import Reactions from 'components/Reactions/Reactions';
+import { ReactionOperation } from 'enums/reactions.enum';
+import { Post, ReactionType, Thread } from 'generated/entity/feed/thread';
+import { isUndefined, toString } from 'lodash';
+import React, { useState } from 'react';
+import { useTranslation } from 'react-i18next';
+import { Link } from 'react-router-dom';
+import {
+ entityDisplayName,
+ getEntityFieldDisplay,
+ getEntityFQN,
+ getEntityType,
+ prepareFeedLink,
+} from 'utils/FeedUtils';
+import { getTaskDetailPath } from 'utils/TasksUtils';
+import {
+ getDateTimeFromMilliSeconds,
+ getDayTimeByTimeStamp,
+} from 'utils/TimeUtils';
+import { useActivityFeedProvider } from '../ActivityFeedProvider/ActivityFeedProvider';
+import ActivityFeedActions from '../Shared/ActivityFeedActions';
+import './task-feed-card.less';
+import { ReactComponent as TaskOpenIcon } from '/assets/svg/ic-open-task.svg';
+import { ReactComponent as ThreadIcon } from '/assets/svg/thread.svg';
+
+interface TaskFeedCardProps {
+ post: Post;
+ feed: Thread;
+ className?: string;
+ showThread?: boolean;
+ isEntityFeed?: boolean;
+ isOpenInDrawer?: boolean;
+}
+
+const TaskFeedCard = ({
+ post,
+ feed,
+ className = '',
+ isEntityFeed = false,
+ showThread = true,
+ isOpenInDrawer = false,
+}: TaskFeedCardProps) => {
+ const { t } = useTranslation();
+ const timeStamp = feed.threadTs;
+ const taskDetails = feed.task;
+ const postLength = feed?.postsCount ?? 0;
+ const entityType = getEntityType(feed.about) ?? '';
+ const entityFQN = getEntityFQN(feed.about) ?? '';
+ const entityCheck = !isUndefined(entityFQN) && !isUndefined(entityType);
+ const [isEditPost, setIsEditPost] = useState(false);
+ const repliedUsers = [...new Set((feed?.posts ?? []).map((f) => f.from))];
+ const repliedUniqueUsersList = repliedUsers.slice(0, postLength >= 3 ? 2 : 1);
+
+ const { showDrawer, updateReactions } = useActivityFeedProvider();
+
+ const showReplies = () => {
+ showDrawer?.(feed);
+ };
+
+ const onEditPost = () => {
+ setIsEditPost(!isEditPost);
+ };
+
+ const onReactionUpdate = (
+ reaction: ReactionType,
+ operation: ReactionOperation
+ ) => {
+ updateReactions(post, feed.id, true, reaction, operation);
+ };
+
+ const getTaskLinkElement = entityCheck && (
+
+ {`#${taskDetails?.id} `}
+
+
+ {taskDetails?.type}
+ {t('label.for-lowercase')}
+ {isEntityFeed ? (
+
+ {getEntityFieldDisplay(feed.about)}
+
+ ) : (
+ <>
+ {entityType}
+
+
+
+ )}
+
+ );
+
+ return (
+ <>
+
+
+
+
+
+ {feed.createdBy}
+
+ {t('message.created-this-task-lowercase')}
+ {timeStamp && (
+
+
+ {getDayTimeByTimeStamp(timeStamp)}
+
+
+ )}
+
+
+
+
+ {t('label.assignee-plural')}
+
+
+ {!showThread && postLength > 0 && (
+
+
+
+ {repliedUniqueUsersList.map((user) => (
+
+
+
+
+ ))}
+
+
+ {postLength}
+
+ {Boolean(feed.reactions?.length) && (
+
+ )}
+
+ )}
+
+
+
+
+ );
+};
+
+export default TaskFeedCard;
diff --git a/openmetadata-ui/src/main/resources/ui/src/components/ActivityFeed/TaskFeedCard/task-feed-card.less b/openmetadata-ui/src/main/resources/ui/src/components/ActivityFeed/TaskFeedCard/task-feed-card.less
new file mode 100644
index 00000000000..935a2420646
--- /dev/null
+++ b/openmetadata-ui/src/main/resources/ui/src/components/ActivityFeed/TaskFeedCard/task-feed-card.less
@@ -0,0 +1,22 @@
+/*
+ * Copyright 2023 Collate.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+.task-feed-card-v1 {
+ .task-feed-body {
+ padding-left: 1.5rem;
+ }
+ .assignee-item {
+ margin: 0;
+ margin-right: 4px;
+ }
+}
diff --git a/openmetadata-ui/src/main/resources/ui/src/components/DataInsightDetail/KPIChartV1.tsx b/openmetadata-ui/src/main/resources/ui/src/components/DataInsightDetail/KPIChartV1.tsx
index 90c51141dde..d59b8b5f045 100644
--- a/openmetadata-ui/src/main/resources/ui/src/components/DataInsightDetail/KPIChartV1.tsx
+++ b/openmetadata-ui/src/main/resources/ui/src/components/DataInsightDetail/KPIChartV1.tsx
@@ -12,7 +12,9 @@
*/
import { Card, Col, Row, Typography } from 'antd';
+import { ReactComponent as KPIIcon } from 'assets/svg/ic-kpi.svg';
import { AxiosError } from 'axios';
+import { DATA_INSIGHT_DOCS } from 'constants/docs.constants';
import { isEmpty, isUndefined } from 'lodash';
import React, { FC, useCallback, useEffect, useMemo, useState } from 'react';
import { useTranslation } from 'react-i18next';
@@ -26,6 +28,7 @@ import {
YAxis,
} from 'recharts';
import { getLatestKpiResult, getListKpiResult } from 'rest/KpiAPI';
+import { Transi18next } from 'utils/CommonUtils';
import {
getCurrentDateTimeMillis,
getPastDaysDateTimeMillis,
@@ -36,7 +39,6 @@ import { Kpi, KpiResult } from '../../generated/dataInsight/kpi/kpi';
import { UIKpiResult } from '../../interface/data-insight.interface';
import { CustomTooltip, getKpiGraphData } from '../../utils/DataInsightUtils';
import { showErrorToast } from '../../utils/ToastUtils';
-import { EmptyGraphPlaceholder } from './EmptyGraphPlaceholder';
import KPILatestResultsV1 from './KPILatestResultsV1';
interface Props {
@@ -44,6 +46,39 @@ interface Props {
selectedDays: number;
}
+const EmptyPlaceholder = () => {
+ const { t } = useTranslation();
+
+ return (
+
+
+
+
+ {t('message.adding-new-entity-is-easy-just-give-it-a-spin', {
+ entity: t('label.data-insight'),
+ })}
+
+
+
+
+
+ );
+};
+
const KPIChartV1: FC
= ({ kpiList, selectedDays }) => {
const { t } = useTranslation();
@@ -204,12 +239,12 @@ const KPIChartV1: FC = ({ kpiList, selectedDays }) => {
) : (
diff --git a/openmetadata-ui/src/main/resources/ui/src/components/MyData/RightSidebar/RightSidebar.component.tsx b/openmetadata-ui/src/main/resources/ui/src/components/MyData/RightSidebar/RightSidebar.component.tsx
index 8de0520661b..dfd5e520a80 100644
--- a/openmetadata-ui/src/main/resources/ui/src/components/MyData/RightSidebar/RightSidebar.component.tsx
+++ b/openmetadata-ui/src/main/resources/ui/src/components/MyData/RightSidebar/RightSidebar.component.tsx
@@ -54,52 +54,56 @@ const RightSidebar = ({
return (
<>
-
-
- {t('label.recent-announcement-plural')}
-
-
- {announcements.map((item) => {
- return (
-
-
-
-
- {t('label.announcement')}
-
-
-
+ {announcements.length > 0 && (
+ <>
+
+
+ {t('label.recent-announcement-plural')}
+
+
+ {announcements.map((item) => {
+ return (
+
+
+
+
+ {t('label.announcement')}
+
+
+
+
+
+
+ )}
-
= ({ reactions, onReactionSelect }) => {
});
return (
-
-
- {emojis}
-
- e.stopPropagation()}>
-
-
-
+
+ {emojis}
+
+ e.stopPropagation()}>
+
+
);
};
diff --git a/openmetadata-ui/src/main/resources/ui/src/components/Widgets/FeedsWidget/FeedsWidget.component.tsx b/openmetadata-ui/src/main/resources/ui/src/components/Widgets/FeedsWidget/FeedsWidget.component.tsx
index d8f828fcb84..7f3dc46525e 100644
--- a/openmetadata-ui/src/main/resources/ui/src/components/Widgets/FeedsWidget/FeedsWidget.component.tsx
+++ b/openmetadata-ui/src/main/resources/ui/src/components/Widgets/FeedsWidget/FeedsWidget.component.tsx
@@ -11,25 +11,35 @@
* limitations under the License.
*/
import { Tabs } from 'antd';
+import AppState from 'AppState';
import ActivityFeedListV1 from 'components/ActivityFeed/ActivityFeedList/ActivityFeedListV1.component';
import { useActivityFeedProvider } from 'components/ActivityFeed/ActivityFeedProvider/ActivityFeedProvider';
import { FeedFilter } from 'enums/mydata.enum';
import { ThreadType } from 'generated/entity/feed/thread';
-import React, { useEffect, useState } from 'react';
+import React, { useEffect, useMemo, useState } from 'react';
import { useTranslation } from 'react-i18next';
+import { getFeedsWithFilter } from 'rest/feedsAPI';
+import { showErrorToast } from 'utils/ToastUtils';
import './feeds-widget.less';
const FeedsWidget = () => {
const { t } = useTranslation();
const [activeTab, setActiveTab] = useState('all');
const { loading, entityThread, getFeedData } = useActivityFeedProvider();
+ const [taskCount, setTaskCount] = useState(0);
+ const currentUser = useMemo(
+ () => AppState.getCurrentUserDetails(),
+ [AppState.userDetails, AppState.nonSecureUserDetails]
+ );
useEffect(() => {
if (activeTab === 'all') {
- getFeedData(FeedFilter.OWNER).catch(() => {
- // ignore since error is displayed in toast in the parent promise.
- // Added block for sonar code smell
- });
+ getFeedData(FeedFilter.OWNER, undefined, ThreadType.Conversation).catch(
+ () => {
+ // ignore since error is displayed in toast in the parent promise.
+ // Added block for sonar code smell
+ }
+ );
} else if (activeTab === 'mentions') {
getFeedData(FeedFilter.MENTIONS).catch(() => {
// ignore since error is displayed in toast in the parent promise.
@@ -43,6 +53,21 @@ const FeedsWidget = () => {
}
}, [activeTab]);
+ useEffect(() => {
+ getFeedsWithFilter(
+ currentUser?.id,
+ FeedFilter.OWNER,
+ undefined,
+ ThreadType.Task
+ )
+ .then((res) => {
+ setTaskCount(res.data.length);
+ })
+ .catch((err) => {
+ showErrorToast(err);
+ });
+ }, [currentUser]);
+
return (
{
),
},
{
- label: t('label.task-plural'),
+ label: `${t('label.task-plural')} (${taskCount})`,
key: 'tasks',
children: (
{
assignees: EntityReference[];
+ profilePicType?: ImageShape;
+ showUserName?: boolean;
+ profileWidth?: string;
}
-const AssigneeList: FC = ({ assignees, className }) => {
+const AssigneeList: FC = ({
+ assignees,
+ className,
+ profilePicType = 'square',
+ showUserName = true,
+ profileWidth = '20',
+}) => {
const history = useHistory();
const handleClick = (e: React.MouseEvent, assignee: EntityReference) => {
@@ -40,11 +50,18 @@ const AssigneeList: FC = ({ assignees, className }) => {
type={assignee.type}
userName={assignee.name || ''}>
handleClick(e, assignee)}>
- {assignee.name || ''}
+ {assignee.name ?? ''}
+ )}
))}
diff --git a/openmetadata-ui/src/main/resources/ui/src/components/common/PopOverCard/EntityPopOverCard.tsx b/openmetadata-ui/src/main/resources/ui/src/components/common/PopOverCard/EntityPopOverCard.tsx
index 97362015c5d..464310b3fb8 100644
--- a/openmetadata-ui/src/main/resources/ui/src/components/common/PopOverCard/EntityPopOverCard.tsx
+++ b/openmetadata-ui/src/main/resources/ui/src/components/common/PopOverCard/EntityPopOverCard.tsx
@@ -11,64 +11,66 @@
* limitations under the License.
*/
-import { Button, Divider, Popover, Space, Typography } from 'antd';
-import { AxiosError } from 'axios';
+import { Popover } from 'antd';
import { EntityUnion } from 'components/Explore/explore.interface';
-import { get, uniqueId } from 'lodash';
-import { EntityTags } from 'Models';
-import React, { FC, HTMLAttributes, useEffect, useMemo, useState } from 'react';
-import { useTranslation } from 'react-i18next';
-import { Link } from 'react-router-dom';
+import ExploreSearchCard from 'components/ExploreV1/ExploreSearchCard/ExploreSearchCard';
+import React, {
+ FC,
+ HTMLAttributes,
+ useCallback,
+ useEffect,
+ useState,
+} from 'react';
import { getDashboardByFqn } from 'rest/dashboardAPI';
import {
getDatabaseDetailsByFQN,
getDatabaseSchemaDetailsByFQN,
} from 'rest/databaseAPI';
+import { getGlossaryTermByFQN } from 'rest/glossaryAPI';
import { getMlModelByFQN } from 'rest/mlModelAPI';
import { getPipelineByFqn } from 'rest/pipelineAPI';
import { getTableDetailsByFQN } from 'rest/tableAPI';
import { getTopicByFqn } from 'rest/topicsAPI';
import { getEntityName } from 'utils/EntityUtils';
import AppState from '../../../AppState';
-import { FQN_SEPARATOR_CHAR } from '../../../constants/char.constants';
import { EntityType } from '../../../enums/entity.enum';
import { Table } from '../../../generated/entity/data/table';
-import { TagSource } from '../../../generated/type/tagLabel';
-import SVGIcons from '../../../utils/SvgUtils';
-import {
- getEntityLink,
- getTagsWithoutTier,
- getTierTags,
-} from '../../../utils/TableUtils';
-import { showErrorToast } from '../../../utils/ToastUtils';
-import ProfilePicture from '../ProfilePicture/ProfilePicture';
-import RichTextEditorPreviewer from '../rich-text-editor/RichTextEditorPreviewer';
+import './popover-card.less';
interface Props extends HTMLAttributes {
entityType: string;
entityFQN: string;
}
+const PopoverContent: React.FC<{
+ entityData: EntityUnion;
+ entityFQN: string;
+ entityType: string;
+}> = ({ entityData, entityFQN, entityType }) => {
+ const name = entityData.name;
+ const displayName = getEntityName(entityData);
+
+ return (
+ = ({ children, entityType, entityFQN }) => {
- const { t } = useTranslation();
const [entityData, setEntityData] = useState({} as EntityUnion);
- const entityTier = useMemo(() => {
- const tierFQN = getTierTags((entityData as Table).tags || [])?.tagFQN;
-
- return tierFQN?.split(FQN_SEPARATOR_CHAR)[1];
- }, [(entityData as Table).tags]);
-
- const entityTags = useMemo(() => {
- const tags: EntityTags[] =
- getTagsWithoutTier((entityData as Table).tags || []) || [];
-
- return tags.map((tag) =>
- tag.source === TagSource.Glossary ? tag.tagFQN : `#${tag.tagFQN}`
- );
- }, [(entityData as Table).tags]);
-
- const getData = () => {
+ const getData = useCallback(() => {
const setEntityDetails = (entityDetail: EntityUnion) => {
AppState.entityData[entityFQN] = entityDetail;
};
@@ -105,6 +107,10 @@ const EntityPopOverCard: FC = ({ children, entityType, entityFQN }) => {
case EntityType.DATABASE_SCHEMA:
promise = getDatabaseSchemaDetailsByFQN(entityFQN, 'owner');
+ break;
+ case EntityType.GLOSSARY_TERM:
+ promise = getGlossaryTermByFQN(entityFQN, 'owner');
+
break;
default:
@@ -118,23 +124,11 @@ const EntityPopOverCard: FC = ({ children, entityType, entityFQN }) => {
setEntityData(res);
})
- .catch((err: AxiosError) => showErrorToast(err));
+ .catch(() => {
+ // do nothing
+ });
}
- };
-
- const PopoverTitle = () => {
- return (
- e.stopPropagation()}>
- {entityFQN}
-
-
- );
- };
+ }, [entityType, entityFQN]);
const onMouseOver = () => {
const entitydetails = AppState.entityData[entityFQN];
@@ -145,95 +139,22 @@ const EntityPopOverCard: FC = ({ children, entityType, entityFQN }) => {
}
};
- const ownerName = useMemo(() => {
- return get(entityData, 'owner');
- }, [entityData]);
-
- const PopoverContent = () => {
- useEffect(() => {
- onMouseOver();
- }, []);
-
- return (
-
-
-
- {ownerName ? (
-
-
- {getEntityName(ownerName)}
-
-
- ) : (
-
- {t('label.no-entity', {
- entity: t('label.owner'),
- })}
-
- )}
-
|
-
- {entityTier
- ? entityTier
- : t('label.no-entity', {
- entity: t('label.tier'),
- })}
-
-
-
-
- {entityData.description ? (
-
- {t('label.no-entity', {
- entity: t('label.description'),
- })}
-
- )}
-
-
- {entityTags.length ? (
- <>
-
-
-
-
-
-
- {entityTags.map((tag) => (
-
- {tag}
-
- ))}
-
-
-
- ) : null}
-
= ({ children, userName, type = 'user' }) => {
const teams = getNonDeletedTeams(userData.teams ?? []);
return teams?.length ? (
-
-
+
+
{t('label.team-plural')}
-
+
{teams.map((team, i) => (
{team?.displayName ?? team?.name}
@@ -91,21 +91,19 @@ const UserPopOverCard: FC = ({ children, userName, type = 'user' }) => {
const isAdmin = userData?.isAdmin;
return roles?.length ? (
-
-
+
+
{t('label.role-plural')}
-
+
{isAdmin && (
-
+
{TERM_ADMIN}
)}
{roles.map((role, i) => (
-
+
{role?.displayName ?? role?.name}
))}
@@ -120,17 +118,17 @@ const UserPopOverCard: FC = ({ children, userName, type = 'user' }) => {
return (
-
+
-
+
{
e.stopPropagation();
onTitleClickHandler(getUserPath(name));
}}>
- {displayName}
+ {displayName}
{displayName !== name ? (
{name}
@@ -151,7 +149,7 @@ const UserPopOverCard: FC
= ({ children, userName, type = 'user' }) => {
{isLoading ? (
+
{isEmpty(userData) ? (
{t('message.no-data-available')}
) : (
@@ -168,7 +166,6 @@ const UserPopOverCard: FC
= ({ children, userName, type = 'user' }) => {
return (