From 4b33693ffdbf8b0424dc91a6793a2a32ca03c77f Mon Sep 17 00:00:00 2001 From: darth-coder00 <86726556+darth-coder00@users.noreply.github.com> Date: Thu, 26 May 2022 23:46:51 +0530 Subject: [PATCH] Fix types issue post schema changes (#5161) --- .../AddNewService/metabase.spec.js | 8 +------ .../integration/Pages/TeamsAndUsers.spec.js | 11 +++++---- .../AddIngestion/AddIngestion.component.tsx | 18 ++++++++------- .../ServiceConfig/ConnectionConfigForm.tsx | 4 +++- .../resources/ui/src/pages/service/index.tsx | 23 ++----------------- .../resources/ui/src/pages/services/index.tsx | 2 +- 6 files changed, 23 insertions(+), 43 deletions(-) diff --git a/openmetadata-ui/src/main/resources/ui/cypress/integration/AddNewService/metabase.spec.js b/openmetadata-ui/src/main/resources/ui/cypress/integration/AddNewService/metabase.spec.js index bd8aa4e7e1b..c476c7597c3 100644 --- a/openmetadata-ui/src/main/resources/ui/cypress/integration/AddNewService/metabase.spec.js +++ b/openmetadata-ui/src/main/resources/ui/cypress/integration/AddNewService/metabase.spec.js @@ -11,10 +11,7 @@ * limitations under the License. */ -import { - goToAddNewServicePage, - testServiceCreationAndIngestion, -} from '../../common/common'; +import { goToAddNewServicePage, testServiceCreationAndIngestion } from '../../common/common'; describe('Metabase Ingestion', () => { it('add and ingest data', () => { @@ -31,9 +28,6 @@ describe('Metabase Ingestion', () => { cy.get('#root_hostPort') .scrollIntoView() .type(Cypress.env('metabaseHostPort')); - cy.get('#root_dbServiceName') - .scrollIntoView() - .type(Cypress.env('metabaseDbServiceName')); }; const addIngestionInput = () => { diff --git a/openmetadata-ui/src/main/resources/ui/cypress/integration/Pages/TeamsAndUsers.spec.js b/openmetadata-ui/src/main/resources/ui/cypress/integration/Pages/TeamsAndUsers.spec.js index 3ca07b0568f..97ffde355f3 100644 --- a/openmetadata-ui/src/main/resources/ui/cypress/integration/Pages/TeamsAndUsers.spec.js +++ b/openmetadata-ui/src/main/resources/ui/cypress/integration/Pages/TeamsAndUsers.spec.js @@ -143,9 +143,9 @@ describe('TeamsAndUsers page', () => { it('Add and remove user to team should work properly', () => { const searchString = 'aaron'; - - cy.wait(1000) - cy.get('[data-testid="add-new-user"]').should('be.visible'); + + cy.wait(1000); + cy.get('[data-testid="add-new-user"]').should('be.visible'); cy.get('[data-testid="add-new-user"]').click(); cy.get('.tw-modal-container').should('be.visible'); cy.get( @@ -276,11 +276,12 @@ describe('TeamsAndUsers page', () => { ).as('searchApi'); cy.wait('@searchApi'); - cy.get('[data-testid="table-link"]') .first() .contains(SEARCH_ENTITY_TABLE.table_1.term) - .click(); + .as('resultLink'); + cy.wait(500); // Wait for result to load after api success + cy.get('@resultLink').click(); cy.get('[data-testid="Manage"]').should('be.visible').click(); cy.get('[data-testid="owner-dropdown"]').should('be.visible').click(); diff --git a/openmetadata-ui/src/main/resources/ui/src/components/AddIngestion/AddIngestion.component.tsx b/openmetadata-ui/src/main/resources/ui/src/components/AddIngestion/AddIngestion.component.tsx index fee2a0a59e9..6086be7f206 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/AddIngestion/AddIngestion.component.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/components/AddIngestion/AddIngestion.component.tsx @@ -23,15 +23,15 @@ import { FilterPatternEnum } from '../../enums/filterPattern.enum'; import { FormSubmitType } from '../../enums/form.enum'; import { ServiceCategory } from '../../enums/service.enum'; import { - ConfigClass, CreateIngestionPipeline, LogLevels, PipelineType, } from '../../generated/api/services/ingestionPipelines/createIngestionPipeline'; import { - ConfigType, + ConfigClass, FilterPattern, IngestionPipeline, + TypeEnum, } from '../../generated/entity/services/ingestionPipelines/ingestionPipeline'; import { DatabaseServiceMetadataPipelineClass, @@ -219,13 +219,13 @@ const AddIngestion = ({ const usageIngestionType = useMemo(() => { return ( (data?.source.sourceConfig.config as ConfigClass)?.type ?? - ConfigType.DatabaseUsage + TypeEnum.DatabaseUsage ); }, [data]); const profilerIngestionType = useMemo(() => { return ( (data?.source.sourceConfig.config as ConfigClass)?.type ?? - ConfigType.Profiler + TypeEnum.Profiler ); }, [data]); @@ -399,7 +399,7 @@ const AddIngestion = ({ ), markDeletedTables, ...DatabaseConfigData, - type: ConfigType.DatabaseMetadata, + type: TypeEnum.DatabaseMetadata, }; } case ServiceCategory.MESSAGING_SERVICES: { @@ -408,7 +408,7 @@ const AddIngestion = ({ topicFilterPattern, showTopicFilter ), - type: ConfigType.MessagingMetadata, + type: TypeEnum.MessagingMetadata, }; } case ServiceCategory.DASHBOARD_SERVICES: { @@ -421,7 +421,7 @@ const AddIngestion = ({ dashboardFilterPattern, showDashboardFilter ), - type: ConfigType.DashboardMetadata, + type: TypeEnum.DashboardMetadata, }; } default: { @@ -476,7 +476,9 @@ const AddIngestion = ({ type: serviceCategory.slice(0, -1), }, sourceConfig: { - config: getConfigData(pipelineType), + config: getConfigData( + pipelineType + ) as CreateIngestionPipeline['sourceConfig']['config'], }, }; diff --git a/openmetadata-ui/src/main/resources/ui/src/components/ServiceConfig/ConnectionConfigForm.tsx b/openmetadata-ui/src/main/resources/ui/src/components/ServiceConfig/ConnectionConfigForm.tsx index 6c489dd73f5..7aa7c43f139 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/ServiceConfig/ConnectionConfigForm.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/components/ServiceConfig/ConnectionConfigForm.tsx @@ -74,7 +74,9 @@ const ConnectionConfigForm: FunctionComponent = ({ data.hasOwnProperty('connection') ? ((data as DatabaseService | MessagingService | DashboardService) .connection.config as ConfigData) - : ({ pipelineUrl: (data as PipelineService).pipelineUrl } as ConfigData) + : ({ + pipelineUrl: (data as PipelineService).connection.config?.hostPort, + } as ConfigData) : ({} as ConfigData); const handleSave = (data: ISubmitEvent) => { diff --git a/openmetadata-ui/src/main/resources/ui/src/pages/service/index.tsx b/openmetadata-ui/src/main/resources/ui/src/pages/service/index.tsx index 7738744bf89..99efe194af8 100644 --- a/openmetadata-ui/src/main/resources/ui/src/pages/service/index.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/pages/service/index.tsx @@ -735,31 +735,12 @@ const ServicePage: FunctionComponent = () => { setIsEdit(false); }; - const getServiceSpecificData = (serviceDetails?: ServiceDataObj) => { - switch (serviceCategory) { - case ServiceCategory.DATABASE_SERVICES: - case ServiceCategory.MESSAGING_SERVICES: - case ServiceCategory.DASHBOARD_SERVICES: - return { - connection: serviceDetails?.connection, - }; - - case ServiceCategory.PIPELINE_SERVICES: - return { - pipelineUrl: serviceDetails?.pipelineUrl, - }; - - default: - return {}; - } - }; - const onDescriptionUpdate = (updatedHTML: string) => { if (description !== updatedHTML && !isUndefined(serviceDetails)) { const { id } = serviceDetails; const updatedServiceDetails = { - ...getServiceSpecificData(serviceDetails), + ...serviceDetails, name: serviceDetails.name, serviceType: serviceDetails.serviceType, description: updatedHTML, @@ -788,7 +769,7 @@ const ServicePage: FunctionComponent = () => { const handleUpdateOwner = (owner: ServiceDataObj['owner']) => { const updatedData = { - ...getServiceSpecificData(serviceDetails), + ...serviceDetails, name: serviceDetails?.name, serviceType: serviceDetails?.serviceType, owner, diff --git a/openmetadata-ui/src/main/resources/ui/src/pages/services/index.tsx b/openmetadata-ui/src/main/resources/ui/src/pages/services/index.tsx index beb8a5b6117..3500490f6ae 100644 --- a/openmetadata-ui/src/main/resources/ui/src/pages/services/index.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/pages/services/index.tsx @@ -308,7 +308,7 @@ const ServicesPage = () => { - {pipelineService.pipelineUrl} + {pipelineService.connection.config?.hostPort}