Merge branch 'main' into patch-1

open-metadata · Jan 29, 2025 · 027940a · 027940a
2 parents 23692d2 + 060ab6e
commit 027940a
Show file tree

Hide file tree

Showing 4 changed files with 86 additions and 37 deletions.
diff --git a/ingestion/src/metadata/ingestion/ometa/mixins/es_mixin.py b/ingestion/src/metadata/ingestion/ometa/mixins/es_mixin.py
@@ -402,19 +402,51 @@ def yield_es_view_def(
             "query": {
                 "bool": {
                     "must": [
-                        {"term": {"service.name.keyword": service_name}},
                         {
-                            "term": {
-                                "tableType": [
-                                    TableType.View.value,
-                                    TableType.MaterializedView.value,
-                                    TableType.SecureView.value,
-                                    TableType.Dynamic.value,
+                            "bool": {
+                                "should": [
+                                    {"term": {"service.name.keyword": service_name}}
+                                ]
+                            }
+                        },
+                        {
+                            "bool": {
+                                "must": [
+                                    {
+                                        "bool": {
+                                            "should": [
+                                                {
+                                                    "term": {
+                                                        "tableType": TableType.View.value
+                                                    }
+                                                },
+                                                {
+                                                    "term": {
+                                                        "tableType": TableType.MaterializedView.value
+                                                    }
+                                                },
+                                                {
+                                                    "term": {
+                                                        "tableType": TableType.SecureView.value
+                                                    }
+                                                },
+                                                {
+                                                    "term": {
+                                                        "tableType": TableType.Dynamic.value
+                                                    }
+                                                },
+                                            ]
+                                        }
+                                    }
                                 ]
                             }
                         },
-                        {"term": {"deleted": False}},
-                        {"exists": {"field": "schemaDefinition"}},
+                        {"bool": {"should": [{"term": {"deleted": False}}]}},
+                        {
+                            "bool": {
+                                "should": [{"exists": {"field": "schemaDefinition"}}]
+                            }
+                        },
                     ]
                 }
             }

diff --git a/ingestion/src/metadata/ingestion/source/database/stored_procedures_mixin.py b/ingestion/src/metadata/ingestion/source/database/stored_procedures_mixin.py
@@ -244,8 +244,18 @@ def procedure_lineage_generator(self) -> Iterable[ProcedureAndQuery]:
             "query": {
                 "bool": {
                     "must": [
-                        {"term": {"service.name.keyword": self.service_name}},
-                        {"term": {"deleted": False}},
+                        {
+                            "bool": {
+                                "should": [
+                                    {
+                                        "term": {
+                                            "service.name.keyword": self.service_name
+                                        }
+                                    }
+                                ]
+                            }
+                        },
+                        {"bool": {"should": [{"term": {"deleted": False}}]}},
                     ]
                 }
             }

diff --git a/...urces/ui/src/components/Domain/DomainTabs/DocumentationTab/DocumentationTab.component.tsx b/...urces/ui/src/components/Domain/DomainTabs/DocumentationTab/DocumentationTab.component.tsx
@@ -197,26 +197,32 @@ const DocumentationTab = ({
                 <Typography.Text className="right-panel-label">
                   {t('label.owner-plural')}
                 </Typography.Text>
-                {editOwnerPermission && domain.owners && (
-                  <UserTeamSelectableList
-                    hasPermission
-                    multiple={{ team: false, user: true }}
-                    owner={domain.owners}
-                    onUpdate={(updatedUser) => handleUpdatedOwner(updatedUser)}>
-                    <Tooltip
-                      title={t('label.edit-entity', {
-                        entity: t('label.owner-plural'),
-                      })}>
-                      <Button
-                        className="cursor-pointer flex-center m-l-xss"
-                        data-testid="edit-owner"
-                        icon={<EditIcon color={DE_ACTIVE_COLOR} width="14px" />}
-                        size="small"
-                        type="text"
-                      />
-                    </Tooltip>
-                  </UserTeamSelectableList>
-                )}
+                {editOwnerPermission &&
+                  domain.owners &&
+                  domain.owners.length > 0 && (
+                    <UserTeamSelectableList
+                      hasPermission
+                      multiple={{ team: false, user: true }}
+                      owner={domain.owners}
+                      onUpdate={(updatedUser) =>
+                        handleUpdatedOwner(updatedUser)
+                      }>
+                      <Tooltip
+                        title={t('label.edit-entity', {
+                          entity: t('label.owner-plural'),
+                        })}>
+                        <Button
+                          className="cursor-pointer flex-center m-l-xss"
+                          data-testid="edit-owner"
+                          icon={
+                            <EditIcon color={DE_ACTIVE_COLOR} width="14px" />
+                          }
+                          size="small"
+                          type="text"
+                        />
+                      </Tooltip>
+                    </UserTeamSelectableList>
+                  )}
               </div>
 
               <Space className="m-r-xss" size={4}>

diff --git a/.../resources/ui/src/components/common/EntityPageInfos/AnnouncementCard/AnnouncementCard.tsx b/.../resources/ui/src/components/common/EntityPageInfos/AnnouncementCard/AnnouncementCard.tsx
@@ -15,6 +15,7 @@ import { Card, Space, Typography } from 'antd';
 import React, { FC, useMemo } from 'react';
 import { ReactComponent as AnnouncementIcon } from '../../../../assets/svg/announcements-v1.svg';
 import { Thread } from '../../../../generated/entity/feed/thread';
+import RichTextEditorPreviewerV1 from '../../RichTextEditor/RichTextEditorPreviewerV1';
 import './AnnouncementCard.less';
 
 interface Props {
@@ -50,12 +51,12 @@ const AnnouncementCard: FC<Props> = ({ onClick, announcement }) => {
         </Typography.Paragraph>
       </Space>
       {message && (
-        <Typography.Paragraph
-          ellipsis
-          className="text-grey-muted m-0 text-xs"
-          data-testid="announcement-message">
-          {message}
-        </Typography.Paragraph>
+        <RichTextEditorPreviewerV1
+          className="text-grey-muted m-0 text-xss"
+          data-testid="announcement-message"
+          markdown={message}
+          reducePreviewLineClass="max-one-line"
+        />
       )}
     </Card>
   );