From e50876d28426a62d1b40479a7bfade5587f86d17 Mon Sep 17 00:00:00 2001
From: Ashish Gupta <ashish@getcollate.io>
Date: Fri, 28 Oct 2022 10:06:40 +0530
Subject: [PATCH] Fix UI :- fix the Team redirect url in mentions (#8384)

* Fix the Team redirect url in mentions

* added regex for to validate teams
---
 .../src/main/resources/ui/src/constants/feed.constants.ts    | 3 ++-
 .../src/main/resources/ui/src/utils/FeedUtils.tsx            | 5 +++++
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/openmetadata-ui/src/main/resources/ui/src/constants/feed.constants.ts b/openmetadata-ui/src/main/resources/ui/src/constants/feed.constants.ts
index e80d6ac269f..d58322034d0 100644
--- a/openmetadata-ui/src/main/resources/ui/src/constants/feed.constants.ts
+++ b/openmetadata-ui/src/main/resources/ui/src/constants/feed.constants.ts
@@ -18,11 +18,12 @@ export const EntityRegEx = new RegExp(EntityRegExPattern);
 export const mentionRegEx = /\[@(.+?)?\]\((.+?)?\)/g;
 export const hashtagRegEx = /\[#(.+?)?\]\((.+?)?\)/g;
 export const linkRegEx = /\((.+?\/\/.+?)\/(.+?)\/(.+?)\)/;
+export const teamsLinkRegEx = /\((.+?\/\/.+?)\/(.+?\/.+?\/.+?)\/(.+?)\)/;
 export const entityLinkRegEx = /<#E::([^<>]+?)::([^<>]+?)>/g;
 export const entityRegex = /<#E::([^<>]+?)::([^<>]+?)\|(\[(.+?)?\]\((.+?)?\))>/;
 
 export const entityUrlMap = {
-  team: 'teams-and-users',
+  team: 'settings/members/teams',
   user: 'users',
 };
 
diff --git a/openmetadata-ui/src/main/resources/ui/src/utils/FeedUtils.tsx b/openmetadata-ui/src/main/resources/ui/src/utils/FeedUtils.tsx
index 08b0b52508b..7314f81eb81 100644
--- a/openmetadata-ui/src/main/resources/ui/src/utils/FeedUtils.tsx
+++ b/openmetadata-ui/src/main/resources/ui/src/utils/FeedUtils.tsx
@@ -45,6 +45,7 @@ import {
   hashtagRegEx,
   linkRegEx,
   mentionRegEx,
+  teamsLinkRegEx,
 } from '../constants/feed.constants';
 import { EntityType, FqnPart, TabSpecificField } from '../enums/entity.enum';
 import { SearchIndex } from '../enums/search.enum';
@@ -272,6 +273,10 @@ const getHashTagList = (message: string) => {
 };
 
 const getEntityDetail = (item: string) => {
+  if (item.includes('teams')) {
+    return item.match(teamsLinkRegEx);
+  }
+
   return item.match(linkRegEx);
 };