diff --git a/openmetadata-ui/src/main/resources/ui/src/components/AddDataQualityTest/AddDataQualityTestV1.tsx b/openmetadata-ui/src/main/resources/ui/src/components/AddDataQualityTest/AddDataQualityTestV1.tsx index 4eafa7480e8..9881aa2b84d 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/AddDataQualityTest/AddDataQualityTestV1.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/components/AddDataQualityTest/AddDataQualityTestV1.tsx @@ -19,6 +19,7 @@ import { isUndefined, toString } from 'lodash'; import { default as React, useCallback, useMemo, useState } from 'react'; import { useHistory, useParams } from 'react-router-dom'; import { createTestCase, createTestSuites } from 'rest/testAPI'; +import { getEntityName } from 'utils/EntityUtils'; import { getDatabaseDetailsPath, getDatabaseSchemaDetailsPath, @@ -36,7 +37,6 @@ import { TestCase } from '../../generated/tests/testCase'; import { TestSuite } from '../../generated/tests/testSuite'; import { getCurrentUserId, - getEntityName, getPartialNameFromTableFQN, } from '../../utils/CommonUtils'; import { getTestSuitePath } from '../../utils/RouterUtils'; diff --git a/openmetadata-ui/src/main/resources/ui/src/components/BotDetails/BotDetails.component.tsx b/openmetadata-ui/src/main/resources/ui/src/components/BotDetails/BotDetails.component.tsx index f42177e8182..1f1bb65a47c 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/BotDetails/BotDetails.component.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/components/BotDetails/BotDetails.component.tsx @@ -22,6 +22,7 @@ import { getAuthMechanismForBotUser, getRoles, } from 'rest/userAPI'; +import { getEntityName } from 'utils/EntityUtils'; import { TERM_ADMIN } from '../../constants/constants'; import { GlobalSettingOptions, @@ -32,7 +33,6 @@ import { AuthenticationMechanism, AuthType, } from '../../generated/entity/teams/user'; -import { getEntityName } from '../../utils/CommonUtils'; import { getSettingPath } from '../../utils/RouterUtils'; import SVGIcons, { Icons } from '../../utils/SvgUtils'; import { showErrorToast } from '../../utils/ToastUtils'; diff --git a/openmetadata-ui/src/main/resources/ui/src/components/BotListV1/BotListV1.component.tsx b/openmetadata-ui/src/main/resources/ui/src/components/BotListV1/BotListV1.component.tsx index 24b5c76b951..90a8eda2d11 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/BotListV1/BotListV1.component.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/components/BotListV1/BotListV1.component.tsx @@ -20,6 +20,7 @@ import React, { useCallback, useEffect, useMemo, useState } from 'react'; import { useTranslation } from 'react-i18next'; import { Link } from 'react-router-dom'; import { getBots } from 'rest/botsAPI'; +import { getEntityName } from 'utils/EntityUtils'; import { getBotsPath, INITIAL_PAGING_VALUE, @@ -32,7 +33,6 @@ import { Bot, ProviderType } from '../../generated/entity/bot'; import { Include } from '../../generated/type/include'; import { Paging } from '../../generated/type/paging'; import { useAuth } from '../../hooks/authHooks'; -import { getEntityName } from '../../utils/CommonUtils'; import SVGIcons, { Icons } from '../../utils/SvgUtils'; import { showErrorToast } from '../../utils/ToastUtils'; import DeleteWidgetModal from '../common/DeleteWidget/DeleteWidgetModal'; diff --git a/openmetadata-ui/src/main/resources/ui/src/components/ContainerDetail/ContainerChildren/ContainerChildren.tsx b/openmetadata-ui/src/main/resources/ui/src/components/ContainerDetail/ContainerChildren/ContainerChildren.tsx index 8fca9c354b4..cab0f0bf580 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/ContainerDetail/ContainerChildren/ContainerChildren.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/components/ContainerDetail/ContainerChildren/ContainerChildren.tsx @@ -18,8 +18,8 @@ import { EntityReference } from 'generated/type/entityReference'; import React, { FC, useMemo } from 'react'; import { useTranslation } from 'react-i18next'; import { Link } from 'react-router-dom'; -import { getEntityName } from 'utils/CommonUtils'; import { getContainerDetailPath } from 'utils/ContainerDetailUtils'; +import { getEntityName } from 'utils/EntityUtils'; interface ContainerChildrenProps { childrenList: Container['children']; diff --git a/openmetadata-ui/src/main/resources/ui/src/components/ContainerDetail/ContainerDataModel/ContainerDataModel.tsx b/openmetadata-ui/src/main/resources/ui/src/components/ContainerDetail/ContainerDataModel/ContainerDataModel.tsx index 2ab010d2f77..03bf7402054 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/ContainerDetail/ContainerDataModel/ContainerDataModel.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/components/ContainerDetail/ContainerDataModel/ContainerDataModel.tsx @@ -33,7 +33,7 @@ import { import { ReactComponent as EditIcon } from 'assets/svg/ic-edit.svg'; import { ModalWithMarkdownEditor } from 'components/Modals/ModalWithMarkdownEditor/ModalWithMarkdownEditor'; -import { getEntityName } from 'utils/CommonUtils'; +import { getEntityName } from 'utils/EntityUtils'; const ContainerDataModel: FC = ({ dataModel, diff --git a/openmetadata-ui/src/main/resources/ui/src/components/CustomEntityDetail/CustomPropertyTable.tsx b/openmetadata-ui/src/main/resources/ui/src/components/CustomEntityDetail/CustomPropertyTable.tsx index 1811d3febe1..24495c857b8 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/CustomEntityDetail/CustomPropertyTable.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/components/CustomEntityDetail/CustomPropertyTable.tsx @@ -16,11 +16,11 @@ import { LOADING_STATE, OPERATION } from 'enums/common.enum'; import { isEmpty } from 'lodash'; import React, { FC, Fragment, useEffect, useMemo, useState } from 'react'; import { useTranslation } from 'react-i18next'; +import { getEntityName } from 'utils/EntityUtils'; import { ReactComponent as IconDelete } from '../../assets/svg/ic-delete.svg'; import { ReactComponent as IconEdit } from '../../assets/svg/ic-edit.svg'; import { NO_PERMISSION_FOR_ACTION } from '../../constants/HelperTextUtil'; import { CustomProperty } from '../../generated/entity/type'; -import { getEntityName } from '../../utils/CommonUtils'; import RichTextEditorPreviewer from '../common/rich-text-editor/RichTextEditorPreviewer'; import ConfirmationModal from '../Modals/ConfirmationModal/ConfirmationModal'; import { ModalWithMarkdownEditor } from '../Modals/ModalWithMarkdownEditor/ModalWithMarkdownEditor'; @@ -84,6 +84,7 @@ export const CustomPropertyTable: FC = ({ title: t('label.name'), dataIndex: 'name', key: 'name', + render: (_, record) => getEntityName(record), }, { title: t('label.type'), diff --git a/openmetadata-ui/src/main/resources/ui/src/components/DashboardDetails/DashboardDetails.component.tsx b/openmetadata-ui/src/main/resources/ui/src/components/DashboardDetails/DashboardDetails.component.tsx index 3ecea09f7c6..68fab3527e8 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/DashboardDetails/DashboardDetails.component.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/components/DashboardDetails/DashboardDetails.component.tsx @@ -28,6 +28,7 @@ import React, { import { useTranslation } from 'react-i18next'; import { Link, useHistory } from 'react-router-dom'; import { restoreDashboard } from 'rest/dashboardAPI'; +import { getEntityName } from 'utils/EntityUtils'; import { FQN_SEPARATOR_CHAR } from '../../constants/char.constants'; import { EntityField } from '../../constants/Feeds.constants'; import { observerOptions } from '../../constants/Mydata.constants'; @@ -42,7 +43,6 @@ import { LabelType, State, TagLabel } from '../../generated/type/tagLabel'; import { useInfiniteScroll } from '../../hooks/useInfiniteScroll'; import { getCurrentUserId, - getEntityName, getEntityPlaceHolder, getOwnerValue, refreshPage, diff --git a/openmetadata-ui/src/main/resources/ui/src/components/DashboardVersion/DashboardVersion.component.tsx b/openmetadata-ui/src/main/resources/ui/src/components/DashboardVersion/DashboardVersion.component.tsx index 580bd93c79e..0be0ec73b57 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/DashboardVersion/DashboardVersion.component.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/components/DashboardVersion/DashboardVersion.component.tsx @@ -20,6 +20,7 @@ import { ExtraInfo } from 'Models'; import React, { FC, useEffect, useMemo, useState } from 'react'; import { useTranslation } from 'react-i18next'; import { Link } from 'react-router-dom'; +import { getEntityName } from 'utils/EntityUtils'; import { FQN_SEPARATOR_CHAR } from '../../constants/char.constants'; import { EntityField } from '../../constants/Feeds.constants'; import { OwnerType } from '../../enums/user.enum'; @@ -221,7 +222,7 @@ const DashboardVersion: FC = ({ render: (text, record) => ( - {record.displayName} + {getEntityName(record)} ( {prepareConstraintIcon(name, record.constraint, tableConstraints)} - {name} + {getEntityName(record)} ), }, @@ -632,6 +633,30 @@ const EntityTable = ({ width: 220, render: renderDataTypeDisplay, }, + { + title: t('label.scale'), + dataIndex: 'scale', + key: 'scale', + accessor: 'scale', + width: 80, + render: (scale: number) => scale || '--', + }, + { + title: t('label.precision'), + dataIndex: 'precision', + key: 'precision', + accessor: 'precision', + width: 80, + render: (precision: number) => precision || '--', + }, + { + title: t('label.ordinal-position'), + dataIndex: 'ordinalPosition', + key: 'ordinalPosition', + accessor: 'ordinalPosition', + width: 80, + render: (ordinalPosition: number) => ordinalPosition || '--', + }, { title: t('label.description'), dataIndex: 'description', diff --git a/openmetadata-ui/src/main/resources/ui/src/components/Glossary/GlossaryHeader/GlossaryHeader.component.tsx b/openmetadata-ui/src/main/resources/ui/src/components/Glossary/GlossaryHeader/GlossaryHeader.component.tsx index d0f96df601a..7cb5ae86a78 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/Glossary/GlossaryHeader/GlossaryHeader.component.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/components/Glossary/GlossaryHeader/GlossaryHeader.component.tsx @@ -26,7 +26,7 @@ import { cloneDeep, debounce, includes, isEqual } from 'lodash'; import React, { useCallback, useEffect, useMemo, useState } from 'react'; import { useTranslation } from 'react-i18next'; import { Link } from 'react-router-dom'; -import { getEntityName } from 'utils/CommonUtils'; +import { getEntityName } from 'utils/EntityUtils'; import { getOwnerList } from 'utils/ManageUtils'; import SVGIcons, { Icons } from 'utils/SvgUtils'; import { diff --git a/openmetadata-ui/src/main/resources/ui/src/components/Glossary/GlossaryTermTab/GlossaryTermTab.component.tsx b/openmetadata-ui/src/main/resources/ui/src/components/Glossary/GlossaryTermTab/GlossaryTermTab.component.tsx index 549ffbe1f52..c70d69e3e70 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/Glossary/GlossaryTermTab/GlossaryTermTab.component.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/components/Glossary/GlossaryTermTab/GlossaryTermTab.component.tsx @@ -30,7 +30,7 @@ import React, { useEffect, useMemo, useState } from 'react'; import { useTranslation } from 'react-i18next'; import { Link, useHistory, useParams } from 'react-router-dom'; import { getGlossaryTerms, ListGlossaryTermsParams } from 'rest/glossaryAPI'; -import { getEntityName } from 'utils/CommonUtils'; +import { getEntityName } from 'utils/EntityUtils'; import { createGlossaryTermTree, getRootLevelGlossaryTerm, diff --git a/openmetadata-ui/src/main/resources/ui/src/components/Ingestion/Ingestion.component.tsx b/openmetadata-ui/src/main/resources/ui/src/components/Ingestion/Ingestion.component.tsx index 38478a98229..68211429c64 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/Ingestion/Ingestion.component.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/components/Ingestion/Ingestion.component.tsx @@ -21,6 +21,7 @@ import { isEmpty, isNil, lowerCase, startCase } from 'lodash'; import React, { Fragment, useEffect, useMemo, useState } from 'react'; import { useTranslation } from 'react-i18next'; import { useHistory } from 'react-router-dom'; +import { getEntityName } from 'utils/EntityUtils'; import { PAGE_SIZE } from '../../constants/constants'; import { WORKFLOWS_METADATA_DOCS } from '../../constants/docs.constants'; import { PIPELINE_TYPE_LOCALIZATION } from '../../constants/Ingestions.constant'; @@ -420,7 +421,7 @@ const Ingestion: React.FC = ({ title: t('label.name'), dataIndex: 'name', key: 'name', - render: (text) => + render: (text, record) => airflowEndpoint ? ( = ({ rel="noopener noreferrer" target="_blank" type="link"> - {text} + {getEntityName(record)} = ({ ) : ( - text + getEntityName(record) ), }, { diff --git a/openmetadata-ui/src/main/resources/ui/src/components/MlModelDetail/MlModelDetail.component.tsx b/openmetadata-ui/src/main/resources/ui/src/components/MlModelDetail/MlModelDetail.component.tsx index 05c7ca11050..ce94dfb22de 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/MlModelDetail/MlModelDetail.component.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/components/MlModelDetail/MlModelDetail.component.tsx @@ -30,6 +30,7 @@ import React, { import { useTranslation } from 'react-i18next'; import { useHistory } from 'react-router-dom'; import { restoreMlmodel } from 'rest/mlModelAPI'; +import { getEntityName } from 'utils/EntityUtils'; import AppState from '../../AppState'; import { FQN_SEPARATOR_CHAR } from '../../constants/char.constants'; import { @@ -50,7 +51,6 @@ import { LabelType, State, TagLabel } from '../../generated/type/tagLabel'; import { useInfiniteScroll } from '../../hooks/useInfiniteScroll'; import { getEmptyPlaceholder, - getEntityName, getEntityPlaceHolder, getOwnerValue, refreshPage, diff --git a/openmetadata-ui/src/main/resources/ui/src/components/PipelineDetails/PipelineDetails.component.tsx b/openmetadata-ui/src/main/resources/ui/src/components/PipelineDetails/PipelineDetails.component.tsx index 8284eac99f7..0821c3dd521 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/PipelineDetails/PipelineDetails.component.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/components/PipelineDetails/PipelineDetails.component.tsx @@ -58,13 +58,12 @@ import { EntityFieldThreadCount } from '../../interface/feed.interface'; import { getCountBadge, getCurrentUserId, - getEntityName, getEntityPlaceHolder, getFeedCounts, getOwnerValue, refreshPage, } from '../../utils/CommonUtils'; -import { getEntityFeedLink } from '../../utils/EntityUtils'; +import { getEntityFeedLink, getEntityName } from '../../utils/EntityUtils'; import { deletePost, getEntityFieldThreadCounts, @@ -567,9 +566,9 @@ const PipelineDetails = ({ key: t('label.name'), dataIndex: 'name', title: t('label.name'), - render: (name, record) => ( + render: (_, record) => ( - {name} + {getEntityName(record)} = ({ }), dataIndex: 'displayName', key: 'displayName', - render: (text, record) => ( + render: (_, record) => ( - {text} + {getEntityName(record)} = ({ dataIndex: 'name', key: 'name', width: 320, - render: (name: string) => ( + render: (name: string, record) => ( - {name} + {getEntityName(record)} ), }, diff --git a/openmetadata-ui/src/main/resources/ui/src/components/Services/Services.tsx b/openmetadata-ui/src/main/resources/ui/src/components/Services/Services.tsx index de4b1d1fd5c..f446dd7c6cd 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/Services/Services.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/components/Services/Services.tsx @@ -17,6 +17,7 @@ import { isEmpty } from 'lodash'; import React, { Fragment, useCallback, useMemo } from 'react'; import { useTranslation } from 'react-i18next'; import { Link, useHistory } from 'react-router-dom'; +import { getEntityName } from 'utils/EntityUtils'; import { getServiceDetailsPath, SERVICE_VIEW_CAP, @@ -29,11 +30,7 @@ import { ServiceCategory } from '../../enums/service.enum'; import { Operation } from '../../generated/entity/policies/policy'; import { Paging } from '../../generated/type/paging'; import { ServicesType } from '../../interface/service.interface'; -import { - getEntityName, - getServiceLogo, - showPagination, -} from '../../utils/CommonUtils'; +import { getServiceLogo, showPagination } from '../../utils/CommonUtils'; import { checkPermission } from '../../utils/PermissionsUtils'; import { getAddServicePath } from '../../utils/RouterUtils'; import { diff --git a/openmetadata-ui/src/main/resources/ui/src/components/TasksDAGView/TasksDAGView.tsx b/openmetadata-ui/src/main/resources/ui/src/components/TasksDAGView/TasksDAGView.tsx index f046e7e2e3b..b7abd7de550 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/TasksDAGView/TasksDAGView.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/components/TasksDAGView/TasksDAGView.tsx @@ -19,10 +19,10 @@ import ReactFlow, { useEdgesState, useNodesState, } from 'reactflow'; +import { getEntityName } from 'utils/EntityUtils'; import { EntityLineageNodeType } from '../../enums/entity.enum'; import { PipelineStatus, Task } from '../../generated/entity/data/pipeline'; -import { EntityReference } from '../../generated/type/entityReference'; -import { getEntityName, replaceSpaceWith_ } from '../../utils/CommonUtils'; +import { replaceSpaceWith_ } from '../../utils/CommonUtils'; import { getLayoutedElements, onLoad } from '../../utils/EntityLineageUtils'; import { getTaskExecStatus } from '../../utils/PipelineDetailsUtils'; import TaskNode from './TaskNode'; @@ -76,7 +76,7 @@ const TasksDAGView = ({ tasks, selectedExec }: Props) => { id: replaceSpaceWith_(task.name), type: getNodeType(task), data: { - label: getEntityName(task as EntityReference), + label: getEntityName(task), }, position: { x: 0, y: 0 }, isConnectable: false, diff --git a/openmetadata-ui/src/main/resources/ui/src/components/TeamDetails/RolesAndPoliciesList.tsx b/openmetadata-ui/src/main/resources/ui/src/components/TeamDetails/RolesAndPoliciesList.tsx index 79c5208fbe5..6d6f7327865 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/TeamDetails/RolesAndPoliciesList.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/components/TeamDetails/RolesAndPoliciesList.tsx @@ -16,10 +16,10 @@ import Table, { ColumnsType } from 'antd/lib/table'; import React, { useMemo } from 'react'; import { useTranslation } from 'react-i18next'; import { Link } from 'react-router-dom'; +import { getEntityName } from 'utils/EntityUtils'; import { NO_PERMISSION_FOR_ACTION } from '../../constants/HelperTextUtil'; import { EntityType } from '../../enums/entity.enum'; import { EntityReference } from '../../generated/type/entityReference'; -import { getEntityName } from '../../utils/CommonUtils'; import { getPolicyWithFqnPath, getRoleWithFqnPath, diff --git a/openmetadata-ui/src/main/resources/ui/src/components/TeamDetails/TeamDetailsV1.tsx b/openmetadata-ui/src/main/resources/ui/src/components/TeamDetails/TeamDetailsV1.tsx index 109440e459e..445fc1545d6 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/TeamDetails/TeamDetailsV1.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/components/TeamDetails/TeamDetailsV1.tsx @@ -66,12 +66,8 @@ import { PlaceholderProps, TeamDetailsProp, } from '../../interface/teamsAndUsers.interface'; -import { - getEntityName, - getTierFromEntityInfo, - hasEditAccess, -} from '../../utils/CommonUtils'; -import { filterEntityAssets } from '../../utils/EntityUtils'; +import { getTierFromEntityInfo, hasEditAccess } from '../../utils/CommonUtils'; +import { filterEntityAssets, getEntityName } from '../../utils/EntityUtils'; import { checkPermission, DEFAULT_ENTITY_PERMISSION, diff --git a/openmetadata-ui/src/main/resources/ui/src/components/TeamDetails/TeamHierarchy.test.tsx b/openmetadata-ui/src/main/resources/ui/src/components/TeamDetails/TeamHierarchy.test.tsx index 13dac9ae0e8..260137dd977 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/TeamDetails/TeamHierarchy.test.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/components/TeamDetails/TeamHierarchy.test.tsx @@ -46,7 +46,7 @@ jest.mock('rest/teamsAPI', () => ({ .mockImplementation(() => Promise.resolve(MOCK_CURRENT_TEAM)), })); -jest.mock('../../utils/CommonUtils', () => ({ +jest.mock('utils/EntityUtils', () => ({ getEntityName: jest.fn().mockReturnValue('entityName'), })); diff --git a/openmetadata-ui/src/main/resources/ui/src/components/TeamDetails/TeamHierarchy.tsx b/openmetadata-ui/src/main/resources/ui/src/components/TeamDetails/TeamHierarchy.tsx index 1ed7e67dd6a..bd9b9bd1f25 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/TeamDetails/TeamHierarchy.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/components/TeamDetails/TeamHierarchy.tsx @@ -23,9 +23,10 @@ import { HTML5Backend } from 'react-dnd-html5-backend'; import { useTranslation } from 'react-i18next'; import { Link } from 'react-router-dom'; import { getTeamByName, updateTeam } from 'rest/teamsAPI'; +import { getEntityName } from 'utils/EntityUtils'; import { TABLE_CONSTANTS } from '../../constants/Teams.constants'; import { Team } from '../../generated/entity/teams/team'; -import { getEntityName, Transi18next } from '../../utils/CommonUtils'; +import { Transi18next } from '../../utils/CommonUtils'; import { getTeamsWithFqnPath } from '../../utils/RouterUtils'; import { getTableExpandableConfig } from '../../utils/TableUtils'; import { getMovedTeamData } from '../../utils/TeamUtils'; diff --git a/openmetadata-ui/src/main/resources/ui/src/components/TeamsSelectable/TeamsSelectable.tsx b/openmetadata-ui/src/main/resources/ui/src/components/TeamsSelectable/TeamsSelectable.tsx index 54eb1f330ff..5c4f2c31073 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/TeamsSelectable/TeamsSelectable.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/components/TeamsSelectable/TeamsSelectable.tsx @@ -15,8 +15,8 @@ import { TreeSelect } from 'antd'; import { t } from 'i18next'; import React, { useEffect, useState } from 'react'; import { getTeamsHierarchy } from 'rest/teamsAPI'; +import { getEntityName } from 'utils/EntityUtils'; import { TeamHierarchy } from '../../generated/entity/teams/teamHierarchy'; -import { getEntityName } from '../../utils/CommonUtils'; import SVGIcons from '../../utils/SvgUtils'; import { showErrorToast } from '../../utils/ToastUtils'; diff --git a/openmetadata-ui/src/main/resources/ui/src/components/TestSuitePipelineTab/TestSuitePipelineTab.component.tsx b/openmetadata-ui/src/main/resources/ui/src/components/TestSuitePipelineTab/TestSuitePipelineTab.component.tsx index e5dac42ec19..b10bc5b7ea6 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/TestSuitePipelineTab/TestSuitePipelineTab.component.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/components/TestSuitePipelineTab/TestSuitePipelineTab.component.tsx @@ -27,6 +27,7 @@ import { triggerIngestionPipelineById, } from 'rest/ingestionPipelineAPI'; import { fetchAirflowConfig } from 'rest/miscAPI'; +import { getEntityName } from 'utils/EntityUtils'; import { Operation } from '../../generated/entity/policies/policy'; import { IngestionPipeline } from '../../generated/entity/services/ingestionPipelines/ingestionPipeline'; import { useAirflowStatus } from '../../hooks/useAirflowStatus'; @@ -310,11 +311,13 @@ const TestSuitePipelineTab = () => { title: t('label.name'), dataIndex: 'name', key: 'name', - render: (name: string) => { + render: (_, record) => { + const FieldName = getEntityName(record); + return ( + )} + +
+ + {`${t('label.usage')}:`} + + {record.usageCount ? ( + + {record.usageCount} + ) : ( - {t('label.no-entity', { - entity: t('label.description'), - })} + {t('label.not-used')} )}
- - {(classificationPermissions.EditDescription || - classificationPermissions.EditAll) && ( - - )} -
- - {`${t('label.usage')}:`} - - {record.usageCount ? ( - - {record.usageCount} - - ) : ( - {t('label.not-used')} - )} -
- - ), - }, - { - title: t('label.action-plural'), - dataIndex: 'actions', - key: 'actions', - width: 120, - align: 'center', - render: (_, record: Tag) => ( - - ), - }, - ], + ), + }, + { + title: t('label.action-plural'), + dataIndex: 'actions', + key: 'actions', + width: 120, + align: 'center', + render: (_, record: Tag) => ( + + ), + }, + ] as ColumnsType, [ currentClassification, classificationPermissions, diff --git a/openmetadata-ui/src/main/resources/ui/src/pages/teams/AddUsersModalV1.tsx b/openmetadata-ui/src/main/resources/ui/src/pages/teams/AddUsersModalV1.tsx index 7eed143d755..ffdaab101b8 100644 --- a/openmetadata-ui/src/main/resources/ui/src/pages/teams/AddUsersModalV1.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/pages/teams/AddUsersModalV1.tsx @@ -20,6 +20,7 @@ import React, { useEffect, useState } from 'react'; import { useTranslation } from 'react-i18next'; import { searchData } from 'rest/miscAPI'; import { getUsers } from 'rest/userAPI'; +import { getEntityName } from 'utils/EntityUtils'; import { ADD_USER_CONTAINER_HEIGHT, PAGE_SIZE_MEDIUM, @@ -34,7 +35,6 @@ import { import { Paging } from '../../generated/type/paging'; import { SearchResponse } from '../../interface/search.interface'; import { formatUsersResponse } from '../../utils/APIUtils'; -import { getEntityName } from '../../utils/CommonUtils'; import { showErrorToast } from '../../utils/ToastUtils'; import './AddUsersModal.less'; import UserCard from './UserCard'; diff --git a/openmetadata-ui/src/main/resources/ui/src/pages/teams/TeamsPage.tsx b/openmetadata-ui/src/main/resources/ui/src/pages/teams/TeamsPage.tsx index 21d5498ba1c..bd54ea41a69 100644 --- a/openmetadata-ui/src/main/resources/ui/src/pages/teams/TeamsPage.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/pages/teams/TeamsPage.tsx @@ -35,6 +35,7 @@ import { patchTeamDetail, } from 'rest/teamsAPI'; import { getUsers, updateUserDetail } from 'rest/userAPI'; +import { getEntityName } from 'utils/EntityUtils'; import AppState from '../../AppState'; import { INITIAL_PAGING_VALUE, @@ -57,7 +58,6 @@ import { formatUsersResponse, SearchEntityHits, } from '../../utils/APIUtils'; -import { getEntityName } from '../../utils/CommonUtils'; import { DEFAULT_ENTITY_PERMISSION } from '../../utils/PermissionsUtils'; import { getSettingPath, getTeamsWithFqnPath } from '../../utils/RouterUtils'; import { showErrorToast, showSuccessToast } from '../../utils/ToastUtils'; diff --git a/openmetadata-ui/src/main/resources/ui/src/utils/CommonUtils.tsx b/openmetadata-ui/src/main/resources/ui/src/utils/CommonUtils.tsx index 72cfbf744fd..5e343915554 100644 --- a/openmetadata-ui/src/main/resources/ui/src/utils/CommonUtils.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/utils/CommonUtils.tsx @@ -23,7 +23,6 @@ import { } from 'components/common/CronEditor/CronEditor.constant'; import ErrorPlaceHolder from 'components/common/error-with-placeholder/ErrorPlaceHolder'; import Loader from 'components/Loader/Loader'; -import { Container } from 'generated/entity/data/container'; import { t } from 'i18next'; import { capitalize, @@ -64,27 +63,12 @@ import { import { SIZE } from '../enums/common.enum'; import { EntityType, FqnPart, TabSpecificField } from '../enums/entity.enum'; import { FilterPatternEnum } from '../enums/filterPattern.enum'; -import { Field } from '../generated/api/data/createTopic'; -import { Kpi } from '../generated/dataInsight/kpi/kpi'; -import { Bot } from '../generated/entity/bot'; -import { Classification } from '../generated/entity/classification/classification'; -import { Dashboard } from '../generated/entity/data/dashboard'; -import { Database } from '../generated/entity/data/database'; -import { GlossaryTerm } from '../generated/entity/data/glossaryTerm'; -import { Pipeline } from '../generated/entity/data/pipeline'; -import { Column, Table } from '../generated/entity/data/table'; -import { Topic } from '../generated/entity/data/topic'; -import { Webhook } from '../generated/entity/events/webhook'; import { ThreadTaskStatus, ThreadType } from '../generated/entity/feed/thread'; -import { Policy } from '../generated/entity/policies/policy'; import { PipelineType } from '../generated/entity/services/ingestionPipelines/ingestionPipeline'; -import { Role } from '../generated/entity/teams/role'; -import { Team } from '../generated/entity/teams/team'; -import { EntityReference, User } from '../generated/entity/teams/user'; +import { EntityReference } from '../generated/entity/teams/user'; import { Paging } from '../generated/type/paging'; import { TagLabel } from '../generated/type/tagLabel'; import { EntityFieldThreadCount } from '../interface/feed.interface'; -import { ServicesType } from '../interface/service.interface'; import jsonData from '../jsons/en'; import { getEntityFeedLink, getTitleCase } from './EntityUtils'; import Fqn from './Fqn'; @@ -549,51 +533,6 @@ export const getEntityPlaceHolder = (value: string, isDeleted?: boolean) => { } }; -/** - * Take entity reference as input and return name for entity - * @param entity - entity reference - * @returns - entity name - */ -export const getEntityName = ( - entity?: - | EntityReference - | ServicesType - | User - | Topic - | Database - | Dashboard - | Table - | Pipeline - | Team - | Policy - | Role - | GlossaryTerm - | Webhook - | Bot - | Kpi - | Classification - | Field - | Container - | Column -) => { - return entity?.displayName || entity?.name || ''; -}; - -export const getEntityId = ( - entity?: - | EntityReference - | ServicesType - | User - | Topic - | Database - | Dashboard - | Table - | Pipeline - | Team - | Policy - | Role -) => entity?.id || ''; - export const getEntityDeleteMessage = (entity: string, dependents: string) => { if (dependents) { return t('message.permanently-delete-metadata-and-dependents', { diff --git a/openmetadata-ui/src/main/resources/ui/src/utils/EntityLineageUtils.tsx b/openmetadata-ui/src/main/resources/ui/src/utils/EntityLineageUtils.tsx index 09ba02cb1ec..66a38b18221 100644 --- a/openmetadata-ui/src/main/resources/ui/src/utils/EntityLineageUtils.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/utils/EntityLineageUtils.tsx @@ -67,12 +67,11 @@ import { } from '../generated/type/entityLineage'; import { EntityReference } from '../generated/type/entityReference'; import { - getEntityName, getPartialNameFromFQN, getPartialNameFromTableFQN, prepareLabel, } from './CommonUtils'; -import { isLeafNode } from './EntityUtils'; +import { getEntityName, isLeafNode } from './EntityUtils'; import { getEncodedFqn } from './StringsUtils'; import SVGIcons from './SvgUtils'; import { getEntityLink } from './TableUtils'; diff --git a/openmetadata-ui/src/main/resources/ui/src/utils/EntitySummaryPanelUtils.tsx b/openmetadata-ui/src/main/resources/ui/src/utils/EntitySummaryPanelUtils.tsx index 38ef73d5c63..16dbca771d5 100644 --- a/openmetadata-ui/src/main/resources/ui/src/utils/EntitySummaryPanelUtils.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/utils/EntitySummaryPanelUtils.tsx @@ -22,7 +22,7 @@ import { MlFeature } from '../generated/entity/data/mlmodel'; import { Task } from '../generated/entity/data/pipeline'; import { Column, TableConstraint } from '../generated/entity/data/table'; import { Field } from '../generated/entity/data/topic'; -import { getEntityName } from './CommonUtils'; +import { getEntityName } from './EntityUtils'; import SVGIcons from './SvgUtils'; const { Text } = Typography; diff --git a/openmetadata-ui/src/main/resources/ui/src/utils/EntityUtils.tsx b/openmetadata-ui/src/main/resources/ui/src/utils/EntityUtils.tsx index 91c5faf5895..527761f828a 100644 --- a/openmetadata-ui/src/main/resources/ui/src/utils/EntityUtils.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/utils/EntityUtils.tsx @@ -52,7 +52,6 @@ import { Edge, EntityLineage } from '../generated/type/entityLineage'; import { EntityReference } from '../generated/type/entityUsage'; import { TagLabel } from '../generated/type/tagLabel'; import { - getEntityName, getOwnerValue, getPartialNameFromTableFQN, getTableFQNFromColumnFQN, @@ -69,6 +68,20 @@ export enum DRAWER_NAVIGATION_OPTIONS { lineage = 'Lineage', } +/** + * Take entity reference as input and return name for entity + * @param entity - entity reference + * @returns - entity name + */ +export const getEntityName = (entity?: { + name?: string; + displayName?: string; +}) => { + return entity?.displayName || entity?.name || ''; +}; + +export const getEntityId = (entity?: { id?: string }) => entity?.id || ''; + export const getEntityTags = ( type: string, entityDetail: Table | Pipeline | Dashboard | Topic | Mlmodel diff --git a/openmetadata-ui/src/main/resources/ui/src/utils/ManageUtils.ts b/openmetadata-ui/src/main/resources/ui/src/utils/ManageUtils.ts index 9b502886e36..87ebb4e1d83 100644 --- a/openmetadata-ui/src/main/resources/ui/src/utils/ManageUtils.ts +++ b/openmetadata-ui/src/main/resources/ui/src/utils/ManageUtils.ts @@ -17,7 +17,7 @@ import { WILD_CARD_CHAR } from '../constants/char.constants'; import { Team } from '../generated/entity/teams/team'; import { User } from '../generated/entity/teams/user'; import { EntityReference } from '../generated/type/entityUsage'; -import { getEntityName } from './CommonUtils'; +import { getEntityName } from './EntityUtils'; /** * @param listUsers - List of users diff --git a/openmetadata-ui/src/main/resources/ui/src/utils/TasksUtils.ts b/openmetadata-ui/src/main/resources/ui/src/utils/TasksUtils.ts index fde7bf5d5f8..5baae88ed85 100644 --- a/openmetadata-ui/src/main/resources/ui/src/utils/TasksUtils.ts +++ b/openmetadata-ui/src/main/resources/ui/src/utils/TasksUtils.ts @@ -41,10 +41,11 @@ import { EntityType, FqnPart, TabSpecificField } from '../enums/entity.enum'; import { ServiceCategory } from '../enums/service.enum'; import { Column, Table } from '../generated/entity/data/table'; import { TaskType } from '../generated/entity/feed/thread'; -import { getEntityName, getPartialNameFromTableFQN } from './CommonUtils'; +import { getPartialNameFromTableFQN } from './CommonUtils'; import { defaultFields as DashboardFields } from './DashboardDetailsUtils'; import { defaultFields as DatabaseSchemaFields } from './DatabaseSchemaDetailsUtils'; import { defaultFields as TableFields } from './DatasetDetailsUtils'; +import { getEntityName } from './EntityUtils'; import { defaultFields as MlModelFields } from './MlModelDetailsUtils'; import { defaultFields as PipelineFields } from './PipelineDetailsUtils'; import { serviceTypeLogo } from './ServiceUtils';