yujunjun/OpenMetadata
1
0
Fork 0
mirror of https://github.com/open-metadata/OpenMetadata.git synced 2025-10-26 16:22:09 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/1.9.10' into 1.9.10

Browse Source
This commit is contained in:
mohitdeuex 2025-09-24 09:03:19 +05:30
commit 45195b48ec
4 changed files with 11 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
openmetadata-ui/src/main/resources/ui/src/components/BlockEditor/Extensions/hashtag/HashList.tsx
View File

@ -116,6 +116,7 @@ export default forwardRef<
className={classNames('w-full cursor-pointer hashtag-item', { className={classNames('w-full cursor-pointer hashtag-item', {
'bg-grey-2': index === selectedIndex, 'bg-grey-2': index === selectedIndex,
})} })}
data-testid={`hash-mention-${item.label}`}
direction="vertical" direction="vertical"
id={`hashtag-item-${item.id}`} id={`hashtag-item-${item.id}`}
key={item.id} key={item.id}

4
openmetadata-ui/src/main/resources/ui/src/components/BlockEditor/Extensions/hashtag/hashtagSuggestion.ts
View File

@ -17,8 +17,8 @@ import tippy, { Instance, Props } from 'tippy.js';
import { EntityType } from '../../../../enums/entity.enum'; import { EntityType } from '../../../../enums/entity.enum';
import { SearchIndex } from '../../../../enums/search.enum'; import { SearchIndex } from '../../../../enums/search.enum';
import { searchData } from '../../../../rest/miscAPI'; import { searchData } from '../../../../rest/miscAPI';
import { getEntityBreadcrumbs } from '../../../../utils/EntityUtils';
import { buildMentionLink } from '../../../../utils/FeedUtils'; import { buildMentionLink } from '../../../../utils/FeedUtils';
import searchClassBase from '../../../../utils/SearchClassBase';
import { ExtensionRef } from '../../BlockEditor.interface'; import { ExtensionRef } from '../../BlockEditor.interface';
import HashList from './HashList'; import HashList from './HashList';
@ -45,7 +45,7 @@ export const hashtagSuggestion = () => ({
hit._source.fullyQualifiedName ?? '' hit._source.fullyQualifiedName ?? ''
), ),
type: hit._source.entityType, type: hit._source.entityType,
breadcrumbs: getEntityBreadcrumbs( breadcrumbs: searchClassBase.getEntityBreadcrumbs(
hit._source, hit._source,
hit._source.entityType as EntityType, hit._source.entityType as EntityType,
false false

15
openmetadata-ui/src/main/resources/ui/src/components/Settings/Team/TeamDetails/TeamDetailsV1.tsx
View File

@ -206,13 +206,6 @@ const TeamDetailsV1 = ({
navigate({ search: Qs.stringify({ activeTab: key }) }); 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 * Take user id as input to find out the user data and set it for delete
* @param id - user id * @param id - user id
@ -620,12 +613,12 @@ const TeamDetailsV1 = ({
); );
const teamsTableRender = useMemo(() => { const teamsTableRender = useMemo(() => {
let addUserButtonTitle = editUserPermission let addTeamButtonTitle = entityPermissions.Create
? t('label.add-entity', { entity: t('label.team') }) ? t('label.add-entity', { entity: t('label.team') })
: t('message.no-permission-for-action'); : t('message.no-permission-for-action');
if (isTeamDeleted) { if (isTeamDeleted) {
addUserButtonTitle = t( addTeamButtonTitle = t(
'message.this-action-is-not-allowed-for-deleted-entities' 'message.this-action-is-not-allowed-for-deleted-entities'
); );
} }
@ -651,11 +644,11 @@ const TeamDetailsV1 = ({
}} }}
/> />
</Typography.Paragraph> </Typography.Paragraph>
<Tooltip placement="top" title={addUserButtonTitle}> <Tooltip placement="top" title={addTeamButtonTitle}>
<Button <Button
ghost ghost
data-testid="add-placeholder-button" data-testid="add-placeholder-button"
disabled={!editUserPermission || isTeamDeleted} disabled={!entityPermissions.Create || isTeamDeleted}
icon={<PlusOutlined />} icon={<PlusOutlined />}
type="primary" type="primary"
onClick={handleAddTeamButtonClick}> onClick={handleAddTeamButtonClick}>

4
openmetadata-ui/src/main/resources/ui/src/utils/FeedUtils.tsx
View File

@ -149,6 +149,10 @@ export const buildMentionLink = (entityType: string, entityFqn: string) => {
const classificationFqn = Fqn.split(entityFqn); const classificationFqn = Fqn.split(entityFqn);
return `${document.location.protocol}//${document.location.host}/tags/${classificationFqn[0]}`; return `${document.location.protocol}//${document.location.host}/tags/${classificationFqn[0]}`;
} else if (entityType === EntityType.KNOWLEDGE_PAGE) {
return `${document.location.protocol}//${
document.location.host
}/knowledge-center/${getEncodedFqn(entityFqn)}`;
} }
return `${document.location.protocol}//${ return `${document.location.protocol}//${