From 4309d19167547d65c9ee360936485a63b7295de6 Mon Sep 17 00:00:00 2001
From: "shnaii...der" <chandhokesajal3@gmail.com>
Date: Sun, 26 Apr 2026 23:23:45 +0530
Subject: [PATCH 1/2] Fix: resolved issue #27376

---
 .../Entity/EntityRightPanel/EntityRightPanel.tsx   | 14 +++++++++++++-
 .../Tag/TagsContainerV2/TagsContainerV2.tsx        |  4 ++++
 2 files changed, 17 insertions(+), 1 deletion(-)

diff --git a/openmetadata-ui/src/main/resources/ui/src/components/Entity/EntityRightPanel/EntityRightPanel.tsx b/openmetadata-ui/src/main/resources/ui/src/components/Entity/EntityRightPanel/EntityRightPanel.tsx
index 6abd62696cb9..5e201d76018f 100644
--- a/openmetadata-ui/src/main/resources/ui/src/components/Entity/EntityRightPanel/EntityRightPanel.tsx
+++ b/openmetadata-ui/src/main/resources/ui/src/components/Entity/EntityRightPanel/EntityRightPanel.tsx
@@ -75,7 +75,19 @@ const EntityRightPanel = <T extends ExtentionEntitiesKeys>({
   }>();
 
   const { domains, dataProducts, id: entityId } = data ?? {};
-
+ const hasClassificationTags = selectedTags.some(
+    (tag) => tag.source === TagSource.Classification
+  );
+  const hasGlossaryTags = selectedTags.some(
+    (tag) => tag.source === TagSource.Glossary
+  );
+ 
+  const shouldShowTags = editTagPermission || hasClassificationTags;
+  const shouldShowGlossaryTerms =
+    editGlossaryTermsPermission || hasGlossaryTags;
+  const shouldShowDataProducts =
+    showDataProductContainer &&
+    (editDataProductPermission || Boolean(dataProducts?.length));
   return (
     <>
       {beforeSlot}
diff --git a/openmetadata-ui/src/main/resources/ui/src/components/Tag/TagsContainerV2/TagsContainerV2.tsx b/openmetadata-ui/src/main/resources/ui/src/components/Tag/TagsContainerV2/TagsContainerV2.tsx
index 29b4009e3ac7..cad4dfd86d2b 100644
--- a/openmetadata-ui/src/main/resources/ui/src/components/Tag/TagsContainerV2/TagsContainerV2.tsx
+++ b/openmetadata-ui/src/main/resources/ui/src/components/Tag/TagsContainerV2/TagsContainerV2.tsx
@@ -493,6 +493,10 @@ const TagsContainerV2 = ({
     setTags(getFilterTags(selectedTags));
   }, [selectedTags]);
 
+  if (newLook && !permission && isEmpty(tags?.[tagType]) && !isEditTags) {
+    return null;
+  }
+  
   if (newLook) {
     return (
       <ExpandableCard

From 819b2046c615b0c17311795720fb82f97189269a Mon Sep 17 00:00:00 2001
From: "shnaii...der" <chandhokesajal3@gmail.com>
Date: Sun, 26 Apr 2026 23:59:51 +0530
Subject: [PATCH 2/2] Include missing fixes

---
 .../Entity/EntityRightPanel/EntityRightPanel.tsx          | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/openmetadata-ui/src/main/resources/ui/src/components/Entity/EntityRightPanel/EntityRightPanel.tsx b/openmetadata-ui/src/main/resources/ui/src/components/Entity/EntityRightPanel/EntityRightPanel.tsx
index 5e201d76018f..4ea4d8eb39b9 100644
--- a/openmetadata-ui/src/main/resources/ui/src/components/Entity/EntityRightPanel/EntityRightPanel.tsx
+++ b/openmetadata-ui/src/main/resources/ui/src/components/Entity/EntityRightPanel/EntityRightPanel.tsx
@@ -92,7 +92,7 @@ const EntityRightPanel = <T extends ExtentionEntitiesKeys>({
     <>
       {beforeSlot}
       <Space className="w-full" direction="vertical" size="large">
-        {showDataProductContainer && (
+        {shouldShowDataProducts && (
           <div data-testid="KnowledgePanel.DataProducts">
             <DataProductsContainer
               newLook
@@ -104,7 +104,7 @@ const EntityRightPanel = <T extends ExtentionEntitiesKeys>({
             />
           </div>
         )}
-
+        {shouldShowTags && (
         <div data-testid="KnowledgePanel.Tags">
           <TagsContainerV2
             newLook
@@ -118,7 +118,8 @@ const EntityRightPanel = <T extends ExtentionEntitiesKeys>({
             onSelectionChange={onTagSelectionChange}
           />
         </div>
-
+               )}
+     {shouldShowGlossaryTerms && (
         <div data-testid="KnowledgePanel.GlossaryTerms">
           <TagsContainerV2
             newLook
@@ -132,6 +133,7 @@ const EntityRightPanel = <T extends ExtentionEntitiesKeys>({
             onSelectionChange={onTagSelectionChange}
           />
         </div>
+               )}
         {KnowledgeArticles && (
           <KnowledgeArticles entityId={entityId} entityType={entityType} />
         )}