From 722d7ef4737ed7c4e00a8ac42fa1df46a86a6f8e Mon Sep 17 00:00:00 2001 From: Shailesh Parmar Date: Thu, 17 Nov 2022 14:33:26 +0530 Subject: [PATCH] Fixed UI: Lineage exit full screen is not working for pipeline entity #8831 (#8832) --- .../PipelineDetails/PipelineDetails.component.tsx | 8 +++----- .../components/PipelineDetails/PipelineDetails.test.tsx | 4 ++-- .../main/resources/ui/src/constants/pipeline.constants.ts | 2 +- .../src/main/resources/ui/src/locale/languages/en-us.json | 2 +- .../resources/ui/src/pages/LineagePage/LineagePage.tsx | 5 +---- 5 files changed, 8 insertions(+), 13 deletions(-) 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 1c4e23a6789..087ee3db7eb 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 @@ -679,7 +679,7 @@ const PipelineDetails = ({ useEffect(() => { switch (tab) { - case PIPELINE_DETAILS_TABS.EntityLineage: + case PIPELINE_DETAILS_TABS.Lineage: !deleted && isEmpty(entityLineage) && getLineageData(); break; @@ -955,10 +955,8 @@ const PipelineDetails = ({ {t('label.entity-lineage')} - }> + key={PIPELINE_DETAILS_TABS.Lineage} + tab={{t('label.lineage')}}>
{ container, 'label.activity-feed-and-task-plural' ); - const lineageTab = await findByText(container, 'label.entity-lineage'); + const lineageTab = await findByText(container, 'label.lineage'); const executionsTab = await findByText(container, 'label.executions'); const customPropertiesTab = await findByText( container, @@ -311,7 +311,7 @@ describe('Test PipelineDetails component', () => { wrapper: MemoryRouter, } ); - const activityFeedTab = await findByText(container, 'label.entity-lineage'); + const activityFeedTab = await findByText(container, 'label.lineage'); await act(async () => { fireEvent.click(activityFeedTab); diff --git a/openmetadata-ui/src/main/resources/ui/src/constants/pipeline.constants.ts b/openmetadata-ui/src/main/resources/ui/src/constants/pipeline.constants.ts index ebdd6df8f3d..7e760887bf1 100644 --- a/openmetadata-ui/src/main/resources/ui/src/constants/pipeline.constants.ts +++ b/openmetadata-ui/src/main/resources/ui/src/constants/pipeline.constants.ts @@ -15,6 +15,6 @@ export enum PIPELINE_DETAILS_TABS { Tasks = 'tasks', ActivityFeedsAndTasks = 'activity-feeds-tasks', Executions = 'executions', - EntityLineage = 'entity-lineage', + Lineage = 'lineage', CustomProperties = 'custom-properties', } diff --git a/openmetadata-ui/src/main/resources/ui/src/locale/languages/en-us.json b/openmetadata-ui/src/main/resources/ui/src/locale/languages/en-us.json index 87452e9288d..08ae7ba4ee1 100644 --- a/openmetadata-ui/src/main/resources/ui/src/locale/languages/en-us.json +++ b/openmetadata-ui/src/main/resources/ui/src/locale/languages/en-us.json @@ -232,7 +232,7 @@ "tasks": "Tasks", "activity-feed-and-task-plural": "Activity Feeds & tasks", "executions": "Executions", - "entity-lineage": "Entity Lineage", + "lineage": "Lineage", "custom-properties": "Custom Properties", "dag-view": "DAG view", "read-more": "read more", diff --git a/openmetadata-ui/src/main/resources/ui/src/pages/LineagePage/LineagePage.tsx b/openmetadata-ui/src/main/resources/ui/src/pages/LineagePage/LineagePage.tsx index ab1bffed1e2..3013b8b44bb 100644 --- a/openmetadata-ui/src/main/resources/ui/src/pages/LineagePage/LineagePage.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/pages/LineagePage/LineagePage.tsx @@ -203,10 +203,7 @@ const LineagePage = () => { const pipelineRes = await getPipelineByFqn(entityFQN, ''); updateBreadcrumb( pipelineRes, - getPipelineDetailsPath( - entityFQN, - PIPELINE_DETAILS_TABS.EntityLineage - ) + getPipelineDetailsPath(entityFQN, PIPELINE_DETAILS_TABS.Lineage) ); }