Merge branch 'main' into fix-18834

open-metadata · Jan 26, 2025 · cc59628 · cc59628
2 parents ced8210 + 31719a5
commit cc59628
Show file tree

Hide file tree

Showing 7 changed files with 33 additions and 16 deletions.
diff --git a/ingestion/tests/cli_e2e/base/config_builders/builders.py b/ingestion/tests/cli_e2e/base/config_builders/builders.py
@@ -139,14 +139,20 @@ def __init__(self, config: dict, config_args: dict) -> None:
 
     def build(self) -> dict:
         """build profiler config"""
-        del self.config["source"]["sourceConfig"]["config"]
-        self.config["source"]["sourceConfig"] = {
-            "config": {
-                "type": TestSuiteConfigType.TestSuite.value,
-                "entityFullyQualifiedName": self.entity_fqn,
-            },
+        self.config["source"]["sourceConfig"]["config"] = {
+            "type": TestSuiteConfigType.TestSuite.value,
+            "entityFullyQualifiedName": self.entity_fqn,
         }
 
+        self.config["source"]["sourceConfig"]["config"]["serviceConnections"] = [
+            {
+                "serviceName": self.config["source"]["serviceName"],
+                "serviceConnection": self.config["source"]["serviceConnection"],
+            }
+        ]
+
+        del self.config["source"]["serviceConnection"]
+
         self.config["processor"] = {
             "type": "orm-test-runner",
             "config": {"testCases": self.test_case_defintions},

diff --git a/openmetadata-ui/src/main/resources/ui/src/components/Tag/TagsV1/TagsV1.component.tsx b/openmetadata-ui/src/main/resources/ui/src/components/Tag/TagsV1/TagsV1.component.tsx
@@ -41,6 +41,7 @@ const TagsV1 = ({
   tooltipOverride,
   tagType,
   size,
+  isEditTags,
 }: TagsV1Props) => {
   const color = useMemo(
     () => (isVersionPage ? undefined : tag.style?.color),
@@ -144,7 +145,8 @@ const TagsV1 = ({
             ),
           },
           'tag-chip tag-chip-content',
-          size
+          size,
+          'cursor-pointer'
         )}
         data-testid="tags"
         style={
@@ -185,14 +187,19 @@ const TagsV1 = ({
   }
 
   return (
-    <Tooltip
-      className="cursor-pointer"
-      mouseEnterDelay={0.5}
-      placement="bottomLeft"
-      title={tooltipOverride ?? getTagTooltip(tag.tagFQN, tag.description)}
-      trigger="hover">
-      {tagChip}
-    </Tooltip>
+    <>
+      {isEditTags ? (
+        tagChip
+      ) : (
+        <Tooltip
+          mouseEnterDelay={0.5}
+          placement="bottomLeft"
+          title={tooltipOverride ?? getTagTooltip(tag.tagFQN, tag.description)}
+          trigger="hover">
+          {tagChip}
+        </Tooltip>
+      )}
+    </>
   );
 };
 

diff --git a/openmetadata-ui/src/main/resources/ui/src/components/Tag/TagsV1/TagsV1.interface.ts b/openmetadata-ui/src/main/resources/ui/src/components/Tag/TagsV1/TagsV1.interface.ts
@@ -31,4 +31,5 @@ export type TagsV1Props = {
   tooltipOverride?: string;
   tagType?: TagSource;
   size?: SelectProps['size'];
+  isEditTags?: boolean;
 };
diff --git a/...tadata-ui/src/main/resources/ui/src/components/common/AsyncSelectList/AsyncSelectList.tsx b/...tadata-ui/src/main/resources/ui/src/components/common/AsyncSelectList/AsyncSelectList.tsx
@@ -248,6 +248,7 @@ const AsyncSelectList: FC<AsyncSelectListProps & SelectProps> = ({
 
     return (
       <TagsV1
+        isEditTags
         size={props.size}
         startWith={TAG_START_WITH.SOURCE_ICON}
         tag={tag}

diff --git a/...ta-ui/src/main/resources/ui/src/components/common/AsyncSelectList/TreeAsyncSelectList.tsx b/...ta-ui/src/main/resources/ui/src/components/common/AsyncSelectList/TreeAsyncSelectList.tsx
@@ -173,6 +173,7 @@ const TreeAsyncSelectList: FC<Omit<AsyncSelectListProps, 'fetchOptions'>> = ({
 
     return (
       <TagsV1
+        isEditTags
         startWith={TAG_START_WITH.SOURCE_ICON}
         tag={tag}
         tagProps={tagProps}

diff --git a/openmetadata-ui/src/main/resources/ui/src/constants/Navbar.constants.ts b/openmetadata-ui/src/main/resources/ui/src/constants/Navbar.constants.ts
@@ -41,6 +41,7 @@ export interface SupportItem {
   icon: SvgComponent;
   link?: string;
   isExternal: boolean;
+  handleSupportItemClick?: () => void;
 }
 
 export const HELP_ITEMS = [

diff --git a/openmetadata-ui/src/main/resources/ui/src/utils/NavbarUtils.tsx b/openmetadata-ui/src/main/resources/ui/src/utils/NavbarUtils.tsx
@@ -24,7 +24,7 @@ const getHelpDropdownLabelContentRenderer = (
   version?: string
 ) => {
   return (
-    <Row className="cursor-pointer">
+    <Row className="cursor-pointer" onClick={item.handleSupportItemClick}>
       <Col span={4}>
         <Icon
           className="align-middle"