yujunjun/OpenMetadata
1
0
Fork 0
mirror of https://github.com/open-metadata/OpenMetadata.git synced 2025-08-26 18:06:03 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix UI :- fix the Team redirect url in mentions (#8384)

Browse Source 
* Fix the Team redirect url in mentions

* added regex for to validate teams
This commit is contained in:
Ashish Gupta 2022-10-28 10:06:40 +05:30 committed by GitHub
parent a6438c6347
commit e50876d284
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
openmetadata-ui/src/main/resources/ui/src/constants/feed.constants.ts
View File

@ -18,11 +18,12 @@ export const EntityRegEx = new RegExp(EntityRegExPattern);
export const mentionRegEx = /\[@(.+?)?\]\((.+?)?\)/g; export const mentionRegEx = /\[@(.+?)?\]\((.+?)?\)/g;
export const hashtagRegEx = /\[#(.+?)?\]\((.+?)?\)/g; export const hashtagRegEx = /\[#(.+?)?\]\((.+?)?\)/g;
export const linkRegEx = /\((.+?\/\/.+?)\/(.+?)\/(.+?)\)/; export const linkRegEx = /\((.+?\/\/.+?)\/(.+?)\/(.+?)\)/;
export const teamsLinkRegEx = /\((.+?\/\/.+?)\/(.+?\/.+?\/.+?)\/(.+?)\)/;
export const entityLinkRegEx = /<#E::([^<>]+?)::([^<>]+?)>/g; export const entityLinkRegEx = /<#E::([^<>]+?)::([^<>]+?)>/g;
export const entityRegex = /<#E::([^<>]+?)::([^<>]+?)\|(\[(.+?)?\]\((.+?)?\))>/; export const entityRegex = /<#E::([^<>]+?)::([^<>]+?)\|(\[(.+?)?\]\((.+?)?\))>/;
export const entityUrlMap = { export const entityUrlMap = {
team: 'teams-and-users', team: 'settings/members/teams',
user: 'users', user: 'users',
}; };

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

@ -45,6 +45,7 @@ import {
hashtagRegEx, hashtagRegEx,
linkRegEx, linkRegEx,
mentionRegEx, mentionRegEx,
teamsLinkRegEx,
} from '../constants/feed.constants'; } from '../constants/feed.constants';
import { EntityType, FqnPart, TabSpecificField } from '../enums/entity.enum'; import { EntityType, FqnPart, TabSpecificField } from '../enums/entity.enum';
import { SearchIndex } from '../enums/search.enum'; import { SearchIndex } from '../enums/search.enum';
@ -272,6 +273,10 @@ const getHashTagList = (message: string) => {
}; };
const getEntityDetail = (item: string) => { const getEntityDetail = (item: string) => {
if (item.includes('teams')) {
return item.match(teamsLinkRegEx);
}
return item.match(linkRegEx); return item.match(linkRegEx);
}; };