diff --git a/openmetadata-ui/src/main/resources/ui/src/components/EntityTable/EntityTable.component.tsx b/openmetadata-ui/src/main/resources/ui/src/components/EntityTable/EntityTable.component.tsx
index e4561871561..8222f863303 100644
--- a/openmetadata-ui/src/main/resources/ui/src/components/EntityTable/EntityTable.component.tsx
+++ b/openmetadata-ui/src/main/resources/ui/src/components/EntityTable/EntityTable.component.tsx
@@ -17,7 +17,7 @@ import { EntityTags } from 'Models';
import React, { Fragment, useEffect, useState } from 'react';
import { Link } from 'react-router-dom';
import { useExpanded, useTable } from 'react-table';
-import { getDatasetDetailsPath } from '../../constants/constants';
+import { getTableDetailsPath } from '../../constants/constants';
import {
Column,
ColumnJoins,
@@ -536,7 +536,7 @@ const EntityTable = ({
)}
= ({
const [joinedTables, setJoinedTables] = useState([]);
const handleTableClick = (fqn: string) => {
- history.push(getDatasetDetailsPath(fqn));
+ history.push(getTableDetailsPath(fqn));
};
useEffect(() => {
@@ -106,7 +106,7 @@ const FrequentlyJoinedTables: FunctionComponent = ({
key={index}>
+ to={getTableDetailsPath(table.fullyQualifiedName as string)}>
{table.name}
{getCountBadge(table.joinCount, '', false)}
diff --git a/openmetadata-ui/src/main/resources/ui/src/components/my-data-details/SchemaTable.tsx b/openmetadata-ui/src/main/resources/ui/src/components/my-data-details/SchemaTable.tsx
index e42d5739445..276d2d0ab50 100644
--- a/openmetadata-ui/src/main/resources/ui/src/components/my-data-details/SchemaTable.tsx
+++ b/openmetadata-ui/src/main/resources/ui/src/components/my-data-details/SchemaTable.tsx
@@ -22,7 +22,7 @@ import React, {
useState,
} from 'react';
import { Link } from 'react-router-dom';
-import { getDatasetDetailsPath } from '../../constants/constants';
+import { getTableDetailsPath } from '../../constants/constants';
import {
Column,
ColumnJoins,
@@ -318,7 +318,7 @@ const SchemaTable: FunctionComponent = ({
)}
= ({
{
// const oData = recentlyViewedData[i];
try {
switch (oData.entityType) {
- case EntityType.DATASET: {
+ case EntityType.TABLE: {
const res = await getTableDetailsByFQN(
oData.fqn,
'usageSummary, tags, owner,columns'
diff --git a/openmetadata-ui/src/main/resources/ui/src/constants/constants.ts b/openmetadata-ui/src/main/resources/ui/src/constants/constants.ts
index 3f46b8abdc8..244aa8cab43 100644
--- a/openmetadata-ui/src/main/resources/ui/src/constants/constants.ts
+++ b/openmetadata-ui/src/main/resources/ui/src/constants/constants.ts
@@ -33,7 +33,7 @@ export const imageTypes = {
export const TOUR_SEARCH_TERM = 'dim_a';
export const ERROR404 = 'No data found';
export const ERROR500 = 'Something went wrong';
-const PLACEHOLDER_ROUTE_DATASET_FQN = ':datasetFQN';
+const PLACEHOLDER_ROUTE_TABLE_FQN = ':datasetFQN';
const PLACEHOLDER_ROUTE_TOPIC_FQN = ':topicFQN';
const PLACEHOLDER_ROUTE_PIPELINE_FQN = ':pipelineFQN';
const PLACEHOLDER_ROUTE_DASHBOARD_FQN = ':dashboardFQN';
@@ -136,8 +136,8 @@ export const ROUTES = {
TAGS: '/tags',
SIGNUP: '/signup',
SIGNIN: '/signin',
- DATASET_DETAILS: `/dataset/${PLACEHOLDER_ROUTE_DATASET_FQN}`,
- DATASET_DETAILS_WITH_TAB: `/dataset/${PLACEHOLDER_ROUTE_DATASET_FQN}/${PLACEHOLDER_ROUTE_TAB}`,
+ TABLE_DETAILS: `/table/${PLACEHOLDER_ROUTE_TABLE_FQN}`,
+ TABLE_DETAILS_WITH_TAB: `/table/${PLACEHOLDER_ROUTE_TABLE_FQN}/${PLACEHOLDER_ROUTE_TAB}`,
ENTITY_VERSION: `/${PLACEHOLDER_ROUTE_ENTITY_TYPE}/${PLACEHOLDER_ROUTE_ENTITY_FQN}/versions/${PLAEHOLDER_ROUTE_VERSION}`,
TOPIC_DETAILS: `/topic/${PLACEHOLDER_ROUTE_TOPIC_FQN}`,
TOPIC_DETAILS_WITH_TAB: `/topic/${PLACEHOLDER_ROUTE_TOPIC_FQN}/${PLACEHOLDER_ROUTE_TAB}`,
@@ -155,12 +155,9 @@ export const IN_PAGE_SEARCH_ROUTES: Record> = {
'/database/': ['In this Database'],
};
-export const getDatasetDetailsPath = (
- datasetFQN: string,
- columnName?: string
-) => {
- let path = ROUTES.DATASET_DETAILS;
- path = path.replace(PLACEHOLDER_ROUTE_DATASET_FQN, datasetFQN);
+export const getTableDetailsPath = (tableFQN: string, columnName?: string) => {
+ let path = ROUTES.TABLE_DETAILS;
+ path = path.replace(PLACEHOLDER_ROUTE_TABLE_FQN, tableFQN);
return `${path}${columnName ? `.${columnName}` : ''}`;
};
@@ -179,10 +176,10 @@ export const getVersionPath = (
return path;
};
-export const getDatasetTabPath = (datasetFQN: string, tab = 'schema') => {
- let path = ROUTES.DATASET_DETAILS_WITH_TAB;
+export const getTableTabPath = (tableFQN: string, tab = 'schema') => {
+ let path = ROUTES.TABLE_DETAILS_WITH_TAB;
path = path
- .replace(PLACEHOLDER_ROUTE_DATASET_FQN, datasetFQN)
+ .replace(PLACEHOLDER_ROUTE_TABLE_FQN, tableFQN)
.replace(PLACEHOLDER_ROUTE_TAB, tab);
return path;
diff --git a/openmetadata-ui/src/main/resources/ui/src/interface/types.d.ts b/openmetadata-ui/src/main/resources/ui/src/interface/types.d.ts
index 8a6a4ec0f03..6d8fad5c9d7 100644
--- a/openmetadata-ui/src/main/resources/ui/src/interface/types.d.ts
+++ b/openmetadata-ui/src/main/resources/ui/src/interface/types.d.ts
@@ -386,7 +386,7 @@ declare module 'Models' {
// topic interface end
interface RecentlyViewedData {
- entityType: 'dataset' | 'topic' | 'dashboard' | 'pipeline';
+ entityType: 'table' | 'topic' | 'dashboard' | 'pipeline';
fqn: string;
serviceType?: string;
timestamp: number;
diff --git a/openmetadata-ui/src/main/resources/ui/src/pages/DatasetDetailsPage/DatasetDetailsPage.component.tsx b/openmetadata-ui/src/main/resources/ui/src/pages/DatasetDetailsPage/DatasetDetailsPage.component.tsx
index 731e7eb745e..7937b6610c1 100644
--- a/openmetadata-ui/src/main/resources/ui/src/pages/DatasetDetailsPage/DatasetDetailsPage.component.tsx
+++ b/openmetadata-ui/src/main/resources/ui/src/pages/DatasetDetailsPage/DatasetDetailsPage.component.tsx
@@ -30,9 +30,9 @@ import DatasetDetails from '../../components/DatasetDetails/DatasetDetails.compo
import Loader from '../../components/Loader/Loader';
import {
getDatabaseDetailsPath,
- getDatasetTabPath,
- getVersionPath,
getServiceDetailsPath,
+ getTableTabPath,
+ getVersionPath,
} from '../../constants/constants';
import { EntityType } from '../../enums/entity.enum';
import { ServiceCategory } from '../../enums/service.enum';
@@ -115,7 +115,7 @@ const DatasetDetailsPage: FunctionComponent = () => {
getCurrentDatasetTab(datasetTableTabs[currentTabIndex].path)
);
history.push({
- pathname: getDatasetTabPath(
+ pathname: getTableTabPath(
tableFQN,
datasetTableTabs[currentTabIndex].path
),
@@ -276,7 +276,7 @@ const DatasetDetailsPage: FunctionComponent = () => {
]);
addToRecentViewed({
- entityType: EntityType.DATASET,
+ entityType: EntityType.TABLE,
fqn: fullyQualifiedName,
serviceType: serviceType,
timestamp: 0,
diff --git a/openmetadata-ui/src/main/resources/ui/src/pages/EntityVersionPage/EntityVersionPage.component.tsx b/openmetadata-ui/src/main/resources/ui/src/pages/EntityVersionPage/EntityVersionPage.component.tsx
index 865f79cdcdb..66e38a4a7ee 100644
--- a/openmetadata-ui/src/main/resources/ui/src/pages/EntityVersionPage/EntityVersionPage.component.tsx
+++ b/openmetadata-ui/src/main/resources/ui/src/pages/EntityVersionPage/EntityVersionPage.component.tsx
@@ -43,9 +43,9 @@ import TopicVersion from '../../components/TopicVersion/TopicVersion.component';
import {
getDashboardDetailsPath,
getDatabaseDetailsPath,
- getDatasetDetailsPath,
getPipelineDetailsPath,
getServiceDetailsPath,
+ getTableDetailsPath,
getTopicDetailsPath,
getVersionPath,
} from '../../constants/constants';
@@ -94,7 +94,7 @@ const EntityVersionPage: FunctionComponent = () => {
const backHandler = () => {
switch (entityType) {
case EntityType.TABLE:
- history.push(getDatasetDetailsPath(entityFQN));
+ history.push(getTableDetailsPath(entityFQN));
break;
diff --git a/openmetadata-ui/src/main/resources/ui/src/pages/database-details/index.tsx b/openmetadata-ui/src/main/resources/ui/src/pages/database-details/index.tsx
index c924d1a38ee..9bbf747f9d9 100644
--- a/openmetadata-ui/src/main/resources/ui/src/pages/database-details/index.tsx
+++ b/openmetadata-ui/src/main/resources/ui/src/pages/database-details/index.tsx
@@ -36,9 +36,9 @@ import PageContainer from '../../components/containers/PageContainer';
import Loader from '../../components/Loader/Loader';
import Tags from '../../components/tags/tags';
import {
- getDatasetDetailsPath,
getExplorePathWithSearch,
getServiceDetailsPath,
+ getTableDetailsPath,
pagingObject,
} from '../../constants/constants';
import { ServiceCategory } from '../../enums/service.enum';
@@ -305,7 +305,7 @@ const DatabaseDetails: FunctionComponent = () => {
{
+
-