diff --git a/openmetadata-ui/src/main/resources/ui/src/components/BlockEditor/Extensions/hashtag/HashList.tsx b/openmetadata-ui/src/main/resources/ui/src/components/BlockEditor/Extensions/hashtag/HashList.tsx index 5791a3b3c2c..52189c77728 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/BlockEditor/Extensions/hashtag/HashList.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/components/BlockEditor/Extensions/hashtag/HashList.tsx @@ -116,6 +116,7 @@ export default forwardRef< className={classNames('w-full cursor-pointer hashtag-item', { 'bg-grey-2': index === selectedIndex, })} + data-testid={`hash-mention-${item.label}`} direction="vertical" id={`hashtag-item-${item.id}`} key={item.id} diff --git a/openmetadata-ui/src/main/resources/ui/src/components/BlockEditor/Extensions/hashtag/hashtagSuggestion.ts b/openmetadata-ui/src/main/resources/ui/src/components/BlockEditor/Extensions/hashtag/hashtagSuggestion.ts index c96e44aa5d4..9456023a3c7 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/BlockEditor/Extensions/hashtag/hashtagSuggestion.ts +++ b/openmetadata-ui/src/main/resources/ui/src/components/BlockEditor/Extensions/hashtag/hashtagSuggestion.ts @@ -17,8 +17,8 @@ import tippy, { Instance, Props } from 'tippy.js'; import { EntityType } from '../../../../enums/entity.enum'; import { SearchIndex } from '../../../../enums/search.enum'; import { searchData } from '../../../../rest/miscAPI'; -import { getEntityBreadcrumbs } from '../../../../utils/EntityUtils'; import { buildMentionLink } from '../../../../utils/FeedUtils'; +import searchClassBase from '../../../../utils/SearchClassBase'; import { ExtensionRef } from '../../BlockEditor.interface'; import HashList from './HashList'; @@ -45,7 +45,7 @@ export const hashtagSuggestion = () => ({ hit._source.fullyQualifiedName ?? '' ), type: hit._source.entityType, - breadcrumbs: getEntityBreadcrumbs( + breadcrumbs: searchClassBase.getEntityBreadcrumbs( hit._source, hit._source.entityType as EntityType, false diff --git a/openmetadata-ui/src/main/resources/ui/src/components/Settings/Team/TeamDetails/TeamDetailsV1.tsx b/openmetadata-ui/src/main/resources/ui/src/components/Settings/Team/TeamDetails/TeamDetailsV1.tsx index 9dbb1e3e92b..1c2286a46c9 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/Settings/Team/TeamDetails/TeamDetailsV1.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/components/Settings/Team/TeamDetails/TeamDetailsV1.tsx @@ -206,13 +206,6 @@ const TeamDetailsV1 = ({ navigate({ search: Qs.stringify({ activeTab: key }) }); }; - const { editUserPermission } = useMemo(() => { - return { - editUserPermission: - entityPermissions.EditAll || entityPermissions.EditUsers, - }; - }, [entityPermissions]); - /** * Take user id as input to find out the user data and set it for delete * @param id - user id @@ -620,12 +613,12 @@ const TeamDetailsV1 = ({ ); const teamsTableRender = useMemo(() => { - let addUserButtonTitle = editUserPermission + let addTeamButtonTitle = entityPermissions.Create ? t('label.add-entity', { entity: t('label.team') }) : t('message.no-permission-for-action'); if (isTeamDeleted) { - addUserButtonTitle = t( + addTeamButtonTitle = t( 'message.this-action-is-not-allowed-for-deleted-entities' ); } @@ -651,11 +644,11 @@ const TeamDetailsV1 = ({ }} /> - +