From f4919b283335903ec2be7837b6dc2e3395f74d0c Mon Sep 17 00:00:00 2001 From: Chirag Madlani <12962843+chirag-madlani@users.noreply.github.com> Date: Wed, 14 Feb 2024 13:10:21 +0530 Subject: [PATCH 1/3] chore(ui): organise component directory structure --- .../src/main/resources/ui/src/App.tsx | 14 +-- .../ActivityFeedCard/ActivityFeedCardV1.tsx | 2 +- .../FeedCardBody/FeedCardBody.tsx | 2 +- .../ActivityFeedCard/PopoverContent.tsx | 2 +- .../ActivityFeedDrawer/ActivityFeedDrawer.tsx | 2 +- .../ActivityFeedEditor/ActivityFeedEditor.tsx | 2 +- .../ActivityFeedListV1.component.tsx | 2 +- .../ActivityFeedTab.component.tsx | 6 +- .../ActivityThreadPanelBody.tsx | 2 +- .../FeedEditor/FeedEditor.interface.ts | 0 .../FeedEditor/FeedEditor.test.tsx | 0 .../FeedEditor/FeedEditor.tsx | 18 ++-- .../FeedEditor/feed-editor.less | 0 .../Reactions/Emoji.test.tsx | 4 +- .../{ => ActivityFeed}/Reactions/Emoji.tsx | 10 +- .../Reactions/Reaction.test.tsx | 2 +- .../{ => ActivityFeed}/Reactions/Reaction.tsx | 6 +- .../Reactions/Reactions.test.tsx | 2 +- .../Reactions/Reactions.tsx | 10 +- .../Reactions/reactions.less | 2 +- .../Shared/ActivityFeedActions.tsx | 2 +- .../ui/src/components/AppBar/Appbar.tsx | 4 +- .../ui/src/components/AppBar/Suggestions.tsx | 30 +++--- .../ui/src/components/AppRouter/AppRouter.tsx | 2 +- .../AppRouter/AuthenticatedAppRouter.tsx | 16 ++-- .../AppRouter/withSuspenseFallback.js | 2 +- .../ui/src/components/AppTour/Tour.tsx | 2 +- .../AppAuthenticators/OidcAuthenticator.tsx | 2 +- .../Auth/AuthProviders/AuthProvider.tsx | 4 +- .../Extensions/image/ImageComponent.tsx | 2 +- .../ClassificationDetails.interface.ts | 8 +- .../ClassificationDetails.tsx | 64 ++++++------- .../ContainerChildren.test.tsx | 0 .../ContainerChildren/ContainerChildren.tsx | 6 +- .../ContainerDataModel.interface.ts | 0 .../ContainerDataModel.test.tsx | 0 .../ContainerDataModel/ContainerDataModel.tsx | 10 +- .../ContainerVersion.component.tsx | 34 +++---- .../ContainerVersion.interface.ts | 10 +- .../ContainerVersion.test.tsx | 32 +++---- .../DashboardDetails.component.tsx | 82 ++++++++-------- .../DashboardDetails.interface.ts | 12 +-- .../DashboardDetails.test.tsx | 10 +- .../DashboardVersion.component.tsx | 34 +++---- .../DashboardVersion.interface.ts | 10 +- .../DashboardVersion.test.tsx | 4 +- .../DataModelVersion.component.tsx | 30 +++--- .../DataModelVersion.interface.ts | 10 +- .../DataModels/DataModelDetails.component.tsx | 54 +++++------ .../DataModels/DataModelDetails.interface.tsx | 16 ++-- .../DataModel}/DataModels/DataModelsTable.tsx | 28 +++--- .../ModelTab/ModelTab.component.tsx | 20 ++-- .../ModelTab/ModelTab.interface.tsx | 4 +- .../AssetSelectionModal.interface.ts | 2 +- .../AssetSelectionModal.tsx | 2 +- .../asset-selection-model.style.less | 0 .../DataAssetAsyncSelectList.interface.ts | 6 +- .../DataAssetAsyncSelectList.test.tsx | 4 +- .../DataAssetAsyncSelectList.tsx | 22 ++--- .../DataAssetsHeader.component.tsx | 8 +- .../DataAssetsHeader.interface.ts | 4 +- .../DataAssetsTab/DataAssetsTab.component.tsx | 2 +- .../DataProductsSelectForm.interface.ts | 6 +- .../DataProductsSelectForm.test.tsx | 0 .../DataProductsSelectForm.tsx | 5 +- .../DataProductsContainer.component.tsx | 24 ++--- .../DataProductsDetailsPage.component.tsx | 38 ++++---- .../DataProductsPage.component.tsx | 2 +- .../DataProductSelectList.interface.ts | 4 +- .../DataProductsSelectList.tsx | 12 +-- .../AddDataQualityTest.interface.ts | 12 +-- .../AddDataQualityTestV1.tsx | 52 +++++----- .../EditTestCaseModal.test.tsx | 2 +- .../AddDataQualityTest/EditTestCaseModal.tsx | 29 +++--- .../AddDataQualityTest/TestSuiteIngestion.tsx | 24 ++--- .../components/ParameterForm.test.tsx | 4 +- .../components/ParameterForm.tsx | 12 +-- .../components/RightPanel.tsx | 0 .../components/TestCaseForm.test.tsx | 4 +- .../components/TestCaseForm.tsx | 33 ++++--- .../components/TestSuiteScheduler.tsx | 2 +- .../AddDataQualityTest/rightPanelData.ts | 0 .../AddTestCaseList.component.tsx | 22 ++--- .../AddTestCaseList.interface.ts | 2 +- .../CustomMetricForm.component.tsx | 12 +-- .../CustomMetricForm.interface.ts | 4 +- .../CustomMetricForm.test.tsx | 0 .../IncidentManagerPageHeader.component.tsx | 38 ++++---- .../IncidentManagerPageHeader.interface.ts | 4 +- .../Severity/Severity.component.tsx | 14 +-- .../Severity/Severity.interface.ts | 2 +- .../Severity/Severity.test.tsx | 8 +- .../Severity/SeverityModal.component.tsx | 2 +- .../Severity/SeverityModal.test.tsx | 2 +- .../TestCaseIncidentTab.component.tsx | 28 +++--- .../TestCaseIncidentTab.test.tsx | 2 +- .../test-case-incident-tab.style.less | 2 +- .../TestCaseResultTab.component.tsx | 28 +++--- .../TestCaseResultTab.interface.ts | 2 +- .../TestCaseResultTab.test.tsx | 4 +- .../test-case-result-tab.style.less | 2 +- ...estCaseIncidentManagerStatus.component.tsx | 20 ++-- ...TestCaseIncidentManagerStatus.interface.ts | 4 +- .../TestCaseIncidentManagerStatus.test.tsx | 4 +- .../incident-manager.style.less | 2 +- .../TestCases/TestCases.component.tsx | 4 +- .../AddTestSuiteForm.test.tsx | 8 +- .../AddTestSuiteForm/AddTestSuiteForm.tsx | 16 ++-- .../TestSuitePipelineTab.component.tsx | 48 +++++----- .../TestSuitePipelineTab.test.tsx | 6 +- .../TestSuiteStepper.interface.tsx | 2 +- .../TestSuiteStepper.test.tsx | 39 +++----- .../TestSuiteStepper/TestSuiteStepper.tsx | 32 +++---- .../TestSuites/TestSuites.component.tsx | 6 +- .../ColumnFilter/ColumnFilter.component.tsx | 0 .../DataQualityTab}/DataQualityTab.test.tsx | 4 +- .../DataQualityTab}/DataQualityTab.tsx | 62 ++++++------ .../DataQualityTab}/data-quality-tab.less | 2 +- .../ProfilerDashboard/profiler-dashboard.less | 0 .../profilerDashboard.interface.ts | 12 +-- .../ProfilerDetailsCard.test.tsx | 4 +- .../ProfilerDetailsCard.tsx | 10 +- .../ProfilerLatestValue.test.tsx | 4 +- .../ProfilerLatestValue.tsx | 4 +- .../ProfilerSettings/CustomRangeWidget.tsx | 0 .../CustomeRangeWidget.test.tsx | 0 .../Profiler}/ProfilerSettings/MockSchema.ts | 0 .../ProfilerObjectFieldTemplate.tsx | 0 .../ProfilerSettings.test.tsx | 2 +- .../ProfilerSettings/ProfilerSettings.tsx | 20 ++-- .../ProfilerSettings/profiler-settings.less | 0 .../TestSummary}/TestSummary.test.tsx | 8 +- .../Profiler/TestSummary}/TestSummary.tsx | 38 ++++---- .../Profiler/TestSummary}/test-summary.less | 2 +- .../TestSummaryCustomTooltip.component.tsx | 8 +- .../TestSummaryCustomTooltip.test.tsx | 0 .../RetentionPeriod.component.test.tsx | 15 +-- .../RetentionPeriod.component.tsx | 8 +- .../RetentionPeriod.interface.ts | 2 +- .../SampleDataTable/RowData.test.tsx | 0 .../SampleDataTable/RowData.tsx | 4 +- .../SampleDataTable/SampleData.interface.ts | 2 +- .../SampleDataTable.component.tsx | 39 ++++---- .../SampleDataTable/SampleDataTable.test.tsx | 6 +- .../SampleDataTable/sample-data-table.less | 0 .../SampleDataWithMessages/MessageCard.tsx | 0 .../SampleDataWithMessages.test.tsx | 4 +- .../SampleDataWithMessages.tsx | 18 ++-- .../SampleDataWithMessages/message-card.less | 2 +- .../SchemaEditor/SchemaEditor.test.tsx | 0 .../SchemaEditor/SchemaEditor.tsx | 6 +- .../SchemaTab/SchemaTab.component.tsx | 2 +- .../SchemaTab/SchemaTab.interfaces.ts | 4 +- .../SchemaTab/SchemaTab.test.tsx | 2 +- .../SchemaTable/SchemaTable.component.tsx | 50 +++++----- .../SchemaTable/SchemaTable.interface.ts | 8 +- .../SchemaTable/SchemaTable.test.tsx | 41 ++++---- .../StoredProcedureVersion.component.tsx | 28 +++--- .../StoredProcedureVersion.interface.ts | 10 +- .../StoredProcedureVersion.test.tsx | 2 +- .../TableDataCardBody.test.tsx | 2 +- .../TableDataCardBody/TableDataCardBody.tsx | 10 +- .../TableDescription.component.tsx | 10 +- .../TableDescription.interface.ts | 6 +- .../TableDescription.test.tsx | 13 +-- .../TableProfiler}/ColumnPickerMenu.tsx | 0 .../ColumnProfileTable.test.tsx | 2 +- .../ColumnProfileTable.tsx | 60 ++++++------ .../TableProfiler}/ColumnSummary.tsx | 4 +- .../CustomMetricGraphs.component.tsx | 33 ++++--- .../CustomMetricGraphs.interface.ts | 4 +- .../CustomMetricGraphs.test.tsx | 22 +++-- .../custom-metric-graphs.style.less | 0 .../NoProfilerBanner.component.tsx | 2 +- .../NoProfilerBanner.test.tsx | 0 .../ProfilerProgressWidget.test.tsx | 0 .../ProfilerProgressWidget.tsx | 0 .../ProfilerSettingsModal.test.tsx | 4 +- .../ProfilerSettingsModal.tsx | 18 ++-- .../QualityTab/QualityTab.component.tsx | 40 ++++---- .../TableProfiler}/SingleColumnProfile.tsx | 8 +- .../TableProfiler/TableProfiler.interface.ts | 10 +- .../TableProfiler/TableProfiler.test.tsx | 4 +- .../TableProfiler/TableProfiler.tsx | 14 +-- .../TableProfilerChart.test.tsx | 6 +- .../TableProfilerChart.tsx | 40 ++++---- .../TableProfiler/TableProfilerProvider.tsx | 30 +++--- .../TableProfiler/table-profiler.less | 2 +- .../TableQueries/QueryCard.test.tsx | 4 +- .../{ => Database}/TableQueries/QueryCard.tsx | 24 ++--- .../QueryCardExtraOption.component.tsx | 22 ++--- .../QueryCardExtraOption.interface.ts | 4 +- .../QueryCardExtraOption.test.tsx | 10 +- .../query-card-extra-option.style.less | 2 +- .../QueryUsedByOtherTable.component.tsx | 14 +-- .../QueryUsedByOtherTable.test.tsx | 8 +- .../TableQueries/TableQueries.interface.ts | 8 +- .../TableQueries/TableQueries.test.tsx | 7 +- .../TableQueries/TableQueries.tsx | 42 ++++---- .../TableQueryRightPanel.component.tsx | 22 ++--- .../TableQueryRightPanel.interface.ts | 4 +- .../TableQueryRightPanel.test.tsx | 8 +- .../TableQueries/table-queries.style.less | 2 +- .../TableTags/TableTags.component.tsx | 6 +- .../TableTags/TableTags.interface.ts | 16 ++-- .../TableTags/TableTags.test.tsx | 10 +- .../TableVersion/TableVersion.component.tsx | 34 +++---- .../TableVersion/TableVersion.interface.ts | 10 +- .../TableVersion/TableVersion.test.tsx | 2 +- .../AddDomainForm/AddDomainForm.component.tsx | 4 +- .../DomainDetailsPage.component.tsx | 14 +-- .../DomainLeftPanel.component.tsx | 6 +- .../Domain/DomainPage.component.tsx | 6 +- .../Domain/DomainProvider/DomainProvider.tsx | 2 +- .../DataProductsTab.component.tsx | 2 +- .../DataProductsTab.interface.ts | 2 +- .../DocumentationTab.component.tsx | 8 +- .../DomainVersion/DomainVersion.component.tsx | 2 +- .../EdgeInfoDrawer.component.tsx | 4 +- .../AppPipelineModel/AddPipeLineModal.tsx | 2 +- .../CustomControls.component.tsx | 2 +- .../EntityLineage/CustomControls.test.tsx | 2 +- .../EntityLineage/CustomEdge.component.tsx | 2 +- .../EntityLineage/CustomNodeV1.component.tsx | 2 +- .../EntityLineage/CustomNodeV1.test.tsx | 2 +- .../Entity/EntityList/EntityList.tsx | 2 +- .../EntityRightPanel.test.tsx | 9 +- .../EntityRightPanel/EntityRightPanel.tsx | 2 +- .../Task/TaskTab/TaskTab.component.test.tsx | 60 ++++++------ .../Task/TaskTab/TaskTab.component.tsx | 76 +++++++-------- .../Task/TaskTab/TaskTab.interface.ts | 8 +- .../{ => Entity}/Task/TaskTab/task-tab.less | 2 +- ...TaskTabIncidentManagerHeader.component.tsx | 22 ++--- .../TaskTabIncidentManagerHeader.test.tsx | 4 +- ...ask-tab-incident-manager-header.style.less | 2 +- .../VersionTable/VersionTable.component.tsx | 24 ++--- .../VersionTable/VersionTable.interfaces.ts | 4 +- .../VersionTable/VersionTable.test.tsx | 13 ++- .../Voting/Voting.component.test.tsx | 2 +- .../{ => Entity}/Voting/Voting.component.tsx | 6 +- .../{ => Entity}/Voting/voting.interface.ts | 4 +- .../AdvanceSearchProvider.component.tsx | 2 +- .../ContainerSummary.component.tsx | 2 +- .../DashboardSummary.component.tsx | 4 +- .../DataModelSummary.component.tsx | 2 +- .../DataProductSummary.component.tsx | 2 +- .../DatabaseSchemaSummary.component.tsx | 2 +- .../DatabaseSummary.component.tsx | 2 +- .../EntitySummaryPanel.component.tsx | 12 +-- .../GlossaryTermSummary.component.tsx | 4 +- .../MlModelSummary.component.tsx | 2 +- .../PipelineSummary.component.tsx | 2 +- .../SearchIndexSummary.component.tsx | 2 +- .../ServiceSummary.component.tsx | 2 +- .../StoredProcedureSummary.component.tsx | 4 +- .../TableSummary/TableSummary.component.tsx | 12 +-- .../TagsSummary/TagsSummary.component.tsx | 2 +- .../TopicSummary/TopicSummary.component.tsx | 4 +- .../ExploreSearchCard/ExploreSearchCard.tsx | 4 +- .../ExploreV1/ExploreV1.component.tsx | 2 +- .../GlossaryDetails.component.tsx | 2 +- .../GlossaryDetails.interface.ts | 4 +- .../GlossaryDetails/GlossaryDetails.test.tsx | 2 +- .../GlossaryDetailsRightPanel.component.tsx | 4 +- .../GlossaryDetailsRightPanel.test.tsx | 2 +- .../GlossaryHeader.component.tsx | 4 +- .../GlossaryHeader.interface.tsx | 4 +- .../GlossaryTermModal.component.tsx | 2 +- .../GlossaryTermTab.component.tsx | 4 +- .../GlossaryTermTab.interface.ts | 2 +- .../GlossaryTermsV1.component.tsx | 4 +- .../GlossaryTermsV1.interface.ts | 4 +- .../GlossaryTerms/GlossaryTermsV1.test.tsx | 2 +- .../tabs/AssetsTabs.interface.ts | 2 +- .../tabs/GlossaryOverviewTab.component.tsx | 2 +- .../tabs/GlossaryTermReferences.tsx | 4 +- .../tabs/GlossaryTermSynonyms.tsx | 4 +- .../GlossaryTerms/tabs/RelatedTerms.tsx | 4 +- .../Glossary/GlossaryV1.component.tsx | 12 +-- .../Glossary/GlossaryV1.interfaces.ts | 2 +- .../GlossaryVersion.component.tsx | 2 +- .../components/Lineage/Lineage.component.tsx | 4 +- .../MlModelDetail/MlModel.interface.ts | 6 +- .../MlModelDetail.component.test.tsx | 32 +++---- .../MlModelDetail/MlModelDetail.component.tsx | 68 ++++++------- .../MlModelDetail/MlModelDetail.interface.ts | 8 +- .../MlModelFeaturesList.test.tsx | 35 +++---- .../MlModelDetail/MlModelFeaturesList.tsx | 18 ++-- .../MlModelDetail/SourceList.component.tsx | 6 +- .../MlModelDetail/source-list.less | 0 .../MlModelVersion.component.tsx | 43 +++++---- .../MlModelVersion.interface.tsx | 10 +- .../MlModelVersion/MlModelVersion.test.tsx | 36 +++---- .../ModalWithMarkdownEditor.tsx | 2 +- .../ModalWithQueryEditor.tsx | 4 +- .../SchemaModal/SchemaModal.interface.ts | 2 +- .../Modals/SchemaModal/SchemaModal.tsx | 2 +- .../StyleModal/StyleModal.component.tsx | 2 +- .../AddWidgetModal.interface.ts | 2 +- .../AddWidgetModal/AddWidgetModal.test.tsx | 4 +- .../AddWidgetModal/AddWidgetModal.tsx | 18 ++-- .../AddWidgetTabContent.test.tsx | 2 +- .../AddWidgetModal/AddWidgetTabContent.tsx | 2 +- .../AddWidgetModal/add-widget-modal.less | 2 +- .../CustomizeMyData.interface.ts | 4 +- .../CustomizeMyData/CustomizeMyData.test.tsx | 6 +- .../CustomizeMyData/CustomizeMyData.tsx | 40 ++++---- .../CustomizeMyData/customize-my-data.less | 2 +- .../EmptyWidgetPlaceholder.interface.ts | 2 +- .../EmptyWidgetPlaceholder.test.tsx | 4 +- .../EmptyWidgetPlaceholder.tsx | 4 +- .../empty-widget-placeholder.less | 2 +- .../GithubStarCard.component.tsx | 18 ++-- .../GithubStarCard/GithubStarCard.test.tsx | 2 +- .../github-star-card.style.less | 2 +- .../MyDataWidget/MyDataWidget.component.tsx | 2 +- .../AddEditPersona.component.tsx | 22 ++--- .../AddEditPersona.interface.ts | 2 +- .../PersonaDetailsCard.test.tsx | 0 .../PersonaDetailsCard/PersonaDetailsCard.tsx | 8 +- .../PersonaSelectableList.component.tsx | 17 ++-- .../PersonaSelectableList.interface.ts | 2 +- .../RightSidebar/AnnouncementsWidget.tsx | 2 +- .../WelcomeScreen/WelcomScreen.test.tsx | 0 .../WelcomeScreen/WelcomeScreen.component.tsx | 15 ++- .../WelcomeScreen/welcome-screen.style.less | 2 +- .../FeedsWidget/FeedsWidget.component.tsx | 36 +++---- .../Widgets/FeedsWidget/FeedsWidget.test.tsx | 0 .../Widgets/FeedsWidget/feeds-widget.less | 2 +- .../KPIWidget/KPIWidget.component.tsx | 28 +++--- .../Widgets}/KPIWidget/KPIWidget.interface.ts | 2 +- .../Widgets}/KPIWidget/kpi-widget.less | 0 .../RecentlyViewed/RecentlyViewed.test.tsx | 2 +- .../Widgets/RecentlyViewed/RecentlyViewed.tsx | 22 ++--- .../RecentlyViewed/recently-viewed.less | 2 +- .../TotalDataAssetsWidget.component.tsx | 29 +++--- .../TotalDataAssetsWidget.interface.ts | 2 +- .../total-data-assets-widget.less | 0 .../ui/src/components/NavBar/NavBar.tsx | 6 +- .../components/NavBar/PopupAlertClassBase.ts | 2 +- .../NotificationBox.component.tsx | 2 +- .../components/PageLayoutV1/PageLayoutV1.tsx | 2 +- .../Execution/Execution.component.test.tsx | 14 +-- .../Execution/Execution.component.tsx | 18 ++-- .../ListView/ListViewTab.component.test.tsx | 8 +- .../ListView/ListViewTab.component.tsx | 8 +- .../TreeView/TreeViewTab.component.tsx | 11 ++- .../Execution/TreeView/tree-view-tab.less | 0 .../{ => Pipeline}/Execution/execution.less | 0 .../PipelineDetails.component.tsx | 88 ++++++++--------- .../PipelineDetails.interface.ts | 8 +- .../PipelineDetails/PipelineDetails.test.tsx | 85 ++++++++-------- .../pipeline-details.style.less | 2 +- .../PipelineVersion.component.tsx | 43 +++++---- .../PipelineVersion.interface.ts | 10 +- .../PipelineVersion/PipelineVersion.test.tsx | 48 ++++------ .../TasksDAGView/TaskNode/TaskNode.test.tsx | 0 .../TasksDAGView/TaskNode/TaskNode.tsx | 2 +- .../TaskNode/task-node.style.less | 2 +- .../TasksDAGView/TasksDAGView.test.tsx | 2 +- .../TasksDAGView/TasksDAGView.tsx | 14 +-- .../TasksDAGView/tasks-dag-view.style.less | 0 .../SearchDropdown/SearchDropdown.tsx | 2 +- .../SearchIndexVersion.interface.ts | 2 +- .../SearchIndexVersion/SearchIndexVersion.tsx | 8 +- .../components/SearchedData/SearchedData.tsx | 2 +- .../AlertsDetails/AlertDetails.component.tsx | 16 ++-- .../AlertsDetails/AlertDetails.test.tsx | 12 +-- .../AppDetails/AppDetails.component.tsx | 46 ++++----- .../AppDetails/AppDetails.interface.ts | 2 +- .../AppDetails/AppDetails.test.tsx | 30 +++--- .../AppDetails/ApplicationSchemaClassBase.ts | 2 +- .../Applications/AppDetails/app-details.less | 2 +- .../AppInstallVerifyCard.component.tsx | 14 +-- .../AppInstallVerifyCard.interface.ts | 2 +- .../AppInstallVerifyCard.test.tsx | 12 +-- .../app-install-verify-card.less | 0 .../AppLogo/AppLogo.component.tsx | 2 +- .../AppLogsViewer/AppLogsViewer.component.tsx | 8 +- .../AppLogsViewer/AppLogsViewer.interface.ts | 2 +- .../AppLogsViewer/AppLogsViewer.test.tsx | 8 +- .../AppRunsHistory.component.tsx | 38 ++++---- .../AppRunsHistory.interface.ts | 4 +- .../AppRunsHistory/AppRunsHistory.test.tsx | 28 +++--- .../AppSchedule/AppSchedule.component.tsx | 8 +- .../AppSchedule/AppSchedule.test.tsx | 28 +++--- .../AppSchedule/AppScheduleProps.interface.ts | 2 +- .../ApplicationCard.component.tsx | 2 +- .../ApplicationCard.interface.ts | 0 .../ApplicationCard/ApplicationCard.test.tsx | 0 .../MarketPlaceAppDetails.component.tsx | 28 +++--- .../MarketPlaceAppDetails.interface.ts | 0 .../MarketPlaceAppDetails.test.tsx | 25 +++-- .../market-place-app-details.less | 2 +- .../Bot}/BotDetails/AuthMechanism.tsx | 10 +- .../Bot}/BotDetails/AuthMechanismForm.tsx | 8 +- .../Bot}/BotDetails/BotDetails.component.tsx | 30 +++--- .../Bot}/BotDetails/BotDetails.interfaces.ts | 6 +- .../Bot}/BotDetails/BotDetails.test.tsx | 12 +-- .../Bot}/BotDetails/auth-mechanism.less | 0 .../Bot}/BotDetails/bot-details.less | 0 .../Bot}/BotListV1/BotListV1.component.tsx | 54 +++++------ .../Bot}/BotListV1/BotListV1.interfaces.ts | 0 .../AddCustomProperty.test.tsx | 19 ++-- .../AddCustomProperty/AddCustomProperty.tsx | 39 ++++---- .../CustomPropertyTable.interface.ts | 2 +- .../CustomPropertyTable.test.tsx | 11 +-- .../CustomProperty}/CustomPropertyTable.tsx | 24 ++--- .../EmailConfigForm.component.tsx | 6 +- .../Email}/TestEmail/TestEmail.component.tsx | 6 +- .../Email}/TestEmail/TestEmail.test.tsx | 6 +- .../AddIngestion/AddIngestion.component.tsx | 27 +++--- .../AddIngestion/AddIngestion.test.tsx | 19 ++-- .../IngestionWorkflow.interface.ts | 8 +- .../Steps/ScheduleInterval.test.tsx | 2 +- .../AddIngestion/Steps/ScheduleInterval.tsx | 4 +- .../AddService/AddService.component.tsx | 41 ++++---- .../AddService/AddService.interface.ts | 8 +- .../Services}/AddService/AddService.test.tsx | 15 +-- .../Steps/ConfigureService.test.tsx | 0 .../AddService/Steps/ConfigureService.tsx | 9 +- .../Steps/SelectServiceType.test.tsx | 2 +- .../AddService/Steps/SelectServiceType.tsx | 22 ++--- .../AddService/Steps/Steps.interface.ts | 2 +- .../AddService/Steps/select-service-type.less | 2 +- .../AddIngestionButton.component.tsx | 10 +- .../Ingestion/AddIngestionButton.interface.ts | 10 +- .../Ingestion/Ingestion.component.tsx | 20 ++-- .../Services}/Ingestion/Ingestion.mock.ts | 2 +- .../Services}/Ingestion/Ingestion.test.tsx | 20 ++-- .../IngestionListTable.component.tsx | 20 ++-- .../Ingestion/IngestionListTable.interface.ts | 10 +- .../Ingestion/IngestionListTable.test.tsx | 14 +-- .../IngestinoPipelineList.test.tsx | 20 ++-- .../IngestionPipelineList.component.tsx | 37 +++---- .../IngestionRecentRun.test.tsx | 10 +- .../IngestionRecentRuns.component.tsx | 14 +-- .../ingestion-recent-run.style.less | 0 .../IngestionStepper.component.tsx | 0 .../IngestionStepper.test.tsx | 0 .../ingestion-stepper.style.less | 0 .../IngestionWorkflowForm.tsx | 22 ++--- .../Ingestion/PipelineActions.component.tsx | 12 +-- .../Ingestion/PipelineActions.interface.ts | 6 +- .../Ingestion/ingestion.interface.ts | 12 +-- .../ServiceConfig/ConnectionConfigForm.tsx | 51 +++++----- .../Services}/ServiceConfig/ServiceConfig.tsx | 14 +-- .../ServiceConnectionDetails.component.tsx | 41 ++++---- .../{ => Settings}/Services/Services.tsx | 66 ++++++------- .../SettingItemCard.component.tsx | 0 .../SettingItemCard/SettingsItemCard.test.tsx | 0 .../setting-item-card.style.less | 0 .../Team/TeamDetails/RolesAndPoliciesList.tsx | 14 +-- .../TeamDetails/TeamDetailsV1.interface.ts | 16 ++-- .../Team/TeamDetails/TeamDetailsV1.tsx | 96 +++++++++---------- .../Team/TeamDetails/TeamDetailsV1.utils.tsx | 2 +- .../Team/TeamDetails/TeamHierarchy.test.tsx | 15 +-- .../Team/TeamDetails/TeamHierarchy.tsx | 32 +++---- .../TeamsHeadingLabel.component.tsx | 10 +- .../TeamsHeadingLabel.test.tsx | 10 +- .../TeamsInfo.component.tsx | 22 ++--- .../TeamsHeaderSection/TeamsInfo.test.tsx | 16 ++-- .../TeamsSubscription.component.tsx | 10 +- .../TeamsSubscription.test.tsx | 0 .../TeamDetails/UserTab/UserTab.component.tsx | 64 ++++++------- .../TeamDetails/UserTab/UserTab.interface.ts | 6 +- .../Team/TeamDetails/UserTab/UserTab.test.tsx | 37 +++---- .../Team/TeamDetails/team.interface.ts | 7 +- .../Team/TeamDetails/teams.less | 2 +- .../TeamImportResult.component.tsx | 10 +- .../TeamImportResult.interface.ts | 2 +- .../TeamImportResult.test.tsx | 2 +- .../TeamsSelectable.interface.ts | 2 +- .../TeamsSelectable/TeamsSelectable.test.tsx | 4 +- .../Team}/TeamsSelectable/TeamsSelectable.tsx | 10 +- .../UserImportResult.component.tsx | 10 +- .../UserImportResult.interface.ts | 2 +- .../UserImportResult.test.tsx | 2 +- .../AccessTokenCard.component.tsx | 18 ++-- .../AccessTokenCard.interfaces.ts | 4 +- .../AccessTokenCard/AccessTokenCard.test.tsx | 12 +-- .../Users/ChangePasswordForm.test.tsx | 0 .../Users/ChangePasswordForm.tsx | 6 +- .../CreateUser/CreateUser.component.tsx | 37 +++---- .../Users}/CreateUser/CreateUser.interface.ts | 4 +- .../Users}/CreateUser/CreateUser.test.tsx | 4 +- .../UserProfileIcon.component.tsx | 18 ++-- .../UserProfileIcon/UserProfileIcon.test.tsx | 29 +++--- .../UserProfileIcon/user-profile-icon.less | 0 .../Users/Users.component.test.tsx | 51 +++------- .../{ => Settings}/Users/Users.component.tsx | 46 ++++----- .../{ => Settings}/Users/Users.interface.ts | 4 +- .../UserProfileDetails.component.tsx | 37 +++---- .../UserProfileDetails.interface.ts | 2 +- .../UserProfileDetails.test.tsx | 26 ++--- .../UserProfileImage.component.tsx | 4 +- .../UserProfileImage.interface.ts | 2 +- .../UserProfileImage.test.tsx | 6 +- .../UserProfileInheritedRoles.component.tsx | 4 +- .../UserProfileInheritedRoles.interface.ts | 2 +- .../UserProfileInheritedRoles.test.tsx | 2 +- .../UserProfileRoles.component.tsx | 22 ++--- .../UserProfileRoles.interface.ts | 2 +- .../UserProfileRoles.test.tsx | 16 ++-- .../UserProfileTeams.component.tsx | 18 ++-- .../UserProfileTeams.interface.ts | 2 +- .../UserProfileTeams.test.tsx | 14 +-- .../Users/UsersTab/UsersTab.test.tsx | 7 +- .../Users/UsersTab/UsersTabs.component.tsx | 16 ++-- .../{ => Settings}/Users/mocks/User.mocks.ts | 10 +- .../{ => Settings}/Users/users.less | 2 +- .../Tag/TagsContainerV2/TagsContainerV2.tsx | 4 +- .../TagsSelectForm.component.tsx | 2 +- .../TagsSelectForm.interface.ts | 2 +- .../TopicDetails/TopicDetails.component.tsx | 72 +++++++------- .../TopicDetails/TopicDetails.interface.ts | 12 +-- .../TopicDetails/TopicDetails.mock.ts | 4 +- .../TopicDetails/TopicDetails.test.tsx | 4 +- .../TopicSchema/TopicSchema.interface.tsx | 0 .../TopicSchema/TopicSchema.mock.ts | 0 .../TopicSchema/TopicSchema.test.tsx | 2 +- .../TopicSchema/TopicSchema.tsx | 16 ++-- .../TopicVersion/TopicVersion.component.tsx | 35 +++---- .../TopicVersion/TopicVersion.interface.ts | 10 +- .../TopicVersion/TopicVersion.test.tsx | 4 +- .../Chart/Chart.interface.ts | 4 +- .../Chart/CustomBarChart.test.tsx | 4 +- .../Chart/CustomBarChart.tsx | 6 +- .../DataDistributionHistogram.component.tsx | 12 +-- .../Chart/DataDistributionHistogram.test.tsx | 9 +- .../Chart/OperationDateBarChart.test.tsx | 4 +- .../Chart/OperationDateBarChart.tsx | 8 +- .../{ => common}/AsyncSelect/AsyncSelect.tsx | 0 .../AsyncSelectList.interface.ts | 6 +- .../AsyncSelectList/AsyncSelectList.test.tsx | 2 +- .../AsyncSelectList/AsyncSelectList.tsx | 20 ++-- .../common/BrandImage/BrandImage.tsx | 2 +- .../CopyToClipboardButton.test.tsx | 0 .../CopyToClipboardButton.tsx | 4 +- .../CustomPropertyTable.tsx | 10 +- .../CustomPropertyTable/PropertyInput.tsx | 2 +- .../DatePickerMenu.component.tsx | 8 +- .../DatePickerMenu/date-picker-menu.less | 0 .../DocumentTitle/DocumentTitle.tsx | 0 .../DomainLabel/DomainLabel.component.tsx | 2 +- .../Draggable/DraggableBodyRow.tsx | 2 +- .../DraggableBodyRowProps.interface.ts | 4 +- .../EntityImport/EntityImport.component.tsx | 4 +- .../ErrorBoundary/ErrorBoundary.tsx | 2 +- .../ErrorBoundary/ErrorFallback.tsx | 2 +- .../ErrorPlaceHolderIngestion.tsx | 2 +- .../{ => common}/Form/Form.interface.ts | 0 .../{ => common}/Form/FormItemLabel.test.tsx | 0 .../{ => common}/Form/FormItemLabel.tsx | 2 +- .../JSONSchemaTemplate/ArrayFieldTemplate.tsx | 2 +- .../BooleanFieldTemplate.tsx | 0 .../DescriptionFieldTemplate.tsx | 0 .../FieldErrorTemplate.test.tsx | 0 .../FieldErrorTemplate/FieldErrorTemplate.tsx | 0 .../ObjectFieldTemplate.tsx | 2 +- .../WorkflowArrayFieldTemplate.tsx | 0 .../object-field-template.less | 0 .../JsonSchemaWidgets/AsyncSelectWidget.tsx | 6 +- .../JsonSchemaWidgets/MultiSelectWidget.tsx | 0 .../JsonSchemaWidgets/PasswordWidget.tsx | 0 .../common/FormBuilder/FormBuilder.tsx | 16 ++-- .../InlineEdit/InlineEdit.component.tsx | 0 .../InlineEdit/InlineEdit.interface.ts | 0 .../InlineEdit/InlineEdit.test.tsx | 0 .../ListView/ListView.component.tsx | 8 +- .../ListView/ListView.interface.ts | 0 .../{ => common}/ListView/ListView.test.tsx | 0 .../{ => common}/Loader/Loader.less | 0 .../{ => common}/Loader/Loader.test.tsx | 0 .../components/{ => common}/Loader/Loader.tsx | 0 .../{ => common}/LoginButton/LoginButton.tsx | 0 .../LoginButton/login-button.style.less | 2 +- .../PopOverCard/EntityPopOverCard.test.tsx | 2 +- .../common/PopOverCard/EntityPopOverCard.tsx | 4 +- .../common/PopOverCard/UserPopOverCard.tsx | 4 +- .../common/ProfilePicture/ProfilePicture.tsx | 6 +- .../QueryViewer/QueryViewer.component.tsx | 2 +- .../ResizablePanels/ResizablePanels.tsx | 2 +- .../SearchBar.component.tsx | 2 +- .../SelectableList.component.tsx | 2 +- .../ServiceDocPanel/ServiceDocPanel.tsx | 2 +- .../TitleBreadcrumbSkeleton.component.tsx | 0 .../ControlElements.component.tsx | 0 .../LabelCountSkeleton.component.tsx | 0 .../GlossaryV1LeftPanelSkeleton.component.tsx | 2 +- .../EntityListSkeleton.component.tsx | 2 +- .../EntityListSkeleton.test.tsx | 0 .../Skeleton/Skeleton.interfaces.ts | 0 .../SummaryPanelSkeleton.component.tsx | 8 +- .../Tags/TagsLeftPanelSkeleton.component.tsx | 2 +- .../SliderWithInput.interface.ts | 0 .../SliderWithInput/SliderWithInput.tsx | 0 .../common/SuccessScreen/SuccessScreen.tsx | 2 +- .../TableDataCardV2/TableDataCardV2.tsx | 2 +- .../TabsLabel/TabsLabel.component.tsx | 2 +- .../TabsLabel/TabsLabel.interface.ts | 0 .../{ => common}/TabsLabel/TabsLabel.test.tsx | 0 .../TagButton/TagButton.component.tsx | 2 +- .../common/TestConnection/TestConnection.tsx | 2 +- .../TestIndicator/TestIndicator.test.tsx | 2 +- .../common/TestIndicator/TestIndicator.tsx | 2 +- .../components/common/TierCard/TierCard.tsx | 2 +- .../TitleBreadcrumb.component.tsx | 2 +- .../ToggleExpandButton.interface.ts | 0 .../ToggleExpandButton.test.tsx | 0 .../ToggleExpandButton/ToggleExpandButton.tsx | 6 +- .../ui/src/constants/Assets.constants.ts | 2 +- .../src/constants/GlobalSettings.constants.ts | 2 +- .../ui/src/constants/Teams.constants.ts | 2 +- .../ApplicationConfigProvider.test.tsx | 0 .../ApplicationConfigProvider.tsx | 2 +- .../DirectionProvider/DirectionProvider.tsx | 0 .../GlobalSearchProvider.interface.tsx | 2 +- .../GlobalSearchProvider.tsx | 2 +- .../GlobalSearchSuggestions.interface.ts | 0 .../global-search-suggestions.less | 0 .../LineageProvider.interface.tsx | 12 +-- .../LineageProvider/LineageProvider.test.tsx | 30 +++--- .../LineageProvider/LineageProvider.tsx | 32 +++---- .../PermissionProvider.interface.ts | 0 .../PermissionProvider.test.tsx | 2 +- .../PermissionProvider/PermissionProvider.tsx | 4 +- .../TourProvider/TourProvider.tsx | 0 .../WebSocketProvider/WebSocketProvider.tsx | 2 +- .../main/resources/ui/src/hoc/withLoader.tsx | 2 +- .../src/hooks/user-profile/useUserProfile.ts | 2 +- .../ui/src/mocks/ContainerVersion.mock.ts | 2 +- .../resources/ui/src/mocks/Glossary.mock.ts | 2 +- .../ui/src/mocks/IngestionListTable.mock.ts | 2 +- .../ui/src/mocks/MlModelVersion.mock.ts | 2 +- .../ui/src/mocks/Permissions.mock.ts | 2 +- .../ui/src/mocks/PipelineVersion.mock.ts | 2 +- .../src/mocks/StoredProcedureVersion.mock.ts | 2 +- .../ui/src/mocks/TableVersion.mock.ts | 2 +- .../ui/src/mocks/TopicVersion.mock.ts | 2 +- .../ui/src/mocks/VersionTable.mock.ts | 2 +- .../ui/src/mocks/dashboardVersion.mock.ts | 2 +- .../AddCustomMetricPage.tsx | 12 +-- .../AddDataQualityTestPage.tsx | 4 +- .../AddGlossary/AddGlossaryPage.component.tsx | 4 +- .../AddIngestionPage.component.tsx | 4 +- .../AddNotificationPage.tsx | 2 +- .../AddObservabilityPage.tsx | 2 +- .../TeamAndUserSelectItem.interface.ts | 2 +- .../TeamAndUserSelectItem.tsx | 4 +- .../AddQueryPage/AddQueryPage.component.tsx | 6 +- .../AddServicePage.component.tsx | 2 +- .../AlertDetailsPage/AlertDetailsPage.tsx | 2 +- .../AlertsActivityFeedPage.tsx | 4 +- .../pages/AppInstall/AppInstall.component.tsx | 10 +- .../Application/ApplicationPage.test.tsx | 2 +- .../src/pages/Application/ApplicationPage.tsx | 2 +- .../pages/BotDetailsPage/BotDetailsPage.tsx | 8 +- .../pages/BotsPageV1/BotsPageV1.component.tsx | 2 +- .../ClassificationVersionPage.test.tsx | 6 +- .../ClassificationVersionPage.tsx | 8 +- .../EditLoginConfigurationPage.tsx | 2 +- .../LoginConfigurationPage.tsx | 2 +- .../src/pages/ContainerPage/ContainerPage.tsx | 22 ++--- .../CreateUserPage.component.tsx | 2 +- .../CustomLogoConfigSettingsPage.tsx | 2 +- .../CustomPropertiesPageV1.tsx | 16 ++-- .../CustomizablePage/CustomizablePage.tsx | 4 +- .../DashboardDetailsPage.component.tsx | 10 +- .../DashboardDetailsPage.test.tsx | 2 +- .../DataInsightHeader.component.tsx | 6 +- .../DataInsightPage.component.tsx | 4 +- .../DataInsightPage/DataInsightProvider.tsx | 2 +- .../pages/DataInsightPage/KPIList.test.tsx | 2 +- .../ui/src/pages/DataInsightPage/KPIList.tsx | 4 +- .../DataModelPage/DataModelPage.component.tsx | 10 +- .../DataModelPage/DataModelPage.test.tsx | 2 +- .../src/pages/DataQuality/DataQualityPage.tsx | 4 +- .../DatabaseDetailsPage.tsx | 18 ++-- .../DatabaseSchemaPage.component.tsx | 18 ++-- .../DatabaseSchemaPage.test.tsx | 2 +- .../DatabaseSchemaVersionPage.tsx | 16 ++-- .../DatabaseVersionPage.tsx | 16 ++-- .../EditConnectionFormPage.component.tsx | 4 +- .../EditCustomLogoConfig.tsx | 2 +- .../EditEmailConfigPage.component.tsx | 2 +- .../EditIngestionPage.component.tsx | 4 +- .../EmailConfigSettingsPage.component.tsx | 2 +- .../EntityVersionPage.component.tsx | 28 +++--- .../ExplorePage/ExplorePageV1.component.tsx | 4 +- .../GlobalSettingCategoryPage.tsx | 4 +- .../GlobalSettingPage/GlobalSettingPage.tsx | 4 +- .../GlossaryLeftPanel.component.tsx | 6 +- .../GlossaryPage/GlossaryPage.component.tsx | 8 +- .../IncidentManagerDetailPage.tsx | 14 +-- .../IncidentManager/IncidentManagerPage.tsx | 12 +-- .../ui/src/pages/KPIPage/EditKPIPage.tsx | 2 +- .../src/pages/LoginPage/SignInPage.test.tsx | 22 ++--- .../ui/src/pages/LoginPage/SignInPage.tsx | 4 +- .../pages/LogsViewer/LogsViewer.component.tsx | 6 +- .../pages/MarketPlacePage/MarketPlacePage.tsx | 4 +- .../MlModelPage.component.test.tsx | 15 +-- .../MlModelPage/MlModelPage.component.tsx | 10 +- .../pages/MyDataPage/MyDataPage.component.tsx | 6 +- .../src/pages/MyDataPage/MyDataPage.test.tsx | 2 +- .../PersonaDetailsPage/PersonaDetailsPage.tsx | 8 +- .../Persona/PersonaListPage/PersonaPage.tsx | 4 +- .../PipelineDetailsPage.component.tsx | 10 +- .../PoliciesDetailPage/AddRulePage.tsx | 2 +- .../PoliciesDetailPage/EditRulePage.tsx | 2 +- .../PoliciesDetailPage/PoliciesDetailPage.tsx | 2 +- .../PoliciesListPage/PoliciesListPage.tsx | 4 +- .../pages/QueryPage/QueryPage.component.tsx | 12 +-- .../AddAttributeModal/AddAttributeModal.tsx | 2 +- .../RolesDetailPage/RolesDetailPage.tsx | 2 +- .../RolesPage/RolesListPage/RolesListPage.tsx | 4 +- .../SearchIndexDetailsPage.test.tsx | 2 +- .../SearchIndexDetailsPage.tsx | 20 ++-- .../SearchIndexFieldsTab.tsx | 2 +- .../SearchIndexFieldsTable.tsx | 4 +- .../ServiceDetailsPage/ServiceDetailsPage.tsx | 14 +-- .../ServiceMainTabContent.tsx | 4 +- .../ServiceVersionPage.test.tsx | 2 +- .../ServiceVersionPage/ServiceVersionPage.tsx | 8 +- .../src/pages/ServicesPage/ServicesPage.tsx | 6 +- .../ui/src/pages/SignUp/SignUpPage.tsx | 2 +- .../StoredProcedurePage.test.tsx | 2 +- .../StoredProcedure/StoredProcedurePage.tsx | 20 ++-- .../TableDetailsPageV1.test.tsx | 2 +- .../TableDetailsPageV1/TableDetailsPageV1.tsx | 28 +++--- .../ui/src/pages/TagsPage/TagsPage.tsx | 16 ++-- .../RequestDescriptionPage.tsx | 2 +- .../RequestTagPage/RequestTagPage.tsx | 2 +- .../UpdateDescriptionPage.tsx | 2 +- .../TasksPage/UpdateTagPage/UpdateTagPage.tsx | 2 +- .../pages/TasksPage/shared/TagSuggestion.tsx | 4 +- .../ImportTeamsPage/ImportTeamsPage.test.tsx | 2 +- .../ImportTeamsPage/ImportTeamsPage.tsx | 10 +- .../ui/src/pages/TeamsPage/TeamsPage.tsx | 10 +- .../TestSuiteDetailsPage.component.tsx | 10 +- .../TestSuiteDetailsPage.test.tsx | 2 +- .../TestSuiteIngestionPage.test.tsx | 25 ++--- .../TestSuiteIngestionPage.tsx | 8 +- .../TopicDetailsPage.component.tsx | 12 +-- .../src/pages/TourPage/TourPage.component.tsx | 2 +- .../ui/src/pages/TourPage/TourPage.test.tsx | 2 +- .../src/pages/UserPage/UserPage.component.tsx | 4 +- .../resources/ui/src/rest/SearchIndexAPI.ts | 2 +- .../resources/ui/src/rest/applicationAPI.ts | 2 +- .../resources/ui/src/rest/dashboardAPI.ts | 2 +- .../resources/ui/src/rest/dataModelsAPI.ts | 2 +- .../main/resources/ui/src/rest/databaseAPI.ts | 2 +- .../main/resources/ui/src/rest/glossaryAPI.ts | 2 +- .../main/resources/ui/src/rest/mlModelAPI.ts | 2 +- .../resources/ui/src/rest/permissionAPI.ts | 2 +- .../main/resources/ui/src/rest/pipelineAPI.ts | 2 +- .../main/resources/ui/src/rest/queryAPI.ts | 2 +- .../main/resources/ui/src/rest/storageAPI.ts | 2 +- .../ui/src/rest/storedProceduresAPI.ts | 2 +- .../main/resources/ui/src/rest/tableAPI.ts | 2 +- .../main/resources/ui/src/rest/topicsAPI.ts | 2 +- .../ui/src/utils/Alerts/AlertsUtil.tsx | 2 +- .../ui/src/utils/Assets/AssetsUtils.ts | 2 +- .../ui/src/utils/ClassificationUtils.tsx | 2 +- .../resources/ui/src/utils/CommonUtils.tsx | 2 +- .../utils/CustomizableLandingPageUtils.tsx | 2 +- .../ui/src/utils/CustomizePageClassBase.ts | 8 +- .../src/utils/DataQualityAndProfilerUtils.ts | 2 +- .../EntityImport/EntityImportUtils.test.ts | 2 +- .../ui/src/utils/EntityLineageUtils.tsx | 2 +- .../resources/ui/src/utils/EntityUtils.tsx | 4 +- .../main/resources/ui/src/utils/FeedUtils.tsx | 2 +- .../ui/src/utils/GlobalSettingsUtils.tsx | 8 +- .../ui/src/utils/LogsViewer.utils.ts | 2 +- .../ui/src/utils/PermissionsUtils.ts | 2 +- .../ui/src/utils/Query/QueryUtils.ts | 4 +- .../resources/ui/src/utils/SearchClassBase.ts | 8 +- .../resources/ui/src/utils/SearchUtils.tsx | 8 +- .../ui/src/utils/ServiceUtilClassBase.ts | 2 +- .../resources/ui/src/utils/ServiceUtils.tsx | 2 +- .../src/utils/TableProfilerUtils.interface.ts | 2 +- .../ui/src/utils/TableProfilerUtils.ts | 2 +- .../src/utils/TableTags/TableTags.utils.tsx | 2 +- .../main/resources/ui/src/utils/TagsUtils.tsx | 2 +- .../ui/src/utils/TopicDetailsUtils.ts | 2 +- .../main/resources/ui/src/utils/formUtils.tsx | 10 +- 786 files changed, 3508 insertions(+), 3546 deletions(-) rename openmetadata-ui/src/main/resources/ui/src/components/{ => ActivityFeed}/FeedEditor/FeedEditor.interface.ts (100%) rename openmetadata-ui/src/main/resources/ui/src/components/{ => ActivityFeed}/FeedEditor/FeedEditor.test.tsx (100%) rename openmetadata-ui/src/main/resources/ui/src/components/{ => ActivityFeed}/FeedEditor/FeedEditor.tsx (94%) rename openmetadata-ui/src/main/resources/ui/src/components/{ => ActivityFeed}/FeedEditor/feed-editor.less (100%) rename openmetadata-ui/src/main/resources/ui/src/components/{ => ActivityFeed}/Reactions/Emoji.test.tsx (95%) rename openmetadata-ui/src/main/resources/ui/src/components/{ => ActivityFeed}/Reactions/Emoji.tsx (91%) rename openmetadata-ui/src/main/resources/ui/src/components/{ => ActivityFeed}/Reactions/Reaction.test.tsx (97%) rename openmetadata-ui/src/main/resources/ui/src/components/{ => ActivityFeed}/Reactions/Reaction.tsx (91%) rename openmetadata-ui/src/main/resources/ui/src/components/{ => ActivityFeed}/Reactions/Reactions.test.tsx (98%) rename openmetadata-ui/src/main/resources/ui/src/components/{ => ActivityFeed}/Reactions/Reactions.tsx (91%) rename openmetadata-ui/src/main/resources/ui/src/components/{ => ActivityFeed}/Reactions/reactions.less (96%) rename openmetadata-ui/src/main/resources/ui/src/components/{ => Classifications}/ClassificationDetails/ClassificationDetails.interface.ts (79%) rename openmetadata-ui/src/main/resources/ui/src/components/{ => Classifications}/ClassificationDetails/ClassificationDetails.tsx (88%) rename openmetadata-ui/src/main/resources/ui/src/components/{ContainerDetail => Container}/ContainerChildren/ContainerChildren.test.tsx (100%) rename openmetadata-ui/src/main/resources/ui/src/components/{ContainerDetail => Container}/ContainerChildren/ContainerChildren.tsx (91%) rename openmetadata-ui/src/main/resources/ui/src/components/{ContainerDetail => Container}/ContainerDataModel/ContainerDataModel.interface.ts (100%) rename openmetadata-ui/src/main/resources/ui/src/components/{ContainerDetail => Container}/ContainerDataModel/ContainerDataModel.test.tsx (100%) rename openmetadata-ui/src/main/resources/ui/src/components/{ContainerDetail => Container}/ContainerDataModel/ContainerDataModel.tsx (94%) rename openmetadata-ui/src/main/resources/ui/src/components/{ => Container}/ContainerVersion/ContainerVersion.component.tsx (85%) rename openmetadata-ui/src/main/resources/ui/src/components/{ => Container}/ContainerVersion/ContainerVersion.interface.ts (75%) rename openmetadata-ui/src/main/resources/ui/src/components/{ => Container}/ContainerVersion/ContainerVersion.test.tsx (82%) rename openmetadata-ui/src/main/resources/ui/src/components/{ => Dashboard}/DashboardDetails/DashboardDetails.component.tsx (87%) rename openmetadata-ui/src/main/resources/ui/src/components/{ => Dashboard}/DashboardDetails/DashboardDetails.interface.ts (78%) rename openmetadata-ui/src/main/resources/ui/src/components/{ => Dashboard}/DashboardDetails/DashboardDetails.test.tsx (95%) rename openmetadata-ui/src/main/resources/ui/src/components/{ => Dashboard}/DashboardVersion/DashboardVersion.component.tsx (86%) rename openmetadata-ui/src/main/resources/ui/src/components/{ => Dashboard}/DashboardVersion/DashboardVersion.interface.ts (75%) rename openmetadata-ui/src/main/resources/ui/src/components/{ => Dashboard}/DashboardVersion/DashboardVersion.test.tsx (98%) rename openmetadata-ui/src/main/resources/ui/src/components/{ => Dashboard/DataModel}/DataModelVersion/DataModelVersion.component.tsx (84%) rename openmetadata-ui/src/main/resources/ui/src/components/{ => Dashboard/DataModel}/DataModelVersion/DataModelVersion.interface.ts (71%) rename openmetadata-ui/src/main/resources/ui/src/components/{ => Dashboard/DataModel}/DataModels/DataModelDetails.component.tsx (85%) rename openmetadata-ui/src/main/resources/ui/src/components/{ => Dashboard/DataModel}/DataModels/DataModelDetails.interface.tsx (69%) rename openmetadata-ui/src/main/resources/ui/src/components/{ => Dashboard/DataModel}/DataModels/DataModelsTable.tsx (84%) rename openmetadata-ui/src/main/resources/ui/src/components/{ => Dashboard/DataModel}/DataModels/ModelTab/ModelTab.component.tsx (88%) rename openmetadata-ui/src/main/resources/ui/src/components/{ => Dashboard/DataModel}/DataModels/ModelTab/ModelTab.interface.tsx (84%) rename openmetadata-ui/src/main/resources/ui/src/components/{Assets => DataAssets}/AssetsSelectionModal/AssetSelectionModal.interface.ts (97%) rename openmetadata-ui/src/main/resources/ui/src/components/{Assets => DataAssets}/AssetsSelectionModal/AssetSelectionModal.tsx (99%) rename openmetadata-ui/src/main/resources/ui/src/components/{Assets => DataAssets}/AssetsSelectionModal/asset-selection-model.style.less (100%) rename openmetadata-ui/src/main/resources/ui/src/components/{ => DataAssets}/DataAssetAsyncSelectList/DataAssetAsyncSelectList.interface.ts (86%) rename openmetadata-ui/src/main/resources/ui/src/components/{ => DataAssets}/DataAssetAsyncSelectList/DataAssetAsyncSelectList.test.tsx (98%) rename openmetadata-ui/src/main/resources/ui/src/components/{ => DataAssets}/DataAssetAsyncSelectList/DataAssetAsyncSelectList.tsx (91%) rename openmetadata-ui/src/main/resources/ui/src/components/{ => DataProducts}/DataProductSelectForm/DataProductsSelectForm.interface.ts (79%) rename openmetadata-ui/src/main/resources/ui/src/components/{ => DataProducts}/DataProductSelectForm/DataProductsSelectForm.test.tsx (100%) rename openmetadata-ui/src/main/resources/ui/src/components/{ => DataProducts}/DataProductSelectForm/DataProductsSelectForm.tsx (91%) rename openmetadata-ui/src/main/resources/ui/src/components/{ => DataProducts}/DataProductsContainer/DataProductsContainer.component.tsx (86%) rename openmetadata-ui/src/main/resources/ui/src/components/{ => DataProducts}/DataProductsSelectList/DataProductSelectList.interface.ts (89%) rename openmetadata-ui/src/main/resources/ui/src/components/{ => DataProducts}/DataProductsSelectList/DataProductsSelectList.tsx (93%) rename openmetadata-ui/src/main/resources/ui/src/components/{ => DataQuality}/AddDataQualityTest/AddDataQualityTest.interface.ts (80%) rename openmetadata-ui/src/main/resources/ui/src/components/{ => DataQuality}/AddDataQualityTest/AddDataQualityTestV1.tsx (83%) rename openmetadata-ui/src/main/resources/ui/src/components/{ => DataQuality}/AddDataQualityTest/EditTestCaseModal.test.tsx (99%) rename openmetadata-ui/src/main/resources/ui/src/components/{ => DataQuality}/AddDataQualityTest/EditTestCaseModal.tsx (91%) rename openmetadata-ui/src/main/resources/ui/src/components/{ => DataQuality}/AddDataQualityTest/TestSuiteIngestion.tsx (90%) rename openmetadata-ui/src/main/resources/ui/src/components/{ => DataQuality}/AddDataQualityTest/components/ParameterForm.test.tsx (96%) rename openmetadata-ui/src/main/resources/ui/src/components/{ => DataQuality}/AddDataQualityTest/components/ParameterForm.tsx (95%) rename openmetadata-ui/src/main/resources/ui/src/components/{ => DataQuality}/AddDataQualityTest/components/RightPanel.tsx (100%) rename openmetadata-ui/src/main/resources/ui/src/components/{ => DataQuality}/AddDataQualityTest/components/TestCaseForm.test.tsx (98%) rename openmetadata-ui/src/main/resources/ui/src/components/{ => DataQuality}/AddDataQualityTest/components/TestCaseForm.tsx (92%) rename openmetadata-ui/src/main/resources/ui/src/components/{ => DataQuality}/AddDataQualityTest/components/TestSuiteScheduler.tsx (96%) rename openmetadata-ui/src/main/resources/ui/src/components/{ => DataQuality}/AddDataQualityTest/rightPanelData.ts (100%) rename openmetadata-ui/src/main/resources/ui/src/components/{ => DataQuality}/AddTestCaseList/AddTestCaseList.component.tsx (91%) rename openmetadata-ui/src/main/resources/ui/src/components/{ => DataQuality}/AddTestCaseList/AddTestCaseList.interface.ts (91%) rename openmetadata-ui/src/main/resources/ui/src/components/{ => DataQuality}/CustomMetricForm/CustomMetricForm.component.tsx (92%) rename openmetadata-ui/src/main/resources/ui/src/components/{ => DataQuality}/CustomMetricForm/CustomMetricForm.interface.ts (86%) rename openmetadata-ui/src/main/resources/ui/src/components/{ => DataQuality}/CustomMetricForm/CustomMetricForm.test.tsx (100%) rename openmetadata-ui/src/main/resources/ui/src/components/{ => DataQuality}/IncidentManager/IncidentManagerPageHeader/IncidentManagerPageHeader.component.tsx (86%) rename openmetadata-ui/src/main/resources/ui/src/components/{ => DataQuality}/IncidentManager/IncidentManagerPageHeader/IncidentManagerPageHeader.interface.ts (85%) rename openmetadata-ui/src/main/resources/ui/src/components/{ => DataQuality}/IncidentManager/Severity/Severity.component.tsx (79%) rename openmetadata-ui/src/main/resources/ui/src/components/{ => DataQuality}/IncidentManager/Severity/Severity.interface.ts (91%) rename openmetadata-ui/src/main/resources/ui/src/components/{ => DataQuality}/IncidentManager/Severity/Severity.test.tsx (92%) rename openmetadata-ui/src/main/resources/ui/src/components/{ => DataQuality}/IncidentManager/Severity/SeverityModal.component.tsx (96%) rename openmetadata-ui/src/main/resources/ui/src/components/{ => DataQuality}/IncidentManager/Severity/SeverityModal.test.tsx (95%) rename openmetadata-ui/src/main/resources/ui/src/components/{ => DataQuality}/IncidentManager/TestCaseIncidentTab/TestCaseIncidentTab.component.tsx (83%) rename openmetadata-ui/src/main/resources/ui/src/components/{ => DataQuality}/IncidentManager/TestCaseIncidentTab/TestCaseIncidentTab.test.tsx (98%) rename openmetadata-ui/src/main/resources/ui/src/components/{ => DataQuality}/IncidentManager/TestCaseIncidentTab/test-case-incident-tab.style.less (95%) rename openmetadata-ui/src/main/resources/ui/src/components/{ => DataQuality}/IncidentManager/TestCaseResultTab/TestCaseResultTab.component.tsx (86%) rename openmetadata-ui/src/main/resources/ui/src/components/{ => DataQuality}/IncidentManager/TestCaseResultTab/TestCaseResultTab.interface.ts (91%) rename openmetadata-ui/src/main/resources/ui/src/components/{ => DataQuality}/IncidentManager/TestCaseResultTab/TestCaseResultTab.test.tsx (97%) rename openmetadata-ui/src/main/resources/ui/src/components/{ => DataQuality}/IncidentManager/TestCaseResultTab/test-case-result-tab.style.less (92%) rename openmetadata-ui/src/main/resources/ui/src/components/{ => DataQuality}/IncidentManager/TestCaseStatus/TestCaseIncidentManagerStatus.component.tsx (79%) rename openmetadata-ui/src/main/resources/ui/src/components/{ => DataQuality}/IncidentManager/TestCaseStatus/TestCaseIncidentManagerStatus.interface.ts (82%) rename openmetadata-ui/src/main/resources/ui/src/components/{ => DataQuality}/IncidentManager/TestCaseStatus/TestCaseIncidentManagerStatus.test.tsx (96%) rename openmetadata-ui/src/main/resources/ui/src/components/{ => DataQuality}/IncidentManager/incident-manager.style.less (96%) rename openmetadata-ui/src/main/resources/ui/src/components/{ => DataQuality}/TestSuite/AddTestSuiteForm/AddTestSuiteForm.test.tsx (90%) rename openmetadata-ui/src/main/resources/ui/src/components/{ => DataQuality}/TestSuite/AddTestSuiteForm/AddTestSuiteForm.tsx (87%) rename openmetadata-ui/src/main/resources/ui/src/components/{ => DataQuality}/TestSuite/TestSuitePipelineTab/TestSuitePipelineTab.component.tsx (91%) rename openmetadata-ui/src/main/resources/ui/src/components/{ => DataQuality}/TestSuite/TestSuitePipelineTab/TestSuitePipelineTab.test.tsx (92%) rename openmetadata-ui/src/main/resources/ui/src/components/{ => DataQuality}/TestSuite/TestSuiteStepper/TestSuiteStepper.interface.tsx (92%) rename openmetadata-ui/src/main/resources/ui/src/components/{ => DataQuality}/TestSuite/TestSuiteStepper/TestSuiteStepper.test.tsx (71%) rename openmetadata-ui/src/main/resources/ui/src/components/{ => DataQuality}/TestSuite/TestSuiteStepper/TestSuiteStepper.tsx (81%) rename openmetadata-ui/src/main/resources/ui/src/components/{Table => Database}/ColumnFilter/ColumnFilter.component.tsx (100%) rename openmetadata-ui/src/main/resources/ui/src/components/{ProfilerDashboard/component => Database/Profiler/DataQualityTab}/DataQualityTab.test.tsx (97%) rename openmetadata-ui/src/main/resources/ui/src/components/{ProfilerDashboard/component => Database/Profiler/DataQualityTab}/DataQualityTab.tsx (85%) rename openmetadata-ui/src/main/resources/ui/src/components/{ProfilerDashboard/component => Database/Profiler/DataQualityTab}/data-quality-tab.less (92%) rename openmetadata-ui/src/main/resources/ui/src/components/{ => Database/Profiler}/ProfilerDashboard/profiler-dashboard.less (100%) rename openmetadata-ui/src/main/resources/ui/src/components/{ => Database/Profiler}/ProfilerDashboard/profilerDashboard.interface.ts (87%) rename openmetadata-ui/src/main/resources/ui/src/components/{ProfilerDashboard/component => Database/Profiler/ProfilerDetailsCard}/ProfilerDetailsCard.test.tsx (91%) rename openmetadata-ui/src/main/resources/ui/src/components/{ProfilerDashboard/component => Database/Profiler/ProfilerDetailsCard}/ProfilerDetailsCard.tsx (91%) rename openmetadata-ui/src/main/resources/ui/src/components/{ProfilerDashboard/component => Database/Profiler/ProfilerLatestValue}/ProfilerLatestValue.test.tsx (93%) rename openmetadata-ui/src/main/resources/ui/src/components/{ProfilerDashboard/component => Database/Profiler/ProfilerLatestValue}/ProfilerLatestValue.tsx (91%) rename openmetadata-ui/src/main/resources/ui/src/components/{ => Database/Profiler}/ProfilerSettings/CustomRangeWidget.tsx (100%) rename openmetadata-ui/src/main/resources/ui/src/components/{ => Database/Profiler}/ProfilerSettings/CustomeRangeWidget.test.tsx (100%) rename openmetadata-ui/src/main/resources/ui/src/components/{ => Database/Profiler}/ProfilerSettings/MockSchema.ts (100%) rename openmetadata-ui/src/main/resources/ui/src/components/{ => Database/Profiler}/ProfilerSettings/ProfilerObjectFieldTemplate.tsx (100%) rename openmetadata-ui/src/main/resources/ui/src/components/{ => Database/Profiler}/ProfilerSettings/ProfilerSettings.test.tsx (98%) rename openmetadata-ui/src/main/resources/ui/src/components/{ => Database/Profiler}/ProfilerSettings/ProfilerSettings.tsx (86%) rename openmetadata-ui/src/main/resources/ui/src/components/{ => Database/Profiler}/ProfilerSettings/profiler-settings.less (100%) rename openmetadata-ui/src/main/resources/ui/src/components/{ProfilerDashboard/component => Database/Profiler/TestSummary}/TestSummary.test.tsx (94%) rename openmetadata-ui/src/main/resources/ui/src/components/{ProfilerDashboard/component => Database/Profiler/TestSummary}/TestSummary.tsx (91%) rename openmetadata-ui/src/main/resources/ui/src/components/{ProfilerDashboard/component => Database/Profiler/TestSummary}/test-summary.less (94%) rename openmetadata-ui/src/main/resources/ui/src/components/{ProfilerDashboard/component => Database/Profiler/TestSummaryCustomTooltip}/TestSummaryCustomTooltip.component.tsx (91%) rename openmetadata-ui/src/main/resources/ui/src/components/{ProfilerDashboard/component => Database/Profiler/TestSummaryCustomTooltip}/TestSummaryCustomTooltip.test.tsx (100%) rename openmetadata-ui/src/main/resources/ui/src/components/{ => Database}/RetentionPeriod/RetentionPeriod.component.test.tsx (91%) rename openmetadata-ui/src/main/resources/ui/src/components/{ => Database}/RetentionPeriod/RetentionPeriod.component.tsx (92%) rename openmetadata-ui/src/main/resources/ui/src/components/{ => Database}/RetentionPeriod/RetentionPeriod.interface.ts (87%) rename openmetadata-ui/src/main/resources/ui/src/components/{ => Database}/SampleDataTable/RowData.test.tsx (100%) rename openmetadata-ui/src/main/resources/ui/src/components/{ => Database}/SampleDataTable/RowData.tsx (93%) rename openmetadata-ui/src/main/resources/ui/src/components/{ => Database}/SampleDataTable/SampleData.interface.ts (90%) rename openmetadata-ui/src/main/resources/ui/src/components/{ => Database}/SampleDataTable/SampleDataTable.component.tsx (85%) rename openmetadata-ui/src/main/resources/ui/src/components/{ => Database}/SampleDataTable/SampleDataTable.test.tsx (95%) rename openmetadata-ui/src/main/resources/ui/src/components/{ => Database}/SampleDataTable/sample-data-table.less (100%) rename openmetadata-ui/src/main/resources/ui/src/components/{ => Database}/SampleDataWithMessages/MessageCard.tsx (100%) rename openmetadata-ui/src/main/resources/ui/src/components/{ => Database}/SampleDataWithMessages/SampleDataWithMessages.test.tsx (94%) rename openmetadata-ui/src/main/resources/ui/src/components/{ => Database}/SampleDataWithMessages/SampleDataWithMessages.tsx (80%) rename openmetadata-ui/src/main/resources/ui/src/components/{ => Database}/SampleDataWithMessages/message-card.less (95%) rename openmetadata-ui/src/main/resources/ui/src/components/{ => Database}/SchemaEditor/SchemaEditor.test.tsx (100%) rename openmetadata-ui/src/main/resources/ui/src/components/{ => Database}/SchemaEditor/SchemaEditor.tsx (93%) rename openmetadata-ui/src/main/resources/ui/src/components/{ => Database}/SchemaTab/SchemaTab.component.tsx (96%) rename openmetadata-ui/src/main/resources/ui/src/components/{ => Database}/SchemaTab/SchemaTab.interfaces.ts (90%) rename openmetadata-ui/src/main/resources/ui/src/components/{ => Database}/SchemaTab/SchemaTab.test.tsx (98%) rename openmetadata-ui/src/main/resources/ui/src/components/{ => Database}/SchemaTable/SchemaTable.component.tsx (90%) rename openmetadata-ui/src/main/resources/ui/src/components/{ => Database}/SchemaTable/SchemaTable.interface.ts (89%) rename openmetadata-ui/src/main/resources/ui/src/components/{ => Database}/SchemaTable/SchemaTable.test.tsx (87%) rename openmetadata-ui/src/main/resources/ui/src/components/{ => Database}/StoredProcedureVersion/StoredProcedureVersion.component.tsx (85%) rename openmetadata-ui/src/main/resources/ui/src/components/{ => Database}/StoredProcedureVersion/StoredProcedureVersion.interface.ts (75%) rename openmetadata-ui/src/main/resources/ui/src/components/{ => Database}/StoredProcedureVersion/StoredProcedureVersion.test.tsx (97%) rename openmetadata-ui/src/main/resources/ui/src/components/{ => Database}/TableDataCardBody/TableDataCardBody.test.tsx (98%) rename openmetadata-ui/src/main/resources/ui/src/components/{ => Database}/TableDataCardBody/TableDataCardBody.tsx (85%) rename openmetadata-ui/src/main/resources/ui/src/components/{ => Database}/TableDescription/TableDescription.component.tsx (85%) rename openmetadata-ui/src/main/resources/ui/src/components/{ => Database}/TableDescription/TableDescription.interface.ts (83%) rename openmetadata-ui/src/main/resources/ui/src/components/{ => Database}/TableDescription/TableDescription.test.tsx (89%) rename openmetadata-ui/src/main/resources/ui/src/components/{TableProfiler/Component => Database/TableProfiler}/ColumnPickerMenu.tsx (100%) rename openmetadata-ui/src/main/resources/ui/src/components/{TableProfiler/Component => Database/TableProfiler/ColumnProfileTable}/ColumnProfileTable.test.tsx (98%) rename openmetadata-ui/src/main/resources/ui/src/components/{TableProfiler/Component => Database/TableProfiler/ColumnProfileTable}/ColumnProfileTable.tsx (87%) rename openmetadata-ui/src/main/resources/ui/src/components/{TableProfiler/Component => Database/TableProfiler}/ColumnSummary.tsx (89%) rename openmetadata-ui/src/main/resources/ui/src/components/{ => Database}/TableProfiler/CustomMetricGraphs/CustomMetricGraphs.component.tsx (89%) rename openmetadata-ui/src/main/resources/ui/src/components/{ => Database}/TableProfiler/CustomMetricGraphs/CustomMetricGraphs.interface.ts (83%) rename openmetadata-ui/src/main/resources/ui/src/components/{ => Database}/TableProfiler/CustomMetricGraphs/CustomMetricGraphs.test.tsx (92%) rename openmetadata-ui/src/main/resources/ui/src/components/{ => Database}/TableProfiler/CustomMetricGraphs/custom-metric-graphs.style.less (100%) rename openmetadata-ui/src/main/resources/ui/src/components/{TableProfiler/Component => Database/TableProfiler/NoProfilerBanner}/NoProfilerBanner.component.tsx (93%) rename openmetadata-ui/src/main/resources/ui/src/components/{TableProfiler/Component => Database/TableProfiler/NoProfilerBanner}/NoProfilerBanner.test.tsx (100%) rename openmetadata-ui/src/main/resources/ui/src/components/{TableProfiler/Component => Database/TableProfiler/ProfilerProgressWidget}/ProfilerProgressWidget.test.tsx (100%) rename openmetadata-ui/src/main/resources/ui/src/components/{TableProfiler/Component => Database/TableProfiler/ProfilerProgressWidget}/ProfilerProgressWidget.tsx (100%) rename openmetadata-ui/src/main/resources/ui/src/components/{TableProfiler/Component => Database/TableProfiler/ProfilerSettingsModal}/ProfilerSettingsModal.test.tsx (97%) rename openmetadata-ui/src/main/resources/ui/src/components/{TableProfiler/Component => Database/TableProfiler/ProfilerSettingsModal}/ProfilerSettingsModal.tsx (98%) rename openmetadata-ui/src/main/resources/ui/src/components/{ => Database}/TableProfiler/QualityTab/QualityTab.component.tsx (82%) rename openmetadata-ui/src/main/resources/ui/src/components/{TableProfiler/Component => Database/TableProfiler}/SingleColumnProfile.tsx (94%) rename openmetadata-ui/src/main/resources/ui/src/components/{ => Database}/TableProfiler/TableProfiler.interface.ts (90%) rename openmetadata-ui/src/main/resources/ui/src/components/{ => Database}/TableProfiler/TableProfiler.test.tsx (96%) rename openmetadata-ui/src/main/resources/ui/src/components/{ => Database}/TableProfiler/TableProfiler.tsx (87%) rename openmetadata-ui/src/main/resources/ui/src/components/{TableProfiler/Component => Database/TableProfiler/TableProfilerChart}/TableProfilerChart.test.tsx (96%) rename openmetadata-ui/src/main/resources/ui/src/components/{TableProfiler/Component => Database/TableProfiler/TableProfilerChart}/TableProfilerChart.tsx (87%) rename openmetadata-ui/src/main/resources/ui/src/components/{ => Database}/TableProfiler/TableProfilerProvider.tsx (89%) rename openmetadata-ui/src/main/resources/ui/src/components/{ => Database}/TableProfiler/table-profiler.less (97%) rename openmetadata-ui/src/main/resources/ui/src/components/{ => Database}/TableQueries/QueryCard.test.tsx (96%) rename openmetadata-ui/src/main/resources/ui/src/components/{ => Database}/TableQueries/QueryCard.tsx (91%) rename openmetadata-ui/src/main/resources/ui/src/components/{ => Database}/TableQueries/QueryCardExtraOption/QueryCardExtraOption.component.tsx (86%) rename openmetadata-ui/src/main/resources/ui/src/components/{ => Database}/TableQueries/QueryCardExtraOption/QueryCardExtraOption.interface.ts (87%) rename openmetadata-ui/src/main/resources/ui/src/components/{ => Database}/TableQueries/QueryCardExtraOption/QueryCardExtraOption.test.tsx (96%) rename openmetadata-ui/src/main/resources/ui/src/components/{ => Database}/TableQueries/QueryCardExtraOption/query-card-extra-option.style.less (95%) rename openmetadata-ui/src/main/resources/ui/src/components/{ => Database}/TableQueries/QueryUsedByOtherTable/QueryUsedByOtherTable.component.tsx (92%) rename openmetadata-ui/src/main/resources/ui/src/components/{ => Database}/TableQueries/QueryUsedByOtherTable/QueryUsedByOtherTable.test.tsx (93%) rename openmetadata-ui/src/main/resources/ui/src/components/{ => Database}/TableQueries/TableQueries.interface.ts (88%) rename openmetadata-ui/src/main/resources/ui/src/components/{ => Database}/TableQueries/TableQueries.test.tsx (96%) rename openmetadata-ui/src/main/resources/ui/src/components/{ => Database}/TableQueries/TableQueries.tsx (89%) rename openmetadata-ui/src/main/resources/ui/src/components/{ => Database}/TableQueries/TableQueryRightPanel/TableQueryRightPanel.component.tsx (90%) rename openmetadata-ui/src/main/resources/ui/src/components/{ => Database}/TableQueries/TableQueryRightPanel/TableQueryRightPanel.interface.ts (86%) rename openmetadata-ui/src/main/resources/ui/src/components/{ => Database}/TableQueries/TableQueryRightPanel/TableQueryRightPanel.test.tsx (93%) rename openmetadata-ui/src/main/resources/ui/src/components/{ => Database}/TableQueries/table-queries.style.less (96%) rename openmetadata-ui/src/main/resources/ui/src/components/{ => Database}/TableTags/TableTags.component.tsx (90%) rename openmetadata-ui/src/main/resources/ui/src/components/{ => Database}/TableTags/TableTags.interface.ts (70%) rename openmetadata-ui/src/main/resources/ui/src/components/{ => Database}/TableTags/TableTags.test.tsx (93%) rename openmetadata-ui/src/main/resources/ui/src/components/{ => Database}/TableVersion/TableVersion.component.tsx (86%) rename openmetadata-ui/src/main/resources/ui/src/components/{ => Database}/TableVersion/TableVersion.interface.ts (75%) rename openmetadata-ui/src/main/resources/ui/src/components/{ => Database}/TableVersion/TableVersion.test.tsx (98%) rename openmetadata-ui/src/main/resources/ui/src/components/{ => Entity}/Task/TaskTab/TaskTab.component.test.tsx (67%) rename openmetadata-ui/src/main/resources/ui/src/components/{ => Entity}/Task/TaskTab/TaskTab.component.tsx (90%) rename openmetadata-ui/src/main/resources/ui/src/components/{ => Entity}/Task/TaskTab/TaskTab.interface.ts (78%) rename openmetadata-ui/src/main/resources/ui/src/components/{ => Entity}/Task/TaskTab/task-tab.less (93%) rename openmetadata-ui/src/main/resources/ui/src/components/{ => Entity}/Task/TaskTabIncidentManagerHeader/TaskTabIncidentManagerHeader.component.tsx (87%) rename openmetadata-ui/src/main/resources/ui/src/components/{ => Entity}/Task/TaskTabIncidentManagerHeader/TaskTabIncidentManagerHeader.test.tsx (97%) rename openmetadata-ui/src/main/resources/ui/src/components/{ => Entity}/Task/TaskTabIncidentManagerHeader/task-tab-incident-manager-header.style.less (92%) rename openmetadata-ui/src/main/resources/ui/src/components/{ => Entity}/VersionTable/VersionTable.component.tsx (90%) rename openmetadata-ui/src/main/resources/ui/src/components/{ => Entity}/VersionTable/VersionTable.interfaces.ts (89%) rename openmetadata-ui/src/main/resources/ui/src/components/{ => Entity}/VersionTable/VersionTable.test.tsx (78%) rename openmetadata-ui/src/main/resources/ui/src/components/{ => Entity}/Voting/Voting.component.test.tsx (97%) rename openmetadata-ui/src/main/resources/ui/src/components/{ => Entity}/Voting/Voting.component.tsx (89%) rename openmetadata-ui/src/main/resources/ui/src/components/{ => Entity}/Voting/voting.interface.ts (85%) rename openmetadata-ui/src/main/resources/ui/src/components/{ => MlModel}/MlModelDetail/MlModel.interface.ts (82%) rename openmetadata-ui/src/main/resources/ui/src/components/{ => MlModel}/MlModelDetail/MlModelDetail.component.test.tsx (91%) rename openmetadata-ui/src/main/resources/ui/src/components/{ => MlModel}/MlModelDetail/MlModelDetail.component.tsx (86%) rename openmetadata-ui/src/main/resources/ui/src/components/{ => MlModel}/MlModelDetail/MlModelDetail.interface.ts (81%) rename openmetadata-ui/src/main/resources/ui/src/components/{ => MlModel}/MlModelDetail/MlModelFeaturesList.test.tsx (85%) rename openmetadata-ui/src/main/resources/ui/src/components/{ => MlModel}/MlModelDetail/MlModelFeaturesList.tsx (93%) rename openmetadata-ui/src/main/resources/ui/src/components/{ => MlModel}/MlModelDetail/SourceList.component.tsx (94%) rename openmetadata-ui/src/main/resources/ui/src/components/{ => MlModel}/MlModelDetail/source-list.less (100%) rename openmetadata-ui/src/main/resources/ui/src/components/{ => MlModel}/MlModelVersion/MlModelVersion.component.tsx (88%) rename openmetadata-ui/src/main/resources/ui/src/components/{ => MlModel}/MlModelVersion/MlModelVersion.interface.tsx (75%) rename openmetadata-ui/src/main/resources/ui/src/components/{ => MlModel}/MlModelVersion/MlModelVersion.test.tsx (81%) rename openmetadata-ui/src/main/resources/ui/src/components/{ => MyData}/CustomizableComponents/AddWidgetModal/AddWidgetModal.interface.ts (94%) rename openmetadata-ui/src/main/resources/ui/src/components/{ => MyData}/CustomizableComponents/AddWidgetModal/AddWidgetModal.test.tsx (97%) rename openmetadata-ui/src/main/resources/ui/src/components/{ => MyData}/CustomizableComponents/AddWidgetModal/AddWidgetModal.tsx (86%) rename openmetadata-ui/src/main/resources/ui/src/components/{ => MyData}/CustomizableComponents/AddWidgetModal/AddWidgetTabContent.test.tsx (98%) rename openmetadata-ui/src/main/resources/ui/src/components/{ => MyData}/CustomizableComponents/AddWidgetModal/AddWidgetTabContent.tsx (97%) rename openmetadata-ui/src/main/resources/ui/src/components/{ => MyData}/CustomizableComponents/AddWidgetModal/add-widget-modal.less (95%) rename openmetadata-ui/src/main/resources/ui/src/components/{ => MyData}/CustomizableComponents/CustomizeMyData/CustomizeMyData.interface.ts (85%) rename openmetadata-ui/src/main/resources/ui/src/components/{ => MyData}/CustomizableComponents/CustomizeMyData/CustomizeMyData.test.tsx (97%) rename openmetadata-ui/src/main/resources/ui/src/components/{ => MyData}/CustomizableComponents/CustomizeMyData/CustomizeMyData.tsx (88%) rename openmetadata-ui/src/main/resources/ui/src/components/{ => MyData}/CustomizableComponents/CustomizeMyData/customize-my-data.less (91%) rename openmetadata-ui/src/main/resources/ui/src/components/{ => MyData}/CustomizableComponents/EmptyWidgetPlaceholder/EmptyWidgetPlaceholder.interface.ts (94%) rename openmetadata-ui/src/main/resources/ui/src/components/{ => MyData}/CustomizableComponents/EmptyWidgetPlaceholder/EmptyWidgetPlaceholder.test.tsx (96%) rename openmetadata-ui/src/main/resources/ui/src/components/{ => MyData}/CustomizableComponents/EmptyWidgetPlaceholder/EmptyWidgetPlaceholder.tsx (95%) rename openmetadata-ui/src/main/resources/ui/src/components/{ => MyData}/CustomizableComponents/EmptyWidgetPlaceholder/empty-widget-placeholder.less (94%) rename openmetadata-ui/src/main/resources/ui/src/components/{ => MyData}/GithubStarCard/GithubStarCard.component.tsx (88%) rename openmetadata-ui/src/main/resources/ui/src/components/{ => MyData}/GithubStarCard/GithubStarCard.test.tsx (98%) rename openmetadata-ui/src/main/resources/ui/src/components/{ => MyData}/GithubStarCard/github-star-card.style.less (97%) rename openmetadata-ui/src/main/resources/ui/src/components/{ => MyData}/Persona/AddEditPersona/AddEditPersona.component.tsx (87%) rename openmetadata-ui/src/main/resources/ui/src/components/{ => MyData}/Persona/AddEditPersona/AddEditPersona.interface.ts (90%) rename openmetadata-ui/src/main/resources/ui/src/components/{ => MyData}/Persona/PersonaDetailsCard/PersonaDetailsCard.test.tsx (100%) rename openmetadata-ui/src/main/resources/ui/src/components/{ => MyData}/Persona/PersonaDetailsCard/PersonaDetailsCard.tsx (86%) rename openmetadata-ui/src/main/resources/ui/src/components/{ => MyData}/Persona/PersonaSelectableList/PersonaSelectableList.component.tsx (86%) rename openmetadata-ui/src/main/resources/ui/src/components/{ => MyData}/Persona/PersonaSelectableList/PersonaSelectableList.interface.ts (93%) rename openmetadata-ui/src/main/resources/ui/src/components/{ => MyData}/WelcomeScreen/WelcomScreen.test.tsx (100%) rename openmetadata-ui/src/main/resources/ui/src/components/{ => MyData}/WelcomeScreen/WelcomeScreen.component.tsx (87%) rename openmetadata-ui/src/main/resources/ui/src/components/{ => MyData}/WelcomeScreen/welcome-screen.style.less (96%) rename openmetadata-ui/src/main/resources/ui/src/components/{ => MyData}/Widgets/FeedsWidget/FeedsWidget.component.tsx (86%) rename openmetadata-ui/src/main/resources/ui/src/components/{ => MyData}/Widgets/FeedsWidget/FeedsWidget.test.tsx (100%) rename openmetadata-ui/src/main/resources/ui/src/components/{ => MyData}/Widgets/FeedsWidget/feeds-widget.less (95%) rename openmetadata-ui/src/main/resources/ui/src/components/{ => MyData/Widgets}/KPIWidget/KPIWidget.component.tsx (89%) rename openmetadata-ui/src/main/resources/ui/src/components/{ => MyData/Widgets}/KPIWidget/KPIWidget.interface.ts (87%) rename openmetadata-ui/src/main/resources/ui/src/components/{ => MyData/Widgets}/KPIWidget/kpi-widget.less (100%) rename openmetadata-ui/src/main/resources/ui/src/components/{ => MyData}/Widgets/RecentlyViewed/RecentlyViewed.test.tsx (97%) rename openmetadata-ui/src/main/resources/ui/src/components/{ => MyData}/Widgets/RecentlyViewed/RecentlyViewed.tsx (87%) rename openmetadata-ui/src/main/resources/ui/src/components/{ => MyData}/Widgets/RecentlyViewed/recently-viewed.less (95%) rename openmetadata-ui/src/main/resources/ui/src/components/{ => MyData/Widgets}/TotalDataAssetsWidget/TotalDataAssetsWidget.component.tsx (85%) rename openmetadata-ui/src/main/resources/ui/src/components/{ => MyData/Widgets}/TotalDataAssetsWidget/TotalDataAssetsWidget.interface.ts (87%) rename openmetadata-ui/src/main/resources/ui/src/components/{ => MyData/Widgets}/TotalDataAssetsWidget/total-data-assets-widget.less (100%) rename openmetadata-ui/src/main/resources/ui/src/components/{ => Pipeline}/Execution/Execution.component.test.tsx (89%) rename openmetadata-ui/src/main/resources/ui/src/components/{ => Pipeline}/Execution/Execution.component.tsx (92%) rename openmetadata-ui/src/main/resources/ui/src/components/{ => Pipeline}/Execution/ListView/ListViewTab.component.test.tsx (88%) rename openmetadata-ui/src/main/resources/ui/src/components/{ => Pipeline}/Execution/ListView/ListViewTab.component.tsx (89%) rename openmetadata-ui/src/main/resources/ui/src/components/{ => Pipeline}/Execution/TreeView/TreeViewTab.component.tsx (89%) rename openmetadata-ui/src/main/resources/ui/src/components/{ => Pipeline}/Execution/TreeView/tree-view-tab.less (100%) rename openmetadata-ui/src/main/resources/ui/src/components/{ => Pipeline}/Execution/execution.less (100%) rename openmetadata-ui/src/main/resources/ui/src/components/{ => Pipeline}/PipelineDetails/PipelineDetails.component.tsx (87%) rename openmetadata-ui/src/main/resources/ui/src/components/{ => Pipeline}/PipelineDetails/PipelineDetails.interface.ts (81%) rename openmetadata-ui/src/main/resources/ui/src/components/{ => Pipeline}/PipelineDetails/PipelineDetails.test.tsx (80%) rename openmetadata-ui/src/main/resources/ui/src/components/{ => Pipeline}/PipelineDetails/pipeline-details.style.less (92%) rename openmetadata-ui/src/main/resources/ui/src/components/{ => Pipeline}/PipelineVersion/PipelineVersion.component.tsx (84%) rename openmetadata-ui/src/main/resources/ui/src/components/{ => Pipeline}/PipelineVersion/PipelineVersion.interface.ts (75%) rename openmetadata-ui/src/main/resources/ui/src/components/{ => Pipeline}/PipelineVersion/PipelineVersion.test.tsx (80%) rename openmetadata-ui/src/main/resources/ui/src/components/{ => Pipeline}/TasksDAGView/TaskNode/TaskNode.test.tsx (100%) rename openmetadata-ui/src/main/resources/ui/src/components/{ => Pipeline}/TasksDAGView/TaskNode/TaskNode.tsx (97%) rename openmetadata-ui/src/main/resources/ui/src/components/{ => Pipeline}/TasksDAGView/TaskNode/task-node.style.less (93%) rename openmetadata-ui/src/main/resources/ui/src/components/{ => Pipeline}/TasksDAGView/TasksDAGView.test.tsx (97%) rename openmetadata-ui/src/main/resources/ui/src/components/{ => Pipeline}/TasksDAGView/TasksDAGView.tsx (88%) rename openmetadata-ui/src/main/resources/ui/src/components/{ => Pipeline}/TasksDAGView/tasks-dag-view.style.less (100%) rename openmetadata-ui/src/main/resources/ui/src/components/{ => Settings}/Alerts/AlertsDetails/AlertDetails.component.tsx (86%) rename openmetadata-ui/src/main/resources/ui/src/components/{ => Settings}/Alerts/AlertsDetails/AlertDetails.test.tsx (90%) rename openmetadata-ui/src/main/resources/ui/src/components/{ => Settings}/Applications/AppDetails/AppDetails.component.tsx (89%) rename openmetadata-ui/src/main/resources/ui/src/components/{ => Settings}/Applications/AppDetails/AppDetails.interface.ts (88%) rename openmetadata-ui/src/main/resources/ui/src/components/{ => Settings}/Applications/AppDetails/AppDetails.test.tsx (87%) rename openmetadata-ui/src/main/resources/ui/src/components/{ => Settings}/Applications/AppDetails/ApplicationSchemaClassBase.ts (92%) rename openmetadata-ui/src/main/resources/ui/src/components/{ => Settings}/Applications/AppDetails/app-details.less (97%) rename openmetadata-ui/src/main/resources/ui/src/components/{ => Settings}/Applications/AppInstallVerifyCard/AppInstallVerifyCard.component.tsx (90%) rename openmetadata-ui/src/main/resources/ui/src/components/{ => Settings}/Applications/AppInstallVerifyCard/AppInstallVerifyCard.interface.ts (85%) rename openmetadata-ui/src/main/resources/ui/src/components/{ => Settings}/Applications/AppInstallVerifyCard/AppInstallVerifyCard.test.tsx (86%) rename openmetadata-ui/src/main/resources/ui/src/components/{ => Settings}/Applications/AppInstallVerifyCard/app-install-verify-card.less (100%) rename openmetadata-ui/src/main/resources/ui/src/components/{ => Settings}/Applications/AppLogo/AppLogo.component.tsx (94%) rename openmetadata-ui/src/main/resources/ui/src/components/{ => Settings}/Applications/AppLogsViewer/AppLogsViewer.component.tsx (93%) rename openmetadata-ui/src/main/resources/ui/src/components/{ => Settings}/Applications/AppLogsViewer/AppLogsViewer.interface.ts (90%) rename openmetadata-ui/src/main/resources/ui/src/components/{ => Settings}/Applications/AppLogsViewer/AppLogsViewer.test.tsx (92%) rename openmetadata-ui/src/main/resources/ui/src/components/{ => Settings}/Applications/AppRunsHistory/AppRunsHistory.component.tsx (86%) rename openmetadata-ui/src/main/resources/ui/src/components/{ => Settings}/Applications/AppRunsHistory/AppRunsHistory.interface.ts (84%) rename openmetadata-ui/src/main/resources/ui/src/components/{ => Settings}/Applications/AppRunsHistory/AppRunsHistory.test.tsx (88%) rename openmetadata-ui/src/main/resources/ui/src/components/{ => Settings}/Applications/AppSchedule/AppSchedule.component.tsx (95%) rename openmetadata-ui/src/main/resources/ui/src/components/{ => Settings}/Applications/AppSchedule/AppSchedule.test.tsx (86%) rename openmetadata-ui/src/main/resources/ui/src/components/{ => Settings}/Applications/AppSchedule/AppScheduleProps.interface.ts (91%) rename openmetadata-ui/src/main/resources/ui/src/components/{ => Settings}/Applications/ApplicationCard/ApplicationCard.component.tsx (96%) rename openmetadata-ui/src/main/resources/ui/src/components/{ => Settings}/Applications/ApplicationCard/ApplicationCard.interface.ts (100%) rename openmetadata-ui/src/main/resources/ui/src/components/{ => Settings}/Applications/ApplicationCard/ApplicationCard.test.tsx (100%) rename openmetadata-ui/src/main/resources/ui/src/components/{ => Settings}/Applications/MarketPlaceAppDetails/MarketPlaceAppDetails.component.tsx (86%) rename openmetadata-ui/src/main/resources/ui/src/components/{ => Settings}/Applications/MarketPlaceAppDetails/MarketPlaceAppDetails.interface.ts (100%) rename openmetadata-ui/src/main/resources/ui/src/components/{ => Settings}/Applications/MarketPlaceAppDetails/MarketPlaceAppDetails.test.tsx (86%) rename openmetadata-ui/src/main/resources/ui/src/components/{ => Settings}/Applications/MarketPlaceAppDetails/market-place-app-details.less (95%) rename openmetadata-ui/src/main/resources/ui/src/components/{ => Settings/Bot}/BotDetails/AuthMechanism.tsx (90%) rename openmetadata-ui/src/main/resources/ui/src/components/{ => Settings/Bot}/BotDetails/AuthMechanismForm.tsx (95%) rename openmetadata-ui/src/main/resources/ui/src/components/{ => Settings/Bot}/BotDetails/BotDetails.component.tsx (87%) rename openmetadata-ui/src/main/resources/ui/src/components/{ => Settings/Bot}/BotDetails/BotDetails.interfaces.ts (82%) rename openmetadata-ui/src/main/resources/ui/src/components/{ => Settings/Bot}/BotDetails/BotDetails.test.tsx (93%) rename openmetadata-ui/src/main/resources/ui/src/components/{ => Settings/Bot}/BotDetails/auth-mechanism.less (100%) rename openmetadata-ui/src/main/resources/ui/src/components/{ => Settings/Bot}/BotDetails/bot-details.less (100%) rename openmetadata-ui/src/main/resources/ui/src/components/{ => Settings/Bot}/BotListV1/BotListV1.component.tsx (81%) rename openmetadata-ui/src/main/resources/ui/src/components/{ => Settings/Bot}/BotListV1/BotListV1.interfaces.ts (100%) rename openmetadata-ui/src/main/resources/ui/src/components/{CustomEntityDetail => Settings/CustomProperty}/AddCustomProperty/AddCustomProperty.test.tsx (92%) rename openmetadata-ui/src/main/resources/ui/src/components/{CustomEntityDetail => Settings/CustomProperty}/AddCustomProperty/AddCustomProperty.tsx (84%) rename openmetadata-ui/src/main/resources/ui/src/components/{CustomEntityDetail => Settings/CustomProperty}/CustomPropertyTable.interface.ts (92%) rename openmetadata-ui/src/main/resources/ui/src/components/{CustomEntityDetail => Settings/CustomProperty}/CustomPropertyTable.test.tsx (95%) rename openmetadata-ui/src/main/resources/ui/src/components/{CustomEntityDetail => Settings/CustomProperty}/CustomPropertyTable.tsx (86%) rename openmetadata-ui/src/main/resources/ui/src/components/{ => Settings/Email}/EmailConfigForm/EmailConfigForm.component.tsx (94%) rename openmetadata-ui/src/main/resources/ui/src/components/{ => Settings/Email}/TestEmail/TestEmail.component.tsx (90%) rename openmetadata-ui/src/main/resources/ui/src/components/{ => Settings/Email}/TestEmail/TestEmail.test.tsx (94%) rename openmetadata-ui/src/main/resources/ui/src/components/{ => Settings/Services}/AddIngestion/AddIngestion.component.tsx (90%) rename openmetadata-ui/src/main/resources/ui/src/components/{ => Settings/Services}/AddIngestion/AddIngestion.test.tsx (81%) rename openmetadata-ui/src/main/resources/ui/src/components/{ => Settings/Services}/AddIngestion/IngestionWorkflow.interface.ts (86%) rename openmetadata-ui/src/main/resources/ui/src/components/{ => Settings/Services}/AddIngestion/Steps/ScheduleInterval.test.tsx (96%) rename openmetadata-ui/src/main/resources/ui/src/components/{ => Settings/Services}/AddIngestion/Steps/ScheduleInterval.tsx (94%) rename openmetadata-ui/src/main/resources/ui/src/components/{ => Settings/Services}/AddService/AddService.component.tsx (87%) rename openmetadata-ui/src/main/resources/ui/src/components/{ => Settings/Services}/AddService/AddService.interface.ts (77%) rename openmetadata-ui/src/main/resources/ui/src/components/{ => Settings/Services}/AddService/AddService.test.tsx (84%) rename openmetadata-ui/src/main/resources/ui/src/components/{ => Settings/Services}/AddService/Steps/ConfigureService.test.tsx (100%) rename openmetadata-ui/src/main/resources/ui/src/components/{ => Settings/Services}/AddService/Steps/ConfigureService.tsx (90%) rename openmetadata-ui/src/main/resources/ui/src/components/{ => Settings/Services}/AddService/Steps/SelectServiceType.test.tsx (96%) rename openmetadata-ui/src/main/resources/ui/src/components/{ => Settings/Services}/AddService/Steps/SelectServiceType.tsx (86%) rename openmetadata-ui/src/main/resources/ui/src/components/{ => Settings/Services}/AddService/Steps/Steps.interface.ts (96%) rename openmetadata-ui/src/main/resources/ui/src/components/{ => Settings/Services}/AddService/Steps/select-service-type.less (93%) rename openmetadata-ui/src/main/resources/ui/src/components/{ => Settings/Services}/Ingestion/AddIngestionButton.component.tsx (89%) rename openmetadata-ui/src/main/resources/ui/src/components/{ => Settings/Services}/Ingestion/AddIngestionButton.interface.ts (65%) rename openmetadata-ui/src/main/resources/ui/src/components/{ => Settings/Services}/Ingestion/Ingestion.component.tsx (90%) rename openmetadata-ui/src/main/resources/ui/src/components/{ => Settings/Services}/Ingestion/Ingestion.mock.ts (98%) rename openmetadata-ui/src/main/resources/ui/src/components/{ => Settings/Services}/Ingestion/Ingestion.test.tsx (94%) rename openmetadata-ui/src/main/resources/ui/src/components/{ => Settings/Services}/Ingestion/IngestionListTable.component.tsx (88%) rename openmetadata-ui/src/main/resources/ui/src/components/{ => Settings/Services}/Ingestion/IngestionListTable.interface.ts (78%) rename openmetadata-ui/src/main/resources/ui/src/components/{ => Settings/Services}/Ingestion/IngestionListTable.test.tsx (90%) rename openmetadata-ui/src/main/resources/ui/src/components/{ => Settings/Services}/Ingestion/IngestionPipelineList/IngestinoPipelineList.test.tsx (79%) rename openmetadata-ui/src/main/resources/ui/src/components/{ => Settings/Services}/Ingestion/IngestionPipelineList/IngestionPipelineList.component.tsx (85%) rename openmetadata-ui/src/main/resources/ui/src/components/{ => Settings/Services}/Ingestion/IngestionRecentRun/IngestionRecentRun.test.tsx (97%) rename openmetadata-ui/src/main/resources/ui/src/components/{ => Settings/Services}/Ingestion/IngestionRecentRun/IngestionRecentRuns.component.tsx (92%) rename openmetadata-ui/src/main/resources/ui/src/components/{ => Settings/Services}/Ingestion/IngestionRecentRun/ingestion-recent-run.style.less (100%) rename openmetadata-ui/src/main/resources/ui/src/components/{ => Settings/Services/Ingestion}/IngestionStepper/IngestionStepper.component.tsx (100%) rename openmetadata-ui/src/main/resources/ui/src/components/{ => Settings/Services/Ingestion}/IngestionStepper/IngestionStepper.test.tsx (100%) rename openmetadata-ui/src/main/resources/ui/src/components/{ => Settings/Services/Ingestion}/IngestionStepper/ingestion-stepper.style.less (100%) rename openmetadata-ui/src/main/resources/ui/src/components/{ => Settings/Services/Ingestion}/IngestionWorkflowForm/IngestionWorkflowForm.tsx (82%) rename openmetadata-ui/src/main/resources/ui/src/components/{ => Settings/Services}/Ingestion/PipelineActions.component.tsx (94%) rename openmetadata-ui/src/main/resources/ui/src/components/{ => Settings/Services}/Ingestion/PipelineActions.interface.ts (81%) rename openmetadata-ui/src/main/resources/ui/src/components/{ => Settings/Services}/Ingestion/ingestion.interface.ts (78%) rename openmetadata-ui/src/main/resources/ui/src/components/{ => Settings/Services}/ServiceConfig/ConnectionConfigForm.tsx (73%) rename openmetadata-ui/src/main/resources/ui/src/components/{ => Settings/Services}/ServiceConfig/ServiceConfig.tsx (82%) rename openmetadata-ui/src/main/resources/ui/src/components/{ => Settings/Services}/ServiceConnectionDetails/ServiceConnectionDetails.component.tsx (83%) rename openmetadata-ui/src/main/resources/ui/src/components/{ => Settings}/Services/Services.tsx (86%) rename openmetadata-ui/src/main/resources/ui/src/components/{Setting => Settings}/SettingItemCard/SettingItemCard.component.tsx (100%) rename openmetadata-ui/src/main/resources/ui/src/components/{Setting => Settings}/SettingItemCard/SettingsItemCard.test.tsx (100%) rename openmetadata-ui/src/main/resources/ui/src/components/{Setting => Settings}/SettingItemCard/setting-item-card.style.less (100%) rename openmetadata-ui/src/main/resources/ui/src/components/{ => Settings}/Team/TeamDetails/RolesAndPoliciesList.tsx (87%) rename openmetadata-ui/src/main/resources/ui/src/components/{ => Settings}/Team/TeamDetails/TeamDetailsV1.interface.ts (87%) rename openmetadata-ui/src/main/resources/ui/src/components/{ => Settings}/Team/TeamDetails/TeamDetailsV1.tsx (90%) rename openmetadata-ui/src/main/resources/ui/src/components/{ => Settings}/Team/TeamDetails/TeamDetailsV1.utils.tsx (96%) rename openmetadata-ui/src/main/resources/ui/src/components/{ => Settings}/Team/TeamDetails/TeamHierarchy.test.tsx (91%) rename openmetadata-ui/src/main/resources/ui/src/components/{ => Settings}/Team/TeamDetails/TeamHierarchy.tsx (85%) rename openmetadata-ui/src/main/resources/ui/src/components/{ => Settings}/Team/TeamDetails/TeamsHeaderSection/TeamsHeadingLabel.component.tsx (93%) rename openmetadata-ui/src/main/resources/ui/src/components/{ => Settings}/Team/TeamDetails/TeamsHeaderSection/TeamsHeadingLabel.test.tsx (92%) rename openmetadata-ui/src/main/resources/ui/src/components/{ => Settings}/Team/TeamDetails/TeamsHeaderSection/TeamsInfo.component.tsx (91%) rename openmetadata-ui/src/main/resources/ui/src/components/{ => Settings}/Team/TeamDetails/TeamsHeaderSection/TeamsInfo.test.tsx (88%) rename openmetadata-ui/src/main/resources/ui/src/components/{ => Settings}/Team/TeamDetails/TeamsHeaderSection/TeamsSubscription.component.tsx (95%) rename openmetadata-ui/src/main/resources/ui/src/components/{ => Settings}/Team/TeamDetails/TeamsHeaderSection/TeamsSubscription.test.tsx (100%) rename openmetadata-ui/src/main/resources/ui/src/components/{ => Settings}/Team/TeamDetails/UserTab/UserTab.component.tsx (82%) rename openmetadata-ui/src/main/resources/ui/src/components/{ => Settings}/Team/TeamDetails/UserTab/UserTab.interface.ts (79%) rename openmetadata-ui/src/main/resources/ui/src/components/{ => Settings}/Team/TeamDetails/UserTab/UserTab.test.tsx (77%) rename openmetadata-ui/src/main/resources/ui/src/components/{ => Settings}/Team/TeamDetails/team.interface.ts (90%) rename openmetadata-ui/src/main/resources/ui/src/components/{ => Settings}/Team/TeamDetails/teams.less (98%) rename openmetadata-ui/src/main/resources/ui/src/components/{ => Settings}/Team/TeamImportResult/TeamImportResult.component.tsx (94%) rename openmetadata-ui/src/main/resources/ui/src/components/{ => Settings}/Team/TeamImportResult/TeamImportResult.interface.ts (92%) rename openmetadata-ui/src/main/resources/ui/src/components/{ => Settings}/Team/TeamImportResult/TeamImportResult.test.tsx (96%) rename openmetadata-ui/src/main/resources/ui/src/components/{ => Settings/Team}/TeamsSelectable/TeamsSelectable.interface.ts (92%) rename openmetadata-ui/src/main/resources/ui/src/components/{ => Settings/Team}/TeamsSelectable/TeamsSelectable.test.tsx (95%) rename openmetadata-ui/src/main/resources/ui/src/components/{ => Settings/Team}/TeamsSelectable/TeamsSelectable.tsx (91%) rename openmetadata-ui/src/main/resources/ui/src/components/{ => Settings}/Team/UserImportResult/UserImportResult.component.tsx (94%) rename openmetadata-ui/src/main/resources/ui/src/components/{ => Settings}/Team/UserImportResult/UserImportResult.interface.ts (92%) rename openmetadata-ui/src/main/resources/ui/src/components/{ => Settings}/Team/UserImportResult/UserImportResult.test.tsx (96%) rename openmetadata-ui/src/main/resources/ui/src/components/{ => Settings/Users}/AccessTokenCard/AccessTokenCard.component.tsx (93%) rename openmetadata-ui/src/main/resources/ui/src/components/{ => Settings/Users}/AccessTokenCard/AccessTokenCard.interfaces.ts (85%) rename openmetadata-ui/src/main/resources/ui/src/components/{ => Settings/Users}/AccessTokenCard/AccessTokenCard.test.tsx (91%) rename openmetadata-ui/src/main/resources/ui/src/components/{ => Settings}/Users/ChangePasswordForm.test.tsx (100%) rename openmetadata-ui/src/main/resources/ui/src/components/{ => Settings}/Users/ChangePasswordForm.tsx (94%) rename openmetadata-ui/src/main/resources/ui/src/components/{ => Settings/Users}/CreateUser/CreateUser.component.tsx (90%) rename openmetadata-ui/src/main/resources/ui/src/components/{ => Settings/Users}/CreateUser/CreateUser.interface.ts (84%) rename openmetadata-ui/src/main/resources/ui/src/components/{ => Settings/Users}/CreateUser/CreateUser.test.tsx (94%) rename openmetadata-ui/src/main/resources/ui/src/components/{ => Settings}/Users/UserProfileIcon/UserProfileIcon.component.tsx (94%) rename openmetadata-ui/src/main/resources/ui/src/components/{ => Settings}/Users/UserProfileIcon/UserProfileIcon.test.tsx (86%) rename openmetadata-ui/src/main/resources/ui/src/components/{ => Settings}/Users/UserProfileIcon/user-profile-icon.less (100%) rename openmetadata-ui/src/main/resources/ui/src/components/{ => Settings}/Users/Users.component.test.tsx (81%) rename openmetadata-ui/src/main/resources/ui/src/components/{ => Settings}/Users/Users.component.tsx (87%) rename openmetadata-ui/src/main/resources/ui/src/components/{ => Settings}/Users/Users.interface.ts (87%) rename openmetadata-ui/src/main/resources/ui/src/components/{ => Settings}/Users/UsersProfile/UserProfileDetails/UserProfileDetails.component.tsx (87%) rename openmetadata-ui/src/main/resources/ui/src/components/{ => Settings}/Users/UsersProfile/UserProfileDetails/UserProfileDetails.interface.ts (91%) rename openmetadata-ui/src/main/resources/ui/src/components/{ => Settings}/Users/UsersProfile/UserProfileDetails/UserProfileDetails.test.tsx (87%) rename openmetadata-ui/src/main/resources/ui/src/components/{ => Settings}/Users/UsersProfile/UserProfileImage/UserProfileImage.component.tsx (93%) rename openmetadata-ui/src/main/resources/ui/src/components/{ => Settings}/Users/UsersProfile/UserProfileImage/UserProfileImage.interface.ts (91%) rename openmetadata-ui/src/main/resources/ui/src/components/{ => Settings}/Users/UsersProfile/UserProfileImage/UserProfileImage.test.tsx (90%) rename openmetadata-ui/src/main/resources/ui/src/components/{ => Settings}/Users/UsersProfile/UserProfileInheritedRoles/UserProfileInheritedRoles.component.tsx (91%) rename openmetadata-ui/src/main/resources/ui/src/components/{ => Settings}/Users/UsersProfile/UserProfileInheritedRoles/UserProfileInheritedRoles.interface.ts (91%) rename openmetadata-ui/src/main/resources/ui/src/components/{ => Settings}/Users/UsersProfile/UserProfileInheritedRoles/UserProfileInheritedRoles.test.tsx (95%) rename openmetadata-ui/src/main/resources/ui/src/components/{ => Settings}/Users/UsersProfile/UserProfileRoles/UserProfileRoles.component.tsx (87%) rename openmetadata-ui/src/main/resources/ui/src/components/{ => Settings}/Users/UsersProfile/UserProfileRoles/UserProfileRoles.interface.ts (91%) rename openmetadata-ui/src/main/resources/ui/src/components/{ => Settings}/Users/UsersProfile/UserProfileRoles/UserProfileRoles.test.tsx (88%) rename openmetadata-ui/src/main/resources/ui/src/components/{ => Settings}/Users/UsersProfile/UserProfileTeams/UserProfileTeams.component.tsx (81%) rename openmetadata-ui/src/main/resources/ui/src/components/{ => Settings}/Users/UsersProfile/UserProfileTeams/UserProfileTeams.interface.ts (91%) rename openmetadata-ui/src/main/resources/ui/src/components/{ => Settings}/Users/UsersProfile/UserProfileTeams/UserProfileTeams.test.tsx (85%) rename openmetadata-ui/src/main/resources/ui/src/components/{ => Settings}/Users/UsersTab/UsersTab.test.tsx (95%) rename openmetadata-ui/src/main/resources/ui/src/components/{ => Settings}/Users/UsersTab/UsersTabs.component.tsx (88%) rename openmetadata-ui/src/main/resources/ui/src/components/{ => Settings}/Users/mocks/User.mocks.ts (99%) rename openmetadata-ui/src/main/resources/ui/src/components/{ => Settings}/Users/users.less (97%) rename openmetadata-ui/src/main/resources/ui/src/components/{ => Topic}/TopicDetails/TopicDetails.component.tsx (84%) rename openmetadata-ui/src/main/resources/ui/src/components/{ => Topic}/TopicDetails/TopicDetails.interface.ts (76%) rename openmetadata-ui/src/main/resources/ui/src/components/{ => Topic}/TopicDetails/TopicDetails.mock.ts (97%) rename openmetadata-ui/src/main/resources/ui/src/components/{ => Topic}/TopicDetails/TopicDetails.test.tsx (98%) rename openmetadata-ui/src/main/resources/ui/src/components/{TopicDetails => Topic}/TopicSchema/TopicSchema.interface.tsx (100%) rename openmetadata-ui/src/main/resources/ui/src/components/{TopicDetails => Topic}/TopicSchema/TopicSchema.mock.ts (100%) rename openmetadata-ui/src/main/resources/ui/src/components/{TopicDetails => Topic}/TopicSchema/TopicSchema.test.tsx (98%) rename openmetadata-ui/src/main/resources/ui/src/components/{TopicDetails => Topic}/TopicSchema/TopicSchema.tsx (93%) rename openmetadata-ui/src/main/resources/ui/src/components/{ => Topic}/TopicVersion/TopicVersion.component.tsx (85%) rename openmetadata-ui/src/main/resources/ui/src/components/{ => Topic}/TopicVersion/TopicVersion.interface.ts (75%) rename openmetadata-ui/src/main/resources/ui/src/components/{ => Topic}/TopicVersion/TopicVersion.test.tsx (97%) rename openmetadata-ui/src/main/resources/ui/src/components/{ => Visualisations}/Chart/Chart.interface.ts (82%) rename openmetadata-ui/src/main/resources/ui/src/components/{ => Visualisations}/Chart/CustomBarChart.test.tsx (93%) rename openmetadata-ui/src/main/resources/ui/src/components/{ => Visualisations}/Chart/CustomBarChart.tsx (93%) rename openmetadata-ui/src/main/resources/ui/src/components/{ => Visualisations}/Chart/DataDistributionHistogram.component.tsx (89%) rename openmetadata-ui/src/main/resources/ui/src/components/{ => Visualisations}/Chart/DataDistributionHistogram.test.tsx (96%) rename openmetadata-ui/src/main/resources/ui/src/components/{ => Visualisations}/Chart/OperationDateBarChart.test.tsx (93%) rename openmetadata-ui/src/main/resources/ui/src/components/{ => Visualisations}/Chart/OperationDateBarChart.tsx (91%) rename openmetadata-ui/src/main/resources/ui/src/components/{ => common}/AsyncSelect/AsyncSelect.tsx (100%) rename openmetadata-ui/src/main/resources/ui/src/components/{ => common}/AsyncSelectList/AsyncSelectList.interface.ts (85%) rename openmetadata-ui/src/main/resources/ui/src/components/{ => common}/AsyncSelectList/AsyncSelectList.test.tsx (98%) rename openmetadata-ui/src/main/resources/ui/src/components/{ => common}/AsyncSelectList/AsyncSelectList.tsx (93%) rename openmetadata-ui/src/main/resources/ui/src/components/{ => common}/CopyToClipboardButton/CopyToClipboardButton.test.tsx (100%) rename openmetadata-ui/src/main/resources/ui/src/components/{ => common}/CopyToClipboardButton/CopyToClipboardButton.tsx (92%) rename openmetadata-ui/src/main/resources/ui/src/components/{ => common}/DatePickerMenu/DatePickerMenu.component.tsx (96%) rename openmetadata-ui/src/main/resources/ui/src/components/{ => common}/DatePickerMenu/date-picker-menu.less (100%) rename openmetadata-ui/src/main/resources/ui/src/components/{ => common}/DocumentTitle/DocumentTitle.tsx (100%) rename openmetadata-ui/src/main/resources/ui/src/components/{ => common}/Draggable/DraggableBodyRow.tsx (96%) rename openmetadata-ui/src/main/resources/ui/src/components/{ => common}/Draggable/DraggableBodyRowProps.interface.ts (88%) rename openmetadata-ui/src/main/resources/ui/src/components/{ => common}/ErrorBoundary/ErrorBoundary.tsx (95%) rename openmetadata-ui/src/main/resources/ui/src/components/{ => common}/ErrorBoundary/ErrorFallback.tsx (95%) rename openmetadata-ui/src/main/resources/ui/src/components/{ => common}/Form/Form.interface.ts (100%) rename openmetadata-ui/src/main/resources/ui/src/components/{ => common}/Form/FormItemLabel.test.tsx (100%) rename openmetadata-ui/src/main/resources/ui/src/components/{ => common}/Form/FormItemLabel.tsx (95%) rename openmetadata-ui/src/main/resources/ui/src/components/{ => common/Form/JSONSchema}/JSONSchemaTemplate/ArrayFieldTemplate.tsx (96%) rename openmetadata-ui/src/main/resources/ui/src/components/{ => common/Form/JSONSchema}/JSONSchemaTemplate/BooleanFieldTemplate.tsx (100%) rename openmetadata-ui/src/main/resources/ui/src/components/{ => common/Form/JSONSchema}/JSONSchemaTemplate/DescriptionFieldTemplate.tsx (100%) rename openmetadata-ui/src/main/resources/ui/src/components/{ => common/Form/JSONSchema}/JSONSchemaTemplate/FieldErrorTemplate/FieldErrorTemplate.test.tsx (100%) rename openmetadata-ui/src/main/resources/ui/src/components/{ => common/Form/JSONSchema}/JSONSchemaTemplate/FieldErrorTemplate/FieldErrorTemplate.tsx (100%) rename openmetadata-ui/src/main/resources/ui/src/components/{ => common/Form/JSONSchema}/JSONSchemaTemplate/ObjectFieldTemplate.tsx (98%) rename openmetadata-ui/src/main/resources/ui/src/components/{ => common/Form/JSONSchema}/JSONSchemaTemplate/WorkflowArrayFieldTemplate.tsx (100%) rename openmetadata-ui/src/main/resources/ui/src/components/{ => common/Form/JSONSchema}/JSONSchemaTemplate/object-field-template.less (100%) rename openmetadata-ui/src/main/resources/ui/src/components/{ => common/Form/JSONSchema}/JsonSchemaWidgets/AsyncSelectWidget.tsx (81%) rename openmetadata-ui/src/main/resources/ui/src/components/{ => common/Form/JSONSchema}/JsonSchemaWidgets/MultiSelectWidget.tsx (100%) rename openmetadata-ui/src/main/resources/ui/src/components/{ => common/Form/JSONSchema}/JsonSchemaWidgets/PasswordWidget.tsx (100%) rename openmetadata-ui/src/main/resources/ui/src/components/{ => common}/InlineEdit/InlineEdit.component.tsx (100%) rename openmetadata-ui/src/main/resources/ui/src/components/{ => common}/InlineEdit/InlineEdit.interface.ts (100%) rename openmetadata-ui/src/main/resources/ui/src/components/{ => common}/InlineEdit/InlineEdit.test.tsx (100%) rename openmetadata-ui/src/main/resources/ui/src/components/{ => common}/ListView/ListView.component.tsx (91%) rename openmetadata-ui/src/main/resources/ui/src/components/{ => common}/ListView/ListView.interface.ts (100%) rename openmetadata-ui/src/main/resources/ui/src/components/{ => common}/ListView/ListView.test.tsx (100%) rename openmetadata-ui/src/main/resources/ui/src/components/{ => common}/Loader/Loader.less (100%) rename openmetadata-ui/src/main/resources/ui/src/components/{ => common}/Loader/Loader.test.tsx (100%) rename openmetadata-ui/src/main/resources/ui/src/components/{ => common}/Loader/Loader.tsx (100%) rename openmetadata-ui/src/main/resources/ui/src/components/{ => common}/LoginButton/LoginButton.tsx (100%) rename openmetadata-ui/src/main/resources/ui/src/components/{ => common}/LoginButton/login-button.style.less (95%) rename openmetadata-ui/src/main/resources/ui/src/components/{ => common}/Skeleton/BreadCrumb/TitleBreadcrumbSkeleton.component.tsx (100%) rename openmetadata-ui/src/main/resources/ui/src/components/{ => common}/Skeleton/CommonSkeletons/ControlElements/ControlElements.component.tsx (100%) rename openmetadata-ui/src/main/resources/ui/src/components/{ => common}/Skeleton/CommonSkeletons/LabelCountSkeleton/LabelCountSkeleton.component.tsx (100%) rename openmetadata-ui/src/main/resources/ui/src/components/{ => common}/Skeleton/GlossaryV1/GlossaryV1LeftPanelSkeleton.component.tsx (95%) rename openmetadata-ui/src/main/resources/ui/src/components/{ => common}/Skeleton/MyData/EntityListSkeleton/EntityListSkeleton.component.tsx (96%) rename openmetadata-ui/src/main/resources/ui/src/components/{ => common}/Skeleton/MyData/EntityListSkeleton/EntityListSkeleton.test.tsx (100%) rename openmetadata-ui/src/main/resources/ui/src/components/{ => common}/Skeleton/Skeleton.interfaces.ts (100%) rename openmetadata-ui/src/main/resources/ui/src/components/{ => common}/Skeleton/SummaryPanelSkeleton/SummaryPanelSkeleton.component.tsx (79%) rename openmetadata-ui/src/main/resources/ui/src/components/{ => common}/Skeleton/Tags/TagsLeftPanelSkeleton.component.tsx (95%) rename openmetadata-ui/src/main/resources/ui/src/components/{ => common}/SliderWithInput/SliderWithInput.interface.ts (100%) rename openmetadata-ui/src/main/resources/ui/src/components/{ => common}/SliderWithInput/SliderWithInput.tsx (100%) rename openmetadata-ui/src/main/resources/ui/src/components/{ => common}/TabsLabel/TabsLabel.component.tsx (94%) rename openmetadata-ui/src/main/resources/ui/src/components/{ => common}/TabsLabel/TabsLabel.interface.ts (100%) rename openmetadata-ui/src/main/resources/ui/src/components/{ => common}/TabsLabel/TabsLabel.test.tsx (100%) rename openmetadata-ui/src/main/resources/ui/src/components/{ => common}/TagButton/TagButton.component.tsx (95%) rename openmetadata-ui/src/main/resources/ui/src/components/{ => common}/ToggleExpandButton/ToggleExpandButton.interface.ts (100%) rename openmetadata-ui/src/main/resources/ui/src/components/{ => common}/ToggleExpandButton/ToggleExpandButton.test.tsx (100%) rename openmetadata-ui/src/main/resources/ui/src/components/{ => common}/ToggleExpandButton/ToggleExpandButton.tsx (87%) rename openmetadata-ui/src/main/resources/ui/src/{components => context}/ApplicationConfigProvider/ApplicationConfigProvider.test.tsx (100%) rename openmetadata-ui/src/main/resources/ui/src/{components => context}/ApplicationConfigProvider/ApplicationConfigProvider.tsx (98%) rename openmetadata-ui/src/main/resources/ui/src/{components => context}/DirectionProvider/DirectionProvider.tsx (100%) rename openmetadata-ui/src/main/resources/ui/src/{components => context}/GlobalSearchProvider/GlobalSearchProvider.interface.tsx (89%) rename openmetadata-ui/src/main/resources/ui/src/{components => context}/GlobalSearchProvider/GlobalSearchProvider.tsx (94%) rename openmetadata-ui/src/main/resources/ui/src/{components => context}/GlobalSearchProvider/GlobalSearchSuggestions/GlobalSearchSuggestions.interface.ts (100%) rename openmetadata-ui/src/main/resources/ui/src/{components => context}/GlobalSearchProvider/GlobalSearchSuggestions/global-search-suggestions.less (100%) rename openmetadata-ui/src/main/resources/ui/src/{components => context}/LineageProvider/LineageProvider.interface.tsx (93%) rename openmetadata-ui/src/main/resources/ui/src/{components => context}/LineageProvider/LineageProvider.test.tsx (89%) rename openmetadata-ui/src/main/resources/ui/src/{components => context}/LineageProvider/LineageProvider.tsx (97%) rename openmetadata-ui/src/main/resources/ui/src/{components => context}/PermissionProvider/PermissionProvider.interface.ts (100%) rename openmetadata-ui/src/main/resources/ui/src/{components => context}/PermissionProvider/PermissionProvider.test.tsx (97%) rename openmetadata-ui/src/main/resources/ui/src/{components => context}/PermissionProvider/PermissionProvider.tsx (97%) rename openmetadata-ui/src/main/resources/ui/src/{components => context}/TourProvider/TourProvider.tsx (100%) rename openmetadata-ui/src/main/resources/ui/src/{components => context}/WebSocketProvider/WebSocketProvider.tsx (95%) diff --git a/openmetadata-ui/src/main/resources/ui/src/App.tsx b/openmetadata-ui/src/main/resources/ui/src/App.tsx index e0851a61285d..d7abea1deac0 100644 --- a/openmetadata-ui/src/main/resources/ui/src/App.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/App.tsx @@ -17,19 +17,19 @@ import { I18nextProvider } from 'react-i18next'; import { Router } from 'react-router-dom'; import { ToastContainer } from 'react-toastify'; import 'react-toastify/dist/ReactToastify.min.css'; -import ApplicationConfigProvider from './components/ApplicationConfigProvider/ApplicationConfigProvider'; import AppRouter from './components/AppRouter/AppRouter'; import { AuthProvider } from './components/Auth/AuthProviders/AuthProvider'; -import DirectionProvider from './components/DirectionProvider/DirectionProvider'; +import ErrorBoundary from './components/common/ErrorBoundary/ErrorBoundary'; import DomainProvider from './components/Domain/DomainProvider/DomainProvider'; import { EntityExportModalProvider } from './components/Entity/EntityExportModalProvider/EntityExportModalProvider.component'; -import ErrorBoundary from './components/ErrorBoundary/ErrorBoundary'; -import GlobalSearchProvider from './components/GlobalSearchProvider/GlobalSearchProvider'; -import PermissionProvider from './components/PermissionProvider/PermissionProvider'; -import TourProvider from './components/TourProvider/TourProvider'; import WebAnalyticsProvider from './components/WebAnalytics/WebAnalyticsProvider'; -import WebSocketProvider from './components/WebSocketProvider/WebSocketProvider'; import { TOAST_OPTIONS } from './constants/Toasts.constants'; +import ApplicationConfigProvider from './context/ApplicationConfigProvider/ApplicationConfigProvider'; +import DirectionProvider from './context/DirectionProvider/DirectionProvider'; +import GlobalSearchProvider from './context/GlobalSearchProvider/GlobalSearchProvider'; +import PermissionProvider from './context/PermissionProvider/PermissionProvider'; +import TourProvider from './context/TourProvider/TourProvider'; +import WebSocketProvider from './context/WebSocketProvider/WebSocketProvider'; import { history } from './utils/HistoryUtils'; import i18n from './utils/i18next/LocalUtil'; diff --git a/openmetadata-ui/src/main/resources/ui/src/components/ActivityFeed/ActivityFeedCard/ActivityFeedCardV1.tsx b/openmetadata-ui/src/main/resources/ui/src/components/ActivityFeed/ActivityFeedCard/ActivityFeedCardV1.tsx index 0f71f3b3a3e0..bf68aa543361 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/ActivityFeed/ActivityFeedCard/ActivityFeedCardV1.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/components/ActivityFeed/ActivityFeedCard/ActivityFeedCardV1.tsx @@ -17,7 +17,6 @@ import { noop } from 'lodash'; import React, { useState } from 'react'; import { ReactComponent as ThreadIcon } from '../../../assets/svg/thread.svg'; import UserPopOverCard from '../../../components/common/PopOverCard/UserPopOverCard'; -import Reactions from '../../../components/Reactions/Reactions'; import { ReactionOperation } from '../../../enums/reactions.enum'; import { Post, @@ -25,6 +24,7 @@ import { Thread, } from '../../../generated/entity/feed/thread'; import { useActivityFeedProvider } from '../ActivityFeedProvider/ActivityFeedProvider'; +import Reactions from '../Reactions/Reactions'; import ActivityFeedActions from '../Shared/ActivityFeedActions'; import './activity-feed-card.style.less'; import FeedCardBodyV1 from './FeedCardBody/FeedCardBodyV1'; diff --git a/openmetadata-ui/src/main/resources/ui/src/components/ActivityFeed/ActivityFeedCard/FeedCardBody/FeedCardBody.tsx b/openmetadata-ui/src/main/resources/ui/src/components/ActivityFeed/ActivityFeedCard/FeedCardBody/FeedCardBody.tsx index dfac26f6f30d..ddc330822cd3 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/ActivityFeed/ActivityFeedCard/FeedCardBody/FeedCardBody.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/components/ActivityFeed/ActivityFeedCard/FeedCardBody/FeedCardBody.tsx @@ -22,8 +22,8 @@ import { MarkdownToHTMLConverter, } from '../../../../utils/FeedUtils'; import RichTextEditorPreviewer from '../../../common/RichTextEditor/RichTextEditorPreviewer'; -import Reactions from '../../../Reactions/Reactions'; import ActivityFeedEditor from '../../ActivityFeedEditor/ActivityFeedEditor'; +import Reactions from '../../Reactions/Reactions'; import { FeedBodyProp } from '../ActivityFeedCard.interface'; const FeedCardBody: FC = ({ diff --git a/openmetadata-ui/src/main/resources/ui/src/components/ActivityFeed/ActivityFeedCard/PopoverContent.tsx b/openmetadata-ui/src/main/resources/ui/src/components/ActivityFeed/ActivityFeedCard/PopoverContent.tsx index 7c015d9276ff..ec76c85dc581 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/ActivityFeed/ActivityFeedCard/PopoverContent.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/components/ActivityFeed/ActivityFeedCard/PopoverContent.tsx @@ -24,7 +24,7 @@ import { ReactionOperation } from '../../../enums/reactions.enum'; import { Post } from '../../../generated/entity/feed/thread'; import { ReactionType } from '../../../generated/type/reaction'; import { useAuthContext } from '../../Auth/AuthProviders/AuthProvider'; -import Reaction from '../../Reactions/Reaction'; +import Reaction from '../Reactions/Reaction'; import { ConfirmState } from './ActivityFeedCard.interface'; interface Props { diff --git a/openmetadata-ui/src/main/resources/ui/src/components/ActivityFeed/ActivityFeedDrawer/ActivityFeedDrawer.tsx b/openmetadata-ui/src/main/resources/ui/src/components/ActivityFeed/ActivityFeedDrawer/ActivityFeedDrawer.tsx index 95f6648818ec..7cef831f555e 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/ActivityFeed/ActivityFeedDrawer/ActivityFeedDrawer.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/components/ActivityFeed/ActivityFeedDrawer/ActivityFeedDrawer.tsx @@ -15,9 +15,9 @@ import { Col, Drawer, Row } from 'antd'; import classNames from 'classnames'; import React, { FC } from 'react'; import { useTranslation } from 'react-i18next'; -import Loader from '../../../components/Loader/Loader'; import { ThreadType } from '../../../generated/api/feed/createThread'; import { Thread } from '../../../generated/entity/feed/thread'; +import Loader from '../../common/Loader/Loader'; import ActivityFeedEditor from '../ActivityFeedEditor/ActivityFeedEditor'; import FeedPanelBodyV1 from '../ActivityFeedPanel/FeedPanelBodyV1'; import FeedPanelHeader from '../ActivityFeedPanel/FeedPanelHeader'; diff --git a/openmetadata-ui/src/main/resources/ui/src/components/ActivityFeed/ActivityFeedEditor/ActivityFeedEditor.tsx b/openmetadata-ui/src/main/resources/ui/src/components/ActivityFeed/ActivityFeedEditor/ActivityFeedEditor.tsx index c3064aee1b89..54e1ec4180a0 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/ActivityFeed/ActivityFeedEditor/ActivityFeedEditor.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/components/ActivityFeed/ActivityFeedEditor/ActivityFeedEditor.tsx @@ -14,7 +14,7 @@ import classNames from 'classnames'; import React, { FC, HTMLAttributes, useRef, useState } from 'react'; import { getBackendFormat, HTMLToMarkdown } from '../../../utils/FeedUtils'; -import { FeedEditor } from '../../FeedEditor/FeedEditor'; +import { FeedEditor } from '../FeedEditor/FeedEditor'; import { KeyHelp } from './KeyHelp'; import { SendButton } from './SendButton'; diff --git a/openmetadata-ui/src/main/resources/ui/src/components/ActivityFeed/ActivityFeedList/ActivityFeedListV1.component.tsx b/openmetadata-ui/src/main/resources/ui/src/components/ActivityFeed/ActivityFeedList/ActivityFeedListV1.component.tsx index c6af058a445e..09c6cae3f7fe 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/ActivityFeed/ActivityFeedList/ActivityFeedListV1.component.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/components/ActivityFeed/ActivityFeedList/ActivityFeedListV1.component.tsx @@ -15,10 +15,10 @@ import { isEmpty } from 'lodash'; import React, { ReactNode, useEffect, useState } from 'react'; import { ReactComponent as FeedEmptyIcon } from '../../../assets/svg/activity-feed-no-data-placeholder.svg'; import ErrorPlaceHolder from '../../../components/common/ErrorWithPlaceholder/ErrorPlaceHolder'; -import Loader from '../../../components/Loader/Loader'; import { ERROR_PLACEHOLDER_TYPE, SIZE } from '../../../enums/common.enum'; import { Thread } from '../../../generated/entity/feed/thread'; import { getFeedListWithRelativeDays } from '../../../utils/FeedUtils'; +import Loader from '../../common/Loader/Loader'; import FeedPanelBodyV1 from '../ActivityFeedPanel/FeedPanelBodyV1'; import './activity-feed-list.less'; diff --git a/openmetadata-ui/src/main/resources/ui/src/components/ActivityFeed/ActivityFeedTab/ActivityFeedTab.component.tsx b/openmetadata-ui/src/main/resources/ui/src/components/ActivityFeed/ActivityFeedTab/ActivityFeedTab.component.tsx index 678915c6de87..391c5cdd6d28 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/ActivityFeed/ActivityFeedTab/ActivityFeedTab.component.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/components/ActivityFeed/ActivityFeedTab/ActivityFeedTab.component.tsx @@ -60,9 +60,9 @@ import { } from '../../../utils/EntityUtils'; import { showErrorToast } from '../../../utils/ToastUtils'; import { useAuthContext } from '../../Auth/AuthProviders/AuthProvider'; -import Loader from '../../Loader/Loader'; -import { TaskTab } from '../../Task/TaskTab/TaskTab.component'; -import '../../Widgets/FeedsWidget/feeds-widget.less'; +import Loader from '../../common/Loader/Loader'; +import { TaskTab } from '../../Entity/Task/TaskTab/TaskTab.component'; +import '../../MyData/Widgets/FeedsWidget/feeds-widget.less'; import ActivityFeedEditor from '../ActivityFeedEditor/ActivityFeedEditor'; import ActivityFeedListV1 from '../ActivityFeedList/ActivityFeedListV1.component'; import FeedPanelBodyV1 from '../ActivityFeedPanel/FeedPanelBodyV1'; diff --git a/openmetadata-ui/src/main/resources/ui/src/components/ActivityFeed/ActivityThreadPanel/ActivityThreadPanelBody.tsx b/openmetadata-ui/src/main/resources/ui/src/components/ActivityFeed/ActivityThreadPanel/ActivityThreadPanelBody.tsx index b90f038ada37..185ae2db5c0d 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/ActivityFeed/ActivityThreadPanel/ActivityThreadPanelBody.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/components/ActivityFeed/ActivityThreadPanel/ActivityThreadPanelBody.tsx @@ -33,7 +33,7 @@ import { getAllFeeds } from '../../../rest/feedsAPI'; import { showErrorToast } from '../../../utils/ToastUtils'; import { useAuthContext } from '../../Auth/AuthProviders/AuthProvider'; import ErrorPlaceHolder from '../../common/ErrorWithPlaceholder/ErrorPlaceHolder'; -import Loader from '../../Loader/Loader'; +import Loader from '../../common/Loader/Loader'; import ConfirmationModal from '../../Modals/ConfirmationModal/ConfirmationModal'; import { ConfirmState } from '../ActivityFeedCard/ActivityFeedCard.interface'; import ActivityFeedEditor from '../ActivityFeedEditor/ActivityFeedEditor'; diff --git a/openmetadata-ui/src/main/resources/ui/src/components/FeedEditor/FeedEditor.interface.ts b/openmetadata-ui/src/main/resources/ui/src/components/ActivityFeed/FeedEditor/FeedEditor.interface.ts similarity index 100% rename from openmetadata-ui/src/main/resources/ui/src/components/FeedEditor/FeedEditor.interface.ts rename to openmetadata-ui/src/main/resources/ui/src/components/ActivityFeed/FeedEditor/FeedEditor.interface.ts diff --git a/openmetadata-ui/src/main/resources/ui/src/components/FeedEditor/FeedEditor.test.tsx b/openmetadata-ui/src/main/resources/ui/src/components/ActivityFeed/FeedEditor/FeedEditor.test.tsx similarity index 100% rename from openmetadata-ui/src/main/resources/ui/src/components/FeedEditor/FeedEditor.test.tsx rename to openmetadata-ui/src/main/resources/ui/src/components/ActivityFeed/FeedEditor/FeedEditor.test.tsx diff --git a/openmetadata-ui/src/main/resources/ui/src/components/FeedEditor/FeedEditor.tsx b/openmetadata-ui/src/main/resources/ui/src/components/ActivityFeed/FeedEditor/FeedEditor.tsx similarity index 94% rename from openmetadata-ui/src/main/resources/ui/src/components/FeedEditor/FeedEditor.tsx rename to openmetadata-ui/src/main/resources/ui/src/components/ActivityFeed/FeedEditor/FeedEditor.tsx index 041e0af14609..13c5d0a7340a 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/FeedEditor/FeedEditor.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/components/ActivityFeed/FeedEditor/FeedEditor.tsx @@ -29,23 +29,23 @@ import React, { import ReactDOMServer from 'react-dom/server'; import { useTranslation } from 'react-i18next'; import ReactQuill, { Quill } from 'react-quill'; -import { BORDER_COLOR } from '../../constants/constants'; +import { BORDER_COLOR } from '../../../constants/constants'; import { MENTION_ALLOWED_CHARS, MENTION_DENOTATION_CHARS, TOOLBAR_ITEMS, -} from '../../constants/Feeds.constants'; -import { getUserByName } from '../../rest/userAPI'; +} from '../../../constants/Feeds.constants'; +import { useApplicationConfigContext } from '../../../context/ApplicationConfigProvider/ApplicationConfigProvider'; +import { getUserByName } from '../../../rest/userAPI'; import { HTMLToMarkdown, suggestions, userMentionItemWithAvatar, -} from '../../utils/FeedUtils'; -import { LinkBlot } from '../../utils/QuillLink/QuillLink'; -import { insertMention, insertRef } from '../../utils/QuillUtils'; -import { getEntityIcon } from '../../utils/TableUtils'; -import { useApplicationConfigContext } from '../ApplicationConfigProvider/ApplicationConfigProvider'; -import { editorRef } from '../common/RichTextEditor/RichTextEditor.interface'; +} from '../../../utils/FeedUtils'; +import { LinkBlot } from '../../../utils/QuillLink/QuillLink'; +import { insertMention, insertRef } from '../../../utils/QuillUtils'; +import { getEntityIcon } from '../../../utils/TableUtils'; +import { editorRef } from '../../common/RichTextEditor/RichTextEditor.interface'; import './feed-editor.less'; import { FeedEditorProp, MentionSuggestionsItem } from './FeedEditor.interface'; diff --git a/openmetadata-ui/src/main/resources/ui/src/components/FeedEditor/feed-editor.less b/openmetadata-ui/src/main/resources/ui/src/components/ActivityFeed/FeedEditor/feed-editor.less similarity index 100% rename from openmetadata-ui/src/main/resources/ui/src/components/FeedEditor/feed-editor.less rename to openmetadata-ui/src/main/resources/ui/src/components/ActivityFeed/FeedEditor/feed-editor.less diff --git a/openmetadata-ui/src/main/resources/ui/src/components/Reactions/Emoji.test.tsx b/openmetadata-ui/src/main/resources/ui/src/components/ActivityFeed/Reactions/Emoji.test.tsx similarity index 95% rename from openmetadata-ui/src/main/resources/ui/src/components/Reactions/Emoji.test.tsx rename to openmetadata-ui/src/main/resources/ui/src/components/ActivityFeed/Reactions/Emoji.test.tsx index 25dd54c3a616..00e06a5648bc 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/Reactions/Emoji.test.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/components/ActivityFeed/Reactions/Emoji.test.tsx @@ -13,8 +13,8 @@ import { fireEvent, render } from '@testing-library/react'; import React from 'react'; -import { User } from '../../generated/entity/teams/user'; -import { ReactionType } from '../../generated/type/reaction'; +import { User } from '../../../generated/entity/teams/user'; +import { ReactionType } from '../../../generated/type/reaction'; import Emoji from './Emoji'; const onReactionSelect = jest.fn(); diff --git a/openmetadata-ui/src/main/resources/ui/src/components/Reactions/Emoji.tsx b/openmetadata-ui/src/main/resources/ui/src/components/ActivityFeed/Reactions/Emoji.tsx similarity index 91% rename from openmetadata-ui/src/main/resources/ui/src/components/Reactions/Emoji.tsx rename to openmetadata-ui/src/main/resources/ui/src/components/ActivityFeed/Reactions/Emoji.tsx index 9e5ac1e5a0ac..90c82498d27d 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/Reactions/Emoji.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/components/ActivityFeed/Reactions/Emoji.tsx @@ -16,11 +16,11 @@ import { Button, Popover } from 'antd'; import classNames from 'classnames'; import React, { FC, useEffect, useMemo, useState } from 'react'; import { useTranslation } from 'react-i18next'; -import { REACTION_LIST } from '../../constants/reactions.constant'; -import { ReactionOperation } from '../../enums/reactions.enum'; -import { Reaction, ReactionType } from '../../generated/type/reaction'; -import useImage from '../../hooks/useImage'; -import { useAuthContext } from '../Auth/AuthProviders/AuthProvider'; +import { REACTION_LIST } from '../../../constants/reactions.constant'; +import { ReactionOperation } from '../../../enums/reactions.enum'; +import { Reaction, ReactionType } from '../../../generated/type/reaction'; +import useImage from '../../../hooks/useImage'; +import { useAuthContext } from '../../Auth/AuthProviders/AuthProvider'; interface EmojiProps { reaction: ReactionType; diff --git a/openmetadata-ui/src/main/resources/ui/src/components/Reactions/Reaction.test.tsx b/openmetadata-ui/src/main/resources/ui/src/components/ActivityFeed/Reactions/Reaction.test.tsx similarity index 97% rename from openmetadata-ui/src/main/resources/ui/src/components/Reactions/Reaction.test.tsx rename to openmetadata-ui/src/main/resources/ui/src/components/ActivityFeed/Reactions/Reaction.test.tsx index 197ea0923df5..17449cf7bd36 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/Reactions/Reaction.test.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/components/ActivityFeed/Reactions/Reaction.test.tsx @@ -13,7 +13,7 @@ import { fireEvent, render } from '@testing-library/react'; import React from 'react'; -import { ReactionType } from '../../generated/type/reaction'; +import { ReactionType } from '../../../generated/type/reaction'; import Reaction from './Reaction'; const onReactionSelect = jest.fn(); diff --git a/openmetadata-ui/src/main/resources/ui/src/components/Reactions/Reaction.tsx b/openmetadata-ui/src/main/resources/ui/src/components/ActivityFeed/Reactions/Reaction.tsx similarity index 91% rename from openmetadata-ui/src/main/resources/ui/src/components/Reactions/Reaction.tsx rename to openmetadata-ui/src/main/resources/ui/src/components/ActivityFeed/Reactions/Reaction.tsx index dc1d5f39d9af..74b568ca6fed 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/Reactions/Reaction.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/components/ActivityFeed/Reactions/Reaction.tsx @@ -16,9 +16,9 @@ import { Button } from 'antd'; import classNames from 'classnames'; import { uniqueId } from 'lodash'; import React, { FC } from 'react'; -import { ReactionOperation } from '../../enums/reactions.enum'; -import { ReactionType } from '../../generated/type/reaction'; -import useImage from '../../hooks/useImage'; +import { ReactionOperation } from '../../../enums/reactions.enum'; +import { ReactionType } from '../../../generated/type/reaction'; +import useImage from '../../../hooks/useImage'; interface ReactionProps { reaction: { diff --git a/openmetadata-ui/src/main/resources/ui/src/components/Reactions/Reactions.test.tsx b/openmetadata-ui/src/main/resources/ui/src/components/ActivityFeed/Reactions/Reactions.test.tsx similarity index 98% rename from openmetadata-ui/src/main/resources/ui/src/components/Reactions/Reactions.test.tsx rename to openmetadata-ui/src/main/resources/ui/src/components/ActivityFeed/Reactions/Reactions.test.tsx index 46c67a175299..4d1489fdaae0 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/Reactions/Reactions.test.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/components/ActivityFeed/Reactions/Reactions.test.tsx @@ -13,7 +13,7 @@ import { fireEvent, render } from '@testing-library/react'; import React from 'react'; -import { ReactionType } from '../../generated/type/reaction'; +import { ReactionType } from '../../../generated/type/reaction'; import Reactions from './Reactions'; jest.mock('./Emoji', () => diff --git a/openmetadata-ui/src/main/resources/ui/src/components/Reactions/Reactions.tsx b/openmetadata-ui/src/main/resources/ui/src/components/ActivityFeed/Reactions/Reactions.tsx similarity index 91% rename from openmetadata-ui/src/main/resources/ui/src/components/Reactions/Reactions.tsx rename to openmetadata-ui/src/main/resources/ui/src/components/ActivityFeed/Reactions/Reactions.tsx index 57f7f2eda2b4..7adf797a7a79 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/Reactions/Reactions.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/components/ActivityFeed/Reactions/Reactions.tsx @@ -16,17 +16,17 @@ import { Button, Popover } from 'antd'; import { groupBy, uniqueId } from 'lodash'; import React, { FC, useState } from 'react'; import { useTranslation } from 'react-i18next'; -import { ReactComponent as AddReactionIcon } from '../../assets/svg/ic-reaction.svg'; +import { ReactComponent as AddReactionIcon } from '../../../assets/svg/ic-reaction.svg'; import { REACTION_LIST, REACTION_TYPE_LIST, -} from '../../constants/reactions.constant'; -import { ReactionOperation } from '../../enums/reactions.enum'; +} from '../../../constants/reactions.constant'; +import { ReactionOperation } from '../../../enums/reactions.enum'; import { Reaction as ReactionProp, ReactionType, -} from '../../generated/type/reaction'; -import { useAuthContext } from '../Auth/AuthProviders/AuthProvider'; +} from '../../../generated/type/reaction'; +import { useAuthContext } from '../../Auth/AuthProviders/AuthProvider'; import Emoji from './Emoji'; import Reaction from './Reaction'; import './reactions.less'; diff --git a/openmetadata-ui/src/main/resources/ui/src/components/Reactions/reactions.less b/openmetadata-ui/src/main/resources/ui/src/components/ActivityFeed/Reactions/reactions.less similarity index 96% rename from openmetadata-ui/src/main/resources/ui/src/components/Reactions/reactions.less rename to openmetadata-ui/src/main/resources/ui/src/components/ActivityFeed/Reactions/reactions.less index 253b8234be12..a44dfd2b311c 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/Reactions/reactions.less +++ b/openmetadata-ui/src/main/resources/ui/src/components/ActivityFeed/Reactions/reactions.less @@ -10,7 +10,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -@import url('../../styles/variables.less'); +@import url('../../../styles/variables.less'); /* Reaction CSS Start */ .ant-btn-add-reactions:hover, diff --git a/openmetadata-ui/src/main/resources/ui/src/components/ActivityFeed/Shared/ActivityFeedActions.tsx b/openmetadata-ui/src/main/resources/ui/src/components/ActivityFeed/Shared/ActivityFeedActions.tsx index 62093bcf0666..75bc76e67031 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/ActivityFeed/Shared/ActivityFeedActions.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/components/ActivityFeed/Shared/ActivityFeedActions.tsx @@ -20,7 +20,6 @@ import { ReactComponent as IconEdit } from '../../../assets/svg/ic-edit.svg'; import { ReactComponent as IconReaction } from '../../../assets/svg/ic-reaction.svg'; import { ReactComponent as IconReply } from '../../../assets/svg/ic-reply.svg'; import ConfirmationModal from '../../../components/Modals/ConfirmationModal/ConfirmationModal'; -import Reaction from '../../../components/Reactions/Reaction'; import { REACTION_LIST } from '../../../constants/reactions.constant'; import { ReactionOperation } from '../../../enums/reactions.enum'; import { @@ -31,6 +30,7 @@ import { } from '../../../generated/entity/feed/thread'; import { useAuthContext } from '../../Auth/AuthProviders/AuthProvider'; import { useActivityFeedProvider } from '../ActivityFeedProvider/ActivityFeedProvider'; +import Reaction from '../Reactions/Reaction'; import './activity-feed-actions.less'; interface ActivityFeedActionsProps { diff --git a/openmetadata-ui/src/main/resources/ui/src/components/AppBar/Appbar.tsx b/openmetadata-ui/src/main/resources/ui/src/components/AppBar/Appbar.tsx index 61d5b4646fc7..00359b0a3982 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/AppBar/Appbar.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/components/AppBar/Appbar.tsx @@ -27,8 +27,6 @@ import { ReactComponent as IconTour } from '../../assets/svg/icon-tour.svg'; import { ReactComponent as IconSlackGrey } from '../../assets/svg/slack-grey.svg'; import { ReactComponent as IconVersionBlack } from '../../assets/svg/version-black.svg'; import { ReactComponent as IconWhatsNew } from '../../assets/svg/whats-new.svg'; -import { useGlobalSearchProvider } from '../../components/GlobalSearchProvider/GlobalSearchProvider'; -import { useTourProvider } from '../../components/TourProvider/TourProvider'; import { getExplorePath, ROUTES, @@ -39,6 +37,8 @@ import { urlGithubRepo, urlJoinSlack, } from '../../constants/URL.constants'; +import { useGlobalSearchProvider } from '../../context/GlobalSearchProvider/GlobalSearchProvider'; +import { useTourProvider } from '../../context/TourProvider/TourProvider'; import { CurrentTourPageType } from '../../enums/tour.enum'; import { getVersion } from '../../rest/miscAPI'; import { diff --git a/openmetadata-ui/src/main/resources/ui/src/components/AppBar/Suggestions.tsx b/openmetadata-ui/src/main/resources/ui/src/components/AppBar/Suggestions.tsx index 65eed1043b70..80cb1aedfaf1 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/AppBar/Suggestions.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/components/AppBar/Suggestions.tsx @@ -16,8 +16,21 @@ import { AxiosError } from 'axios'; import { isEmpty } from 'lodash'; import React, { useCallback, useEffect, useRef, useState } from 'react'; import { useTranslation } from 'react-i18next'; -import Loader from '../../components/Loader/Loader'; import { PAGE_SIZE_BASE } from '../../constants/constants'; +import { + DashboardSource, + DataProductSource, + GlossarySource, + MlModelSource, + Option, + PipelineSource, + SearchIndexSource, + SearchSuggestions, + TableSource, + TagSource, + TopicSource, +} from '../../context/GlobalSearchProvider/GlobalSearchSuggestions/GlobalSearchSuggestions.interface'; +import { useTourProvider } from '../../context/TourProvider/TourProvider'; import { SearchIndex } from '../../enums/search.enum'; import { ContainerSearchSource, @@ -33,20 +46,7 @@ import { getSuggestionElement, } from '../../utils/SearchUtils'; import { showErrorToast } from '../../utils/ToastUtils'; -import { - DashboardSource, - DataProductSource, - GlossarySource, - MlModelSource, - Option, - PipelineSource, - SearchIndexSource, - SearchSuggestions, - TableSource, - TagSource, - TopicSource, -} from '../GlobalSearchProvider/GlobalSearchSuggestions/GlobalSearchSuggestions.interface'; -import { useTourProvider } from '../TourProvider/TourProvider'; +import Loader from '../common/Loader/Loader'; type SuggestionProp = { searchText: string; diff --git a/openmetadata-ui/src/main/resources/ui/src/components/AppRouter/AppRouter.tsx b/openmetadata-ui/src/main/resources/ui/src/components/AppRouter/AppRouter.tsx index d5cdda45d95f..7e0a6ee3dcf7 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/AppRouter/AppRouter.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/components/AppRouter/AppRouter.tsx @@ -23,7 +23,7 @@ import SamlCallback from '../../pages/SamlCallback'; import AccountActivationConfirmation from '../../pages/SignUp/account-activation-confirmation.component'; import { isProtectedRoute } from '../../utils/AuthProvider.util'; import { useAuthContext } from '../Auth/AuthProviders/AuthProvider'; -import Loader from '../Loader/Loader'; +import Loader from '../common/Loader/Loader'; import withSuspenseFallback from './withSuspenseFallback'; const SigninPage = withSuspenseFallback( diff --git a/openmetadata-ui/src/main/resources/ui/src/components/AppRouter/AuthenticatedAppRouter.tsx b/openmetadata-ui/src/main/resources/ui/src/components/AppRouter/AuthenticatedAppRouter.tsx index 86215bc88067..b901da422247 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/AppRouter/AuthenticatedAppRouter.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/components/AppRouter/AuthenticatedAppRouter.tsx @@ -13,7 +13,6 @@ import React, { FunctionComponent, useMemo } from 'react'; import { Redirect, Route, Switch } from 'react-router-dom'; -import DataProductsPage from '../../components/DataProducts/DataProductsPage/DataProductsPage.component'; import AddDomain from '../../components/Domain/AddDomain/AddDomain.component'; import DomainPage from '../../components/Domain/DomainPage.component'; import { ROUTES } from '../../constants/constants'; @@ -21,6 +20,8 @@ import { GlobalSettingOptions, GlobalSettingsMenuCategory, } from '../../constants/GlobalSettings.constants'; +import { usePermissionProvider } from '../../context/PermissionProvider/PermissionProvider'; +import { ResourceEntity } from '../../context/PermissionProvider/PermissionProvider.interface'; import { Operation } from '../../generated/entity/policies/policy'; import { TeamType } from '../../generated/entity/teams/team'; import AddCustomMetricPage from '../../pages/AddCustomMetricPage/AddCustomMetricPage'; @@ -36,8 +37,7 @@ import { getSettingPath, getTeamsWithFqnPath, } from '../../utils/RouterUtils'; -import { usePermissionProvider } from '../PermissionProvider/PermissionProvider'; -import { ResourceEntity } from '../PermissionProvider/PermissionProvider.interface'; +import DataProductsPage from '../DataProducts/DataProductsPage/DataProductsPage.component'; import AdminProtectedRoute from './AdminProtectedRoute'; import withSuspenseFallback from './withSuspenseFallback'; @@ -79,7 +79,8 @@ const AddDataQualityTestPage = withSuspenseFallback( const AddCustomProperty = withSuspenseFallback( React.lazy( - () => import('../CustomEntityDetail/AddCustomProperty/AddCustomProperty') + () => + import('../Settings/CustomProperty/AddCustomProperty/AddCustomProperty') ) ); @@ -158,7 +159,7 @@ const MarketPlaceAppDetails = withSuspenseFallback( React.lazy( () => import( - '../../components/Applications/MarketPlaceAppDetails/MarketPlaceAppDetails.component' + '../Settings/Applications/MarketPlaceAppDetails/MarketPlaceAppDetails.component' ) ) ); @@ -327,7 +328,7 @@ const EditKPIPage = withSuspenseFallback( const AddTestSuitePage = withSuspenseFallback( React.lazy( - () => import('../../components/TestSuite/TestSuiteStepper/TestSuiteStepper') + () => import('../DataQuality/TestSuite/TestSuiteStepper/TestSuiteStepper') ) ); @@ -438,8 +439,7 @@ const CustomPropertiesPageV1 = withSuspenseFallback( const AppDetailsPage = withSuspenseFallback( React.lazy( - () => - import('../../components/Applications/AppDetails/AppDetails.component') + () => import('../Settings/Applications/AppDetails/AppDetails.component') ) ); diff --git a/openmetadata-ui/src/main/resources/ui/src/components/AppRouter/withSuspenseFallback.js b/openmetadata-ui/src/main/resources/ui/src/components/AppRouter/withSuspenseFallback.js index 5313751cc5ce..5c69f2be4081 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/AppRouter/withSuspenseFallback.js +++ b/openmetadata-ui/src/main/resources/ui/src/components/AppRouter/withSuspenseFallback.js @@ -12,7 +12,7 @@ */ import React, { Suspense } from 'react'; -import Loader from '../Loader/Loader'; +import Loader from '../common/Loader/Loader'; export default function withSuspenseFallback(Component) { return function DefaultFallback(props) { diff --git a/openmetadata-ui/src/main/resources/ui/src/components/AppTour/Tour.tsx b/openmetadata-ui/src/main/resources/ui/src/components/AppTour/Tour.tsx index 6fa332e28aff..f01d4a9d3b26 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/AppTour/Tour.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/components/AppTour/Tour.tsx @@ -16,9 +16,9 @@ import { Button } from 'antd'; import React, { useState } from 'react'; import { useHistory } from 'react-router-dom'; import { PRIMERY_COLOR } from '../../constants/constants'; +import { useTourProvider } from '../../context/TourProvider/TourProvider'; import { CurrentTourPageType } from '../../enums/tour.enum'; import TourEndModal from '../Modals/TourEndModal/TourEndModal'; -import { useTourProvider } from '../TourProvider/TourProvider'; import './tour.style.less'; const Tour = ({ steps }: { steps: TourSteps[] }) => { diff --git a/openmetadata-ui/src/main/resources/ui/src/components/Auth/AppAuthenticators/OidcAuthenticator.tsx b/openmetadata-ui/src/main/resources/ui/src/components/Auth/AppAuthenticators/OidcAuthenticator.tsx index e17562c7e48d..574cd18097e6 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/Auth/AppAuthenticators/OidcAuthenticator.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/components/Auth/AppAuthenticators/OidcAuthenticator.tsx @@ -28,7 +28,7 @@ import SignInPage from '../../../pages/LoginPage/SignInPage'; import PageNotFound from '../../../pages/PageNotFound/PageNotFound'; import localState from '../../../utils/LocalStorageUtils'; import { showErrorToast } from '../../../utils/ToastUtils'; -import Loader from '../../Loader/Loader'; +import Loader from '../../common/Loader/Loader'; import { useAuthContext } from '../AuthProviders/AuthProvider'; import { AuthenticatorRef, diff --git a/openmetadata-ui/src/main/resources/ui/src/components/Auth/AuthProviders/AuthProvider.tsx b/openmetadata-ui/src/main/resources/ui/src/components/Auth/AuthProviders/AuthProvider.tsx index 4deb22382d81..30aef9b2aa70 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/Auth/AuthProviders/AuthProvider.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/components/Auth/AuthProviders/AuthProvider.tsx @@ -44,6 +44,7 @@ import { REDIRECT_PATHNAME, ROUTES, } from '../../../constants/constants'; +import { useApplicationConfigContext } from '../../../context/ApplicationConfigProvider/ApplicationConfigProvider'; import { ClientErrors } from '../../../enums/Axios.enum'; import { AuthenticationConfiguration } from '../../../generated/configuration/authenticationConfiguration'; import { AuthorizerConfiguration } from '../../../generated/configuration/authorizerConfiguration'; @@ -72,8 +73,7 @@ import { matchUserDetails, } from '../../../utils/UserDataUtils'; import { resetWebAnalyticSession } from '../../../utils/WebAnalyticsUtils'; -import { useApplicationConfigContext } from '../../ApplicationConfigProvider/ApplicationConfigProvider'; -import Loader from '../../Loader/Loader'; +import Loader from '../../common/Loader/Loader'; import Auth0Authenticator from '../AppAuthenticators/Auth0Authenticator'; import BasicAuthAuthenticator from '../AppAuthenticators/BasicAuthAuthenticator'; import MsalAuthenticator from '../AppAuthenticators/MsalAuthenticator'; diff --git a/openmetadata-ui/src/main/resources/ui/src/components/BlockEditor/Extensions/image/ImageComponent.tsx b/openmetadata-ui/src/main/resources/ui/src/components/BlockEditor/Extensions/image/ImageComponent.tsx index 35e58a01e63a..49b1d178bd49 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/BlockEditor/Extensions/image/ImageComponent.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/components/BlockEditor/Extensions/image/ImageComponent.tsx @@ -32,7 +32,7 @@ import { isEmpty } from 'lodash'; import React, { FC, useState } from 'react'; import { useTranslation } from 'react-i18next'; import { ReactComponent as IconFormatImage } from '../../../../assets/svg/ic-format-image.svg'; -import Loader from '../../../Loader/Loader'; +import Loader from '../../../common/Loader/Loader'; interface PopoverContentProps { updateAttributes: NodeViewProps['updateAttributes']; diff --git a/openmetadata-ui/src/main/resources/ui/src/components/ClassificationDetails/ClassificationDetails.interface.ts b/openmetadata-ui/src/main/resources/ui/src/components/Classifications/ClassificationDetails/ClassificationDetails.interface.ts similarity index 79% rename from openmetadata-ui/src/main/resources/ui/src/components/ClassificationDetails/ClassificationDetails.interface.ts rename to openmetadata-ui/src/main/resources/ui/src/components/Classifications/ClassificationDetails/ClassificationDetails.interface.ts index 6ec313bf363b..7f8241d2232c 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/ClassificationDetails/ClassificationDetails.interface.ts +++ b/openmetadata-ui/src/main/resources/ui/src/components/Classifications/ClassificationDetails/ClassificationDetails.interface.ts @@ -10,10 +10,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -import { Classification } from '../../generated/entity/classification/classification'; -import { Tag } from '../../generated/entity/classification/tag'; -import { DeleteTagsType } from '../../pages/TagsPage/TagsPage.interface'; -import { OperationPermission } from '../PermissionProvider/PermissionProvider.interface'; +import { OperationPermission } from '../../../context/PermissionProvider/PermissionProvider.interface'; +import { Classification } from '../../../generated/entity/classification/classification'; +import { Tag } from '../../../generated/entity/classification/tag'; +import { DeleteTagsType } from '../../../pages/TagsPage/TagsPage.interface'; export interface ClassificationDetailsProps { classificationPermissions: OperationPermission; diff --git a/openmetadata-ui/src/main/resources/ui/src/components/ClassificationDetails/ClassificationDetails.tsx b/openmetadata-ui/src/main/resources/ui/src/components/Classifications/ClassificationDetails/ClassificationDetails.tsx similarity index 88% rename from openmetadata-ui/src/main/resources/ui/src/components/ClassificationDetails/ClassificationDetails.tsx rename to openmetadata-ui/src/main/resources/ui/src/components/Classifications/ClassificationDetails/ClassificationDetails.tsx index cd6ef06e5e07..54af3137470c 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/ClassificationDetails/ClassificationDetails.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/components/Classifications/ClassificationDetails/ClassificationDetails.tsx @@ -27,47 +27,47 @@ import React, { } from 'react'; import { useTranslation } from 'react-i18next'; import { useHistory } from 'react-router-dom'; -import { ReactComponent as IconTag } from '../../assets/svg/classification.svg'; -import { ReactComponent as LockIcon } from '../../assets/svg/closed-lock.svg'; -import { ReactComponent as VersionIcon } from '../../assets/svg/ic-version.svg'; -import AppBadge from '../../components/common/Badge/Badge.component'; -import Description from '../../components/common/EntityDescription/Description'; -import ErrorPlaceHolder from '../../components/common/ErrorWithPlaceholder/ErrorPlaceHolder'; -import RichTextEditorPreviewer from '../../components/common/RichTextEditor/RichTextEditorPreviewer'; -import Table from '../../components/common/Table/Table'; -import EntityHeaderTitle from '../../components/Entity/EntityHeaderTitle/EntityHeaderTitle.component'; -import { usePermissionProvider } from '../../components/PermissionProvider/PermissionProvider'; -import { ResourceEntity } from '../../components/PermissionProvider/PermissionProvider.interface'; -import { DE_ACTIVE_COLOR } from '../../constants/constants'; -import { EntityField } from '../../constants/Feeds.constants'; -import { EntityType } from '../../enums/entity.enum'; -import { ProviderType } from '../../generated/api/classification/createClassification'; -import { ChangeDescription } from '../../generated/entity/classification/classification'; -import { Tag } from '../../generated/entity/classification/tag'; -import { Operation } from '../../generated/entity/policies/policy'; -import { Paging } from '../../generated/type/paging'; -import { usePaging } from '../../hooks/paging/usePaging'; -import { useFqn } from '../../hooks/useFqn'; -import { getTags } from '../../rest/tagAPI'; +import { ReactComponent as IconTag } from '../../../assets/svg/classification.svg'; +import { ReactComponent as LockIcon } from '../../../assets/svg/closed-lock.svg'; +import { ReactComponent as VersionIcon } from '../../../assets/svg/ic-version.svg'; +import { DE_ACTIVE_COLOR } from '../../../constants/constants'; +import { EntityField } from '../../../constants/Feeds.constants'; +import { usePermissionProvider } from '../../../context/PermissionProvider/PermissionProvider'; +import { ResourceEntity } from '../../../context/PermissionProvider/PermissionProvider.interface'; +import { EntityType } from '../../../enums/entity.enum'; +import { ProviderType } from '../../../generated/api/classification/createClassification'; +import { ChangeDescription } from '../../../generated/entity/classification/classification'; +import { Tag } from '../../../generated/entity/classification/tag'; +import { Operation } from '../../../generated/entity/policies/policy'; +import { Paging } from '../../../generated/type/paging'; +import { usePaging } from '../../../hooks/paging/usePaging'; +import { useFqn } from '../../../hooks/useFqn'; +import { getTags } from '../../../rest/tagAPI'; import { getClassificationExtraDropdownContent, getTagsTableColumn, -} from '../../utils/ClassificationUtils'; -import { getEntityName } from '../../utils/EntityUtils'; +} from '../../../utils/ClassificationUtils'; +import { getEntityName } from '../../../utils/EntityUtils'; import { getEntityVersionByField, getMutuallyExclusiveDiff, -} from '../../utils/EntityVersionUtils'; -import { checkPermission } from '../../utils/PermissionsUtils'; +} from '../../../utils/EntityVersionUtils'; +import { checkPermission } from '../../../utils/PermissionsUtils'; import { getClassificationDetailsPath, getClassificationVersionsPath, -} from '../../utils/RouterUtils'; -import { getErrorText } from '../../utils/StringsUtils'; -import { showErrorToast } from '../../utils/ToastUtils'; -import ManageButton from '../common/EntityPageInfos/ManageButton/ManageButton'; -import NextPrevious from '../common/NextPrevious/NextPrevious'; -import { NextPreviousProps } from '../common/NextPrevious/NextPrevious.interface'; +} from '../../../utils/RouterUtils'; +import { getErrorText } from '../../../utils/StringsUtils'; +import { showErrorToast } from '../../../utils/ToastUtils'; +import AppBadge from '../../common/Badge/Badge.component'; +import Description from '../../common/EntityDescription/Description'; +import ManageButton from '../../common/EntityPageInfos/ManageButton/ManageButton'; +import ErrorPlaceHolder from '../../common/ErrorWithPlaceholder/ErrorPlaceHolder'; +import NextPrevious from '../../common/NextPrevious/NextPrevious'; +import { NextPreviousProps } from '../../common/NextPrevious/NextPrevious.interface'; +import RichTextEditorPreviewer from '../../common/RichTextEditor/RichTextEditorPreviewer'; +import Table from '../../common/Table/Table'; +import EntityHeaderTitle from '../../Entity/EntityHeaderTitle/EntityHeaderTitle.component'; import { ClassificationDetailsProps } from './ClassificationDetails.interface'; const ClassificationDetails = forwardRef( diff --git a/openmetadata-ui/src/main/resources/ui/src/components/ContainerDetail/ContainerChildren/ContainerChildren.test.tsx b/openmetadata-ui/src/main/resources/ui/src/components/Container/ContainerChildren/ContainerChildren.test.tsx similarity index 100% rename from openmetadata-ui/src/main/resources/ui/src/components/ContainerDetail/ContainerChildren/ContainerChildren.test.tsx rename to openmetadata-ui/src/main/resources/ui/src/components/Container/ContainerChildren/ContainerChildren.test.tsx diff --git a/openmetadata-ui/src/main/resources/ui/src/components/ContainerDetail/ContainerChildren/ContainerChildren.tsx b/openmetadata-ui/src/main/resources/ui/src/components/Container/ContainerChildren/ContainerChildren.tsx similarity index 91% rename from openmetadata-ui/src/main/resources/ui/src/components/ContainerDetail/ContainerChildren/ContainerChildren.tsx rename to openmetadata-ui/src/main/resources/ui/src/components/Container/ContainerChildren/ContainerChildren.tsx index 0e9e1f310cf4..6af65f8c9a10 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/ContainerDetail/ContainerChildren/ContainerChildren.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/components/Container/ContainerChildren/ContainerChildren.tsx @@ -15,13 +15,13 @@ import { ColumnsType } from 'antd/lib/table'; import React, { FC, useEffect, useMemo } from 'react'; import { useTranslation } from 'react-i18next'; import { Link } from 'react-router-dom'; -import ErrorPlaceHolder from '../../../components/common/ErrorWithPlaceholder/ErrorPlaceHolder'; -import RichTextEditorPreviewer from '../../../components/common/RichTextEditor/RichTextEditorPreviewer'; -import Table from '../../../components/common/Table/Table'; import { getContainerDetailPath } from '../../../constants/constants'; import { Container } from '../../../generated/entity/data/container'; import { EntityReference } from '../../../generated/type/entityReference'; import { getEntityName } from '../../../utils/EntityUtils'; +import ErrorPlaceHolder from '../../common/ErrorWithPlaceholder/ErrorPlaceHolder'; +import RichTextEditorPreviewer from '../../common/RichTextEditor/RichTextEditorPreviewer'; +import Table from '../../common/Table/Table'; interface ContainerChildrenProps { childrenList: Container['children']; diff --git a/openmetadata-ui/src/main/resources/ui/src/components/ContainerDetail/ContainerDataModel/ContainerDataModel.interface.ts b/openmetadata-ui/src/main/resources/ui/src/components/Container/ContainerDataModel/ContainerDataModel.interface.ts similarity index 100% rename from openmetadata-ui/src/main/resources/ui/src/components/ContainerDetail/ContainerDataModel/ContainerDataModel.interface.ts rename to openmetadata-ui/src/main/resources/ui/src/components/Container/ContainerDataModel/ContainerDataModel.interface.ts diff --git a/openmetadata-ui/src/main/resources/ui/src/components/ContainerDetail/ContainerDataModel/ContainerDataModel.test.tsx b/openmetadata-ui/src/main/resources/ui/src/components/Container/ContainerDataModel/ContainerDataModel.test.tsx similarity index 100% rename from openmetadata-ui/src/main/resources/ui/src/components/ContainerDetail/ContainerDataModel/ContainerDataModel.test.tsx rename to openmetadata-ui/src/main/resources/ui/src/components/Container/ContainerDataModel/ContainerDataModel.test.tsx diff --git a/openmetadata-ui/src/main/resources/ui/src/components/ContainerDetail/ContainerDataModel/ContainerDataModel.tsx b/openmetadata-ui/src/main/resources/ui/src/components/Container/ContainerDataModel/ContainerDataModel.tsx similarity index 94% rename from openmetadata-ui/src/main/resources/ui/src/components/ContainerDetail/ContainerDataModel/ContainerDataModel.tsx rename to openmetadata-ui/src/main/resources/ui/src/components/Container/ContainerDataModel/ContainerDataModel.tsx index c19cc2116106..13225fce402e 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/ContainerDetail/ContainerDataModel/ContainerDataModel.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/components/Container/ContainerDataModel/ContainerDataModel.tsx @@ -23,11 +23,6 @@ import { import { EntityTags, TagFilterOptions } from 'Models'; import React, { FC, useCallback, useMemo, useState } from 'react'; import { useTranslation } from 'react-i18next'; -import ErrorPlaceHolder from '../../../components/common/ErrorWithPlaceholder/ErrorPlaceHolder'; -import { ModalWithMarkdownEditor } from '../../../components/Modals/ModalWithMarkdownEditor/ModalWithMarkdownEditor'; -import { ColumnFilter } from '../../../components/Table/ColumnFilter/ColumnFilter.component'; -import TableDescription from '../../../components/TableDescription/TableDescription.component'; -import TableTags from '../../../components/TableTags/TableTags.component'; import { TABLE_SCROLL_VALUE } from '../../../constants/Table.constants'; import { EntityType } from '../../../enums/entity.enum'; import { Column, TagLabel } from '../../../generated/entity/data/container'; @@ -45,6 +40,11 @@ import { getFilterIcon, getTableExpandableConfig, } from '../../../utils/TableUtils'; +import ErrorPlaceHolder from '../../common/ErrorWithPlaceholder/ErrorPlaceHolder'; +import { ColumnFilter } from '../../Database/ColumnFilter/ColumnFilter.component'; +import TableDescription from '../../Database/TableDescription/TableDescription.component'; +import TableTags from '../../Database/TableTags/TableTags.component'; +import { ModalWithMarkdownEditor } from '../../Modals/ModalWithMarkdownEditor/ModalWithMarkdownEditor'; import { ContainerDataModelProps } from './ContainerDataModel.interface'; const ContainerDataModel: FC = ({ diff --git a/openmetadata-ui/src/main/resources/ui/src/components/ContainerVersion/ContainerVersion.component.tsx b/openmetadata-ui/src/main/resources/ui/src/components/Container/ContainerVersion/ContainerVersion.component.tsx similarity index 85% rename from openmetadata-ui/src/main/resources/ui/src/components/ContainerVersion/ContainerVersion.component.tsx rename to openmetadata-ui/src/main/resources/ui/src/components/Container/ContainerVersion/ContainerVersion.component.tsx index 75ff6366f19a..9845c8fc6a5e 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/ContainerVersion/ContainerVersion.component.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/components/Container/ContainerVersion/ContainerVersion.component.tsx @@ -17,33 +17,33 @@ import { cloneDeep, toString } from 'lodash'; import React, { useEffect, useMemo, useState } from 'react'; import { useTranslation } from 'react-i18next'; import { useHistory, useParams } from 'react-router-dom'; -import { CustomPropertyTable } from '../../components/common/CustomPropertyTable/CustomPropertyTable'; -import DescriptionV1 from '../../components/common/EntityDescription/DescriptionV1'; -import DataAssetsVersionHeader from '../../components/DataAssets/DataAssetsVersionHeader/DataAssetsVersionHeader'; -import EntityVersionTimeLine from '../../components/Entity/EntityVersionTimeLine/EntityVersionTimeLine'; -import Loader from '../../components/Loader/Loader'; -import TabsLabel from '../../components/TabsLabel/TabsLabel.component'; -import TagsContainerV2 from '../../components/Tag/TagsContainerV2/TagsContainerV2'; -import VersionTable from '../../components/VersionTable/VersionTable.component'; -import { FQN_SEPARATOR_CHAR } from '../../constants/char.constants'; -import { getVersionPathWithTab } from '../../constants/constants'; -import { EntityField } from '../../constants/Feeds.constants'; -import { EntityTabs, EntityType, FqnPart } from '../../enums/entity.enum'; +import { FQN_SEPARATOR_CHAR } from '../../../constants/char.constants'; +import { getVersionPathWithTab } from '../../../constants/constants'; +import { EntityField } from '../../../constants/Feeds.constants'; +import { EntityTabs, EntityType, FqnPart } from '../../../enums/entity.enum'; import { ChangeDescription, Column, -} from '../../generated/entity/data/container'; -import { TagSource } from '../../generated/type/tagLabel'; -import { getPartialNameFromTableFQN } from '../../utils/CommonUtils'; +} from '../../../generated/entity/data/container'; +import { TagSource } from '../../../generated/type/tagLabel'; +import { getPartialNameFromTableFQN } from '../../../utils/CommonUtils'; import { getColumnsDataWithVersionChanges, getCommonExtraInfoForVersionDetails, getConstraintChanges, getEntityVersionByField, getEntityVersionTags, -} from '../../utils/EntityVersionUtils'; +} from '../../../utils/EntityVersionUtils'; +import { CustomPropertyTable } from '../../common/CustomPropertyTable/CustomPropertyTable'; +import DescriptionV1 from '../../common/EntityDescription/DescriptionV1'; +import Loader from '../../common/Loader/Loader'; +import TabsLabel from '../../common/TabsLabel/TabsLabel.component'; +import DataAssetsVersionHeader from '../../DataAssets/DataAssetsVersionHeader/DataAssetsVersionHeader'; +import EntityVersionTimeLine from '../../Entity/EntityVersionTimeLine/EntityVersionTimeLine'; +import VersionTable from '../../Entity/VersionTable/VersionTable.component'; +import TagsContainerV2 from '../../Tag/TagsContainerV2/TagsContainerV2'; -import DataProductsContainer from '../DataProductsContainer/DataProductsContainer.component'; +import DataProductsContainer from '../../DataProducts/DataProductsContainer/DataProductsContainer.component'; import { ContainerVersionProp } from './ContainerVersion.interface'; const ContainerVersion: React.FC = ({ diff --git a/openmetadata-ui/src/main/resources/ui/src/components/ContainerVersion/ContainerVersion.interface.ts b/openmetadata-ui/src/main/resources/ui/src/components/Container/ContainerVersion/ContainerVersion.interface.ts similarity index 75% rename from openmetadata-ui/src/main/resources/ui/src/components/ContainerVersion/ContainerVersion.interface.ts rename to openmetadata-ui/src/main/resources/ui/src/components/Container/ContainerVersion/ContainerVersion.interface.ts index d2ec4000371b..25ea01d89892 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/ContainerVersion/ContainerVersion.interface.ts +++ b/openmetadata-ui/src/main/resources/ui/src/components/Container/ContainerVersion/ContainerVersion.interface.ts @@ -10,11 +10,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -import { OperationPermission } from '../../components/PermissionProvider/PermissionProvider.interface'; -import { Container } from '../../generated/entity/data/container'; -import { EntityHistory } from '../../generated/type/entityHistory'; -import { TagLabel } from '../../generated/type/tagLabel'; -import { TitleBreadcrumbProps } from '../common/TitleBreadcrumb/TitleBreadcrumb.interface'; +import { OperationPermission } from '../../../context/PermissionProvider/PermissionProvider.interface'; +import { Container } from '../../../generated/entity/data/container'; +import { EntityHistory } from '../../../generated/type/entityHistory'; +import { TagLabel } from '../../../generated/type/tagLabel'; +import { TitleBreadcrumbProps } from '../../common/TitleBreadcrumb/TitleBreadcrumb.interface'; export interface ContainerVersionProp { version: string; diff --git a/openmetadata-ui/src/main/resources/ui/src/components/ContainerVersion/ContainerVersion.test.tsx b/openmetadata-ui/src/main/resources/ui/src/components/Container/ContainerVersion/ContainerVersion.test.tsx similarity index 82% rename from openmetadata-ui/src/main/resources/ui/src/components/ContainerVersion/ContainerVersion.test.tsx rename to openmetadata-ui/src/main/resources/ui/src/components/Container/ContainerVersion/ContainerVersion.test.tsx index 9cfcaf51cb0d..e2bba6553175 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/ContainerVersion/ContainerVersion.test.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/components/Container/ContainerVersion/ContainerVersion.test.tsx @@ -14,47 +14,43 @@ import { act, render, screen } from '@testing-library/react'; import userEvent from '@testing-library/user-event'; import React from 'react'; -import { containerVersionMockProps } from '../../mocks/ContainerVersion.mock'; +import { containerVersionMockProps } from '../../../mocks/ContainerVersion.mock'; import ContainerVersion from './ContainerVersion.component'; const mockPush = jest.fn(); jest.mock( - '../../components/DataAssets/DataAssetsVersionHeader/DataAssetsVersionHeader', + '../../DataAssets/DataAssetsVersionHeader/DataAssetsVersionHeader', () => jest.fn().mockImplementation(() =>
DataAssetsVersionHeader
) ); -jest.mock('../../components/TabsLabel/TabsLabel.component', () => +jest.mock('../../common/TabsLabel/TabsLabel.component', () => jest.fn().mockImplementation(({ name }) =>
{name}
) ); -jest.mock('../../components/Tag/TagsContainerV2/TagsContainerV2', () => +jest.mock('../../Tag/TagsContainerV2/TagsContainerV2', () => jest.fn().mockImplementation(() =>
TagsContainerV2
) ); -jest.mock( - '../../components/common/CustomPropertyTable/CustomPropertyTable', - () => ({ - CustomPropertyTable: jest - .fn() - .mockImplementation(() =>
CustomPropertyTable
), - }) -); +jest.mock('../../common/CustomPropertyTable/CustomPropertyTable', () => ({ + CustomPropertyTable: jest + .fn() + .mockImplementation(() =>
CustomPropertyTable
), +})); -jest.mock('../../components/common/EntityDescription/DescriptionV1', () => +jest.mock('../../common/EntityDescription/DescriptionV1', () => jest.fn().mockImplementation(() =>
DescriptionV1
) ); -jest.mock( - '../../components/Entity/EntityVersionTimeLine/EntityVersionTimeLine', - () => jest.fn().mockImplementation(() =>
EntityVersionTimeLine
) +jest.mock('../../Entity/EntityVersionTimeLine/EntityVersionTimeLine', () => + jest.fn().mockImplementation(() =>
EntityVersionTimeLine
) ); -jest.mock('../../components/VersionTable/VersionTable.component', () => +jest.mock('../../Entity/VersionTable/VersionTable.component', () => jest.fn().mockImplementation(() =>
VersionTable
) ); -jest.mock('../../components/Loader/Loader', () => +jest.mock('../../common/Loader/Loader', () => jest.fn().mockImplementation(() =>
Loader
) ); diff --git a/openmetadata-ui/src/main/resources/ui/src/components/DashboardDetails/DashboardDetails.component.tsx b/openmetadata-ui/src/main/resources/ui/src/components/Dashboard/DashboardDetails/DashboardDetails.component.tsx similarity index 87% rename from openmetadata-ui/src/main/resources/ui/src/components/DashboardDetails/DashboardDetails.component.tsx rename to openmetadata-ui/src/main/resources/ui/src/components/Dashboard/DashboardDetails/DashboardDetails.component.tsx index c14be4b46339..f2b2b59fed6c 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/DashboardDetails/DashboardDetails.component.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/components/Dashboard/DashboardDetails/DashboardDetails.component.tsx @@ -20,54 +20,54 @@ import { EntityTags, TagFilterOptions } from 'Models'; import React, { useCallback, useEffect, useMemo, useState } from 'react'; import { useTranslation } from 'react-i18next'; import { useHistory, useParams } from 'react-router-dom'; -import { ReactComponent as ExternalLinkIcon } from '../../assets/svg/external-links.svg'; -import { useActivityFeedProvider } from '../../components/ActivityFeed/ActivityFeedProvider/ActivityFeedProvider'; -import { ActivityFeedTab } from '../../components/ActivityFeed/ActivityFeedTab/ActivityFeedTab.component'; -import { withActivityFeed } from '../../components/AppRouter/withActivityFeed'; -import DescriptionV1 from '../../components/common/EntityDescription/DescriptionV1'; -import ErrorPlaceHolder from '../../components/common/ErrorWithPlaceholder/ErrorPlaceHolder'; -import { DataAssetsHeader } from '../../components/DataAssets/DataAssetsHeader/DataAssetsHeader.component'; -import { EntityName } from '../../components/Modals/EntityNameModal/EntityNameModal.interface'; -import PageLayoutV1 from '../../components/PageLayoutV1/PageLayoutV1'; -import { ColumnFilter } from '../../components/Table/ColumnFilter/ColumnFilter.component'; -import TableDescription from '../../components/TableDescription/TableDescription.component'; -import TableTags from '../../components/TableTags/TableTags.component'; -import TabsLabel from '../../components/TabsLabel/TabsLabel.component'; -import { getDashboardDetailsPath } from '../../constants/constants'; -import { FEED_COUNT_INITIAL_DATA } from '../../constants/entity.constants'; -import { EntityTabs, EntityType } from '../../enums/entity.enum'; -import { Tag } from '../../generated/entity/classification/tag'; -import { Dashboard } from '../../generated/entity/data/dashboard'; -import { ThreadType } from '../../generated/entity/feed/thread'; -import { TagSource } from '../../generated/type/schema'; -import { TagLabel } from '../../generated/type/tagLabel'; -import { useFqn } from '../../hooks/useFqn'; -import { FeedCounts } from '../../interface/feed.interface'; -import { restoreDashboard } from '../../rest/dashboardAPI'; -import { getFeedCounts } from '../../utils/CommonUtils'; -import { getEntityName } from '../../utils/EntityUtils'; -import { DEFAULT_ENTITY_PERMISSION } from '../../utils/PermissionsUtils'; +import { ReactComponent as ExternalLinkIcon } from '../../../assets/svg/external-links.svg'; +import { getDashboardDetailsPath } from '../../../constants/constants'; +import { FEED_COUNT_INITIAL_DATA } from '../../../constants/entity.constants'; +import LineageProvider from '../../../context/LineageProvider/LineageProvider'; +import { usePermissionProvider } from '../../../context/PermissionProvider/PermissionProvider'; +import { ResourceEntity } from '../../../context/PermissionProvider/PermissionProvider.interface'; +import { EntityTabs, EntityType } from '../../../enums/entity.enum'; +import { Tag } from '../../../generated/entity/classification/tag'; +import { Dashboard } from '../../../generated/entity/data/dashboard'; +import { ThreadType } from '../../../generated/entity/feed/thread'; +import { TagSource } from '../../../generated/type/schema'; +import { TagLabel } from '../../../generated/type/tagLabel'; +import { useFqn } from '../../../hooks/useFqn'; +import { FeedCounts } from '../../../interface/feed.interface'; +import { restoreDashboard } from '../../../rest/dashboardAPI'; +import { getFeedCounts } from '../../../utils/CommonUtils'; +import { getEntityName } from '../../../utils/EntityUtils'; +import { DEFAULT_ENTITY_PERMISSION } from '../../../utils/PermissionsUtils'; import { getAllTags, searchTagInData, -} from '../../utils/TableTags/TableTags.utils'; +} from '../../../utils/TableTags/TableTags.utils'; import { getFilterIcon, getTagsWithoutTier, getTierTags, -} from '../../utils/TableUtils'; -import { createTagObject, updateTierTag } from '../../utils/TagsUtils'; -import { showErrorToast, showSuccessToast } from '../../utils/ToastUtils'; -import ActivityThreadPanel from '../ActivityFeed/ActivityThreadPanel/ActivityThreadPanel'; -import { useAuthContext } from '../Auth/AuthProviders/AuthProvider'; -import { CustomPropertyTable } from '../common/CustomPropertyTable/CustomPropertyTable'; -import EntityRightPanel from '../Entity/EntityRightPanel/EntityRightPanel'; -import Lineage from '../Lineage/Lineage.component'; -import LineageProvider from '../LineageProvider/LineageProvider'; -import { ModalWithMarkdownEditor } from '../Modals/ModalWithMarkdownEditor/ModalWithMarkdownEditor'; -import { usePermissionProvider } from '../PermissionProvider/PermissionProvider'; -import { ResourceEntity } from '../PermissionProvider/PermissionProvider.interface'; -import { SourceType } from '../SearchedData/SearchedData.interface'; +} from '../../../utils/TableUtils'; +import { createTagObject, updateTierTag } from '../../../utils/TagsUtils'; +import { showErrorToast, showSuccessToast } from '../../../utils/ToastUtils'; +import { useActivityFeedProvider } from '../../ActivityFeed/ActivityFeedProvider/ActivityFeedProvider'; +import { ActivityFeedTab } from '../../ActivityFeed/ActivityFeedTab/ActivityFeedTab.component'; +import ActivityThreadPanel from '../../ActivityFeed/ActivityThreadPanel/ActivityThreadPanel'; +import { withActivityFeed } from '../../AppRouter/withActivityFeed'; +import { useAuthContext } from '../../Auth/AuthProviders/AuthProvider'; +import { CustomPropertyTable } from '../../common/CustomPropertyTable/CustomPropertyTable'; +import DescriptionV1 from '../../common/EntityDescription/DescriptionV1'; +import ErrorPlaceHolder from '../../common/ErrorWithPlaceholder/ErrorPlaceHolder'; +import TabsLabel from '../../common/TabsLabel/TabsLabel.component'; +import { DataAssetsHeader } from '../../DataAssets/DataAssetsHeader/DataAssetsHeader.component'; +import { ColumnFilter } from '../../Database/ColumnFilter/ColumnFilter.component'; +import TableDescription from '../../Database/TableDescription/TableDescription.component'; +import TableTags from '../../Database/TableTags/TableTags.component'; +import EntityRightPanel from '../../Entity/EntityRightPanel/EntityRightPanel'; +import Lineage from '../../Lineage/Lineage.component'; +import { EntityName } from '../../Modals/EntityNameModal/EntityNameModal.interface'; +import { ModalWithMarkdownEditor } from '../../Modals/ModalWithMarkdownEditor/ModalWithMarkdownEditor'; +import PageLayoutV1 from '../../PageLayoutV1/PageLayoutV1'; +import { SourceType } from '../../SearchedData/SearchedData.interface'; import { ChartsPermissions, ChartType, diff --git a/openmetadata-ui/src/main/resources/ui/src/components/DashboardDetails/DashboardDetails.interface.ts b/openmetadata-ui/src/main/resources/ui/src/components/Dashboard/DashboardDetails/DashboardDetails.interface.ts similarity index 78% rename from openmetadata-ui/src/main/resources/ui/src/components/DashboardDetails/DashboardDetails.interface.ts rename to openmetadata-ui/src/main/resources/ui/src/components/Dashboard/DashboardDetails/DashboardDetails.interface.ts index 42004d72a4d2..31c42ebb5465 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/DashboardDetails/DashboardDetails.interface.ts +++ b/openmetadata-ui/src/main/resources/ui/src/components/Dashboard/DashboardDetails/DashboardDetails.interface.ts @@ -12,12 +12,12 @@ */ import { Operation } from 'fast-json-patch'; -import { DataAssetWithDomains } from '../../components/DataAssets/DataAssetsHeader/DataAssetsHeader.interface'; -import { OperationPermission } from '../../components/PermissionProvider/PermissionProvider.interface'; -import { QueryVote } from '../../components/TableQueries/TableQueries.interface'; -import { CreateThread } from '../../generated/api/feed/createThread'; -import { Chart } from '../../generated/entity/data/chart'; -import { Dashboard } from '../../generated/entity/data/dashboard'; +import { OperationPermission } from '../../../context/PermissionProvider/PermissionProvider.interface'; +import { CreateThread } from '../../../generated/api/feed/createThread'; +import { Chart } from '../../../generated/entity/data/chart'; +import { Dashboard } from '../../../generated/entity/data/dashboard'; +import { DataAssetWithDomains } from '../../DataAssets/DataAssetsHeader/DataAssetsHeader.interface'; +import { QueryVote } from '../../Database/TableQueries/TableQueries.interface'; export interface ChartType extends Chart { displayName: string; diff --git a/openmetadata-ui/src/main/resources/ui/src/components/DashboardDetails/DashboardDetails.test.tsx b/openmetadata-ui/src/main/resources/ui/src/components/Dashboard/DashboardDetails/DashboardDetails.test.tsx similarity index 95% rename from openmetadata-ui/src/main/resources/ui/src/components/DashboardDetails/DashboardDetails.test.tsx rename to openmetadata-ui/src/main/resources/ui/src/components/Dashboard/DashboardDetails/DashboardDetails.test.tsx index 3b6100629b0b..c8d36df87a26 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/DashboardDetails/DashboardDetails.test.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/components/Dashboard/DashboardDetails/DashboardDetails.test.tsx @@ -19,11 +19,11 @@ import { } from '@testing-library/react'; import React from 'react'; import { MemoryRouter } from 'react-router-dom'; -import { EntityTabs } from '../../enums/entity.enum'; -import { ChartType } from '../../generated/entity/data/chart'; -import { Dashboard } from '../../generated/entity/data/dashboard'; -import { mockGlossaryList } from '../../mocks/Glossary.mock'; -import { mockTagList } from '../../mocks/Tags.mock'; +import { EntityTabs } from '../../../enums/entity.enum'; +import { ChartType } from '../../../generated/entity/data/chart'; +import { Dashboard } from '../../../generated/entity/data/dashboard'; +import { mockGlossaryList } from '../../../mocks/Glossary.mock'; +import { mockTagList } from '../../../mocks/Tags.mock'; import DashboardDetails from './DashboardDetails.component'; import { DashboardDetailsProps } from './DashboardDetails.interface'; diff --git a/openmetadata-ui/src/main/resources/ui/src/components/DashboardVersion/DashboardVersion.component.tsx b/openmetadata-ui/src/main/resources/ui/src/components/Dashboard/DashboardVersion/DashboardVersion.component.tsx similarity index 86% rename from openmetadata-ui/src/main/resources/ui/src/components/DashboardVersion/DashboardVersion.component.tsx rename to openmetadata-ui/src/main/resources/ui/src/components/Dashboard/DashboardVersion/DashboardVersion.component.tsx index c6b29da7ff08..2390ec6ca2c1 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/DashboardVersion/DashboardVersion.component.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/components/Dashboard/DashboardVersion/DashboardVersion.component.tsx @@ -17,30 +17,30 @@ import classNames from 'classnames'; import React, { FC, useEffect, useMemo, useState } from 'react'; import { useTranslation } from 'react-i18next'; import { Link, useHistory, useParams } from 'react-router-dom'; -import { ReactComponent as IconExternalLink } from '../../assets/svg/external-links.svg'; -import { CustomPropertyTable } from '../../components/common/CustomPropertyTable/CustomPropertyTable'; -import DescriptionV1 from '../../components/common/EntityDescription/DescriptionV1'; -import RichTextEditorPreviewer from '../../components/common/RichTextEditor/RichTextEditorPreviewer'; -import DataAssetsVersionHeader from '../../components/DataAssets/DataAssetsVersionHeader/DataAssetsVersionHeader'; -import EntityVersionTimeLine from '../../components/Entity/EntityVersionTimeLine/EntityVersionTimeLine'; -import Loader from '../../components/Loader/Loader'; -import TabsLabel from '../../components/TabsLabel/TabsLabel.component'; -import TagsContainerV2 from '../../components/Tag/TagsContainerV2/TagsContainerV2'; -import { getVersionPathWithTab } from '../../constants/constants'; -import { EntityField } from '../../constants/Feeds.constants'; -import { EntityTabs, EntityType } from '../../enums/entity.enum'; +import { ReactComponent as IconExternalLink } from '../../../assets/svg/external-links.svg'; +import { getVersionPathWithTab } from '../../../constants/constants'; +import { EntityField } from '../../../constants/Feeds.constants'; +import { EntityTabs, EntityType } from '../../../enums/entity.enum'; import { ChangeDescription, EntityReference, -} from '../../generated/entity/data/dashboard'; -import { TagSource } from '../../generated/type/tagLabel'; -import { getEntityName } from '../../utils/EntityUtils'; +} from '../../../generated/entity/data/dashboard'; +import { TagSource } from '../../../generated/type/tagLabel'; +import { getEntityName } from '../../../utils/EntityUtils'; import { getCommonExtraInfoForVersionDetails, getEntityVersionByField, getEntityVersionTags, -} from '../../utils/EntityVersionUtils'; -import DataProductsContainer from '../DataProductsContainer/DataProductsContainer.component'; +} from '../../../utils/EntityVersionUtils'; +import { CustomPropertyTable } from '../../common/CustomPropertyTable/CustomPropertyTable'; +import DescriptionV1 from '../../common/EntityDescription/DescriptionV1'; +import Loader from '../../common/Loader/Loader'; +import RichTextEditorPreviewer from '../../common/RichTextEditor/RichTextEditorPreviewer'; +import TabsLabel from '../../common/TabsLabel/TabsLabel.component'; +import DataAssetsVersionHeader from '../../DataAssets/DataAssetsVersionHeader/DataAssetsVersionHeader'; +import DataProductsContainer from '../../DataProducts/DataProductsContainer/DataProductsContainer.component'; +import EntityVersionTimeLine from '../../Entity/EntityVersionTimeLine/EntityVersionTimeLine'; +import TagsContainerV2 from '../../Tag/TagsContainerV2/TagsContainerV2'; import { DashboardVersionProp } from './DashboardVersion.interface'; const DashboardVersion: FC = ({ diff --git a/openmetadata-ui/src/main/resources/ui/src/components/DashboardVersion/DashboardVersion.interface.ts b/openmetadata-ui/src/main/resources/ui/src/components/Dashboard/DashboardVersion/DashboardVersion.interface.ts similarity index 75% rename from openmetadata-ui/src/main/resources/ui/src/components/DashboardVersion/DashboardVersion.interface.ts rename to openmetadata-ui/src/main/resources/ui/src/components/Dashboard/DashboardVersion/DashboardVersion.interface.ts index 9e645b614d10..24d57bdb7188 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/DashboardVersion/DashboardVersion.interface.ts +++ b/openmetadata-ui/src/main/resources/ui/src/components/Dashboard/DashboardVersion/DashboardVersion.interface.ts @@ -11,11 +11,11 @@ * limitations under the License. */ -import { OperationPermission } from '../../components/PermissionProvider/PermissionProvider.interface'; -import { Dashboard } from '../../generated/entity/data/dashboard'; -import { EntityHistory } from '../../generated/type/entityHistory'; -import { TagLabel } from '../../generated/type/tagLabel'; -import { TitleBreadcrumbProps } from '../common/TitleBreadcrumb/TitleBreadcrumb.interface'; +import { OperationPermission } from '../../../context/PermissionProvider/PermissionProvider.interface'; +import { Dashboard } from '../../../generated/entity/data/dashboard'; +import { EntityHistory } from '../../../generated/type/entityHistory'; +import { TagLabel } from '../../../generated/type/tagLabel'; +import { TitleBreadcrumbProps } from '../../common/TitleBreadcrumb/TitleBreadcrumb.interface'; export interface DashboardVersionProp { version: string; diff --git a/openmetadata-ui/src/main/resources/ui/src/components/DashboardVersion/DashboardVersion.test.tsx b/openmetadata-ui/src/main/resources/ui/src/components/Dashboard/DashboardVersion/DashboardVersion.test.tsx similarity index 98% rename from openmetadata-ui/src/main/resources/ui/src/components/DashboardVersion/DashboardVersion.test.tsx rename to openmetadata-ui/src/main/resources/ui/src/components/Dashboard/DashboardVersion/DashboardVersion.test.tsx index 1335397517a1..6d886027f8b7 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/DashboardVersion/DashboardVersion.test.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/components/Dashboard/DashboardVersion/DashboardVersion.test.tsx @@ -19,8 +19,8 @@ import { dashboardVersionProps, mockNoChartData, mockTagChangeVersion, -} from '../../mocks/dashboardVersion.mock'; -import { ENTITY_PERMISSIONS } from '../../mocks/Permissions.mock'; +} from '../../../mocks/dashboardVersion.mock'; +import { ENTITY_PERMISSIONS } from '../../../mocks/Permissions.mock'; import DashboardVersion from './DashboardVersion.component'; import { DashboardVersionProp } from './DashboardVersion.interface'; diff --git a/openmetadata-ui/src/main/resources/ui/src/components/DataModelVersion/DataModelVersion.component.tsx b/openmetadata-ui/src/main/resources/ui/src/components/Dashboard/DataModel/DataModelVersion/DataModelVersion.component.tsx similarity index 84% rename from openmetadata-ui/src/main/resources/ui/src/components/DataModelVersion/DataModelVersion.component.tsx rename to openmetadata-ui/src/main/resources/ui/src/components/Dashboard/DataModel/DataModelVersion/DataModelVersion.component.tsx index d1eaefc43b33..f23b9da630c2 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/DataModelVersion/DataModelVersion.component.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/components/Dashboard/DataModel/DataModelVersion/DataModelVersion.component.tsx @@ -16,30 +16,30 @@ import classNames from 'classnames'; import { cloneDeep } from 'lodash'; import React, { FC, useEffect, useMemo, useState } from 'react'; import { useTranslation } from 'react-i18next'; -import DescriptionV1 from '../../components/common/EntityDescription/DescriptionV1'; -import DataAssetsVersionHeader from '../../components/DataAssets/DataAssetsVersionHeader/DataAssetsVersionHeader'; -import EntityVersionTimeLine from '../../components/Entity/EntityVersionTimeLine/EntityVersionTimeLine'; -import TabsLabel from '../../components/TabsLabel/TabsLabel.component'; -import TagsContainerV2 from '../../components/Tag/TagsContainerV2/TagsContainerV2'; -import VersionTable from '../../components/VersionTable/VersionTable.component'; -import { FQN_SEPARATOR_CHAR } from '../../constants/char.constants'; -import { EntityField } from '../../constants/Feeds.constants'; -import { EntityTabs, EntityType, FqnPart } from '../../enums/entity.enum'; +import { FQN_SEPARATOR_CHAR } from '../../../../constants/char.constants'; +import { EntityField } from '../../../../constants/Feeds.constants'; +import { EntityTabs, EntityType, FqnPart } from '../../../../enums/entity.enum'; import { ChangeDescription, Column, DashboardDataModel, -} from '../../generated/entity/data/dashboardDataModel'; -import { TagSource } from '../../generated/type/schema'; -import { getPartialNameFromTableFQN } from '../../utils/CommonUtils'; +} from '../../../../generated/entity/data/dashboardDataModel'; +import { TagSource } from '../../../../generated/type/schema'; +import { getPartialNameFromTableFQN } from '../../../../utils/CommonUtils'; import { getColumnsDataWithVersionChanges, getCommonExtraInfoForVersionDetails, getEntityVersionByField, getEntityVersionTags, -} from '../../utils/EntityVersionUtils'; -import DataProductsContainer from '../DataProductsContainer/DataProductsContainer.component'; -import Loader from '../Loader/Loader'; +} from '../../../../utils/EntityVersionUtils'; +import DescriptionV1 from '../../../common/EntityDescription/DescriptionV1'; +import Loader from '../../../common/Loader/Loader'; +import TabsLabel from '../../../common/TabsLabel/TabsLabel.component'; +import DataAssetsVersionHeader from '../../../DataAssets/DataAssetsVersionHeader/DataAssetsVersionHeader'; +import DataProductsContainer from '../../../DataProducts/DataProductsContainer/DataProductsContainer.component'; +import EntityVersionTimeLine from '../../../Entity/EntityVersionTimeLine/EntityVersionTimeLine'; +import VersionTable from '../../../Entity/VersionTable/VersionTable.component'; +import TagsContainerV2 from '../../../Tag/TagsContainerV2/TagsContainerV2'; import { DataModelVersionProp } from './DataModelVersion.interface'; const DataModelVersion: FC = ({ diff --git a/openmetadata-ui/src/main/resources/ui/src/components/DataModelVersion/DataModelVersion.interface.ts b/openmetadata-ui/src/main/resources/ui/src/components/Dashboard/DataModel/DataModelVersion/DataModelVersion.interface.ts similarity index 71% rename from openmetadata-ui/src/main/resources/ui/src/components/DataModelVersion/DataModelVersion.interface.ts rename to openmetadata-ui/src/main/resources/ui/src/components/Dashboard/DataModel/DataModelVersion/DataModelVersion.interface.ts index 449dbc8fd5ab..6f4eed8de44a 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/DataModelVersion/DataModelVersion.interface.ts +++ b/openmetadata-ui/src/main/resources/ui/src/components/Dashboard/DataModel/DataModelVersion/DataModelVersion.interface.ts @@ -11,11 +11,11 @@ * limitations under the License. */ -import { DashboardDataModel } from '../../generated/entity/data/dashboardDataModel'; -import { EntityHistory } from '../../generated/type/entityHistory'; -import { TagLabel } from '../../generated/type/tagLabel'; -import { VersionData } from '../../pages/EntityVersionPage/EntityVersionPage.component'; -import { TitleBreadcrumbProps } from '../common/TitleBreadcrumb/TitleBreadcrumb.interface'; +import { DashboardDataModel } from '../../../../generated/entity/data/dashboardDataModel'; +import { EntityHistory } from '../../../../generated/type/entityHistory'; +import { TagLabel } from '../../../../generated/type/tagLabel'; +import { VersionData } from '../../../../pages/EntityVersionPage/EntityVersionPage.component'; +import { TitleBreadcrumbProps } from '../../../common/TitleBreadcrumb/TitleBreadcrumb.interface'; export interface DataModelVersionProp { version: string; diff --git a/openmetadata-ui/src/main/resources/ui/src/components/DataModels/DataModelDetails.component.tsx b/openmetadata-ui/src/main/resources/ui/src/components/Dashboard/DataModel/DataModels/DataModelDetails.component.tsx similarity index 85% rename from openmetadata-ui/src/main/resources/ui/src/components/DataModels/DataModelDetails.component.tsx rename to openmetadata-ui/src/main/resources/ui/src/components/Dashboard/DataModel/DataModels/DataModelDetails.component.tsx index 51ebc83ab9c5..1ac7f01fc0d5 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/DataModels/DataModelDetails.component.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/components/Dashboard/DataModel/DataModels/DataModelDetails.component.tsx @@ -18,36 +18,36 @@ import { EntityTags } from 'Models'; import React, { useCallback, useEffect, useMemo, useState } from 'react'; import { useTranslation } from 'react-i18next'; import { useHistory, useParams } from 'react-router-dom'; -import { useActivityFeedProvider } from '../../components/ActivityFeed/ActivityFeedProvider/ActivityFeedProvider'; -import { ActivityFeedTab } from '../../components/ActivityFeed/ActivityFeedTab/ActivityFeedTab.component'; -import ActivityThreadPanel from '../../components/ActivityFeed/ActivityThreadPanel/ActivityThreadPanel'; -import { withActivityFeed } from '../../components/AppRouter/withActivityFeed'; -import DescriptionV1 from '../../components/common/EntityDescription/DescriptionV1'; -import { DataAssetsHeader } from '../../components/DataAssets/DataAssetsHeader/DataAssetsHeader.component'; -import { EntityName } from '../../components/Modals/EntityNameModal/EntityNameModal.interface'; -import PageLayoutV1 from '../../components/PageLayoutV1/PageLayoutV1'; -import TabsLabel from '../../components/TabsLabel/TabsLabel.component'; import { getDataModelDetailsPath, getVersionPath, -} from '../../constants/constants'; -import { FEED_COUNT_INITIAL_DATA } from '../../constants/entity.constants'; -import { CSMode } from '../../enums/codemirror.enum'; -import { EntityTabs, EntityType } from '../../enums/entity.enum'; -import { TagLabel } from '../../generated/type/tagLabel'; -import { useFqn } from '../../hooks/useFqn'; -import { FeedCounts } from '../../interface/feed.interface'; -import { restoreDataModel } from '../../rest/dataModelsAPI'; -import { getFeedCounts } from '../../utils/CommonUtils'; -import { getEntityName } from '../../utils/EntityUtils'; -import { getTagsWithoutTier } from '../../utils/TableUtils'; -import { createTagObject } from '../../utils/TagsUtils'; -import { showErrorToast, showSuccessToast } from '../../utils/ToastUtils'; -import EntityRightPanel from '../Entity/EntityRightPanel/EntityRightPanel'; -import Lineage from '../Lineage/Lineage.component'; -import LineageProvider from '../LineageProvider/LineageProvider'; -import SchemaEditor from '../SchemaEditor/SchemaEditor'; -import { SourceType } from '../SearchedData/SearchedData.interface'; +} from '../../../../constants/constants'; +import { FEED_COUNT_INITIAL_DATA } from '../../../../constants/entity.constants'; +import LineageProvider from '../../../../context/LineageProvider/LineageProvider'; +import { CSMode } from '../../../../enums/codemirror.enum'; +import { EntityTabs, EntityType } from '../../../../enums/entity.enum'; +import { TagLabel } from '../../../../generated/type/tagLabel'; +import { useFqn } from '../../../../hooks/useFqn'; +import { FeedCounts } from '../../../../interface/feed.interface'; +import { restoreDataModel } from '../../../../rest/dataModelsAPI'; +import { getFeedCounts } from '../../../../utils/CommonUtils'; +import { getEntityName } from '../../../../utils/EntityUtils'; +import { getTagsWithoutTier } from '../../../../utils/TableUtils'; +import { createTagObject } from '../../../../utils/TagsUtils'; +import { showErrorToast, showSuccessToast } from '../../../../utils/ToastUtils'; +import { useActivityFeedProvider } from '../../../ActivityFeed/ActivityFeedProvider/ActivityFeedProvider'; +import { ActivityFeedTab } from '../../../ActivityFeed/ActivityFeedTab/ActivityFeedTab.component'; +import ActivityThreadPanel from '../../../ActivityFeed/ActivityThreadPanel/ActivityThreadPanel'; +import { withActivityFeed } from '../../../AppRouter/withActivityFeed'; +import DescriptionV1 from '../../../common/EntityDescription/DescriptionV1'; +import TabsLabel from '../../../common/TabsLabel/TabsLabel.component'; +import { DataAssetsHeader } from '../../../DataAssets/DataAssetsHeader/DataAssetsHeader.component'; +import SchemaEditor from '../../../Database/SchemaEditor/SchemaEditor'; +import EntityRightPanel from '../../../Entity/EntityRightPanel/EntityRightPanel'; +import Lineage from '../../../Lineage/Lineage.component'; +import { EntityName } from '../../../Modals/EntityNameModal/EntityNameModal.interface'; +import PageLayoutV1 from '../../../PageLayoutV1/PageLayoutV1'; +import { SourceType } from '../../../SearchedData/SearchedData.interface'; import { DataModelDetailsProps } from './DataModelDetails.interface'; import ModelTab from './ModelTab/ModelTab.component'; diff --git a/openmetadata-ui/src/main/resources/ui/src/components/DataModels/DataModelDetails.interface.tsx b/openmetadata-ui/src/main/resources/ui/src/components/Dashboard/DataModel/DataModels/DataModelDetails.interface.tsx similarity index 69% rename from openmetadata-ui/src/main/resources/ui/src/components/DataModels/DataModelDetails.interface.tsx rename to openmetadata-ui/src/main/resources/ui/src/components/Dashboard/DataModel/DataModels/DataModelDetails.interface.tsx index c7120fbc291a..d6d5baa8f125 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/DataModels/DataModelDetails.interface.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/components/Dashboard/DataModel/DataModels/DataModelDetails.interface.tsx @@ -12,14 +12,14 @@ */ import { EntityTags } from 'Models'; -import { DataAssetWithDomains } from '../../components/DataAssets/DataAssetsHeader/DataAssetsHeader.interface'; -import { OperationPermission } from '../../components/PermissionProvider/PermissionProvider.interface'; -import { QueryVote } from '../../components/TableQueries/TableQueries.interface'; -import { CreateThread } from '../../generated/api/feed/createThread'; -import { Tag } from '../../generated/entity/classification/tag'; -import { DashboardDataModel } from '../../generated/entity/data/dashboardDataModel'; -import { Column } from '../../generated/entity/data/table'; -import { EntityReference } from '../../generated/entity/type'; +import { OperationPermission } from '../../../../context/PermissionProvider/PermissionProvider.interface'; +import { CreateThread } from '../../../../generated/api/feed/createThread'; +import { Tag } from '../../../../generated/entity/classification/tag'; +import { DashboardDataModel } from '../../../../generated/entity/data/dashboardDataModel'; +import { Column } from '../../../../generated/entity/data/table'; +import { EntityReference } from '../../../../generated/entity/type'; +import { DataAssetWithDomains } from '../../../DataAssets/DataAssetsHeader/DataAssetsHeader.interface'; +import { QueryVote } from '../../../Database/TableQueries/TableQueries.interface'; export interface DataModelDetailsProps { updateDataModelDetailsState?: (data: DataAssetWithDomains) => void; diff --git a/openmetadata-ui/src/main/resources/ui/src/components/DataModels/DataModelsTable.tsx b/openmetadata-ui/src/main/resources/ui/src/components/Dashboard/DataModel/DataModels/DataModelsTable.tsx similarity index 84% rename from openmetadata-ui/src/main/resources/ui/src/components/DataModels/DataModelsTable.tsx rename to openmetadata-ui/src/main/resources/ui/src/components/Dashboard/DataModel/DataModels/DataModelsTable.tsx index 3eb5a31918f5..adf5b0b1786a 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/DataModels/DataModelsTable.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/components/Dashboard/DataModel/DataModels/DataModelsTable.tsx @@ -18,25 +18,25 @@ import { isUndefined } from 'lodash'; import React, { useCallback, useEffect, useMemo, useState } from 'react'; import { useTranslation } from 'react-i18next'; import { Link } from 'react-router-dom'; -import ErrorPlaceHolder from '../../components/common/ErrorWithPlaceholder/ErrorPlaceHolder'; -import RichTextEditorPreviewer from '../../components/common/RichTextEditor/RichTextEditorPreviewer'; -import Table from '../../components/common/Table/Table'; import { getDataModelDetailsPath, INITIAL_PAGING_VALUE, PAGE_SIZE_BASE, pagingObject, -} from '../../constants/constants'; -import { Include } from '../../generated/type/include'; -import { Paging } from '../../generated/type/paging'; -import { usePaging } from '../../hooks/paging/usePaging'; -import { useFqn } from '../../hooks/useFqn'; -import { ServicePageData } from '../../pages/ServiceDetailsPage/ServiceDetailsPage'; -import { getDataModels } from '../../rest/dashboardAPI'; -import { getEntityName } from '../../utils/EntityUtils'; -import { showErrorToast } from '../../utils/ToastUtils'; -import NextPrevious from '../common/NextPrevious/NextPrevious'; -import { NextPreviousProps } from '../common/NextPrevious/NextPrevious.interface'; +} from '../../../../constants/constants'; +import { Include } from '../../../../generated/type/include'; +import { Paging } from '../../../../generated/type/paging'; +import { usePaging } from '../../../../hooks/paging/usePaging'; +import { useFqn } from '../../../../hooks/useFqn'; +import { ServicePageData } from '../../../../pages/ServiceDetailsPage/ServiceDetailsPage'; +import { getDataModels } from '../../../../rest/dashboardAPI'; +import { getEntityName } from '../../../../utils/EntityUtils'; +import { showErrorToast } from '../../../../utils/ToastUtils'; +import ErrorPlaceHolder from '../../../common/ErrorWithPlaceholder/ErrorPlaceHolder'; +import NextPrevious from '../../../common/NextPrevious/NextPrevious'; +import { NextPreviousProps } from '../../../common/NextPrevious/NextPrevious.interface'; +import RichTextEditorPreviewer from '../../../common/RichTextEditor/RichTextEditorPreviewer'; +import Table from '../../../common/Table/Table'; const DataModelTable = () => { const { t } = useTranslation(); diff --git a/openmetadata-ui/src/main/resources/ui/src/components/DataModels/ModelTab/ModelTab.component.tsx b/openmetadata-ui/src/main/resources/ui/src/components/Dashboard/DataModel/DataModels/ModelTab/ModelTab.component.tsx similarity index 88% rename from openmetadata-ui/src/main/resources/ui/src/components/DataModels/ModelTab/ModelTab.component.tsx rename to openmetadata-ui/src/main/resources/ui/src/components/Dashboard/DataModel/DataModels/ModelTab/ModelTab.component.tsx index 4fd0b4974d76..466de8ca1956 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/DataModels/ModelTab/ModelTab.component.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/components/Dashboard/DataModel/DataModels/ModelTab/ModelTab.component.tsx @@ -16,16 +16,16 @@ import { cloneDeep, isUndefined } from 'lodash'; import { EntityTags } from 'Models'; import React, { useCallback, useMemo, useState } from 'react'; import { useTranslation } from 'react-i18next'; -import { ModalWithMarkdownEditor } from '../../../components/Modals/ModalWithMarkdownEditor/ModalWithMarkdownEditor'; -import TableDescription from '../../../components/TableDescription/TableDescription.component'; -import TableTags from '../../../components/TableTags/TableTags.component'; -import { EntityType } from '../../../enums/entity.enum'; -import { Column } from '../../../generated/entity/data/dashboardDataModel'; -import { TagLabel, TagSource } from '../../../generated/type/tagLabel'; -import { updateDataModelColumnDescription } from '../../../utils/DataModelsUtils'; -import { getEntityName } from '../../../utils/EntityUtils'; -import { updateFieldTags } from '../../../utils/TableUtils'; -import Table from '../../common/Table/Table'; +import { EntityType } from '../../../../../enums/entity.enum'; +import { Column } from '../../../../../generated/entity/data/dashboardDataModel'; +import { TagLabel, TagSource } from '../../../../../generated/type/tagLabel'; +import { updateDataModelColumnDescription } from '../../../../../utils/DataModelsUtils'; +import { getEntityName } from '../../../../../utils/EntityUtils'; +import { updateFieldTags } from '../../../../../utils/TableUtils'; +import Table from '../../../../common/Table/Table'; +import TableDescription from '../../../../Database/TableDescription/TableDescription.component'; +import TableTags from '../../../../Database/TableTags/TableTags.component'; +import { ModalWithMarkdownEditor } from '../../../../Modals/ModalWithMarkdownEditor/ModalWithMarkdownEditor'; import { ModelTabProps } from './ModelTab.interface'; const ModelTab = ({ diff --git a/openmetadata-ui/src/main/resources/ui/src/components/DataModels/ModelTab/ModelTab.interface.tsx b/openmetadata-ui/src/main/resources/ui/src/components/Dashboard/DataModel/DataModels/ModelTab/ModelTab.interface.tsx similarity index 84% rename from openmetadata-ui/src/main/resources/ui/src/components/DataModels/ModelTab/ModelTab.interface.tsx rename to openmetadata-ui/src/main/resources/ui/src/components/Dashboard/DataModel/DataModels/ModelTab/ModelTab.interface.tsx index 751b677401f5..d45f369e7169 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/DataModels/ModelTab/ModelTab.interface.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/components/Dashboard/DataModel/DataModels/ModelTab/ModelTab.interface.tsx @@ -10,8 +10,8 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -import { ThreadType } from '../../../generated/api/feed/createThread'; -import { Column } from '../../../generated/entity/data/dashboardDataModel'; +import { ThreadType } from '../../../../../generated/api/feed/createThread'; +import { Column } from '../../../../../generated/entity/data/dashboardDataModel'; export interface ModelTabProps { data: Column[]; diff --git a/openmetadata-ui/src/main/resources/ui/src/components/Assets/AssetsSelectionModal/AssetSelectionModal.interface.ts b/openmetadata-ui/src/main/resources/ui/src/components/DataAssets/AssetsSelectionModal/AssetSelectionModal.interface.ts similarity index 97% rename from openmetadata-ui/src/main/resources/ui/src/components/Assets/AssetsSelectionModal/AssetSelectionModal.interface.ts rename to openmetadata-ui/src/main/resources/ui/src/components/DataAssets/AssetsSelectionModal/AssetSelectionModal.interface.ts index 83faf82672fb..1d8334dec63c 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/Assets/AssetsSelectionModal/AssetSelectionModal.interface.ts +++ b/openmetadata-ui/src/main/resources/ui/src/components/DataAssets/AssetsSelectionModal/AssetSelectionModal.interface.ts @@ -10,7 +10,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -import { AssetsOfEntity } from '../../../components/Glossary/GlossaryTerms/tabs/AssetsTabs.interface'; import { EntityType } from '../../../enums/entity.enum'; import { Container } from '../../../generated/entity/data/container'; import { Dashboard } from '../../../generated/entity/data/dashboard'; @@ -34,6 +33,7 @@ import { SearchService } from '../../../generated/entity/services/searchService' import { StorageService } from '../../../generated/entity/services/storageService'; import { Team } from '../../../generated/entity/teams/team'; import { QueryFilterInterface } from '../../../pages/ExplorePage/ExplorePage.interface'; +import { AssetsOfEntity } from '../../Glossary/GlossaryTerms/tabs/AssetsTabs.interface'; export interface AssetSelectionModalProps { entityFqn: string; diff --git a/openmetadata-ui/src/main/resources/ui/src/components/Assets/AssetsSelectionModal/AssetSelectionModal.tsx b/openmetadata-ui/src/main/resources/ui/src/components/DataAssets/AssetsSelectionModal/AssetSelectionModal.tsx similarity index 99% rename from openmetadata-ui/src/main/resources/ui/src/components/Assets/AssetsSelectionModal/AssetSelectionModal.tsx rename to openmetadata-ui/src/main/resources/ui/src/components/DataAssets/AssetsSelectionModal/AssetSelectionModal.tsx index be5c5c840609..1d1660c13e05 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/Assets/AssetsSelectionModal/AssetSelectionModal.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/components/DataAssets/AssetsSelectionModal/AssetSelectionModal.tsx @@ -72,12 +72,12 @@ import { import { getCombinedQueryFilterObject } from '../../../utils/ExplorePage/ExplorePageUtils'; import { showErrorToast } from '../../../utils/ToastUtils'; import ErrorPlaceHolder from '../../common/ErrorWithPlaceholder/ErrorPlaceHolder'; +import Loader from '../../common/Loader/Loader'; import Searchbar from '../../common/SearchBarComponent/SearchBar.component'; import TableDataCardV2 from '../../common/TableDataCardV2/TableDataCardV2'; import { ExploreQuickFilterField } from '../../Explore/ExplorePage.interface'; import ExploreQuickFilters from '../../Explore/ExploreQuickFilters'; import { AssetsOfEntity } from '../../Glossary/GlossaryTerms/tabs/AssetsTabs.interface'; -import Loader from '../../Loader/Loader'; import { SearchedDataProps } from '../../SearchedData/SearchedData.interface'; import './asset-selection-model.style.less'; import { AssetSelectionModalProps } from './AssetSelectionModal.interface'; diff --git a/openmetadata-ui/src/main/resources/ui/src/components/Assets/AssetsSelectionModal/asset-selection-model.style.less b/openmetadata-ui/src/main/resources/ui/src/components/DataAssets/AssetsSelectionModal/asset-selection-model.style.less similarity index 100% rename from openmetadata-ui/src/main/resources/ui/src/components/Assets/AssetsSelectionModal/asset-selection-model.style.less rename to openmetadata-ui/src/main/resources/ui/src/components/DataAssets/AssetsSelectionModal/asset-selection-model.style.less diff --git a/openmetadata-ui/src/main/resources/ui/src/components/DataAssetAsyncSelectList/DataAssetAsyncSelectList.interface.ts b/openmetadata-ui/src/main/resources/ui/src/components/DataAssets/DataAssetAsyncSelectList/DataAssetAsyncSelectList.interface.ts similarity index 86% rename from openmetadata-ui/src/main/resources/ui/src/components/DataAssetAsyncSelectList/DataAssetAsyncSelectList.interface.ts rename to openmetadata-ui/src/main/resources/ui/src/components/DataAssets/DataAssetAsyncSelectList/DataAssetAsyncSelectList.interface.ts index 5976277b1743..5f7a50a3e397 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/DataAssetAsyncSelectList/DataAssetAsyncSelectList.interface.ts +++ b/openmetadata-ui/src/main/resources/ui/src/components/DataAssets/DataAssetAsyncSelectList/DataAssetAsyncSelectList.interface.ts @@ -11,9 +11,9 @@ * limitations under the License. */ import { DefaultOptionType } from 'antd/lib/select'; -import { SearchIndex } from '../../enums/search.enum'; -import { EntityReference } from '../../generated/entity/type'; -import { Paging } from '../../generated/type/paging'; +import { SearchIndex } from '../../../enums/search.enum'; +import { EntityReference } from '../../../generated/entity/type'; +import { Paging } from '../../../generated/type/paging'; export interface DataAssetOption extends DefaultOptionType { reference: EntityReference; diff --git a/openmetadata-ui/src/main/resources/ui/src/components/DataAssetAsyncSelectList/DataAssetAsyncSelectList.test.tsx b/openmetadata-ui/src/main/resources/ui/src/components/DataAssets/DataAssetAsyncSelectList/DataAssetAsyncSelectList.test.tsx similarity index 98% rename from openmetadata-ui/src/main/resources/ui/src/components/DataAssetAsyncSelectList/DataAssetAsyncSelectList.test.tsx rename to openmetadata-ui/src/main/resources/ui/src/components/DataAssets/DataAssetAsyncSelectList/DataAssetAsyncSelectList.test.tsx index ca74b0d06b9c..a6a189e38eae 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/DataAssetAsyncSelectList/DataAssetAsyncSelectList.test.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/components/DataAssets/DataAssetAsyncSelectList/DataAssetAsyncSelectList.test.tsx @@ -12,8 +12,8 @@ */ import { act, fireEvent, render, screen } from '@testing-library/react'; import React from 'react'; -import { SearchIndex } from '../../enums/search.enum'; -import { searchQuery } from '../../rest/searchAPI'; +import { SearchIndex } from '../../../enums/search.enum'; +import { searchQuery } from '../../../rest/searchAPI'; import DataAssetAsyncSelectList from './DataAssetAsyncSelectList'; import { DataAssetOption } from './DataAssetAsyncSelectList.interface'; diff --git a/openmetadata-ui/src/main/resources/ui/src/components/DataAssetAsyncSelectList/DataAssetAsyncSelectList.tsx b/openmetadata-ui/src/main/resources/ui/src/components/DataAssets/DataAssetAsyncSelectList/DataAssetAsyncSelectList.tsx similarity index 91% rename from openmetadata-ui/src/main/resources/ui/src/components/DataAssetAsyncSelectList/DataAssetAsyncSelectList.tsx rename to openmetadata-ui/src/main/resources/ui/src/components/DataAssets/DataAssetAsyncSelectList/DataAssetAsyncSelectList.tsx index 40baf1319d43..65a85198f27f 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/DataAssetAsyncSelectList/DataAssetAsyncSelectList.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/components/DataAssets/DataAssetAsyncSelectList/DataAssetAsyncSelectList.tsx @@ -14,20 +14,20 @@ import { Select, SelectProps, Space } from 'antd'; import { AxiosError } from 'axios'; import { debounce } from 'lodash'; import React, { FC, useCallback, useMemo, useRef, useState } from 'react'; -import Loader from '../../components/Loader/Loader'; -import { PAGE_SIZE } from '../../constants/constants'; -import { EntityType } from '../../enums/entity.enum'; -import { SearchIndex } from '../../enums/search.enum'; -import { EntityReference } from '../../generated/entity/type'; -import { usePaging } from '../../hooks/paging/usePaging'; -import { searchQuery } from '../../rest/searchAPI'; +import { PAGE_SIZE } from '../../../constants/constants'; +import { EntityType } from '../../../enums/entity.enum'; +import { SearchIndex } from '../../../enums/search.enum'; +import { EntityReference } from '../../../generated/entity/type'; +import { usePaging } from '../../../hooks/paging/usePaging'; +import { searchQuery } from '../../../rest/searchAPI'; import { getEntityName, getEntityReferenceFromEntity, -} from '../../utils/EntityUtils'; -import { getEntityIcon } from '../../utils/TableUtils'; -import { showErrorToast } from '../../utils/ToastUtils'; -import ProfilePicture from '../common/ProfilePicture/ProfilePicture'; +} from '../../../utils/EntityUtils'; +import { getEntityIcon } from '../../../utils/TableUtils'; +import { showErrorToast } from '../../../utils/ToastUtils'; +import Loader from '../../common/Loader/Loader'; +import ProfilePicture from '../../common/ProfilePicture/ProfilePicture'; import { DataAssetAsyncSelectListProps, DataAssetOption, diff --git a/openmetadata-ui/src/main/resources/ui/src/components/DataAssets/DataAssetsHeader/DataAssetsHeader.component.tsx b/openmetadata-ui/src/main/resources/ui/src/components/DataAssets/DataAssetsHeader/DataAssetsHeader.component.tsx index fb3954ace35b..d07f3cac20c2 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/DataAssets/DataAssetsHeader/DataAssetsHeader.component.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/components/DataAssets/DataAssetsHeader/DataAssetsHeader.component.tsx @@ -30,11 +30,9 @@ import { DomainLabel } from '../../../components/common/DomainLabel/DomainLabel. import { OwnerLabel } from '../../../components/common/OwnerLabel/OwnerLabel.component'; import TierCard from '../../../components/common/TierCard/TierCard'; import EntityHeaderTitle from '../../../components/Entity/EntityHeaderTitle/EntityHeaderTitle.component'; -import { useTourProvider } from '../../../components/TourProvider/TourProvider'; -import Voting from '../../../components/Voting/Voting.component'; -import { VotingDataProps } from '../../../components/Voting/voting.interface'; import { DE_ACTIVE_COLOR } from '../../../constants/constants'; import { SERVICE_TYPES } from '../../../constants/Services.constant'; +import { useTourProvider } from '../../../context/TourProvider/TourProvider'; import { EntityTabs, EntityType } from '../../../enums/entity.enum'; import { Container } from '../../../generated/entity/data/container'; import { Table } from '../../../generated/entity/data/table'; @@ -58,7 +56,9 @@ import AnnouncementCard from '../../common/EntityPageInfos/AnnouncementCard/Anno import AnnouncementDrawer from '../../common/EntityPageInfos/AnnouncementDrawer/AnnouncementDrawer'; import ManageButton from '../../common/EntityPageInfos/ManageButton/ManageButton'; import TitleBreadcrumb from '../../common/TitleBreadcrumb/TitleBreadcrumb.component'; -import RetentionPeriod from '../../RetentionPeriod/RetentionPeriod.component'; +import RetentionPeriod from '../../Database/RetentionPeriod/RetentionPeriod.component'; +import Voting from '../../Entity/Voting/Voting.component'; +import { VotingDataProps } from '../../Entity/Voting/voting.interface'; import { DataAssetHeaderInfo, DataAssetsHeaderProps, diff --git a/openmetadata-ui/src/main/resources/ui/src/components/DataAssets/DataAssetsHeader/DataAssetsHeader.interface.ts b/openmetadata-ui/src/main/resources/ui/src/components/DataAssets/DataAssetsHeader/DataAssetsHeader.interface.ts index 23db89653f7f..66d6600bfab4 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/DataAssets/DataAssetsHeader/DataAssetsHeader.interface.ts +++ b/openmetadata-ui/src/main/resources/ui/src/components/DataAssets/DataAssetsHeader/DataAssetsHeader.interface.ts @@ -12,8 +12,7 @@ */ import { ReactNode } from 'react'; import { EntityName } from '../../../components/Modals/EntityNameModal/EntityNameModal.interface'; -import { OperationPermission } from '../../../components/PermissionProvider/PermissionProvider.interface'; -import { QueryVote } from '../../../components/TableQueries/TableQueries.interface'; +import { OperationPermission } from '../../../context/PermissionProvider/PermissionProvider.interface'; import { EntityType } from '../../../enums/entity.enum'; import { Tag } from '../../../generated/entity/classification/tag'; import { Container } from '../../../generated/entity/data/container'; @@ -39,6 +38,7 @@ import { StorageService } from '../../../generated/entity/services/storageServic import { EntityReference } from '../../../generated/entity/type'; import { ServicesType } from '../../../interface/service.interface'; import { TitleBreadcrumbProps } from '../../common/TitleBreadcrumb/TitleBreadcrumb.interface'; +import { QueryVote } from '../../Database/TableQueries/TableQueries.interface'; export type DataAssetsType = | Table diff --git a/openmetadata-ui/src/main/resources/ui/src/components/DataInsightDetail/DataAssetsTab/DataAssetsTab.component.tsx b/openmetadata-ui/src/main/resources/ui/src/components/DataInsightDetail/DataAssetsTab/DataAssetsTab.component.tsx index 86910c36ebaa..432d4bd47fb6 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/DataInsightDetail/DataAssetsTab/DataAssetsTab.component.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/components/DataInsightDetail/DataAssetsTab/DataAssetsTab.component.tsx @@ -15,7 +15,7 @@ import React, { useMemo } from 'react'; import { useTranslation } from 'react-i18next'; import { DataInsightChartType } from '../../../generated/dataInsight/dataInsightChartResult'; import { useDataInsightProvider } from '../../../pages/DataInsightPage/DataInsightProvider'; -import Loader from '../../Loader/Loader'; +import Loader from '../../common/Loader/Loader'; import DescriptionInsight from '../DescriptionInsight'; import OwnerInsight from '../OwnerInsight'; import TierInsight from '../TierInsight'; diff --git a/openmetadata-ui/src/main/resources/ui/src/components/DataProductSelectForm/DataProductsSelectForm.interface.ts b/openmetadata-ui/src/main/resources/ui/src/components/DataProducts/DataProductSelectForm/DataProductsSelectForm.interface.ts similarity index 79% rename from openmetadata-ui/src/main/resources/ui/src/components/DataProductSelectForm/DataProductsSelectForm.interface.ts rename to openmetadata-ui/src/main/resources/ui/src/components/DataProducts/DataProductSelectForm/DataProductsSelectForm.interface.ts index dbc76be40309..de0ba7d4db39 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/DataProductSelectForm/DataProductsSelectForm.interface.ts +++ b/openmetadata-ui/src/main/resources/ui/src/components/DataProducts/DataProductSelectForm/DataProductsSelectForm.interface.ts @@ -10,9 +10,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -import { DataProductSelectOption } from '../../components/DataProductsSelectList/DataProductSelectList.interface'; -import { DataProduct } from '../../generated/entity/domains/dataProduct'; -import { Paging } from '../../generated/type/paging'; +import { DataProduct } from '../../../generated/entity/domains/dataProduct'; +import { Paging } from '../../../generated/type/paging'; +import { DataProductSelectOption } from '../DataProductsSelectList/DataProductSelectList.interface'; export type DataProductsSelectFormProps = { placeholder: string; diff --git a/openmetadata-ui/src/main/resources/ui/src/components/DataProductSelectForm/DataProductsSelectForm.test.tsx b/openmetadata-ui/src/main/resources/ui/src/components/DataProducts/DataProductSelectForm/DataProductsSelectForm.test.tsx similarity index 100% rename from openmetadata-ui/src/main/resources/ui/src/components/DataProductSelectForm/DataProductsSelectForm.test.tsx rename to openmetadata-ui/src/main/resources/ui/src/components/DataProducts/DataProductSelectForm/DataProductsSelectForm.test.tsx diff --git a/openmetadata-ui/src/main/resources/ui/src/components/DataProductSelectForm/DataProductsSelectForm.tsx b/openmetadata-ui/src/main/resources/ui/src/components/DataProducts/DataProductSelectForm/DataProductsSelectForm.tsx similarity index 91% rename from openmetadata-ui/src/main/resources/ui/src/components/DataProductSelectForm/DataProductsSelectForm.tsx rename to openmetadata-ui/src/main/resources/ui/src/components/DataProducts/DataProductSelectForm/DataProductsSelectForm.tsx index 765f8004ce91..023eed419484 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/DataProductSelectForm/DataProductsSelectForm.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/components/DataProducts/DataProductSelectForm/DataProductsSelectForm.tsx @@ -13,8 +13,9 @@ import { CheckOutlined, CloseOutlined } from '@ant-design/icons'; import { Button, Col, Row, Space } from 'antd'; import React, { useRef, useState } from 'react'; -import { DataProductsSelectRef } from '../../components/DataProductsSelectList/DataProductSelectList.interface'; -import DataProductsSelectList from '../../components/DataProductsSelectList/DataProductsSelectList'; + +import { DataProductsSelectRef } from '../DataProductsSelectList/DataProductSelectList.interface'; +import DataProductsSelectList from '../DataProductsSelectList/DataProductsSelectList'; import { DataProductsSelectFormProps } from './DataProductsSelectForm.interface'; const DataProductsSelectForm = ({ diff --git a/openmetadata-ui/src/main/resources/ui/src/components/DataProductsContainer/DataProductsContainer.component.tsx b/openmetadata-ui/src/main/resources/ui/src/components/DataProducts/DataProductsContainer/DataProductsContainer.component.tsx similarity index 86% rename from openmetadata-ui/src/main/resources/ui/src/components/DataProductsContainer/DataProductsContainer.component.tsx rename to openmetadata-ui/src/main/resources/ui/src/components/DataProducts/DataProductsContainer/DataProductsContainer.component.tsx index c2f3419bc903..928b2e8b151d 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/DataProductsContainer/DataProductsContainer.component.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/components/DataProducts/DataProductsContainer/DataProductsContainer.component.tsx @@ -15,20 +15,20 @@ import { isEmpty } from 'lodash'; import React, { useCallback, useMemo, useState } from 'react'; import { useTranslation } from 'react-i18next'; import { useHistory } from 'react-router-dom'; -import { ReactComponent as EditIcon } from '../../assets/svg/edit-new.svg'; -import { ReactComponent as DataProductIcon } from '../../assets/svg/ic-data-product.svg'; -import DataProductSelectForm from '../../components/DataProductSelectForm/DataProductsSelectForm'; -import TagsV1 from '../../components/Tag/TagsV1/TagsV1.component'; +import { ReactComponent as EditIcon } from '../../../assets/svg/edit-new.svg'; +import { ReactComponent as DataProductIcon } from '../../../assets/svg/ic-data-product.svg'; import { DE_ACTIVE_COLOR, NO_DATA_PLACEHOLDER, -} from '../../constants/constants'; -import { TAG_CONSTANT, TAG_START_WITH } from '../../constants/Tag.constants'; -import { DataProduct } from '../../generated/entity/domains/dataProduct'; -import { EntityReference } from '../../generated/entity/type'; -import { fetchDataProductsElasticSearch } from '../../rest/dataProductAPI'; -import { getEntityName } from '../../utils/EntityUtils'; -import { getDataProductsDetailsPath } from '../../utils/RouterUtils'; +} from '../../../constants/constants'; +import { TAG_CONSTANT, TAG_START_WITH } from '../../../constants/Tag.constants'; +import { DataProduct } from '../../../generated/entity/domains/dataProduct'; +import { EntityReference } from '../../../generated/entity/type'; +import { fetchDataProductsElasticSearch } from '../../../rest/dataProductAPI'; +import { getEntityName } from '../../../utils/EntityUtils'; +import { getDataProductsDetailsPath } from '../../../utils/RouterUtils'; +import TagsV1 from '../../Tag/TagsV1/TagsV1.component'; +import DataProductsSelectForm from '../DataProductSelectForm/DataProductsSelectForm'; interface DataProductsContainerProps { showHeader?: boolean; @@ -88,7 +88,7 @@ const DataProductsContainer = ({ const autoCompleteFormSelectContainer = useMemo(() => { return ( - item.fullyQualifiedName ?? '' )} diff --git a/openmetadata-ui/src/main/resources/ui/src/components/DataProducts/DataProductsDetailsPage/DataProductsDetailsPage.component.tsx b/openmetadata-ui/src/main/resources/ui/src/components/DataProducts/DataProductsDetailsPage/DataProductsDetailsPage.component.tsx index bc33eac082b6..2a01dc0cfaf2 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/DataProducts/DataProductsDetailsPage/DataProductsDetailsPage.component.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/components/DataProducts/DataProductsDetailsPage/DataProductsDetailsPage.component.tsx @@ -32,28 +32,13 @@ import { ReactComponent as DeleteIcon } from '../../../assets/svg/ic-delete.svg' import { ReactComponent as VersionIcon } from '../../../assets/svg/ic-version.svg'; import { ReactComponent as IconDropdown } from '../../../assets/svg/menu.svg'; import { ReactComponent as StyleIcon } from '../../../assets/svg/style.svg'; -import { AssetSelectionModal } from '../../../components/Assets/AssetsSelectionModal/AssetSelectionModal'; -import { ManageButtonItemLabel } from '../../../components/common/ManageButtonContentItem/ManageButtonContentItem.component'; -import { DomainTabs } from '../../../components/Domain/DomainPage.interface'; -import DocumentationTab from '../../../components/Domain/DomainTabs/DocumentationTab/DocumentationTab.component'; -import { DocumentationEntity } from '../../../components/Domain/DomainTabs/DocumentationTab/DocumentationTab.interface'; -import { EntityHeader } from '../../../components/Entity/EntityHeader/EntityHeader.component'; -import EntitySummaryPanel from '../../../components/Explore/EntitySummaryPanel/EntitySummaryPanel.component'; -import AssetsTabs, { - AssetsTabRef, -} from '../../../components/Glossary/GlossaryTerms/tabs/AssetsTabs.component'; -import { AssetsOfEntity } from '../../../components/Glossary/GlossaryTerms/tabs/AssetsTabs.interface'; -import EntityDeleteModal from '../../../components/Modals/EntityDeleteModal/EntityDeleteModal'; -import EntityNameModal from '../../../components/Modals/EntityNameModal/EntityNameModal.component'; -import PageLayoutV1 from '../../../components/PageLayoutV1/PageLayoutV1'; -import { usePermissionProvider } from '../../../components/PermissionProvider/PermissionProvider'; +import { DE_ACTIVE_COLOR } from '../../../constants/constants'; +import { EntityField } from '../../../constants/Feeds.constants'; +import { usePermissionProvider } from '../../../context/PermissionProvider/PermissionProvider'; import { OperationPermission, ResourceEntity, -} from '../../../components/PermissionProvider/PermissionProvider.interface'; -import TabsLabel from '../../../components/TabsLabel/TabsLabel.component'; -import { DE_ACTIVE_COLOR } from '../../../constants/constants'; -import { EntityField } from '../../../constants/Feeds.constants'; +} from '../../../context/PermissionProvider/PermissionProvider.interface'; import { EntityType } from '../../../enums/entity.enum'; import { SearchIndex } from '../../../enums/search.enum'; import { @@ -84,8 +69,23 @@ import { getEncodedFqn, } from '../../../utils/StringsUtils'; import { showErrorToast } from '../../../utils/ToastUtils'; +import { ManageButtonItemLabel } from '../../common/ManageButtonContentItem/ManageButtonContentItem.component'; +import TabsLabel from '../../common/TabsLabel/TabsLabel.component'; +import { AssetSelectionModal } from '../../DataAssets/AssetsSelectionModal/AssetSelectionModal'; +import { DomainTabs } from '../../Domain/DomainPage.interface'; +import DocumentationTab from '../../Domain/DomainTabs/DocumentationTab/DocumentationTab.component'; +import { DocumentationEntity } from '../../Domain/DomainTabs/DocumentationTab/DocumentationTab.interface'; +import { EntityHeader } from '../../Entity/EntityHeader/EntityHeader.component'; +import EntitySummaryPanel from '../../Explore/EntitySummaryPanel/EntitySummaryPanel.component'; import { EntityDetailsObjectInterface } from '../../Explore/ExplorePage.interface'; +import AssetsTabs, { + AssetsTabRef, +} from '../../Glossary/GlossaryTerms/tabs/AssetsTabs.component'; +import { AssetsOfEntity } from '../../Glossary/GlossaryTerms/tabs/AssetsTabs.interface'; +import EntityDeleteModal from '../../Modals/EntityDeleteModal/EntityDeleteModal'; +import EntityNameModal from '../../Modals/EntityNameModal/EntityNameModal.component'; import StyleModal from '../../Modals/StyleModal/StyleModal.component'; +import PageLayoutV1 from '../../PageLayoutV1/PageLayoutV1'; import './data-products-details-page.less'; import { DataProductsDetailsPageProps, diff --git a/openmetadata-ui/src/main/resources/ui/src/components/DataProducts/DataProductsPage/DataProductsPage.component.tsx b/openmetadata-ui/src/main/resources/ui/src/components/DataProducts/DataProductsPage/DataProductsPage.component.tsx index 71b01ea7ee6c..4b8006feb5fc 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/DataProducts/DataProductsPage/DataProductsPage.component.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/components/DataProducts/DataProductsPage/DataProductsPage.component.tsx @@ -36,8 +36,8 @@ import { } from '../../../utils/RouterUtils'; import { showErrorToast, showSuccessToast } from '../../../utils/ToastUtils'; import ErrorPlaceHolder from '../../common/ErrorWithPlaceholder/ErrorPlaceHolder'; +import Loader from '../../common/Loader/Loader'; import EntityVersionTimeLine from '../../Entity/EntityVersionTimeLine/EntityVersionTimeLine'; -import Loader from '../../Loader/Loader'; import PageLayoutV1 from '../../PageLayoutV1/PageLayoutV1'; import DataProductsDetailsPage from '../DataProductsDetailsPage/DataProductsDetailsPage.component'; diff --git a/openmetadata-ui/src/main/resources/ui/src/components/DataProductsSelectList/DataProductSelectList.interface.ts b/openmetadata-ui/src/main/resources/ui/src/components/DataProducts/DataProductsSelectList/DataProductSelectList.interface.ts similarity index 89% rename from openmetadata-ui/src/main/resources/ui/src/components/DataProductsSelectList/DataProductSelectList.interface.ts rename to openmetadata-ui/src/main/resources/ui/src/components/DataProducts/DataProductsSelectList/DataProductSelectList.interface.ts index 5b6d1fec43c9..2d75405b1dc8 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/DataProductsSelectList/DataProductSelectList.interface.ts +++ b/openmetadata-ui/src/main/resources/ui/src/components/DataProducts/DataProductsSelectList/DataProductSelectList.interface.ts @@ -10,8 +10,8 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -import { DataProduct } from '../../generated/entity/domains/dataProduct'; -import { Paging } from '../../generated/type/paging'; +import { DataProduct } from '../../../generated/entity/domains/dataProduct'; +import { Paging } from '../../../generated/type/paging'; export type DataProductSelectOption = { label: string; diff --git a/openmetadata-ui/src/main/resources/ui/src/components/DataProductsSelectList/DataProductsSelectList.tsx b/openmetadata-ui/src/main/resources/ui/src/components/DataProducts/DataProductsSelectList/DataProductsSelectList.tsx similarity index 93% rename from openmetadata-ui/src/main/resources/ui/src/components/DataProductsSelectList/DataProductsSelectList.tsx rename to openmetadata-ui/src/main/resources/ui/src/components/DataProducts/DataProductsSelectList/DataProductsSelectList.tsx index b694a9ee8ea0..6b1b45a0818b 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/DataProductsSelectList/DataProductsSelectList.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/components/DataProducts/DataProductsSelectList/DataProductsSelectList.tsx @@ -21,12 +21,12 @@ import React, { useRef, useState, } from 'react'; -import Loader from '../../components/Loader/Loader'; -import { DataProduct } from '../../generated/entity/domains/dataProduct'; -import { Paging } from '../../generated/type/paging'; -import { getEntityName } from '../../utils/EntityUtils'; -import { tagRender } from '../../utils/TagsUtils'; -import { showErrorToast } from '../../utils/ToastUtils'; +import { DataProduct } from '../../../generated/entity/domains/dataProduct'; +import { Paging } from '../../../generated/type/paging'; +import { getEntityName } from '../../../utils/EntityUtils'; +import { tagRender } from '../../../utils/TagsUtils'; +import { showErrorToast } from '../../../utils/ToastUtils'; +import Loader from '../../common/Loader/Loader'; import { DataProductSelectOption, DataProductsSelectListProps, diff --git a/openmetadata-ui/src/main/resources/ui/src/components/AddDataQualityTest/AddDataQualityTest.interface.ts b/openmetadata-ui/src/main/resources/ui/src/components/DataQuality/AddDataQualityTest/AddDataQualityTest.interface.ts similarity index 80% rename from openmetadata-ui/src/main/resources/ui/src/components/AddDataQualityTest/AddDataQualityTest.interface.ts rename to openmetadata-ui/src/main/resources/ui/src/components/DataQuality/AddDataQualityTest/AddDataQualityTest.interface.ts index b041267bb8ce..badd593c15bf 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/AddDataQualityTest/AddDataQualityTest.interface.ts +++ b/openmetadata-ui/src/main/resources/ui/src/components/DataQuality/AddDataQualityTest/AddDataQualityTest.interface.ts @@ -12,12 +12,12 @@ */ import { ReactNode } from 'react'; -import { CreateTestCase } from '../../generated/api/tests/createTestCase'; -import { Table } from '../../generated/entity/data/table'; -import { IngestionPipeline } from '../../generated/entity/services/ingestionPipelines/ingestionPipeline'; -import { TestCase } from '../../generated/tests/testCase'; -import { TestDefinition } from '../../generated/tests/testDefinition'; -import { TestSuite } from '../../generated/tests/testSuite'; +import { CreateTestCase } from '../../../generated/api/tests/createTestCase'; +import { Table } from '../../../generated/entity/data/table'; +import { IngestionPipeline } from '../../../generated/entity/services/ingestionPipelines/ingestionPipeline'; +import { TestCase } from '../../../generated/tests/testCase'; +import { TestDefinition } from '../../../generated/tests/testDefinition'; +import { TestSuite } from '../../../generated/tests/testSuite'; export interface AddDataQualityTestProps { table: Table; diff --git a/openmetadata-ui/src/main/resources/ui/src/components/AddDataQualityTest/AddDataQualityTestV1.tsx b/openmetadata-ui/src/main/resources/ui/src/components/DataQuality/AddDataQualityTest/AddDataQualityTestV1.tsx similarity index 83% rename from openmetadata-ui/src/main/resources/ui/src/components/AddDataQualityTest/AddDataQualityTestV1.tsx rename to openmetadata-ui/src/main/resources/ui/src/components/DataQuality/AddDataQualityTest/AddDataQualityTestV1.tsx index 44c14ffd58a0..9318ee6a3616 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/AddDataQualityTest/AddDataQualityTestV1.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/components/DataQuality/AddDataQualityTest/AddDataQualityTestV1.tsx @@ -25,32 +25,38 @@ import { useState, } from 'react'; import { useHistory, useParams } from 'react-router-dom'; -import ResizablePanels from '../../components/common/ResizablePanels/ResizablePanels'; -import { TableProfilerTab } from '../../components/ProfilerDashboard/profilerDashboard.interface'; -import SingleColumnProfile from '../../components/TableProfiler/Component/SingleColumnProfile'; -import TableProfilerChart from '../../components/TableProfiler/Component/TableProfilerChart'; -import { HTTP_STATUS_CODE } from '../../constants/Auth.constants'; -import { getTableTabPath } from '../../constants/constants'; +import { HTTP_STATUS_CODE } from '../../../constants/Auth.constants'; +import { getTableTabPath } from '../../../constants/constants'; import { DEFAULT_RANGE_DATA, STEPS_FOR_ADD_TEST_CASE, -} from '../../constants/profiler.constant'; -import { EntityTabs, EntityType } from '../../enums/entity.enum'; -import { FormSubmitType } from '../../enums/form.enum'; -import { ProfilerDashboardType } from '../../enums/table.enum'; -import { OwnerType } from '../../enums/user.enum'; -import { CreateTestCase } from '../../generated/api/tests/createTestCase'; -import { TestCase } from '../../generated/tests/testCase'; -import { TestSuite } from '../../generated/tests/testSuite'; -import { useFqn } from '../../hooks/useFqn'; -import { createExecutableTestSuite, createTestCase } from '../../rest/testAPI'; -import { getEntityBreadcrumbs, getEntityName } from '../../utils/EntityUtils'; -import { showErrorToast } from '../../utils/ToastUtils'; -import { useAuthContext } from '../Auth/AuthProviders/AuthProvider'; -import SuccessScreen from '../common/SuccessScreen/SuccessScreen'; -import TitleBreadcrumb from '../common/TitleBreadcrumb/TitleBreadcrumb.component'; -import { TitleBreadcrumbProps } from '../common/TitleBreadcrumb/TitleBreadcrumb.interface'; -import IngestionStepper from '../IngestionStepper/IngestionStepper.component'; +} from '../../../constants/profiler.constant'; +import { EntityTabs, EntityType } from '../../../enums/entity.enum'; +import { FormSubmitType } from '../../../enums/form.enum'; +import { ProfilerDashboardType } from '../../../enums/table.enum'; +import { OwnerType } from '../../../enums/user.enum'; +import { CreateTestCase } from '../../../generated/api/tests/createTestCase'; +import { TestCase } from '../../../generated/tests/testCase'; +import { TestSuite } from '../../../generated/tests/testSuite'; +import { useFqn } from '../../../hooks/useFqn'; +import { + createExecutableTestSuite, + createTestCase, +} from '../../../rest/testAPI'; +import { + getEntityBreadcrumbs, + getEntityName, +} from '../../../utils/EntityUtils'; +import { showErrorToast } from '../../../utils/ToastUtils'; +import { useAuthContext } from '../../Auth/AuthProviders/AuthProvider'; +import ResizablePanels from '../../common/ResizablePanels/ResizablePanels'; +import SuccessScreen from '../../common/SuccessScreen/SuccessScreen'; +import TitleBreadcrumb from '../../common/TitleBreadcrumb/TitleBreadcrumb.component'; +import { TitleBreadcrumbProps } from '../../common/TitleBreadcrumb/TitleBreadcrumb.interface'; +import { TableProfilerTab } from '../../Database/Profiler/ProfilerDashboard/profilerDashboard.interface'; +import SingleColumnProfile from '../../Database/TableProfiler/SingleColumnProfile'; +import TableProfilerChart from '../../Database/TableProfiler/TableProfilerChart/TableProfilerChart'; +import IngestionStepper from '../../Settings/Services/Ingestion/IngestionStepper/IngestionStepper.component'; import { AddDataQualityTestProps } from './AddDataQualityTest.interface'; import RightPanel from './components/RightPanel'; import TestCaseForm from './components/TestCaseForm'; diff --git a/openmetadata-ui/src/main/resources/ui/src/components/AddDataQualityTest/EditTestCaseModal.test.tsx b/openmetadata-ui/src/main/resources/ui/src/components/DataQuality/AddDataQualityTest/EditTestCaseModal.test.tsx similarity index 99% rename from openmetadata-ui/src/main/resources/ui/src/components/AddDataQualityTest/EditTestCaseModal.test.tsx rename to openmetadata-ui/src/main/resources/ui/src/components/DataQuality/AddDataQualityTest/EditTestCaseModal.test.tsx index fe7dccbb035f..e574aae8ded1 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/AddDataQualityTest/EditTestCaseModal.test.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/components/DataQuality/AddDataQualityTest/EditTestCaseModal.test.tsx @@ -15,7 +15,7 @@ import React, { forwardRef } from 'react'; import { MOCK_TEST_CASE, MOCK_TEST_DEFINITION_COLUMN_VALUES_TO_MATCH_REGEX, -} from '../../mocks/TestSuite.mock'; +} from '../../../mocks/TestSuite.mock'; import { EditTestCaseModalProps } from './AddDataQualityTest.interface'; import EditTestCaseModal from './EditTestCaseModal'; diff --git a/openmetadata-ui/src/main/resources/ui/src/components/AddDataQualityTest/EditTestCaseModal.tsx b/openmetadata-ui/src/main/resources/ui/src/components/DataQuality/AddDataQualityTest/EditTestCaseModal.tsx similarity index 91% rename from openmetadata-ui/src/main/resources/ui/src/components/AddDataQualityTest/EditTestCaseModal.tsx rename to openmetadata-ui/src/main/resources/ui/src/components/DataQuality/AddDataQualityTest/EditTestCaseModal.tsx index 91f0f695e69a..27b05365c93f 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/AddDataQualityTest/EditTestCaseModal.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/components/DataQuality/AddDataQualityTest/EditTestCaseModal.tsx @@ -18,26 +18,29 @@ import { compare } from 'fast-json-patch'; import { isEmpty } from 'lodash'; import React, { useEffect, useMemo, useState } from 'react'; import { useTranslation } from 'react-i18next'; -import { ENTITY_NAME_REGEX } from '../../constants/regex.constants'; -import { Table } from '../../generated/entity/data/table'; -import { TestCaseParameterValue } from '../../generated/tests/testCase'; +import { ENTITY_NAME_REGEX } from '../../../constants/regex.constants'; +import { Table } from '../../../generated/entity/data/table'; +import { TestCaseParameterValue } from '../../../generated/tests/testCase'; import { TestDataType, TestDefinition, -} from '../../generated/tests/testDefinition'; +} from '../../../generated/tests/testDefinition'; import { FieldProp, FieldTypes, FormItemLayout, -} from '../../interface/FormUtils.interface'; -import { getTableDetailsByFQN } from '../../rest/tableAPI'; -import { getTestDefinitionById, updateTestCaseById } from '../../rest/testAPI'; -import { getNameFromFQN } from '../../utils/CommonUtils'; -import { generateFormFields } from '../../utils/formUtils'; -import { getEntityFqnFromEntityLink } from '../../utils/TableUtils'; -import { showErrorToast, showSuccessToast } from '../../utils/ToastUtils'; -import RichTextEditor from '../common/RichTextEditor/RichTextEditor'; -import Loader from '../Loader/Loader'; +} from '../../../interface/FormUtils.interface'; +import { getTableDetailsByFQN } from '../../../rest/tableAPI'; +import { + getTestDefinitionById, + updateTestCaseById, +} from '../../../rest/testAPI'; +import { getNameFromFQN } from '../../../utils/CommonUtils'; +import { generateFormFields } from '../../../utils/formUtils'; +import { getEntityFqnFromEntityLink } from '../../../utils/TableUtils'; +import { showErrorToast, showSuccessToast } from '../../../utils/ToastUtils'; +import Loader from '../../common/Loader/Loader'; +import RichTextEditor from '../../common/RichTextEditor/RichTextEditor'; import { EditTestCaseModalProps } from './AddDataQualityTest.interface'; import ParameterForm from './components/ParameterForm'; diff --git a/openmetadata-ui/src/main/resources/ui/src/components/AddDataQualityTest/TestSuiteIngestion.tsx b/openmetadata-ui/src/main/resources/ui/src/components/DataQuality/AddDataQualityTest/TestSuiteIngestion.tsx similarity index 90% rename from openmetadata-ui/src/main/resources/ui/src/components/AddDataQualityTest/TestSuiteIngestion.tsx rename to openmetadata-ui/src/main/resources/ui/src/components/DataQuality/AddDataQualityTest/TestSuiteIngestion.tsx index b63287a46508..b89dc373fc1f 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/AddDataQualityTest/TestSuiteIngestion.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/components/DataQuality/AddDataQualityTest/TestSuiteIngestion.tsx @@ -20,31 +20,31 @@ import { useHistory } from 'react-router-dom'; import { DEPLOYED_PROGRESS_VAL, INGESTION_PROGRESS_END_VAL, -} from '../../constants/constants'; -import { FormSubmitType } from '../../enums/form.enum'; -import { IngestionActionMessage } from '../../enums/ingestion.enum'; +} from '../../../constants/constants'; +import { FormSubmitType } from '../../../enums/form.enum'; +import { IngestionActionMessage } from '../../../enums/ingestion.enum'; import { ConfigType, CreateIngestionPipeline, PipelineType, -} from '../../generated/api/services/ingestionPipelines/createIngestionPipeline'; -import { IngestionPipeline } from '../../generated/entity/services/ingestionPipelines/ingestionPipeline'; -import { useFqn } from '../../hooks/useFqn'; +} from '../../../generated/api/services/ingestionPipelines/createIngestionPipeline'; +import { IngestionPipeline } from '../../../generated/entity/services/ingestionPipelines/ingestionPipeline'; +import { useFqn } from '../../../hooks/useFqn'; import { addIngestionPipeline, deployIngestionPipelineById, updateIngestionPipeline, -} from '../../rest/ingestionPipelineAPI'; +} from '../../../rest/ingestionPipelineAPI'; import { getIngestionFrequency, getNameFromFQN, replaceAllSpacialCharWith_, Transi18next, -} from '../../utils/CommonUtils'; -import { getIngestionName } from '../../utils/ServiceUtils'; -import { showErrorToast } from '../../utils/ToastUtils'; -import SuccessScreen from '../common/SuccessScreen/SuccessScreen'; -import DeployIngestionLoaderModal from '../Modals/DeployIngestionLoaderModal/DeployIngestionLoaderModal'; +} from '../../../utils/CommonUtils'; +import { getIngestionName } from '../../../utils/ServiceUtils'; +import { showErrorToast } from '../../../utils/ToastUtils'; +import SuccessScreen from '../../common/SuccessScreen/SuccessScreen'; +import DeployIngestionLoaderModal from '../../Modals/DeployIngestionLoaderModal/DeployIngestionLoaderModal'; import { TestSuiteIngestionProps } from './AddDataQualityTest.interface'; import TestSuiteScheduler from './components/TestSuiteScheduler'; diff --git a/openmetadata-ui/src/main/resources/ui/src/components/AddDataQualityTest/components/ParameterForm.test.tsx b/openmetadata-ui/src/main/resources/ui/src/components/DataQuality/AddDataQualityTest/components/ParameterForm.test.tsx similarity index 96% rename from openmetadata-ui/src/main/resources/ui/src/components/AddDataQualityTest/components/ParameterForm.test.tsx rename to openmetadata-ui/src/main/resources/ui/src/components/DataQuality/AddDataQualityTest/components/ParameterForm.test.tsx index 752b07068183..67fed8d91b00 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/AddDataQualityTest/components/ParameterForm.test.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/components/DataQuality/AddDataQualityTest/components/ParameterForm.test.tsx @@ -13,13 +13,13 @@ import { act, render, screen } from '@testing-library/react'; import React from 'react'; -import { TestDefinition } from '../../../generated/tests/testDefinition'; +import { TestDefinition } from '../../../../generated/tests/testDefinition'; import { MOCK_TABLE_COLUMN_NAME_TO_EXIST, MOCK_TABLE_CUSTOM_SQL_QUERY, MOCK_TABLE_ROW_INSERTED_COUNT_TO_BE_BETWEEN, MOCK_TABLE_WITH_DATE_TIME_COLUMNS, -} from '../../../mocks/TestSuite.mock'; +} from '../../../../mocks/TestSuite.mock'; import ParameterForm from './ParameterForm'; jest.mock('../../../components/SchemaEditor/SchemaEditor', () => { diff --git a/openmetadata-ui/src/main/resources/ui/src/components/AddDataQualityTest/components/ParameterForm.tsx b/openmetadata-ui/src/main/resources/ui/src/components/DataQuality/AddDataQualityTest/components/ParameterForm.tsx similarity index 95% rename from openmetadata-ui/src/main/resources/ui/src/components/AddDataQualityTest/components/ParameterForm.tsx rename to openmetadata-ui/src/main/resources/ui/src/components/DataQuality/AddDataQualityTest/components/ParameterForm.tsx index 448e1703e2ec..e0df340491d9 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/AddDataQualityTest/components/ParameterForm.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/components/DataQuality/AddDataQualityTest/components/ParameterForm.tsx @@ -26,15 +26,15 @@ import 'codemirror/addon/fold/foldgutter.css'; import { isUndefined } from 'lodash'; import React from 'react'; import { useTranslation } from 'react-i18next'; -import { ReactComponent as IconDelete } from '../../../assets/svg/ic-delete.svg'; -import { SUPPORTED_PARTITION_TYPE_FOR_DATE_TIME } from '../../../constants/profiler.constant'; -import { CSMode } from '../../../enums/codemirror.enum'; +import { ReactComponent as IconDelete } from '../../../../assets/svg/ic-delete.svg'; +import { SUPPORTED_PARTITION_TYPE_FOR_DATE_TIME } from '../../../../constants/profiler.constant'; +import { CSMode } from '../../../../enums/codemirror.enum'; import { TestCaseParameterDefinition, TestDataType, -} from '../../../generated/tests/testDefinition'; -import SchemaEditor from '../../SchemaEditor/SchemaEditor'; -import '../../TableProfiler/table-profiler.less'; +} from '../../../../generated/tests/testDefinition'; +import SchemaEditor from '../../../Database/SchemaEditor/SchemaEditor'; +import '../../../Database/TableProfiler/table-profiler.less'; import { ParameterFormProps } from '../AddDataQualityTest.interface'; const ParameterForm: React.FC = ({ definition, table }) => { diff --git a/openmetadata-ui/src/main/resources/ui/src/components/AddDataQualityTest/components/RightPanel.tsx b/openmetadata-ui/src/main/resources/ui/src/components/DataQuality/AddDataQualityTest/components/RightPanel.tsx similarity index 100% rename from openmetadata-ui/src/main/resources/ui/src/components/AddDataQualityTest/components/RightPanel.tsx rename to openmetadata-ui/src/main/resources/ui/src/components/DataQuality/AddDataQualityTest/components/RightPanel.tsx diff --git a/openmetadata-ui/src/main/resources/ui/src/components/AddDataQualityTest/components/TestCaseForm.test.tsx b/openmetadata-ui/src/main/resources/ui/src/components/DataQuality/AddDataQualityTest/components/TestCaseForm.test.tsx similarity index 98% rename from openmetadata-ui/src/main/resources/ui/src/components/AddDataQualityTest/components/TestCaseForm.test.tsx rename to openmetadata-ui/src/main/resources/ui/src/components/DataQuality/AddDataQualityTest/components/TestCaseForm.test.tsx index 8092efcd35dd..efbfb3070b38 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/AddDataQualityTest/components/TestCaseForm.test.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/components/DataQuality/AddDataQualityTest/components/TestCaseForm.test.tsx @@ -19,8 +19,8 @@ import { import userEvent from '@testing-library/user-event'; import React, { forwardRef } from 'react'; import { act } from 'react-dom/test-utils'; -import { ProfilerDashboardType } from '../../../enums/table.enum'; -import { MOCK_TABLE } from '../../../mocks/TableData.mock'; +import { ProfilerDashboardType } from '../../../../enums/table.enum'; +import { MOCK_TABLE } from '../../../../mocks/TableData.mock'; import TestCaseForm from './TestCaseForm'; const mockProps = { diff --git a/openmetadata-ui/src/main/resources/ui/src/components/AddDataQualityTest/components/TestCaseForm.tsx b/openmetadata-ui/src/main/resources/ui/src/components/DataQuality/AddDataQualityTest/components/TestCaseForm.tsx similarity index 92% rename from openmetadata-ui/src/main/resources/ui/src/components/AddDataQualityTest/components/TestCaseForm.tsx rename to openmetadata-ui/src/main/resources/ui/src/components/DataQuality/AddDataQualityTest/components/TestCaseForm.tsx index 97b24d4ed17f..ba38d1bcf138 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/AddDataQualityTest/components/TestCaseForm.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/components/DataQuality/AddDataQualityTest/components/TestCaseForm.tsx @@ -19,36 +19,39 @@ import { isEmpty, snakeCase } from 'lodash'; import Qs from 'qs'; import React, { useCallback, useEffect, useMemo, useState } from 'react'; import { useHistory, useParams } from 'react-router-dom'; -import { PAGE_SIZE_LARGE } from '../../../constants/constants'; -import { ENTITY_NAME_REGEX } from '../../../constants/regex.constants'; -import { ProfilerDashboardType } from '../../../enums/table.enum'; -import { CreateTestCase } from '../../../generated/api/tests/createTestCase'; +import { PAGE_SIZE_LARGE } from '../../../../constants/constants'; +import { ENTITY_NAME_REGEX } from '../../../../constants/regex.constants'; +import { ProfilerDashboardType } from '../../../../enums/table.enum'; +import { CreateTestCase } from '../../../../generated/api/tests/createTestCase'; import { TestCase, TestCaseParameterValue, -} from '../../../generated/tests/testCase'; +} from '../../../../generated/tests/testCase'; import { EntityType, TestDataType, TestDefinition, TestPlatform, -} from '../../../generated/tests/testDefinition'; -import { useFqn } from '../../../hooks/useFqn'; +} from '../../../../generated/tests/testDefinition'; +import { useFqn } from '../../../../hooks/useFqn'; import { FieldProp, FieldTypes, FormItemLayout, -} from '../../../interface/FormUtils.interface'; -import { getListTestCase, getListTestDefinitions } from '../../../rest/testAPI'; +} from '../../../../interface/FormUtils.interface'; +import { + getListTestCase, + getListTestDefinitions, +} from '../../../../rest/testAPI'; import { getNameFromFQN, replaceAllSpacialCharWith_, -} from '../../../utils/CommonUtils'; -import { getEntityName } from '../../../utils/EntityUtils'; -import { generateFormFields } from '../../../utils/formUtils'; -import { generateEntityLink } from '../../../utils/TableUtils'; -import { showErrorToast } from '../../../utils/ToastUtils'; -import RichTextEditor from '../../common/RichTextEditor/RichTextEditor'; +} from '../../../../utils/CommonUtils'; +import { getEntityName } from '../../../../utils/EntityUtils'; +import { generateFormFields } from '../../../../utils/formUtils'; +import { generateEntityLink } from '../../../../utils/TableUtils'; +import { showErrorToast } from '../../../../utils/ToastUtils'; +import RichTextEditor from '../../../common/RichTextEditor/RichTextEditor'; import { TestCaseFormProps } from '../AddDataQualityTest.interface'; import ParameterForm from './ParameterForm'; diff --git a/openmetadata-ui/src/main/resources/ui/src/components/AddDataQualityTest/components/TestSuiteScheduler.tsx b/openmetadata-ui/src/main/resources/ui/src/components/DataQuality/AddDataQualityTest/components/TestSuiteScheduler.tsx similarity index 96% rename from openmetadata-ui/src/main/resources/ui/src/components/AddDataQualityTest/components/TestSuiteScheduler.tsx rename to openmetadata-ui/src/main/resources/ui/src/components/DataQuality/AddDataQualityTest/components/TestSuiteScheduler.tsx index 47a40a071b3d..95c90a5f41e1 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/AddDataQualityTest/components/TestSuiteScheduler.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/components/DataQuality/AddDataQualityTest/components/TestSuiteScheduler.tsx @@ -14,7 +14,7 @@ import { Button, Col, Form, Row, Space } from 'antd'; import { t } from 'i18next'; import React, { useEffect, useState } from 'react'; -import CronEditor from '../../common/CronEditor/CronEditor'; +import CronEditor from '../../../common/CronEditor/CronEditor'; import { TestSuiteSchedulerProps } from '../AddDataQualityTest.interface'; const TestSuiteScheduler: React.FC = ({ diff --git a/openmetadata-ui/src/main/resources/ui/src/components/AddDataQualityTest/rightPanelData.ts b/openmetadata-ui/src/main/resources/ui/src/components/DataQuality/AddDataQualityTest/rightPanelData.ts similarity index 100% rename from openmetadata-ui/src/main/resources/ui/src/components/AddDataQualityTest/rightPanelData.ts rename to openmetadata-ui/src/main/resources/ui/src/components/DataQuality/AddDataQualityTest/rightPanelData.ts diff --git a/openmetadata-ui/src/main/resources/ui/src/components/AddTestCaseList/AddTestCaseList.component.tsx b/openmetadata-ui/src/main/resources/ui/src/components/DataQuality/AddTestCaseList/AddTestCaseList.component.tsx similarity index 91% rename from openmetadata-ui/src/main/resources/ui/src/components/AddTestCaseList/AddTestCaseList.component.tsx rename to openmetadata-ui/src/main/resources/ui/src/components/DataQuality/AddTestCaseList/AddTestCaseList.component.tsx index ca7b94597a89..a67021f9338e 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/AddTestCaseList/AddTestCaseList.component.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/components/DataQuality/AddTestCaseList/AddTestCaseList.component.tsx @@ -15,20 +15,20 @@ import VirtualList from 'rc-virtual-list'; import React, { UIEventHandler, useCallback, useEffect, useState } from 'react'; import { useTranslation } from 'react-i18next'; import { Link } from 'react-router-dom'; -import Loader from '../../components/Loader/Loader'; -import { getTableTabPath, PAGE_SIZE } from '../../constants/constants'; -import { SearchIndex } from '../../enums/search.enum'; -import { TestCase } from '../../generated/tests/testCase'; +import { getTableTabPath, PAGE_SIZE } from '../../../constants/constants'; +import { SearchIndex } from '../../../enums/search.enum'; +import { TestCase } from '../../../generated/tests/testCase'; import { SearchHitBody, TestCaseSearchSource, -} from '../../interface/search.interface'; -import { searchQuery } from '../../rest/searchAPI'; -import { getNameFromFQN } from '../../utils/CommonUtils'; -import { getEntityName } from '../../utils/EntityUtils'; -import { replacePlus } from '../../utils/StringsUtils'; -import { getEntityFqnFromEntityLink } from '../../utils/TableUtils'; -import Searchbar from '../common/SearchBarComponent/SearchBar.component'; +} from '../../../interface/search.interface'; +import { searchQuery } from '../../../rest/searchAPI'; +import { getNameFromFQN } from '../../../utils/CommonUtils'; +import { getEntityName } from '../../../utils/EntityUtils'; +import { replacePlus } from '../../../utils/StringsUtils'; +import { getEntityFqnFromEntityLink } from '../../../utils/TableUtils'; +import Loader from '../../common/Loader/Loader'; +import Searchbar from '../../common/SearchBarComponent/SearchBar.component'; import { AddTestCaseModalProps } from './AddTestCaseList.interface'; // Todo: need to help from backend guys for ES query diff --git a/openmetadata-ui/src/main/resources/ui/src/components/AddTestCaseList/AddTestCaseList.interface.ts b/openmetadata-ui/src/main/resources/ui/src/components/DataQuality/AddTestCaseList/AddTestCaseList.interface.ts similarity index 91% rename from openmetadata-ui/src/main/resources/ui/src/components/AddTestCaseList/AddTestCaseList.interface.ts rename to openmetadata-ui/src/main/resources/ui/src/components/DataQuality/AddTestCaseList/AddTestCaseList.interface.ts index cf78d6b9f6ba..d5adca191535 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/AddTestCaseList/AddTestCaseList.interface.ts +++ b/openmetadata-ui/src/main/resources/ui/src/components/DataQuality/AddTestCaseList/AddTestCaseList.interface.ts @@ -10,7 +10,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -import { EntityReference } from '../../generated/tests/testCase'; +import { EntityReference } from '../../../generated/tests/testCase'; export interface AddTestCaseModalProps { onCancel?: () => void; diff --git a/openmetadata-ui/src/main/resources/ui/src/components/CustomMetricForm/CustomMetricForm.component.tsx b/openmetadata-ui/src/main/resources/ui/src/components/DataQuality/CustomMetricForm/CustomMetricForm.component.tsx similarity index 92% rename from openmetadata-ui/src/main/resources/ui/src/components/CustomMetricForm/CustomMetricForm.component.tsx rename to openmetadata-ui/src/main/resources/ui/src/components/DataQuality/CustomMetricForm/CustomMetricForm.component.tsx index a02695059bb8..a8aeb40d53f3 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/CustomMetricForm/CustomMetricForm.component.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/components/DataQuality/CustomMetricForm/CustomMetricForm.component.tsx @@ -15,12 +15,12 @@ import QueryString from 'qs'; import React, { useEffect, useMemo, useState } from 'react'; import { useTranslation } from 'react-i18next'; import { useLocation } from 'react-router-dom'; -import { ENTITY_NAME_REGEX } from '../../constants/regex.constants'; -import { CSMode } from '../../enums/codemirror.enum'; -import { CustomMetric } from '../../generated/entity/data/table'; -import { getEntityName } from '../../utils/EntityUtils'; -import Loader from '../Loader/Loader'; -import SchemaEditor from '../SchemaEditor/SchemaEditor'; +import { ENTITY_NAME_REGEX } from '../../../constants/regex.constants'; +import { CSMode } from '../../../enums/codemirror.enum'; +import { CustomMetric } from '../../../generated/entity/data/table'; +import { getEntityName } from '../../../utils/EntityUtils'; +import Loader from '../../common/Loader/Loader'; +import SchemaEditor from '../../Database/SchemaEditor/SchemaEditor'; import { CustomMetricFormProps } from './CustomMetricForm.interface'; const CustomMetricForm = ({ diff --git a/openmetadata-ui/src/main/resources/ui/src/components/CustomMetricForm/CustomMetricForm.interface.ts b/openmetadata-ui/src/main/resources/ui/src/components/DataQuality/CustomMetricForm/CustomMetricForm.interface.ts similarity index 86% rename from openmetadata-ui/src/main/resources/ui/src/components/CustomMetricForm/CustomMetricForm.interface.ts rename to openmetadata-ui/src/main/resources/ui/src/components/DataQuality/CustomMetricForm/CustomMetricForm.interface.ts index 49515e02ded5..2d4537707adf 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/CustomMetricForm/CustomMetricForm.interface.ts +++ b/openmetadata-ui/src/main/resources/ui/src/components/DataQuality/CustomMetricForm/CustomMetricForm.interface.ts @@ -11,8 +11,8 @@ * limitations under the License. */ import { FormInstance } from 'antd'; -import { Table } from '../../generated/entity/data/table'; -import { CustomMetric } from '../../generated/tests/customMetric'; +import { Table } from '../../../generated/entity/data/table'; +import { CustomMetric } from '../../../generated/tests/customMetric'; export interface CustomMetricFormProps { isColumnMetric: boolean; diff --git a/openmetadata-ui/src/main/resources/ui/src/components/CustomMetricForm/CustomMetricForm.test.tsx b/openmetadata-ui/src/main/resources/ui/src/components/DataQuality/CustomMetricForm/CustomMetricForm.test.tsx similarity index 100% rename from openmetadata-ui/src/main/resources/ui/src/components/CustomMetricForm/CustomMetricForm.test.tsx rename to openmetadata-ui/src/main/resources/ui/src/components/DataQuality/CustomMetricForm/CustomMetricForm.test.tsx diff --git a/openmetadata-ui/src/main/resources/ui/src/components/IncidentManager/IncidentManagerPageHeader/IncidentManagerPageHeader.component.tsx b/openmetadata-ui/src/main/resources/ui/src/components/DataQuality/IncidentManager/IncidentManagerPageHeader/IncidentManagerPageHeader.component.tsx similarity index 86% rename from openmetadata-ui/src/main/resources/ui/src/components/IncidentManager/IncidentManagerPageHeader/IncidentManagerPageHeader.component.tsx rename to openmetadata-ui/src/main/resources/ui/src/components/DataQuality/IncidentManager/IncidentManagerPageHeader/IncidentManagerPageHeader.component.tsx index 708a9353b4b9..73dcb454f73b 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/IncidentManager/IncidentManagerPageHeader/IncidentManagerPageHeader.component.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/components/DataQuality/IncidentManager/IncidentManagerPageHeader/IncidentManagerPageHeader.component.tsx @@ -18,35 +18,35 @@ import QueryString from 'qs'; import React, { useEffect, useMemo, useState } from 'react'; import { useTranslation } from 'react-i18next'; import { Link, useParams } from 'react-router-dom'; -import { getTableTabPath } from '../../../constants/constants'; -import { EntityTabs, EntityType } from '../../../enums/entity.enum'; -import { ThreadType } from '../../../generated/api/feed/createThread'; +import { getTableTabPath } from '../../../../constants/constants'; +import { usePermissionProvider } from '../../../../context/PermissionProvider/PermissionProvider'; +import { ResourceEntity } from '../../../../context/PermissionProvider/PermissionProvider.interface'; +import { EntityTabs, EntityType } from '../../../../enums/entity.enum'; +import { ThreadType } from '../../../../generated/api/feed/createThread'; import { Thread, ThreadTaskStatus, -} from '../../../generated/entity/feed/thread'; -import { Operation } from '../../../generated/entity/policies/policy'; +} from '../../../../generated/entity/feed/thread'; +import { Operation } from '../../../../generated/entity/policies/policy'; import { Severities, TestCaseResolutionStatus, TestCaseResolutionStatusTypes, -} from '../../../generated/tests/testCaseResolutionStatus'; +} from '../../../../generated/tests/testCaseResolutionStatus'; import { getListTestCaseIncidentByStateId, updateTestCaseIncidentById, -} from '../../../rest/incidentManagerAPI'; -import { getNameFromFQN } from '../../../utils/CommonUtils'; -import { getEntityName } from '../../../utils/EntityUtils'; -import { getEntityFQN } from '../../../utils/FeedUtils'; -import { checkPermission } from '../../../utils/PermissionsUtils'; -import { getDecodedFqn } from '../../../utils/StringsUtils'; -import { getTaskDetailPath } from '../../../utils/TasksUtils'; -import { showErrorToast } from '../../../utils/ToastUtils'; -import { useActivityFeedProvider } from '../../ActivityFeed/ActivityFeedProvider/ActivityFeedProvider'; -import { OwnerLabel } from '../../common/OwnerLabel/OwnerLabel.component'; -import { usePermissionProvider } from '../../PermissionProvider/PermissionProvider'; -import { ResourceEntity } from '../../PermissionProvider/PermissionProvider.interface'; -import { TableProfilerTab } from '../../ProfilerDashboard/profilerDashboard.interface'; +} from '../../../../rest/incidentManagerAPI'; +import { getNameFromFQN } from '../../../../utils/CommonUtils'; +import { getEntityName } from '../../../../utils/EntityUtils'; +import { getEntityFQN } from '../../../../utils/FeedUtils'; +import { checkPermission } from '../../../../utils/PermissionsUtils'; +import { getDecodedFqn } from '../../../../utils/StringsUtils'; +import { getTaskDetailPath } from '../../../../utils/TasksUtils'; +import { showErrorToast } from '../../../../utils/ToastUtils'; +import { useActivityFeedProvider } from '../../../ActivityFeed/ActivityFeedProvider/ActivityFeedProvider'; +import { OwnerLabel } from '../../../common/OwnerLabel/OwnerLabel.component'; +import { TableProfilerTab } from '../../../Database/Profiler/ProfilerDashboard/profilerDashboard.interface'; import Severity from '../Severity/Severity.component'; import TestCaseIncidentManagerStatus from '../TestCaseStatus/TestCaseIncidentManagerStatus.component'; import { IncidentManagerPageHeaderProps } from './IncidentManagerPageHeader.interface'; diff --git a/openmetadata-ui/src/main/resources/ui/src/components/IncidentManager/IncidentManagerPageHeader/IncidentManagerPageHeader.interface.ts b/openmetadata-ui/src/main/resources/ui/src/components/DataQuality/IncidentManager/IncidentManagerPageHeader/IncidentManagerPageHeader.interface.ts similarity index 85% rename from openmetadata-ui/src/main/resources/ui/src/components/IncidentManager/IncidentManagerPageHeader/IncidentManagerPageHeader.interface.ts rename to openmetadata-ui/src/main/resources/ui/src/components/DataQuality/IncidentManager/IncidentManagerPageHeader/IncidentManagerPageHeader.interface.ts index edfeb9377aab..0ab648f04b53 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/IncidentManager/IncidentManagerPageHeader/IncidentManagerPageHeader.interface.ts +++ b/openmetadata-ui/src/main/resources/ui/src/components/DataQuality/IncidentManager/IncidentManagerPageHeader/IncidentManagerPageHeader.interface.ts @@ -10,8 +10,8 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -import { EntityReference } from '../../../generated/entity/type'; -import { TestCase } from '../../../generated/tests/testCase'; +import { EntityReference } from '../../../../generated/entity/type'; +import { TestCase } from '../../../../generated/tests/testCase'; export interface IncidentManagerPageHeaderProps { onOwnerUpdate: (owner?: EntityReference) => Promise; diff --git a/openmetadata-ui/src/main/resources/ui/src/components/IncidentManager/Severity/Severity.component.tsx b/openmetadata-ui/src/main/resources/ui/src/components/DataQuality/IncidentManager/Severity/Severity.component.tsx similarity index 79% rename from openmetadata-ui/src/main/resources/ui/src/components/IncidentManager/Severity/Severity.component.tsx rename to openmetadata-ui/src/main/resources/ui/src/components/DataQuality/IncidentManager/Severity/Severity.component.tsx index a47588a8674c..dc706cfd7380 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/IncidentManager/Severity/Severity.component.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/components/DataQuality/IncidentManager/Severity/Severity.component.tsx @@ -15,13 +15,13 @@ import { Button, Space } from 'antd'; import classNames from 'classnames'; import { startCase, toLower } from 'lodash'; import React, { useCallback, useMemo, useState } from 'react'; -import { ReactComponent as EditIcon } from '../../../assets/svg/edit-new.svg'; -import { NO_DATA_PLACEHOLDER } from '../../../constants/constants'; -import { Operation } from '../../../generated/entity/policies/policy'; -import { checkPermission } from '../../../utils/PermissionsUtils'; -import AppBadge from '../../common/Badge/Badge.component'; -import { usePermissionProvider } from '../../PermissionProvider/PermissionProvider'; -import { ResourceEntity } from '../../PermissionProvider/PermissionProvider.interface'; +import { ReactComponent as EditIcon } from '../../../../assets/svg/edit-new.svg'; +import { NO_DATA_PLACEHOLDER } from '../../../../constants/constants'; +import { usePermissionProvider } from '../../../../context/PermissionProvider/PermissionProvider'; +import { ResourceEntity } from '../../../../context/PermissionProvider/PermissionProvider.interface'; +import { Operation } from '../../../../generated/entity/policies/policy'; +import { checkPermission } from '../../../../utils/PermissionsUtils'; +import AppBadge from '../../../common/Badge/Badge.component'; import { SeverityProps } from './Severity.interface'; import SeverityModal from './SeverityModal.component'; diff --git a/openmetadata-ui/src/main/resources/ui/src/components/IncidentManager/Severity/Severity.interface.ts b/openmetadata-ui/src/main/resources/ui/src/components/DataQuality/IncidentManager/Severity/Severity.interface.ts similarity index 91% rename from openmetadata-ui/src/main/resources/ui/src/components/IncidentManager/Severity/Severity.interface.ts rename to openmetadata-ui/src/main/resources/ui/src/components/DataQuality/IncidentManager/Severity/Severity.interface.ts index a70c0435dd30..8814af9244a7 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/IncidentManager/Severity/Severity.interface.ts +++ b/openmetadata-ui/src/main/resources/ui/src/components/DataQuality/IncidentManager/Severity/Severity.interface.ts @@ -11,7 +11,7 @@ * limitations under the License. */ -import { Severities } from '../../../generated/tests/testCaseResolutionStatus'; +import { Severities } from '../../../../generated/tests/testCaseResolutionStatus'; export interface SeverityFormProps { onSubmit?: (severity: Severities) => Promise; diff --git a/openmetadata-ui/src/main/resources/ui/src/components/IncidentManager/Severity/Severity.test.tsx b/openmetadata-ui/src/main/resources/ui/src/components/DataQuality/IncidentManager/Severity/Severity.test.tsx similarity index 92% rename from openmetadata-ui/src/main/resources/ui/src/components/IncidentManager/Severity/Severity.test.tsx rename to openmetadata-ui/src/main/resources/ui/src/components/DataQuality/IncidentManager/Severity/Severity.test.tsx index 4820eb26635b..9380b746d930 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/IncidentManager/Severity/Severity.test.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/components/DataQuality/IncidentManager/Severity/Severity.test.tsx @@ -18,8 +18,8 @@ import { screen, } from '@testing-library/react'; import React from 'react'; -import { Severities } from '../../../generated/tests/testCaseResolutionStatus'; -import { checkPermission } from '../../../utils/PermissionsUtils'; +import { Severities } from '../../../../generated/tests/testCaseResolutionStatus'; +import { checkPermission } from '../../../../utils/PermissionsUtils'; import Severity from './Severity.component'; jest.mock('./SeverityModal.component', () => @@ -34,10 +34,10 @@ jest.mock('./SeverityModal.component', () => )) ); -jest.mock('../../common/Badge/Badge.component', () => +jest.mock('../../../common/Badge/Badge.component', () => jest.fn().mockImplementation(({ label }) =>
{label}
) ); -jest.mock('../../../utils/PermissionsUtils', () => ({ +jest.mock('../../../../utils/PermissionsUtils', () => ({ checkPermission: jest.fn().mockReturnValue(true), })); diff --git a/openmetadata-ui/src/main/resources/ui/src/components/IncidentManager/Severity/SeverityModal.component.tsx b/openmetadata-ui/src/main/resources/ui/src/components/DataQuality/IncidentManager/Severity/SeverityModal.component.tsx similarity index 96% rename from openmetadata-ui/src/main/resources/ui/src/components/IncidentManager/Severity/SeverityModal.component.tsx rename to openmetadata-ui/src/main/resources/ui/src/components/DataQuality/IncidentManager/Severity/SeverityModal.component.tsx index 7bf5f26e6741..1b7653a848a7 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/IncidentManager/Severity/SeverityModal.component.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/components/DataQuality/IncidentManager/Severity/SeverityModal.component.tsx @@ -16,7 +16,7 @@ import { FormProps, useForm } from 'antd/lib/form/Form'; import { keys, startCase } from 'lodash'; import React, { useState } from 'react'; import { useTranslation } from 'react-i18next'; -import { Severities } from '../../../generated/tests/testCaseResolutionStatus'; +import { Severities } from '../../../../generated/tests/testCaseResolutionStatus'; import { SeverityModalProps } from './Severity.interface'; const SeverityModal = ({ diff --git a/openmetadata-ui/src/main/resources/ui/src/components/IncidentManager/Severity/SeverityModal.test.tsx b/openmetadata-ui/src/main/resources/ui/src/components/DataQuality/IncidentManager/Severity/SeverityModal.test.tsx similarity index 95% rename from openmetadata-ui/src/main/resources/ui/src/components/IncidentManager/Severity/SeverityModal.test.tsx rename to openmetadata-ui/src/main/resources/ui/src/components/DataQuality/IncidentManager/Severity/SeverityModal.test.tsx index b3f773a467ad..78019f40fbbf 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/IncidentManager/Severity/SeverityModal.test.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/components/DataQuality/IncidentManager/Severity/SeverityModal.test.tsx @@ -12,7 +12,7 @@ */ import { act, fireEvent, render, screen } from '@testing-library/react'; import React from 'react'; -import { Severities } from '../../../generated/tests/testCaseResolutionStatus'; +import { Severities } from '../../../../generated/tests/testCaseResolutionStatus'; import SeverityModal from './SeverityModal.component'; const mockProps = { diff --git a/openmetadata-ui/src/main/resources/ui/src/components/IncidentManager/TestCaseIncidentTab/TestCaseIncidentTab.component.tsx b/openmetadata-ui/src/main/resources/ui/src/components/DataQuality/IncidentManager/TestCaseIncidentTab/TestCaseIncidentTab.component.tsx similarity index 83% rename from openmetadata-ui/src/main/resources/ui/src/components/IncidentManager/TestCaseIncidentTab/TestCaseIncidentTab.component.tsx rename to openmetadata-ui/src/main/resources/ui/src/components/DataQuality/IncidentManager/TestCaseIncidentTab/TestCaseIncidentTab.component.tsx index 964f554e69df..ee87fb2245a1 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/IncidentManager/TestCaseIncidentTab/TestCaseIncidentTab.component.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/components/DataQuality/IncidentManager/TestCaseIncidentTab/TestCaseIncidentTab.component.tsx @@ -21,23 +21,23 @@ import React, { useState, } from 'react'; import { useTranslation } from 'react-i18next'; -import { ReactComponent as CheckIcon } from '../../../assets/svg/ic-check.svg'; -import { ReactComponent as TaskIcon } from '../../../assets/svg/ic-task.svg'; -import { observerOptions } from '../../../constants/Mydata.constants'; -import { EntityType } from '../../../enums/entity.enum'; -import { ThreadType } from '../../../generated/api/feed/createThread'; +import { ReactComponent as CheckIcon } from '../../../../assets/svg/ic-check.svg'; +import { ReactComponent as TaskIcon } from '../../../../assets/svg/ic-task.svg'; +import { observerOptions } from '../../../../constants/Mydata.constants'; +import { EntityType } from '../../../../enums/entity.enum'; +import { ThreadType } from '../../../../generated/api/feed/createThread'; import { Thread, ThreadTaskStatus, -} from '../../../generated/entity/feed/thread'; -import { EntityReference } from '../../../generated/entity/type'; -import { useElementInView } from '../../../hooks/useElementInView'; -import { useFqn } from '../../../hooks/useFqn'; -import ActivityFeedListV1 from '../../ActivityFeed/ActivityFeedList/ActivityFeedListV1.component'; -import { useActivityFeedProvider } from '../../ActivityFeed/ActivityFeedProvider/ActivityFeedProvider'; -import { TaskFilter } from '../../ActivityFeed/ActivityFeedTab/ActivityFeedTab.interface'; -import Loader from '../../Loader/Loader'; -import { TaskTab } from '../../Task/TaskTab/TaskTab.component'; +} from '../../../../generated/entity/feed/thread'; +import { EntityReference } from '../../../../generated/entity/type'; +import { useElementInView } from '../../../../hooks/useElementInView'; +import { useFqn } from '../../../../hooks/useFqn'; +import ActivityFeedListV1 from '../../../ActivityFeed/ActivityFeedList/ActivityFeedListV1.component'; +import { useActivityFeedProvider } from '../../../ActivityFeed/ActivityFeedProvider/ActivityFeedProvider'; +import { TaskFilter } from '../../../ActivityFeed/ActivityFeedTab/ActivityFeedTab.interface'; +import Loader from '../../../common/Loader/Loader'; +import { TaskTab } from '../../../Entity/Task/TaskTab/TaskTab.component'; import './test-case-incident-tab.style.less'; const TestCaseIncidentTab = ({ owner }: { owner?: EntityReference }) => { diff --git a/openmetadata-ui/src/main/resources/ui/src/components/IncidentManager/TestCaseIncidentTab/TestCaseIncidentTab.test.tsx b/openmetadata-ui/src/main/resources/ui/src/components/DataQuality/IncidentManager/TestCaseIncidentTab/TestCaseIncidentTab.test.tsx similarity index 98% rename from openmetadata-ui/src/main/resources/ui/src/components/IncidentManager/TestCaseIncidentTab/TestCaseIncidentTab.test.tsx rename to openmetadata-ui/src/main/resources/ui/src/components/DataQuality/IncidentManager/TestCaseIncidentTab/TestCaseIncidentTab.test.tsx index e4a5792f6e70..d002899413f0 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/IncidentManager/TestCaseIncidentTab/TestCaseIncidentTab.test.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/components/DataQuality/IncidentManager/TestCaseIncidentTab/TestCaseIncidentTab.test.tsx @@ -12,7 +12,7 @@ */ import { act, fireEvent, render, screen } from '@testing-library/react'; import React from 'react'; -import { useActivityFeedProvider } from '../../ActivityFeed/ActivityFeedProvider/ActivityFeedProvider'; +import { useActivityFeedProvider } from '../../../ActivityFeed/ActivityFeedProvider/ActivityFeedProvider'; import TestCaseIncidentTab from './TestCaseIncidentTab.component'; const mockThread = [ { diff --git a/openmetadata-ui/src/main/resources/ui/src/components/IncidentManager/TestCaseIncidentTab/test-case-incident-tab.style.less b/openmetadata-ui/src/main/resources/ui/src/components/DataQuality/IncidentManager/TestCaseIncidentTab/test-case-incident-tab.style.less similarity index 95% rename from openmetadata-ui/src/main/resources/ui/src/components/IncidentManager/TestCaseIncidentTab/test-case-incident-tab.style.less rename to openmetadata-ui/src/main/resources/ui/src/components/DataQuality/IncidentManager/TestCaseIncidentTab/test-case-incident-tab.style.less index c491bef2e2ca..4fee6df619c8 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/IncidentManager/TestCaseIncidentTab/test-case-incident-tab.style.less +++ b/openmetadata-ui/src/main/resources/ui/src/components/DataQuality/IncidentManager/TestCaseIncidentTab/test-case-incident-tab.style.less @@ -10,7 +10,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -@import url('../../../styles/variables.less'); +@import url('../../../../styles/variables.less'); .feed-explore-heading { background-color: @grey-1; diff --git a/openmetadata-ui/src/main/resources/ui/src/components/IncidentManager/TestCaseResultTab/TestCaseResultTab.component.tsx b/openmetadata-ui/src/main/resources/ui/src/components/DataQuality/IncidentManager/TestCaseResultTab/TestCaseResultTab.component.tsx similarity index 86% rename from openmetadata-ui/src/main/resources/ui/src/components/IncidentManager/TestCaseResultTab/TestCaseResultTab.component.tsx rename to openmetadata-ui/src/main/resources/ui/src/components/DataQuality/IncidentManager/TestCaseResultTab/TestCaseResultTab.component.tsx index f07132141076..c445f5cbec3c 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/IncidentManager/TestCaseResultTab/TestCaseResultTab.component.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/components/DataQuality/IncidentManager/TestCaseResultTab/TestCaseResultTab.component.tsx @@ -18,21 +18,21 @@ import { compare } from 'fast-json-patch'; import { isEmpty, isUndefined } from 'lodash'; import React, { useCallback, useMemo, useState } from 'react'; import { useTranslation } from 'react-i18next'; -import { ReactComponent as EditIcon } from '../../../assets/svg/edit-new.svg'; -import { DE_ACTIVE_COLOR } from '../../../constants/constants'; -import { CSMode } from '../../../enums/codemirror.enum'; -import { EntityType } from '../../../enums/entity.enum'; -import { Operation } from '../../../generated/entity/policies/policy'; -import { TestCaseParameterValue } from '../../../generated/tests/testCase'; -import { updateTestCaseById } from '../../../rest/testAPI'; -import { checkPermission } from '../../../utils/PermissionsUtils'; -import { showErrorToast, showSuccessToast } from '../../../utils/ToastUtils'; +import { ReactComponent as EditIcon } from '../../../../assets/svg/edit-new.svg'; +import { DE_ACTIVE_COLOR } from '../../../../constants/constants'; +import { usePermissionProvider } from '../../../../context/PermissionProvider/PermissionProvider'; +import { ResourceEntity } from '../../../../context/PermissionProvider/PermissionProvider.interface'; +import { CSMode } from '../../../../enums/codemirror.enum'; +import { EntityType } from '../../../../enums/entity.enum'; +import { Operation } from '../../../../generated/entity/policies/policy'; +import { TestCaseParameterValue } from '../../../../generated/tests/testCase'; +import { updateTestCaseById } from '../../../../rest/testAPI'; +import { checkPermission } from '../../../../utils/PermissionsUtils'; +import { showErrorToast, showSuccessToast } from '../../../../utils/ToastUtils'; +import DescriptionV1 from '../../../common/EntityDescription/DescriptionV1'; +import TestSummary from '../../../Database/Profiler/TestSummary/TestSummary'; +import SchemaEditor from '../../../Database/SchemaEditor/SchemaEditor'; import EditTestCaseModal from '../../AddDataQualityTest/EditTestCaseModal'; -import DescriptionV1 from '../../common/EntityDescription/DescriptionV1'; -import { usePermissionProvider } from '../../PermissionProvider/PermissionProvider'; -import { ResourceEntity } from '../../PermissionProvider/PermissionProvider.interface'; -import TestSummary from '../../ProfilerDashboard/component/TestSummary'; -import SchemaEditor from '../../SchemaEditor/SchemaEditor'; import '../incident-manager.style.less'; import './test-case-result-tab.style.less'; import { TestCaseResultTabProps } from './TestCaseResultTab.interface'; diff --git a/openmetadata-ui/src/main/resources/ui/src/components/IncidentManager/TestCaseResultTab/TestCaseResultTab.interface.ts b/openmetadata-ui/src/main/resources/ui/src/components/DataQuality/IncidentManager/TestCaseResultTab/TestCaseResultTab.interface.ts similarity index 91% rename from openmetadata-ui/src/main/resources/ui/src/components/IncidentManager/TestCaseResultTab/TestCaseResultTab.interface.ts rename to openmetadata-ui/src/main/resources/ui/src/components/DataQuality/IncidentManager/TestCaseResultTab/TestCaseResultTab.interface.ts index 2f019b2522f9..c0105ad00e4e 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/IncidentManager/TestCaseResultTab/TestCaseResultTab.interface.ts +++ b/openmetadata-ui/src/main/resources/ui/src/components/DataQuality/IncidentManager/TestCaseResultTab/TestCaseResultTab.interface.ts @@ -11,7 +11,7 @@ * limitations under the License. */ -import { TestCase } from '../../../generated/tests/testCase'; +import { TestCase } from '../../../../generated/tests/testCase'; export interface TestCaseResultTabProps { testCaseData?: TestCase; diff --git a/openmetadata-ui/src/main/resources/ui/src/components/IncidentManager/TestCaseResultTab/TestCaseResultTab.test.tsx b/openmetadata-ui/src/main/resources/ui/src/components/DataQuality/IncidentManager/TestCaseResultTab/TestCaseResultTab.test.tsx similarity index 97% rename from openmetadata-ui/src/main/resources/ui/src/components/IncidentManager/TestCaseResultTab/TestCaseResultTab.test.tsx rename to openmetadata-ui/src/main/resources/ui/src/components/DataQuality/IncidentManager/TestCaseResultTab/TestCaseResultTab.test.tsx index da73e7dd0997..f33a26afd2fc 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/IncidentManager/TestCaseResultTab/TestCaseResultTab.test.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/components/DataQuality/IncidentManager/TestCaseResultTab/TestCaseResultTab.test.tsx @@ -18,8 +18,8 @@ import { screen, } from '@testing-library/react'; import React from 'react'; -import { TestCase } from '../../../generated/tests/testCase'; -import { checkPermission } from '../../../utils/PermissionsUtils'; +import { TestCase } from '../../../../generated/tests/testCase'; +import { checkPermission } from '../../../../utils/PermissionsUtils'; import TestCaseResultTab from './TestCaseResultTab.component'; import { TestCaseResultTabProps } from './TestCaseResultTab.interface'; diff --git a/openmetadata-ui/src/main/resources/ui/src/components/IncidentManager/TestCaseResultTab/test-case-result-tab.style.less b/openmetadata-ui/src/main/resources/ui/src/components/DataQuality/IncidentManager/TestCaseResultTab/test-case-result-tab.style.less similarity index 92% rename from openmetadata-ui/src/main/resources/ui/src/components/IncidentManager/TestCaseResultTab/test-case-result-tab.style.less rename to openmetadata-ui/src/main/resources/ui/src/components/DataQuality/IncidentManager/TestCaseResultTab/test-case-result-tab.style.less index 5062ab429025..1ad9dccdf1df 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/IncidentManager/TestCaseResultTab/test-case-result-tab.style.less +++ b/openmetadata-ui/src/main/resources/ui/src/components/DataQuality/IncidentManager/TestCaseResultTab/test-case-result-tab.style.less @@ -10,7 +10,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -@import (reference) url('../../../styles/variables.less'); +@import (reference) url('../../../../styles/variables.less'); .test-case-result-tab { .test-case-result-tab-graph { background-color: @grey-5; diff --git a/openmetadata-ui/src/main/resources/ui/src/components/IncidentManager/TestCaseStatus/TestCaseIncidentManagerStatus.component.tsx b/openmetadata-ui/src/main/resources/ui/src/components/DataQuality/IncidentManager/TestCaseStatus/TestCaseIncidentManagerStatus.component.tsx similarity index 79% rename from openmetadata-ui/src/main/resources/ui/src/components/IncidentManager/TestCaseStatus/TestCaseIncidentManagerStatus.component.tsx rename to openmetadata-ui/src/main/resources/ui/src/components/DataQuality/IncidentManager/TestCaseStatus/TestCaseIncidentManagerStatus.component.tsx index cb4a94b16258..b5b5a6771bab 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/IncidentManager/TestCaseStatus/TestCaseIncidentManagerStatus.component.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/components/DataQuality/IncidentManager/TestCaseStatus/TestCaseIncidentManagerStatus.component.tsx @@ -14,19 +14,19 @@ import { Button, Space, Tooltip, Typography } from 'antd'; import classNames from 'classnames'; import React, { useCallback, useMemo, useState } from 'react'; -import { ReactComponent as EditIcon } from '../../../assets/svg/edit-new.svg'; +import { ReactComponent as EditIcon } from '../../../../assets/svg/edit-new.svg'; import { DE_ACTIVE_COLOR, NO_DATA_PLACEHOLDER, -} from '../../../constants/constants'; -import { Operation } from '../../../generated/entity/policies/policy'; -import { formatDate } from '../../../utils/date-time/DateTimeUtils'; -import { getEntityName } from '../../../utils/EntityUtils'; -import { checkPermission } from '../../../utils/PermissionsUtils'; -import AppBadge from '../../common/Badge/Badge.component'; -import { TestCaseStatusModal } from '../../DataQuality/TestCaseStatusModal/TestCaseStatusModal.component'; -import { usePermissionProvider } from '../../PermissionProvider/PermissionProvider'; -import { ResourceEntity } from '../../PermissionProvider/PermissionProvider.interface'; +} from '../../../../constants/constants'; +import { usePermissionProvider } from '../../../../context/PermissionProvider/PermissionProvider'; +import { ResourceEntity } from '../../../../context/PermissionProvider/PermissionProvider.interface'; +import { Operation } from '../../../../generated/entity/policies/policy'; +import { formatDate } from '../../../../utils/date-time/DateTimeUtils'; +import { getEntityName } from '../../../../utils/EntityUtils'; +import { checkPermission } from '../../../../utils/PermissionsUtils'; +import AppBadge from '../../../common/Badge/Badge.component'; +import { TestCaseStatusModal } from '../../TestCaseStatusModal/TestCaseStatusModal.component'; import '../incident-manager.style.less'; import { TestCaseStatusIncidentManagerProps } from './TestCaseIncidentManagerStatus.interface'; const TestCaseIncidentManagerStatus = ({ diff --git a/openmetadata-ui/src/main/resources/ui/src/components/IncidentManager/TestCaseStatus/TestCaseIncidentManagerStatus.interface.ts b/openmetadata-ui/src/main/resources/ui/src/components/DataQuality/IncidentManager/TestCaseStatus/TestCaseIncidentManagerStatus.interface.ts similarity index 82% rename from openmetadata-ui/src/main/resources/ui/src/components/IncidentManager/TestCaseStatus/TestCaseIncidentManagerStatus.interface.ts rename to openmetadata-ui/src/main/resources/ui/src/components/DataQuality/IncidentManager/TestCaseStatus/TestCaseIncidentManagerStatus.interface.ts index 28e0e6ca60fa..8fc98be9fe24 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/IncidentManager/TestCaseStatus/TestCaseIncidentManagerStatus.interface.ts +++ b/openmetadata-ui/src/main/resources/ui/src/components/DataQuality/IncidentManager/TestCaseStatus/TestCaseIncidentManagerStatus.interface.ts @@ -11,8 +11,8 @@ * limitations under the License. */ -import { EntityReference } from '../../../generated/entity/type'; -import { TestCaseResolutionStatus } from '../../../generated/tests/testCaseResolutionStatus'; +import { EntityReference } from '../../../../generated/entity/type'; +import { TestCaseResolutionStatus } from '../../../../generated/tests/testCaseResolutionStatus'; export interface TestCaseStatusIncidentManagerProps { data: TestCaseResolutionStatus; diff --git a/openmetadata-ui/src/main/resources/ui/src/components/IncidentManager/TestCaseStatus/TestCaseIncidentManagerStatus.test.tsx b/openmetadata-ui/src/main/resources/ui/src/components/DataQuality/IncidentManager/TestCaseStatus/TestCaseIncidentManagerStatus.test.tsx similarity index 96% rename from openmetadata-ui/src/main/resources/ui/src/components/IncidentManager/TestCaseStatus/TestCaseIncidentManagerStatus.test.tsx rename to openmetadata-ui/src/main/resources/ui/src/components/DataQuality/IncidentManager/TestCaseStatus/TestCaseIncidentManagerStatus.test.tsx index dc93031814fe..351f3d1e5851 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/IncidentManager/TestCaseStatus/TestCaseIncidentManagerStatus.test.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/components/DataQuality/IncidentManager/TestCaseStatus/TestCaseIncidentManagerStatus.test.tsx @@ -19,8 +19,8 @@ import { } from '@testing-library/react'; import React from 'react'; import { act } from 'react-test-renderer'; -import { TestCaseResolutionStatus } from '../../../generated/tests/testCaseResolutionStatus'; -import { checkPermission } from '../../../utils/PermissionsUtils'; +import { TestCaseResolutionStatus } from '../../../../generated/tests/testCaseResolutionStatus'; +import { checkPermission } from '../../../../utils/PermissionsUtils'; import TestCaseIncidentManagerStatus from './TestCaseIncidentManagerStatus.component'; import { TestCaseStatusIncidentManagerProps } from './TestCaseIncidentManagerStatus.interface'; const mockProps: TestCaseStatusIncidentManagerProps = { diff --git a/openmetadata-ui/src/main/resources/ui/src/components/IncidentManager/incident-manager.style.less b/openmetadata-ui/src/main/resources/ui/src/components/DataQuality/IncidentManager/incident-manager.style.less similarity index 96% rename from openmetadata-ui/src/main/resources/ui/src/components/IncidentManager/incident-manager.style.less rename to openmetadata-ui/src/main/resources/ui/src/components/DataQuality/IncidentManager/incident-manager.style.less index acf558e6bed0..8119faf2291e 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/IncidentManager/incident-manager.style.less +++ b/openmetadata-ui/src/main/resources/ui/src/components/DataQuality/IncidentManager/incident-manager.style.less @@ -11,7 +11,7 @@ * limitations under the License. */ -@import (reference) url('../../styles/variables.less'); +@import (reference) url('../../../styles/variables.less'); .parameter-value-container { background: @grey-1; diff --git a/openmetadata-ui/src/main/resources/ui/src/components/DataQuality/TestCases/TestCases.component.tsx b/openmetadata-ui/src/main/resources/ui/src/components/DataQuality/TestCases/TestCases.component.tsx index cf06ee952e4a..dfe892cf32a0 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/DataQuality/TestCases/TestCases.component.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/components/DataQuality/TestCases/TestCases.component.tsx @@ -16,6 +16,7 @@ import QueryString from 'qs'; import React, { ReactNode, useEffect, useMemo, useState } from 'react'; import { useTranslation } from 'react-i18next'; import { useHistory, useLocation, useParams } from 'react-router-dom'; +import { usePermissionProvider } from '../../../context/PermissionProvider/PermissionProvider'; import { ERROR_PLACEHOLDER_TYPE } from '../../../enums/common.enum'; import { SearchIndex } from '../../../enums/search.enum'; import { TestCase } from '../../../generated/tests/testCase'; @@ -36,8 +37,7 @@ import { showErrorToast } from '../../../utils/ToastUtils'; import ErrorPlaceHolder from '../../common/ErrorWithPlaceholder/ErrorPlaceHolder'; import { PagingHandlerParams } from '../../common/NextPrevious/NextPrevious.interface'; import Searchbar from '../../common/SearchBarComponent/SearchBar.component'; -import { usePermissionProvider } from '../../PermissionProvider/PermissionProvider'; -import DataQualityTab from '../../ProfilerDashboard/component/DataQualityTab'; +import DataQualityTab from '../../Database/Profiler/DataQualityTab/DataQualityTab'; import { DataQualitySearchParams } from '../DataQuality.interface'; export const TestCases = ({ summaryPanel }: { summaryPanel: ReactNode }) => { diff --git a/openmetadata-ui/src/main/resources/ui/src/components/TestSuite/AddTestSuiteForm/AddTestSuiteForm.test.tsx b/openmetadata-ui/src/main/resources/ui/src/components/DataQuality/TestSuite/AddTestSuiteForm/AddTestSuiteForm.test.tsx similarity index 90% rename from openmetadata-ui/src/main/resources/ui/src/components/TestSuite/AddTestSuiteForm/AddTestSuiteForm.test.tsx rename to openmetadata-ui/src/main/resources/ui/src/components/DataQuality/TestSuite/AddTestSuiteForm/AddTestSuiteForm.test.tsx index c4618258514b..753078c87ace 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/TestSuite/AddTestSuiteForm/AddTestSuiteForm.test.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/components/DataQuality/TestSuite/AddTestSuiteForm/AddTestSuiteForm.test.tsx @@ -14,12 +14,12 @@ import { act, render, screen } from '@testing-library/react'; import React from 'react'; import { MemoryRouter } from 'react-router-dom'; -import { MOCK_TABLE_DATA } from '../../../mocks/Teams.mock'; +import { MOCK_TABLE_DATA } from '../../../../mocks/Teams.mock'; import AddTestSuiteForm from './AddTestSuiteForm'; const mockOnSubmit = jest.fn(); -jest.mock('../../../rest/testAPI', () => ({ +jest.mock('../../../../rest/testAPI', () => ({ getListTestSuites: jest .fn() .mockImplementation(() => Promise.resolve(MOCK_TABLE_DATA)), @@ -31,11 +31,11 @@ jest.mock('react-router-dom', () => ({ })), })); -jest.mock('../../common/RichTextEditor/RichTextEditor', () => +jest.mock('../../../common/RichTextEditor/RichTextEditor', () => jest.fn().mockReturnValue(<>RichTextEditor) ); -jest.mock('../../Loader/Loader', () => { +jest.mock('../../../common/Loader/Loader', () => { return jest.fn().mockReturnValue(
Loader
); }); diff --git a/openmetadata-ui/src/main/resources/ui/src/components/TestSuite/AddTestSuiteForm/AddTestSuiteForm.tsx b/openmetadata-ui/src/main/resources/ui/src/components/DataQuality/TestSuite/AddTestSuiteForm/AddTestSuiteForm.tsx similarity index 87% rename from openmetadata-ui/src/main/resources/ui/src/components/TestSuite/AddTestSuiteForm/AddTestSuiteForm.tsx rename to openmetadata-ui/src/main/resources/ui/src/components/DataQuality/TestSuite/AddTestSuiteForm/AddTestSuiteForm.tsx index 7ed9873c7205..b5fd629b3fb8 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/TestSuite/AddTestSuiteForm/AddTestSuiteForm.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/components/DataQuality/TestSuite/AddTestSuiteForm/AddTestSuiteForm.tsx @@ -15,17 +15,17 @@ import { Button, Form, Input, Space } from 'antd'; import React, { useEffect, useState } from 'react'; import { useTranslation } from 'react-i18next'; import { useHistory } from 'react-router-dom'; -import RichTextEditor from '../../../components/common/RichTextEditor/RichTextEditor'; -import Loader from '../../../components/Loader/Loader'; import { PAGE_SIZE_MEDIUM, VALIDATION_MESSAGES, -} from '../../../constants/constants'; -import { ENTITY_NAME_REGEX } from '../../../constants/regex.constants'; -import { TestSuite } from '../../../generated/tests/testSuite'; -import { DataQualityPageTabs } from '../../../pages/DataQuality/DataQualityPage.interface'; -import { getListTestSuites } from '../../../rest/testAPI'; -import { getDataQualityPagePath } from '../../../utils/RouterUtils'; +} from '../../../../constants/constants'; +import { ENTITY_NAME_REGEX } from '../../../../constants/regex.constants'; +import { TestSuite } from '../../../../generated/tests/testSuite'; +import { DataQualityPageTabs } from '../../../../pages/DataQuality/DataQualityPage.interface'; +import { getListTestSuites } from '../../../../rest/testAPI'; +import { getDataQualityPagePath } from '../../../../utils/RouterUtils'; +import Loader from '../../../common/Loader/Loader'; +import RichTextEditor from '../../../common/RichTextEditor/RichTextEditor'; import { AddTestSuiteFormProps } from '../TestSuiteStepper/TestSuiteStepper.interface'; const AddTestSuiteForm: React.FC = ({ diff --git a/openmetadata-ui/src/main/resources/ui/src/components/TestSuite/TestSuitePipelineTab/TestSuitePipelineTab.component.tsx b/openmetadata-ui/src/main/resources/ui/src/components/DataQuality/TestSuite/TestSuitePipelineTab/TestSuitePipelineTab.component.tsx similarity index 91% rename from openmetadata-ui/src/main/resources/ui/src/components/TestSuite/TestSuitePipelineTab/TestSuitePipelineTab.component.tsx rename to openmetadata-ui/src/main/resources/ui/src/components/DataQuality/TestSuite/TestSuitePipelineTab/TestSuitePipelineTab.component.tsx index e76662e941db..186c9fba7ad3 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/TestSuite/TestSuitePipelineTab/TestSuitePipelineTab.component.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/components/DataQuality/TestSuite/TestSuitePipelineTab/TestSuitePipelineTab.component.tsx @@ -19,42 +19,42 @@ import cronstrue from 'cronstrue'; import React, { Fragment, useEffect, useMemo, useState } from 'react'; import { useTranslation } from 'react-i18next'; import { Link, useHistory } from 'react-router-dom'; -import { ReactComponent as ExternalLinkIcon } from '../../../assets/svg/external-links.svg'; -import ErrorPlaceHolder from '../../../components/common/ErrorWithPlaceholder/ErrorPlaceHolder'; -import ErrorPlaceHolderIngestion from '../../../components/common/ErrorWithPlaceholder/ErrorPlaceHolderIngestion'; -import Table from '../../../components/common/Table/Table'; -import { IngestionRecentRuns } from '../../../components/Ingestion/IngestionRecentRun/IngestionRecentRuns.component'; -import Loader from '../../../components/Loader/Loader'; -import EntityDeleteModal from '../../../components/Modals/EntityDeleteModal/EntityDeleteModal'; -import KillIngestionModal from '../../../components/Modals/KillIngestionPipelineModal/KillIngestionPipelineModal'; -import { usePermissionProvider } from '../../../components/PermissionProvider/PermissionProvider'; -import { ResourceEntity } from '../../../components/PermissionProvider/PermissionProvider.interface'; -import { ERROR_PLACEHOLDER_TYPE } from '../../../enums/common.enum'; -import { EntityType } from '../../../enums/entity.enum'; -import { PipelineType } from '../../../generated/api/services/ingestionPipelines/createIngestionPipeline'; -import { Table as TableType } from '../../../generated/entity/data/table'; -import { Operation } from '../../../generated/entity/policies/policy'; -import { IngestionPipeline } from '../../../generated/entity/services/ingestionPipelines/ingestionPipeline'; -import { useAirflowStatus } from '../../../hooks/useAirflowStatus'; +import { ReactComponent as ExternalLinkIcon } from '../../../../assets/svg/external-links.svg'; +import { usePermissionProvider } from '../../../../context/PermissionProvider/PermissionProvider'; +import { ResourceEntity } from '../../../../context/PermissionProvider/PermissionProvider.interface'; +import { ERROR_PLACEHOLDER_TYPE } from '../../../../enums/common.enum'; +import { EntityType } from '../../../../enums/entity.enum'; +import { PipelineType } from '../../../../generated/api/services/ingestionPipelines/createIngestionPipeline'; +import { Table as TableType } from '../../../../generated/entity/data/table'; +import { Operation } from '../../../../generated/entity/policies/policy'; +import { IngestionPipeline } from '../../../../generated/entity/services/ingestionPipelines/ingestionPipeline'; +import { useAirflowStatus } from '../../../../hooks/useAirflowStatus'; import { deleteIngestionPipelineById, deployIngestionPipelineById, enableDisableIngestionPipelineById, getIngestionPipelines, triggerIngestionPipelineById, -} from '../../../rest/ingestionPipelineAPI'; -import { fetchAirflowConfig } from '../../../rest/miscAPI'; -import { getLoadingStatus } from '../../../utils/CommonUtils'; -import { getEntityName } from '../../../utils/EntityUtils'; +} from '../../../../rest/ingestionPipelineAPI'; +import { fetchAirflowConfig } from '../../../../rest/miscAPI'; +import { getLoadingStatus } from '../../../../utils/CommonUtils'; +import { getEntityName } from '../../../../utils/EntityUtils'; import { checkPermission, userPermissions, -} from '../../../utils/PermissionsUtils'; +} from '../../../../utils/PermissionsUtils'; import { getLogsViewerPath, getTestSuiteIngestionPath, -} from '../../../utils/RouterUtils'; -import { showErrorToast, showSuccessToast } from '../../../utils/ToastUtils'; +} from '../../../../utils/RouterUtils'; +import { showErrorToast, showSuccessToast } from '../../../../utils/ToastUtils'; +import ErrorPlaceHolder from '../../../common/ErrorWithPlaceholder/ErrorPlaceHolder'; +import ErrorPlaceHolderIngestion from '../../../common/ErrorWithPlaceholder/ErrorPlaceHolderIngestion'; +import Loader from '../../../common/Loader/Loader'; +import Table from '../../../common/Table/Table'; +import EntityDeleteModal from '../../../Modals/EntityDeleteModal/EntityDeleteModal'; +import KillIngestionModal from '../../../Modals/KillIngestionPipelineModal/KillIngestionPipelineModal'; +import { IngestionRecentRuns } from '../../../Settings/Services/Ingestion/IngestionRecentRun/IngestionRecentRuns.component'; interface Props { testSuite: TableType['testSuite']; diff --git a/openmetadata-ui/src/main/resources/ui/src/components/TestSuite/TestSuitePipelineTab/TestSuitePipelineTab.test.tsx b/openmetadata-ui/src/main/resources/ui/src/components/DataQuality/TestSuite/TestSuitePipelineTab/TestSuitePipelineTab.test.tsx similarity index 92% rename from openmetadata-ui/src/main/resources/ui/src/components/TestSuite/TestSuitePipelineTab/TestSuitePipelineTab.test.tsx rename to openmetadata-ui/src/main/resources/ui/src/components/DataQuality/TestSuite/TestSuitePipelineTab/TestSuitePipelineTab.test.tsx index 521e9440b633..4b3a81ccf86d 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/TestSuite/TestSuitePipelineTab/TestSuitePipelineTab.test.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/components/DataQuality/TestSuite/TestSuitePipelineTab/TestSuitePipelineTab.test.tsx @@ -13,8 +13,8 @@ import { render } from '@testing-library/react'; import React from 'react'; import { act } from 'react-test-renderer'; -import { Table } from '../../../generated/entity/data/table'; -import { getIngestionPipelines } from '../../../rest/ingestionPipelineAPI'; +import { Table } from '../../../../generated/entity/data/table'; +import { getIngestionPipelines } from '../../../../rest/ingestionPipelineAPI'; import TestSuitePipelineTab from './TestSuitePipelineTab.component'; const mockTestSuite = { @@ -55,7 +55,7 @@ const mockTestSuite = { testCaseResultSummary: [], } as unknown as Table['testSuite']; -jest.mock('../../../rest/ingestionPipelineAPI', () => { +jest.mock('../../../../rest/ingestionPipelineAPI', () => { return { getIngestionPipelines: jest .fn() diff --git a/openmetadata-ui/src/main/resources/ui/src/components/TestSuite/TestSuiteStepper/TestSuiteStepper.interface.tsx b/openmetadata-ui/src/main/resources/ui/src/components/DataQuality/TestSuite/TestSuiteStepper/TestSuiteStepper.interface.tsx similarity index 92% rename from openmetadata-ui/src/main/resources/ui/src/components/TestSuite/TestSuiteStepper/TestSuiteStepper.interface.tsx rename to openmetadata-ui/src/main/resources/ui/src/components/DataQuality/TestSuite/TestSuiteStepper/TestSuiteStepper.interface.tsx index 73a742a99439..576bb560498c 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/TestSuite/TestSuiteStepper/TestSuiteStepper.interface.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/components/DataQuality/TestSuite/TestSuiteStepper/TestSuiteStepper.interface.tsx @@ -11,7 +11,7 @@ * limitations under the License. */ -import { TestSuite } from '../../../generated/tests/testSuite'; +import { TestSuite } from '../../../../generated/tests/testSuite'; export interface TestSuiteFormDataProps { name: string; diff --git a/openmetadata-ui/src/main/resources/ui/src/components/TestSuite/TestSuiteStepper/TestSuiteStepper.test.tsx b/openmetadata-ui/src/main/resources/ui/src/components/DataQuality/TestSuite/TestSuiteStepper/TestSuiteStepper.test.tsx similarity index 71% rename from openmetadata-ui/src/main/resources/ui/src/components/TestSuite/TestSuiteStepper/TestSuiteStepper.test.tsx rename to openmetadata-ui/src/main/resources/ui/src/components/DataQuality/TestSuite/TestSuiteStepper/TestSuiteStepper.test.tsx index 8ce79258a540..289830ccf051 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/TestSuite/TestSuiteStepper/TestSuiteStepper.test.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/components/DataQuality/TestSuite/TestSuiteStepper/TestSuiteStepper.test.tsx @@ -16,11 +16,11 @@ import React from 'react'; import { MemoryRouter } from 'react-router-dom'; import TestSuiteStepper from './TestSuiteStepper'; -jest.mock('../../../rest/ingestionPipelineAPI', () => ({ +jest.mock('../../../../rest/ingestionPipelineAPI', () => ({ checkAirflowStatus: jest.fn().mockImplementation(() => Promise.resolve()), })); -jest.mock('../../../rest/testAPI', () => ({ +jest.mock('../../../../rest/testAPI', () => ({ createTestSuites: jest.fn().mockImplementation(() => Promise.resolve()), })); @@ -34,16 +34,16 @@ jest.mock('../../AddDataQualityTest/rightPanelData', () => ({ getRightPanelForAddTestSuitePage: jest.fn().mockReturnValue('Add test suite'), })); -jest.mock('../../../constants/TestSuite.constant', () => ({ +jest.mock('../../../../constants/TestSuite.constant', () => ({ STEPS_FOR_ADD_TEST_SUITE: [], TEST_SUITE_STEPPER_BREADCRUMB: [], })); -jest.mock('../../../utils/RouterUtils', () => ({ +jest.mock('../../../../utils/RouterUtils', () => ({ getTestSuitePath: jest.fn().mockReturnValue('/'), })); -jest.mock('../../../components/AddDataQualityTest/components/RightPanel', () => +jest.mock('../../AddDataQualityTest/components/RightPanel', () => jest.fn().mockReturnValue(
RightPanel
) ); @@ -51,22 +51,18 @@ jest.mock('../AddTestSuiteForm/AddTestSuiteForm', () => jest.fn().mockReturnValue(
AddTestSuiteForm
) ); -jest.mock('../../../components/AddDataQualityTest/TestSuiteIngestion', () => { - return jest.fn().mockReturnValue(
TestSuiteIngestion
); -}); - -jest.mock('../../../components/common/SuccessScreen/SuccessScreen', () => { +jest.mock('../../../common/SuccessScreen/SuccessScreen', () => { return jest.fn().mockReturnValue(
SuccessScreen
); }); jest.mock( - '../../../components/IngestionStepper/IngestionStepper.component', + '../../../Settings/Services/Ingestion/IngestionStepper/IngestionStepper.component', () => { return jest.fn().mockReturnValue(
Ingestion Stepper
); } ); -jest.mock('../../../components/common/ResizablePanels/ResizablePanels', () => +jest.mock('../../../common/ResizablePanels/ResizablePanels', () => jest.fn().mockImplementation(({ firstPanel, secondPanel }) => ( <>
{firstPanel.children}
@@ -75,22 +71,9 @@ jest.mock('../../../components/common/ResizablePanels/ResizablePanels', () => )) ); -jest.mock( - '../../../components/common/TitleBreadcrumb/TitleBreadcrumb.component', - () => { - return jest.fn().mockReturnValue(
Title Breadcrumb
); - } -); - -jest.mock('../../../components/PageLayoutV1/PageLayoutV1', () => - jest.fn().mockImplementation(({ children, leftPanel, rightPanel }) => ( -
- {leftPanel} - {children} - {rightPanel} -
- )) -); +jest.mock('../../../common/TitleBreadcrumb/TitleBreadcrumb.component', () => { + return jest.fn().mockReturnValue(
Title Breadcrumb
); +}); describe('Test Suite Stepper Page', () => { it('Component should render', async () => { diff --git a/openmetadata-ui/src/main/resources/ui/src/components/TestSuite/TestSuiteStepper/TestSuiteStepper.tsx b/openmetadata-ui/src/main/resources/ui/src/components/DataQuality/TestSuite/TestSuiteStepper/TestSuiteStepper.tsx similarity index 81% rename from openmetadata-ui/src/main/resources/ui/src/components/TestSuite/TestSuiteStepper/TestSuiteStepper.tsx rename to openmetadata-ui/src/main/resources/ui/src/components/DataQuality/TestSuite/TestSuiteStepper/TestSuiteStepper.tsx index 7fd4833c0fcb..e7fc42b6042f 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/TestSuite/TestSuiteStepper/TestSuiteStepper.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/components/DataQuality/TestSuite/TestSuiteStepper/TestSuiteStepper.tsx @@ -16,28 +16,28 @@ import { AxiosError } from 'axios'; import React, { useCallback, useState } from 'react'; import { useTranslation } from 'react-i18next'; import { useHistory } from 'react-router-dom'; -import RightPanel from '../../../components/AddDataQualityTest/components/RightPanel'; -import { getRightPanelForAddTestSuitePage } from '../../../components/AddDataQualityTest/rightPanelData'; -import { AddTestCaseList } from '../../../components/AddTestCaseList/AddTestCaseList.component'; -import ResizablePanels from '../../../components/common/ResizablePanels/ResizablePanels'; -import IngestionStepper from '../../../components/IngestionStepper/IngestionStepper.component'; -import { HTTP_STATUS_CODE } from '../../../constants/Auth.constants'; +import { HTTP_STATUS_CODE } from '../../../../constants/Auth.constants'; import { STEPS_FOR_ADD_TEST_SUITE, TEST_SUITE_STEPPER_BREADCRUMB, -} from '../../../constants/TestSuite.constant'; -import { FormSubmitType } from '../../../enums/form.enum'; -import { OwnerType } from '../../../enums/user.enum'; -import { TestSuite } from '../../../generated/tests/testSuite'; +} from '../../../../constants/TestSuite.constant'; +import { FormSubmitType } from '../../../../enums/form.enum'; +import { OwnerType } from '../../../../enums/user.enum'; +import { TestSuite } from '../../../../generated/tests/testSuite'; import { addTestCaseToLogicalTestSuite, createTestSuites, -} from '../../../rest/testAPI'; -import { getTestSuitePath } from '../../../utils/RouterUtils'; -import { showErrorToast } from '../../../utils/ToastUtils'; -import { useAuthContext } from '../../Auth/AuthProviders/AuthProvider'; -import SuccessScreen from '../../common/SuccessScreen/SuccessScreen'; -import TitleBreadcrumb from '../../common/TitleBreadcrumb/TitleBreadcrumb.component'; +} from '../../../../rest/testAPI'; +import { getTestSuitePath } from '../../../../utils/RouterUtils'; +import { showErrorToast } from '../../../../utils/ToastUtils'; +import { useAuthContext } from '../../../Auth/AuthProviders/AuthProvider'; +import ResizablePanels from '../../../common/ResizablePanels/ResizablePanels'; +import SuccessScreen from '../../../common/SuccessScreen/SuccessScreen'; +import TitleBreadcrumb from '../../../common/TitleBreadcrumb/TitleBreadcrumb.component'; +import IngestionStepper from '../../../Settings/Services/Ingestion/IngestionStepper/IngestionStepper.component'; +import RightPanel from '../../AddDataQualityTest/components/RightPanel'; +import { getRightPanelForAddTestSuitePage } from '../../AddDataQualityTest/rightPanelData'; +import { AddTestCaseList } from '../../AddTestCaseList/AddTestCaseList.component'; import AddTestSuiteForm from '../AddTestSuiteForm/AddTestSuiteForm'; const TestSuiteStepper = () => { diff --git a/openmetadata-ui/src/main/resources/ui/src/components/DataQuality/TestSuites/TestSuites.component.tsx b/openmetadata-ui/src/main/resources/ui/src/components/DataQuality/TestSuites/TestSuites.component.tsx index d5add81a62a8..c71d7e2f913f 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/DataQuality/TestSuites/TestSuites.component.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/components/DataQuality/TestSuites/TestSuites.component.tsx @@ -26,6 +26,7 @@ import { useTranslation } from 'react-i18next'; import { Link, useParams } from 'react-router-dom'; import { getTableTabPath, ROUTES } from '../../../constants/constants'; import { PROGRESS_BAR_COLOR } from '../../../constants/TestSuite.constant'; +import { usePermissionProvider } from '../../../context/PermissionProvider/PermissionProvider'; import { ERROR_PLACEHOLDER_TYPE } from '../../../enums/common.enum'; import { EntityTabs } from '../../../enums/entity.enum'; import { TestSummary } from '../../../generated/entity/data/table'; @@ -47,9 +48,8 @@ import NextPrevious from '../../common/NextPrevious/NextPrevious'; import { PagingHandlerParams } from '../../common/NextPrevious/NextPrevious.interface'; import { OwnerLabel } from '../../common/OwnerLabel/OwnerLabel.component'; import Table from '../../common/Table/Table'; -import { usePermissionProvider } from '../../PermissionProvider/PermissionProvider'; -import { TableProfilerTab } from '../../ProfilerDashboard/profilerDashboard.interface'; -import ProfilerProgressWidget from '../../TableProfiler/Component/ProfilerProgressWidget'; +import { TableProfilerTab } from '../../Database/Profiler/ProfilerDashboard/profilerDashboard.interface'; +import ProfilerProgressWidget from '../../Database/TableProfiler/ProfilerProgressWidget/ProfilerProgressWidget'; export const TestSuites = ({ summaryPanel }: { summaryPanel: ReactNode }) => { const { t } = useTranslation(); diff --git a/openmetadata-ui/src/main/resources/ui/src/components/Table/ColumnFilter/ColumnFilter.component.tsx b/openmetadata-ui/src/main/resources/ui/src/components/Database/ColumnFilter/ColumnFilter.component.tsx similarity index 100% rename from openmetadata-ui/src/main/resources/ui/src/components/Table/ColumnFilter/ColumnFilter.component.tsx rename to openmetadata-ui/src/main/resources/ui/src/components/Database/ColumnFilter/ColumnFilter.component.tsx diff --git a/openmetadata-ui/src/main/resources/ui/src/components/ProfilerDashboard/component/DataQualityTab.test.tsx b/openmetadata-ui/src/main/resources/ui/src/components/Database/Profiler/DataQualityTab/DataQualityTab.test.tsx similarity index 97% rename from openmetadata-ui/src/main/resources/ui/src/components/ProfilerDashboard/component/DataQualityTab.test.tsx rename to openmetadata-ui/src/main/resources/ui/src/components/Database/Profiler/DataQualityTab/DataQualityTab.test.tsx index b719cf012ef8..404dc25f80a6 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/ProfilerDashboard/component/DataQualityTab.test.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/components/Database/Profiler/DataQualityTab/DataQualityTab.test.tsx @@ -20,8 +20,8 @@ import { screen, } from '@testing-library/react'; import React from 'react'; -import { MOCK_TEST_CASE } from '../../../mocks/TestSuite.mock'; -import { DataQualityTabProps } from '../profilerDashboard.interface'; +import { MOCK_TEST_CASE } from '../../../../mocks/TestSuite.mock'; +import { DataQualityTabProps } from '../ProfilerDashboard/profilerDashboard.interface'; import DataQualityTab from './DataQualityTab'; const mockProps: DataQualityTabProps = { diff --git a/openmetadata-ui/src/main/resources/ui/src/components/ProfilerDashboard/component/DataQualityTab.tsx b/openmetadata-ui/src/main/resources/ui/src/components/Database/Profiler/DataQualityTab/DataQualityTab.tsx similarity index 85% rename from openmetadata-ui/src/main/resources/ui/src/components/ProfilerDashboard/component/DataQualityTab.tsx rename to openmetadata-ui/src/main/resources/ui/src/components/Database/Profiler/DataQualityTab/DataQualityTab.tsx index d795f31c70cb..74dca19fd810 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/ProfilerDashboard/component/DataQualityTab.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/components/Database/Profiler/DataQualityTab/DataQualityTab.tsx @@ -21,44 +21,44 @@ import QueryString from 'qs'; import React, { useEffect, useMemo, useState } from 'react'; import { useTranslation } from 'react-i18next'; import { Link } from 'react-router-dom'; -import { ReactComponent as IconEdit } from '../../../assets/svg/edit-new.svg'; -import { ReactComponent as IconDelete } from '../../../assets/svg/ic-delete.svg'; -import EditTestCaseModal from '../../../components/AddDataQualityTest/EditTestCaseModal'; -import AppBadge from '../../../components/common/Badge/Badge.component'; -import { StatusBox } from '../../../components/common/LastRunGraph/LastRunGraph.component'; -import Table from '../../../components/common/Table/Table'; -import ConfirmationModal from '../../../components/Modals/ConfirmationModal/ConfirmationModal'; -import { usePermissionProvider } from '../../../components/PermissionProvider/PermissionProvider'; -import { ResourceEntity } from '../../../components/PermissionProvider/PermissionProvider.interface'; -import { getTableTabPath } from '../../../constants/constants'; -import { DATA_QUALITY_PROFILER_DOCS } from '../../../constants/docs.constants'; -import { NO_PERMISSION_FOR_ACTION } from '../../../constants/HelperTextUtil'; -import { EntityType } from '../../../enums/entity.enum'; -import { TestCaseStatus } from '../../../generated/configuration/testResultNotificationConfiguration'; -import { Operation } from '../../../generated/entity/policies/policy'; -import { TestCase, TestCaseResult } from '../../../generated/tests/testCase'; -import { TestCaseResolutionStatus } from '../../../generated/tests/testCaseResolutionStatus'; -import { getListTestCaseIncidentByStateId } from '../../../rest/incidentManagerAPI'; -import { removeTestCaseFromTestSuite } from '../../../rest/testAPI'; -import { getNameFromFQN, Transi18next } from '../../../utils/CommonUtils'; +import { ReactComponent as IconEdit } from '../../../../../assets/svg/edit-new.svg'; +import { ReactComponent as IconDelete } from '../../../../../assets/svg/ic-delete.svg'; +import { getTableTabPath } from '../../../../constants/constants'; +import { DATA_QUALITY_PROFILER_DOCS } from '../../../../constants/docs.constants'; +import { NO_PERMISSION_FOR_ACTION } from '../../../../constants/HelperTextUtil'; +import { usePermissionProvider } from '../../../../context/PermissionProvider/PermissionProvider'; +import { ResourceEntity } from '../../../../context/PermissionProvider/PermissionProvider.interface'; +import { EntityType } from '../../../../enums/entity.enum'; +import { TestCaseStatus } from '../../../../generated/configuration/testResultNotificationConfiguration'; +import { Operation } from '../../../../generated/entity/policies/policy'; +import { TestCase, TestCaseResult } from '../../../../generated/tests/testCase'; +import { TestCaseResolutionStatus } from '../../../../generated/tests/testCaseResolutionStatus'; +import { getListTestCaseIncidentByStateId } from '../../../../rest/incidentManagerAPI'; +import { removeTestCaseFromTestSuite } from '../../../../rest/testAPI'; +import { getNameFromFQN, Transi18next } from '../../../../utils/CommonUtils'; import { formatDate, formatDateTime, -} from '../../../utils/date-time/DateTimeUtils'; -import { getEntityName } from '../../../utils/EntityUtils'; -import { checkPermission } from '../../../utils/PermissionsUtils'; -import { getIncidentManagerDetailPagePath } from '../../../utils/RouterUtils'; -import { replacePlus } from '../../../utils/StringsUtils'; -import { getEntityFqnFromEntityLink } from '../../../utils/TableUtils'; -import { showErrorToast } from '../../../utils/ToastUtils'; -import DeleteWidgetModal from '../../common/DeleteWidget/DeleteWidgetModal'; -import FilterTablePlaceHolder from '../../common/ErrorWithPlaceholder/FilterTablePlaceHolder'; -import NextPrevious from '../../common/NextPrevious/NextPrevious'; +} from '../../../../utils/date-time/DateTimeUtils'; +import { getEntityName } from '../../../../utils/EntityUtils'; +import { checkPermission } from '../../../../utils/PermissionsUtils'; +import { getIncidentManagerDetailPagePath } from '../../../../utils/RouterUtils'; +import { replacePlus } from '../../../../utils/StringsUtils'; +import { getEntityFqnFromEntityLink } from '../../../../utils/TableUtils'; +import { showErrorToast } from '../../../../utils/ToastUtils'; +import AppBadge from '../../../common/Badge/Badge.component'; +import DeleteWidgetModal from '../../../common/DeleteWidget/DeleteWidgetModal'; +import FilterTablePlaceHolder from '../../../common/ErrorWithPlaceholder/FilterTablePlaceHolder'; +import { StatusBox } from '../../../common/LastRunGraph/LastRunGraph.component'; +import NextPrevious from '../../../common/NextPrevious/NextPrevious'; +import Table from '../../../common/Table/Table'; +import EditTestCaseModal from '../../../DataQuality/AddDataQualityTest/EditTestCaseModal'; +import ConfirmationModal from '../../../Modals/ConfirmationModal/ConfirmationModal'; import { DataQualityTabProps, TableProfilerTab, TestCaseAction, -} from '../profilerDashboard.interface'; +} from '../ProfilerDashboard/profilerDashboard.interface'; import './data-quality-tab.less'; const DataQualityTab: React.FC = ({ diff --git a/openmetadata-ui/src/main/resources/ui/src/components/ProfilerDashboard/component/data-quality-tab.less b/openmetadata-ui/src/main/resources/ui/src/components/Database/Profiler/DataQualityTab/data-quality-tab.less similarity index 92% rename from openmetadata-ui/src/main/resources/ui/src/components/ProfilerDashboard/component/data-quality-tab.less rename to openmetadata-ui/src/main/resources/ui/src/components/Database/Profiler/DataQualityTab/data-quality-tab.less index a61707da5ad1..8572d9be37f9 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/ProfilerDashboard/component/data-quality-tab.less +++ b/openmetadata-ui/src/main/resources/ui/src/components/Database/Profiler/DataQualityTab/data-quality-tab.less @@ -10,7 +10,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -@import (reference) url('../../../styles/variables.less'); +@import (reference) url('../../../../../styles/variables.less'); .test-case-summary-table { // Removed padding for expanded rows to prevent unnecessary scrolling behavior for the expanded row content .ant-table.ant-table-small .ant-table-tbody > tr.ant-table-expanded-row > td { diff --git a/openmetadata-ui/src/main/resources/ui/src/components/ProfilerDashboard/profiler-dashboard.less b/openmetadata-ui/src/main/resources/ui/src/components/Database/Profiler/ProfilerDashboard/profiler-dashboard.less similarity index 100% rename from openmetadata-ui/src/main/resources/ui/src/components/ProfilerDashboard/profiler-dashboard.less rename to openmetadata-ui/src/main/resources/ui/src/components/Database/Profiler/ProfilerDashboard/profiler-dashboard.less diff --git a/openmetadata-ui/src/main/resources/ui/src/components/ProfilerDashboard/profilerDashboard.interface.ts b/openmetadata-ui/src/main/resources/ui/src/components/Database/Profiler/ProfilerDashboard/profilerDashboard.interface.ts similarity index 87% rename from openmetadata-ui/src/main/resources/ui/src/components/ProfilerDashboard/profilerDashboard.interface.ts rename to openmetadata-ui/src/main/resources/ui/src/components/Database/Profiler/ProfilerDashboard/profilerDashboard.interface.ts index e647ccd53b63..0f23e66b25f5 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/ProfilerDashboard/profilerDashboard.interface.ts +++ b/openmetadata-ui/src/main/resources/ui/src/components/Database/Profiler/ProfilerDashboard/profilerDashboard.interface.ts @@ -17,12 +17,12 @@ import { Column, ColumnProfile, Table, -} from '../../generated/entity/data/table'; -import { TestCase } from '../../generated/tests/testCase'; -import { TestSuite } from '../../generated/tests/testSuite'; -import { ListTestCaseParams } from '../../rest/testAPI'; -import { NextPreviousProps } from '../common/NextPrevious/NextPrevious.interface'; -import { TitleBreadcrumbProps } from '../common/TitleBreadcrumb/TitleBreadcrumb.interface'; +} from '../../../../generated/entity/data/table'; +import { TestCase } from '../../../../generated/tests/testCase'; +import { TestSuite } from '../../../../generated/tests/testSuite'; +import { ListTestCaseParams } from '../../../../rest/testAPI'; +import { NextPreviousProps } from '../../../common/NextPrevious/NextPrevious.interface'; +import { TitleBreadcrumbProps } from '../../../common/TitleBreadcrumb/TitleBreadcrumb.interface'; export interface ProfilerDashboardProps { onTableChange: (table: Table) => void; diff --git a/openmetadata-ui/src/main/resources/ui/src/components/ProfilerDashboard/component/ProfilerDetailsCard.test.tsx b/openmetadata-ui/src/main/resources/ui/src/components/Database/Profiler/ProfilerDetailsCard/ProfilerDetailsCard.test.tsx similarity index 91% rename from openmetadata-ui/src/main/resources/ui/src/components/ProfilerDashboard/component/ProfilerDetailsCard.test.tsx rename to openmetadata-ui/src/main/resources/ui/src/components/Database/Profiler/ProfilerDetailsCard/ProfilerDetailsCard.test.tsx index 61d0c7c65578..ef54ccbc11a8 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/ProfilerDashboard/component/ProfilerDetailsCard.test.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/components/Database/Profiler/ProfilerDetailsCard/ProfilerDetailsCard.test.tsx @@ -13,8 +13,8 @@ import { queryByAttribute, render, screen } from '@testing-library/react'; import React from 'react'; -import { MOCK_CHART_COLLECTION_DATA } from '../../../mocks/TestSuite.mock'; -import { ProfilerDetailsCardProps } from '../profilerDashboard.interface'; +import { MOCK_CHART_COLLECTION_DATA } from '../../../../mocks/TestSuite.mock'; +import { ProfilerDetailsCardProps } from '../ProfilerDashboard/profilerDashboard.interface'; import ProfilerDetailsCard from './ProfilerDetailsCard'; const mockProps: ProfilerDetailsCardProps = { diff --git a/openmetadata-ui/src/main/resources/ui/src/components/ProfilerDashboard/component/ProfilerDetailsCard.tsx b/openmetadata-ui/src/main/resources/ui/src/components/Database/Profiler/ProfilerDetailsCard/ProfilerDetailsCard.tsx similarity index 91% rename from openmetadata-ui/src/main/resources/ui/src/components/ProfilerDashboard/component/ProfilerDetailsCard.tsx rename to openmetadata-ui/src/main/resources/ui/src/components/Database/Profiler/ProfilerDetailsCard/ProfilerDetailsCard.tsx index d3602d9c12fc..fe74073d802d 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/ProfilerDashboard/component/ProfilerDetailsCard.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/components/Database/Profiler/ProfilerDetailsCard/ProfilerDetailsCard.tsx @@ -24,15 +24,15 @@ import { XAxis, YAxis, } from 'recharts'; -import { GRAPH_BACKGROUND_COLOR } from '../../../constants/constants'; +import { GRAPH_BACKGROUND_COLOR } from '../../../../constants/constants'; import { axisTickFormatter, tooltipFormatter, updateActiveChartFilter, -} from '../../../utils/ChartUtils'; -import ErrorPlaceHolder from '../../common/ErrorWithPlaceholder/ErrorPlaceHolder'; -import { ProfilerDetailsCardProps } from '../profilerDashboard.interface'; -import ProfilerLatestValue from './ProfilerLatestValue'; +} from '../../../../utils/ChartUtils'; +import ErrorPlaceHolder from '../../../common/ErrorWithPlaceholder/ErrorPlaceHolder'; +import { ProfilerDetailsCardProps } from '../ProfilerDashboard/profilerDashboard.interface'; +import ProfilerLatestValue from '../ProfilerLatestValue/ProfilerLatestValue'; const ProfilerDetailsCard: React.FC = ({ showYAxisCategory = false, diff --git a/openmetadata-ui/src/main/resources/ui/src/components/ProfilerDashboard/component/ProfilerLatestValue.test.tsx b/openmetadata-ui/src/main/resources/ui/src/components/Database/Profiler/ProfilerLatestValue/ProfilerLatestValue.test.tsx similarity index 93% rename from openmetadata-ui/src/main/resources/ui/src/components/ProfilerDashboard/component/ProfilerLatestValue.test.tsx rename to openmetadata-ui/src/main/resources/ui/src/components/Database/Profiler/ProfilerLatestValue/ProfilerLatestValue.test.tsx index c606bd91726e..a76c992d8b5d 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/ProfilerDashboard/component/ProfilerLatestValue.test.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/components/Database/Profiler/ProfilerLatestValue/ProfilerLatestValue.test.tsx @@ -15,8 +15,8 @@ import { render, screen } from '@testing-library/react'; import React from 'react'; import { act } from 'react-test-renderer'; -import { INITIAL_ROW_METRIC_VALUE } from '../../../constants/profiler.constant'; -import { ProfilerLatestValueProps } from '../profilerDashboard.interface'; +import { INITIAL_ROW_METRIC_VALUE } from '../../../../constants/profiler.constant'; +import { ProfilerLatestValueProps } from '../ProfilerDashboard/profilerDashboard.interface'; import ProfilerLatestValue from './ProfilerLatestValue'; const mockProps: ProfilerLatestValueProps = { diff --git a/openmetadata-ui/src/main/resources/ui/src/components/ProfilerDashboard/component/ProfilerLatestValue.tsx b/openmetadata-ui/src/main/resources/ui/src/components/Database/Profiler/ProfilerLatestValue/ProfilerLatestValue.tsx similarity index 91% rename from openmetadata-ui/src/main/resources/ui/src/components/ProfilerDashboard/component/ProfilerLatestValue.tsx rename to openmetadata-ui/src/main/resources/ui/src/components/Database/Profiler/ProfilerLatestValue/ProfilerLatestValue.tsx index 2f5f5b8deb1d..301f95ecdb26 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/ProfilerDashboard/component/ProfilerLatestValue.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/components/Database/Profiler/ProfilerLatestValue/ProfilerLatestValue.tsx @@ -13,8 +13,8 @@ import { Space, Statistic, Typography } from 'antd'; import React from 'react'; -import { getStatisticsDisplayValue } from '../../../utils/CommonUtils'; -import { ProfilerLatestValueProps } from '../profilerDashboard.interface'; +import { getStatisticsDisplayValue } from '../../../../utils/CommonUtils'; +import { ProfilerLatestValueProps } from '../ProfilerDashboard/profilerDashboard.interface'; import { isUndefined } from 'lodash'; import '../profiler-dashboard.less'; diff --git a/openmetadata-ui/src/main/resources/ui/src/components/ProfilerSettings/CustomRangeWidget.tsx b/openmetadata-ui/src/main/resources/ui/src/components/Database/Profiler/ProfilerSettings/CustomRangeWidget.tsx similarity index 100% rename from openmetadata-ui/src/main/resources/ui/src/components/ProfilerSettings/CustomRangeWidget.tsx rename to openmetadata-ui/src/main/resources/ui/src/components/Database/Profiler/ProfilerSettings/CustomRangeWidget.tsx diff --git a/openmetadata-ui/src/main/resources/ui/src/components/ProfilerSettings/CustomeRangeWidget.test.tsx b/openmetadata-ui/src/main/resources/ui/src/components/Database/Profiler/ProfilerSettings/CustomeRangeWidget.test.tsx similarity index 100% rename from openmetadata-ui/src/main/resources/ui/src/components/ProfilerSettings/CustomeRangeWidget.test.tsx rename to openmetadata-ui/src/main/resources/ui/src/components/Database/Profiler/ProfilerSettings/CustomeRangeWidget.test.tsx diff --git a/openmetadata-ui/src/main/resources/ui/src/components/ProfilerSettings/MockSchema.ts b/openmetadata-ui/src/main/resources/ui/src/components/Database/Profiler/ProfilerSettings/MockSchema.ts similarity index 100% rename from openmetadata-ui/src/main/resources/ui/src/components/ProfilerSettings/MockSchema.ts rename to openmetadata-ui/src/main/resources/ui/src/components/Database/Profiler/ProfilerSettings/MockSchema.ts diff --git a/openmetadata-ui/src/main/resources/ui/src/components/ProfilerSettings/ProfilerObjectFieldTemplate.tsx b/openmetadata-ui/src/main/resources/ui/src/components/Database/Profiler/ProfilerSettings/ProfilerObjectFieldTemplate.tsx similarity index 100% rename from openmetadata-ui/src/main/resources/ui/src/components/ProfilerSettings/ProfilerObjectFieldTemplate.tsx rename to openmetadata-ui/src/main/resources/ui/src/components/Database/Profiler/ProfilerSettings/ProfilerObjectFieldTemplate.tsx diff --git a/openmetadata-ui/src/main/resources/ui/src/components/ProfilerSettings/ProfilerSettings.test.tsx b/openmetadata-ui/src/main/resources/ui/src/components/Database/Profiler/ProfilerSettings/ProfilerSettings.test.tsx similarity index 98% rename from openmetadata-ui/src/main/resources/ui/src/components/ProfilerSettings/ProfilerSettings.test.tsx rename to openmetadata-ui/src/main/resources/ui/src/components/Database/Profiler/ProfilerSettings/ProfilerSettings.test.tsx index e88aedd9b5de..99103863ba85 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/ProfilerSettings/ProfilerSettings.test.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/components/Database/Profiler/ProfilerSettings/ProfilerSettings.test.tsx @@ -16,7 +16,7 @@ import { waitForElementToBeRemoved, } from '@testing-library/react'; import React from 'react'; -import { EntityType } from '../../enums/entity.enum'; +import { EntityType } from '../../../../enums/entity.enum'; import { MOCK_SCHEMA } from './MockSchema'; import ProfilerSettings, { ProfilerSettingsProps } from './ProfilerSettings'; diff --git a/openmetadata-ui/src/main/resources/ui/src/components/ProfilerSettings/ProfilerSettings.tsx b/openmetadata-ui/src/main/resources/ui/src/components/Database/Profiler/ProfilerSettings/ProfilerSettings.tsx similarity index 86% rename from openmetadata-ui/src/main/resources/ui/src/components/ProfilerSettings/ProfilerSettings.tsx rename to openmetadata-ui/src/main/resources/ui/src/components/Database/Profiler/ProfilerSettings/ProfilerSettings.tsx index 1dec15fc6859..0fb6220ca78b 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/ProfilerSettings/ProfilerSettings.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/components/Database/Profiler/ProfilerSettings/ProfilerSettings.tsx @@ -19,24 +19,24 @@ import { Modal } from 'antd'; import { AxiosError } from 'axios'; import classNames from 'classnames'; import { useTranslation } from 'react-i18next'; -import { EntityType } from '../../enums/entity.enum'; +import { EntityType } from '../../../../enums/entity.enum'; import { DatabaseProfilerConfig as ProfilerConfig, ProfileSampleType, -} from '../../generated/entity/data/database'; -import profilerSettingsSchema from '../../jsons/profilerSettings.json'; +} from '../../../../generated/entity/data/database'; +import profilerSettingsSchema from '../../../../jsons/profilerSettings.json'; import { getDatabaseProfilerConfig, getDatabaseSchemaProfilerConfig, putDatabaseProfileConfig, putDatabaseSchemaProfileConfig, -} from '../../rest/databaseAPI'; -import { transformErrors } from '../../utils/formUtils'; -import { showErrorToast, showSuccessToast } from '../../utils/ToastUtils'; -import BooleanFieldTemplate from '../JSONSchemaTemplate/BooleanFieldTemplate'; -import DescriptionFieldTemplate from '../JSONSchemaTemplate/DescriptionFieldTemplate'; -import { FieldErrorTemplate } from '../JSONSchemaTemplate/FieldErrorTemplate/FieldErrorTemplate'; -import Loader from '../Loader/Loader'; +} from '../../../../rest/databaseAPI'; +import { transformErrors } from '../../../../utils/formUtils'; +import { showErrorToast, showSuccessToast } from '../../../../utils/ToastUtils'; +import BooleanFieldTemplate from '../../../common/Form/JSONSchema/JSONSchemaTemplate/BooleanFieldTemplate'; +import DescriptionFieldTemplate from '../../../common/Form/JSONSchema/JSONSchemaTemplate/DescriptionFieldTemplate'; +import { FieldErrorTemplate } from '../../../common/Form/JSONSchema/JSONSchemaTemplate/FieldErrorTemplate/FieldErrorTemplate'; +import Loader from '../../../common/Loader/Loader'; import { CustomRangeWidget } from './CustomRangeWidget'; import './profiler-settings.less'; import { ProfilerObjectFieldTemplate } from './ProfilerObjectFieldTemplate'; diff --git a/openmetadata-ui/src/main/resources/ui/src/components/ProfilerSettings/profiler-settings.less b/openmetadata-ui/src/main/resources/ui/src/components/Database/Profiler/ProfilerSettings/profiler-settings.less similarity index 100% rename from openmetadata-ui/src/main/resources/ui/src/components/ProfilerSettings/profiler-settings.less rename to openmetadata-ui/src/main/resources/ui/src/components/Database/Profiler/ProfilerSettings/profiler-settings.less diff --git a/openmetadata-ui/src/main/resources/ui/src/components/ProfilerDashboard/component/TestSummary.test.tsx b/openmetadata-ui/src/main/resources/ui/src/components/Database/Profiler/TestSummary/TestSummary.test.tsx similarity index 94% rename from openmetadata-ui/src/main/resources/ui/src/components/ProfilerDashboard/component/TestSummary.test.tsx rename to openmetadata-ui/src/main/resources/ui/src/components/Database/Profiler/TestSummary/TestSummary.test.tsx index 74f4f36dde36..6118b30e6996 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/ProfilerDashboard/component/TestSummary.test.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/components/Database/Profiler/TestSummary/TestSummary.test.tsx @@ -16,10 +16,10 @@ import { MOCK_SQL_TEST_CASE, MOCK_TEST_CASE, MOCK_TEST_CASE_RESULT, -} from '../../../mocks/TestSuite.mock'; -import { getListTestCaseResults } from '../../../rest/testAPI'; -import { getEpochMillisForPastDays } from '../../../utils/date-time/DateTimeUtils'; -import { TestSummaryProps } from '../profilerDashboard.interface'; +} from '../../../../mocks/TestSuite.mock'; +import { getListTestCaseResults } from '../../../../rest/testAPI'; +import { getEpochMillisForPastDays } from '../../../../utils/date-time/DateTimeUtils'; +import { TestSummaryProps } from '../ProfilerDashboard/profilerDashboard.interface'; import TestSummary from './TestSummary'; const mockProps: TestSummaryProps = { diff --git a/openmetadata-ui/src/main/resources/ui/src/components/ProfilerDashboard/component/TestSummary.tsx b/openmetadata-ui/src/main/resources/ui/src/components/Database/Profiler/TestSummary/TestSummary.tsx similarity index 91% rename from openmetadata-ui/src/main/resources/ui/src/components/ProfilerDashboard/component/TestSummary.tsx rename to openmetadata-ui/src/main/resources/ui/src/components/Database/Profiler/TestSummary/TestSummary.tsx index d628f01ffc07..f4752a6aa737 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/ProfilerDashboard/component/TestSummary.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/components/Database/Profiler/TestSummary/TestSummary.tsx @@ -46,47 +46,47 @@ import { YAxis, } from 'recharts'; import { Payload } from 'recharts/types/component/DefaultLegendContent'; -import { ReactComponent as FilterPlaceHolderIcon } from '../../../assets/svg/no-search-placeholder.svg'; +import { ReactComponent as FilterPlaceHolderIcon } from '../../../../../assets/svg/no-search-placeholder.svg'; import { GREEN_3, GREEN_3_OPACITY, RED_3, RED_3_OPACITY, YELLOW_2, -} from '../../../constants/Color.constants'; -import { GRAPH_BACKGROUND_COLOR } from '../../../constants/constants'; +} from '../../../../constants/Color.constants'; +import { GRAPH_BACKGROUND_COLOR } from '../../../../constants/constants'; import { COLORS, PROFILER_FILTER_RANGE, -} from '../../../constants/profiler.constant'; -import { CSMode } from '../../../enums/codemirror.enum'; -import { ERROR_PLACEHOLDER_TYPE } from '../../../enums/common.enum'; +} from '../../../../constants/profiler.constant'; +import { CSMode } from '../../../../enums/codemirror.enum'; +import { ERROR_PLACEHOLDER_TYPE } from '../../../../enums/common.enum'; import { Thread, ThreadTaskStatus, -} from '../../../generated/entity/feed/thread'; +} from '../../../../generated/entity/feed/thread'; import { TestCaseParameterValue, TestCaseResult, TestCaseStatus, -} from '../../../generated/tests/testCase'; -import { getListTestCaseResults } from '../../../rest/testAPI'; -import { axisTickFormatter } from '../../../utils/ChartUtils'; +} from '../../../../generated/tests/testCase'; +import { getListTestCaseResults } from '../../../../rest/testAPI'; +import { axisTickFormatter } from '../../../../utils/ChartUtils'; import { formatDateTime, getCurrentMillis, getEpochMillisForPastDays, -} from '../../../utils/date-time/DateTimeUtils'; -import { showErrorToast } from '../../../utils/ToastUtils'; -import { useActivityFeedProvider } from '../../ActivityFeed/ActivityFeedProvider/ActivityFeedProvider'; -import ErrorPlaceHolder from '../../common/ErrorWithPlaceholder/ErrorPlaceHolder'; -import RichTextEditorPreviewer from '../../common/RichTextEditor/RichTextEditorPreviewer'; -import DatePickerMenu from '../../DatePickerMenu/DatePickerMenu.component'; -import Loader from '../../Loader/Loader'; +} from '../../../../utils/date-time/DateTimeUtils'; +import { showErrorToast } from '../../../../utils/ToastUtils'; +import { useActivityFeedProvider } from '../../../ActivityFeed/ActivityFeedProvider/ActivityFeedProvider'; +import DatePickerMenu from '../../../common/DatePickerMenu/DatePickerMenu.component'; +import ErrorPlaceHolder from '../../../common/ErrorWithPlaceholder/ErrorPlaceHolder'; +import Loader from '../../../common/Loader/Loader'; +import RichTextEditorPreviewer from '../../../common/RichTextEditor/RichTextEditorPreviewer'; import SchemaEditor from '../../SchemaEditor/SchemaEditor'; -import { TestSummaryProps } from '../profilerDashboard.interface'; +import { TestSummaryProps } from '../ProfilerDashboard/profilerDashboard.interface'; +import TestSummaryCustomTooltip from '../TestSummaryCustomTooltip/TestSummaryCustomTooltip.component'; import './test-summary.less'; -import TestSummaryCustomTooltip from './TestSummaryCustomTooltip.component'; type ChartDataType = { information: { label: string; color: string }[]; diff --git a/openmetadata-ui/src/main/resources/ui/src/components/ProfilerDashboard/component/test-summary.less b/openmetadata-ui/src/main/resources/ui/src/components/Database/Profiler/TestSummary/test-summary.less similarity index 94% rename from openmetadata-ui/src/main/resources/ui/src/components/ProfilerDashboard/component/test-summary.less rename to openmetadata-ui/src/main/resources/ui/src/components/Database/Profiler/TestSummary/test-summary.less index 99eda626982e..ed2ae8c83b4e 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/ProfilerDashboard/component/test-summary.less +++ b/openmetadata-ui/src/main/resources/ui/src/components/Database/Profiler/TestSummary/test-summary.less @@ -11,7 +11,7 @@ * limitations under the License. */ -@import url('../../../styles/variables.less'); +@import url('../../../../../styles/variables.less'); .parameter-value-container { background: @grey-1; diff --git a/openmetadata-ui/src/main/resources/ui/src/components/ProfilerDashboard/component/TestSummaryCustomTooltip.component.tsx b/openmetadata-ui/src/main/resources/ui/src/components/Database/Profiler/TestSummaryCustomTooltip/TestSummaryCustomTooltip.component.tsx similarity index 91% rename from openmetadata-ui/src/main/resources/ui/src/components/ProfilerDashboard/component/TestSummaryCustomTooltip.component.tsx rename to openmetadata-ui/src/main/resources/ui/src/components/Database/Profiler/TestSummaryCustomTooltip/TestSummaryCustomTooltip.component.tsx index 26e19711dac6..b352017a824f 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/ProfilerDashboard/component/TestSummaryCustomTooltip.component.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/components/Database/Profiler/TestSummaryCustomTooltip/TestSummaryCustomTooltip.component.tsx @@ -16,10 +16,10 @@ import React from 'react'; import { useTranslation } from 'react-i18next'; import { Link } from 'react-router-dom'; import { TooltipProps } from 'recharts'; -import { Thread } from '../../../generated/entity/feed/thread'; -import { formatDateTime } from '../../../utils/date-time/DateTimeUtils'; -import { getTaskDetailPath } from '../../../utils/TasksUtils'; -import { OwnerLabel } from '../../common/OwnerLabel/OwnerLabel.component'; +import { Thread } from '../../../../generated/entity/feed/thread'; +import { formatDateTime } from '../../../../utils/date-time/DateTimeUtils'; +import { getTaskDetailPath } from '../../../../utils/TasksUtils'; +import { OwnerLabel } from '../../../common/OwnerLabel/OwnerLabel.component'; const TestSummaryCustomTooltip = ( props: TooltipProps diff --git a/openmetadata-ui/src/main/resources/ui/src/components/ProfilerDashboard/component/TestSummaryCustomTooltip.test.tsx b/openmetadata-ui/src/main/resources/ui/src/components/Database/Profiler/TestSummaryCustomTooltip/TestSummaryCustomTooltip.test.tsx similarity index 100% rename from openmetadata-ui/src/main/resources/ui/src/components/ProfilerDashboard/component/TestSummaryCustomTooltip.test.tsx rename to openmetadata-ui/src/main/resources/ui/src/components/Database/Profiler/TestSummaryCustomTooltip/TestSummaryCustomTooltip.test.tsx diff --git a/openmetadata-ui/src/main/resources/ui/src/components/RetentionPeriod/RetentionPeriod.component.test.tsx b/openmetadata-ui/src/main/resources/ui/src/components/Database/RetentionPeriod/RetentionPeriod.component.test.tsx similarity index 91% rename from openmetadata-ui/src/main/resources/ui/src/components/RetentionPeriod/RetentionPeriod.component.test.tsx rename to openmetadata-ui/src/main/resources/ui/src/components/Database/RetentionPeriod/RetentionPeriod.component.test.tsx index acf9fd400413..721d7238d348 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/RetentionPeriod/RetentionPeriod.component.test.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/components/Database/RetentionPeriod/RetentionPeriod.component.test.tsx @@ -13,18 +13,21 @@ import { act, fireEvent, render, screen } from '@testing-library/react'; import React from 'react'; -import { NO_DATA_PLACEHOLDER } from '../../constants/constants'; -import { OperationPermission } from '../PermissionProvider/PermissionProvider.interface'; +import { NO_DATA_PLACEHOLDER } from '../../../constants/constants'; +import { OperationPermission } from '../../../context/PermissionProvider/PermissionProvider.interface'; import RetentionPeriod from './RetentionPeriod.component'; import { RetentionPeriodProps } from './RetentionPeriod.interface'; -jest.mock('../../utils/ToastUtils', () => ({ +jest.mock('../../../utils/ToastUtils', () => ({ showErrorToast: jest.fn(), })); -jest.mock('../DataAssets/DataAssetsHeader/DataAssetsHeader.component', () => ({ - ExtraInfoLabel: jest.fn().mockImplementation(({ value }) => value), -})); +jest.mock( + '../../DataAssets/DataAssetsHeader/DataAssetsHeader.component', + () => ({ + ExtraInfoLabel: jest.fn().mockImplementation(({ value }) => value), + }) +); const mockOnUpdate = jest.fn(); diff --git a/openmetadata-ui/src/main/resources/ui/src/components/RetentionPeriod/RetentionPeriod.component.tsx b/openmetadata-ui/src/main/resources/ui/src/components/Database/RetentionPeriod/RetentionPeriod.component.tsx similarity index 92% rename from openmetadata-ui/src/main/resources/ui/src/components/RetentionPeriod/RetentionPeriod.component.tsx rename to openmetadata-ui/src/main/resources/ui/src/components/Database/RetentionPeriod/RetentionPeriod.component.tsx index be6f77632721..86dd2bab7614 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/RetentionPeriod/RetentionPeriod.component.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/components/Database/RetentionPeriod/RetentionPeriod.component.tsx @@ -15,14 +15,14 @@ import { useForm } from 'antd/lib/form/Form'; import { AxiosError } from 'axios'; import React, { useCallback, useEffect, useState } from 'react'; import { useTranslation } from 'react-i18next'; -import { ReactComponent as EditIcon } from '../../assets/svg/edit-new.svg'; +import { ReactComponent as EditIcon } from '../../../assets/svg/edit-new.svg'; import { DE_ACTIVE_COLOR, NO_DATA_PLACEHOLDER, VALIDATION_MESSAGES, -} from '../../constants/constants'; -import { showErrorToast } from '../../utils/ToastUtils'; -import { ExtraInfoLabel } from '../DataAssets/DataAssetsHeader/DataAssetsHeader.component'; +} from '../../../constants/constants'; +import { showErrorToast } from '../../../utils/ToastUtils'; +import { ExtraInfoLabel } from '../../DataAssets/DataAssetsHeader/DataAssetsHeader.component'; import { RetentionPeriodProps } from './RetentionPeriod.interface'; const RetentionPeriod = ({ diff --git a/openmetadata-ui/src/main/resources/ui/src/components/RetentionPeriod/RetentionPeriod.interface.ts b/openmetadata-ui/src/main/resources/ui/src/components/Database/RetentionPeriod/RetentionPeriod.interface.ts similarity index 87% rename from openmetadata-ui/src/main/resources/ui/src/components/RetentionPeriod/RetentionPeriod.interface.ts rename to openmetadata-ui/src/main/resources/ui/src/components/Database/RetentionPeriod/RetentionPeriod.interface.ts index da15b248292b..ef50ee37a533 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/RetentionPeriod/RetentionPeriod.interface.ts +++ b/openmetadata-ui/src/main/resources/ui/src/components/Database/RetentionPeriod/RetentionPeriod.interface.ts @@ -11,7 +11,7 @@ * limitations under the License. */ -import { OperationPermission } from '../PermissionProvider/PermissionProvider.interface'; +import { OperationPermission } from '../../../context/PermissionProvider/PermissionProvider.interface'; export interface RetentionPeriodProps { retentionPeriod?: string; diff --git a/openmetadata-ui/src/main/resources/ui/src/components/SampleDataTable/RowData.test.tsx b/openmetadata-ui/src/main/resources/ui/src/components/Database/SampleDataTable/RowData.test.tsx similarity index 100% rename from openmetadata-ui/src/main/resources/ui/src/components/SampleDataTable/RowData.test.tsx rename to openmetadata-ui/src/main/resources/ui/src/components/Database/SampleDataTable/RowData.test.tsx diff --git a/openmetadata-ui/src/main/resources/ui/src/components/SampleDataTable/RowData.tsx b/openmetadata-ui/src/main/resources/ui/src/components/Database/SampleDataTable/RowData.tsx similarity index 93% rename from openmetadata-ui/src/main/resources/ui/src/components/SampleDataTable/RowData.tsx rename to openmetadata-ui/src/main/resources/ui/src/components/Database/SampleDataTable/RowData.tsx index 1797df713006..9f06d6401353 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/SampleDataTable/RowData.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/components/Database/SampleDataTable/RowData.tsx @@ -14,8 +14,8 @@ import { Typography } from 'antd'; import { isNil, isObject } from 'lodash'; import React, { Fragment, useCallback, useMemo, useState } from 'react'; -import { NO_DATA_PLACEHOLDER } from '../../constants/constants'; -import SchemaModal from '../Modals/SchemaModal/SchemaModal'; +import { NO_DATA_PLACEHOLDER } from '../../../constants/constants'; +import SchemaModal from '../../Modals/SchemaModal/SchemaModal'; import { SampleDataType } from './SampleData.interface'; export const RowData = ({ data }: { data: SampleDataType }) => { diff --git a/openmetadata-ui/src/main/resources/ui/src/components/SampleDataTable/SampleData.interface.ts b/openmetadata-ui/src/main/resources/ui/src/components/Database/SampleDataTable/SampleData.interface.ts similarity index 90% rename from openmetadata-ui/src/main/resources/ui/src/components/SampleDataTable/SampleData.interface.ts rename to openmetadata-ui/src/main/resources/ui/src/components/Database/SampleDataTable/SampleData.interface.ts index c3606bc9dc49..921d60d6b90d 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/SampleDataTable/SampleData.interface.ts +++ b/openmetadata-ui/src/main/resources/ui/src/components/Database/SampleDataTable/SampleData.interface.ts @@ -11,7 +11,7 @@ * limitations under the License. */ import { ColumnsType } from 'antd/lib/table'; -import { OperationPermission } from '../PermissionProvider/PermissionProvider.interface'; +import { OperationPermission } from '../../../context/PermissionProvider/PermissionProvider.interface'; export type SampleDataType = | string diff --git a/openmetadata-ui/src/main/resources/ui/src/components/SampleDataTable/SampleDataTable.component.tsx b/openmetadata-ui/src/main/resources/ui/src/components/Database/SampleDataTable/SampleDataTable.component.tsx similarity index 85% rename from openmetadata-ui/src/main/resources/ui/src/components/SampleDataTable/SampleDataTable.component.tsx rename to openmetadata-ui/src/main/resources/ui/src/components/Database/SampleDataTable/SampleDataTable.component.tsx index 7e2fdb2ab0ce..db3b925321be 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/SampleDataTable/SampleDataTable.component.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/components/Database/SampleDataTable/SampleDataTable.component.tsx @@ -25,27 +25,30 @@ import classNames from 'classnames'; import { t } from 'i18next'; import { isEmpty, lowerCase } from 'lodash'; import React, { useCallback, useEffect, useMemo, useState } from 'react'; -import { ReactComponent as IconDelete } from '../../assets/svg/ic-delete.svg'; -import { ReactComponent as IconDropdown } from '../../assets/svg/menu.svg'; -import { ManageButtonItemLabel } from '../../components/common/ManageButtonContentItem/ManageButtonContentItem.component'; -import EntityDeleteModal from '../../components/Modals/EntityDeleteModal/EntityDeleteModal'; -import { useTourProvider } from '../../components/TourProvider/TourProvider'; -import { WORKFLOWS_PROFILER_DOCS } from '../../constants/docs.constants'; -import { DROPDOWN_ICON_SIZE_PROPS } from '../../constants/ManageButton.constants'; -import { mockDatasetData } from '../../constants/mockTourData.constants'; -import { LOADING_STATE } from '../../enums/common.enum'; -import { EntityType } from '../../enums/entity.enum'; -import { Table } from '../../generated/entity/data/table'; -import { withLoader } from '../../hoc/withLoader'; +import { ReactComponent as IconDelete } from '../../../assets/svg/ic-delete.svg'; +import { ReactComponent as IconDropdown } from '../../../assets/svg/menu.svg'; +import { WORKFLOWS_PROFILER_DOCS } from '../../../constants/docs.constants'; +import { DROPDOWN_ICON_SIZE_PROPS } from '../../../constants/ManageButton.constants'; +import { mockDatasetData } from '../../../constants/mockTourData.constants'; +import { useTourProvider } from '../../../context/TourProvider/TourProvider'; +import { LOADING_STATE } from '../../../enums/common.enum'; +import { EntityType } from '../../../enums/entity.enum'; +import { Table } from '../../../generated/entity/data/table'; +import { withLoader } from '../../../hoc/withLoader'; import { deleteSampleDataByTableId, getSampleDataByTableId, -} from '../../rest/tableAPI'; -import { getEntityDeleteMessage, Transi18next } from '../../utils/CommonUtils'; -import { showErrorToast } from '../../utils/ToastUtils'; -import { useAuthContext } from '../Auth/AuthProviders/AuthProvider'; -import ErrorPlaceHolder from '../common/ErrorWithPlaceholder/ErrorPlaceHolder'; -import Loader from '../Loader/Loader'; +} from '../../../rest/tableAPI'; +import { + getEntityDeleteMessage, + Transi18next, +} from '../../../utils/CommonUtils'; +import { showErrorToast } from '../../../utils/ToastUtils'; +import { useAuthContext } from '../../Auth/AuthProviders/AuthProvider'; +import ErrorPlaceHolder from '../../common/ErrorWithPlaceholder/ErrorPlaceHolder'; +import Loader from '../../common/Loader/Loader'; +import { ManageButtonItemLabel } from '../../common/ManageButtonContentItem/ManageButtonContentItem.component'; +import EntityDeleteModal from '../../Modals/EntityDeleteModal/EntityDeleteModal'; import { RowData } from './RowData'; import './sample-data-table.less'; import { diff --git a/openmetadata-ui/src/main/resources/ui/src/components/SampleDataTable/SampleDataTable.test.tsx b/openmetadata-ui/src/main/resources/ui/src/components/Database/SampleDataTable/SampleDataTable.test.tsx similarity index 95% rename from openmetadata-ui/src/main/resources/ui/src/components/SampleDataTable/SampleDataTable.test.tsx rename to openmetadata-ui/src/main/resources/ui/src/components/Database/SampleDataTable/SampleDataTable.test.tsx index ba6f0269dd38..3c8e8579d93f 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/SampleDataTable/SampleDataTable.test.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/components/Database/SampleDataTable/SampleDataTable.test.tsx @@ -14,9 +14,9 @@ import { act, render, screen } from '@testing-library/react'; import userEvent from '@testing-library/user-event'; import React from 'react'; -import { OperationPermission } from '../../components/PermissionProvider/PermissionProvider.interface'; -import { MOCK_TABLE } from '../../mocks/TableData.mock'; -import { getSampleDataByTableId } from '../../rest/tableAPI'; +import { OperationPermission } from '../../../context/PermissionProvider/PermissionProvider.interface'; +import { MOCK_TABLE } from '../../../mocks/TableData.mock'; +import { getSampleDataByTableId } from '../../../rest/tableAPI'; import SampleDataTable from './SampleDataTable.component'; const mockProps = { diff --git a/openmetadata-ui/src/main/resources/ui/src/components/SampleDataTable/sample-data-table.less b/openmetadata-ui/src/main/resources/ui/src/components/Database/SampleDataTable/sample-data-table.less similarity index 100% rename from openmetadata-ui/src/main/resources/ui/src/components/SampleDataTable/sample-data-table.less rename to openmetadata-ui/src/main/resources/ui/src/components/Database/SampleDataTable/sample-data-table.less diff --git a/openmetadata-ui/src/main/resources/ui/src/components/SampleDataWithMessages/MessageCard.tsx b/openmetadata-ui/src/main/resources/ui/src/components/Database/SampleDataWithMessages/MessageCard.tsx similarity index 100% rename from openmetadata-ui/src/main/resources/ui/src/components/SampleDataWithMessages/MessageCard.tsx rename to openmetadata-ui/src/main/resources/ui/src/components/Database/SampleDataWithMessages/MessageCard.tsx diff --git a/openmetadata-ui/src/main/resources/ui/src/components/SampleDataWithMessages/SampleDataWithMessages.test.tsx b/openmetadata-ui/src/main/resources/ui/src/components/Database/SampleDataWithMessages/SampleDataWithMessages.test.tsx similarity index 94% rename from openmetadata-ui/src/main/resources/ui/src/components/SampleDataWithMessages/SampleDataWithMessages.test.tsx rename to openmetadata-ui/src/main/resources/ui/src/components/Database/SampleDataWithMessages/SampleDataWithMessages.test.tsx index 28fb9c5fcc0f..12eeb55c251d 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/SampleDataWithMessages/SampleDataWithMessages.test.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/components/Database/SampleDataWithMessages/SampleDataWithMessages.test.tsx @@ -14,7 +14,7 @@ import { act, render } from '@testing-library/react'; import React from 'react'; import { MemoryRouter } from 'react-router-dom'; -import { EntityType } from '../../enums/entity.enum'; +import { EntityType } from '../../../enums/entity.enum'; import SampleDataWithMessages from './SampleDataWithMessages'; const mockSampleData = { @@ -24,7 +24,7 @@ const mockSampleData = { jest.mock('react-router-dom', () => ({ Link: jest.fn().mockImplementation(({ children }) =>
{children}
), })); -jest.mock('../../rest/topicsAPI', () => ({ +jest.mock('../../../rest/topicsAPI', () => ({ getSampleDataByTopicId: jest .fn() .mockImplementation(() => ({ sampleData: mockSampleData })), diff --git a/openmetadata-ui/src/main/resources/ui/src/components/SampleDataWithMessages/SampleDataWithMessages.tsx b/openmetadata-ui/src/main/resources/ui/src/components/Database/SampleDataWithMessages/SampleDataWithMessages.tsx similarity index 80% rename from openmetadata-ui/src/main/resources/ui/src/components/SampleDataWithMessages/SampleDataWithMessages.tsx rename to openmetadata-ui/src/main/resources/ui/src/components/Database/SampleDataWithMessages/SampleDataWithMessages.tsx index b3d2ee15c2d0..118370e40444 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/SampleDataWithMessages/SampleDataWithMessages.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/components/Database/SampleDataWithMessages/SampleDataWithMessages.tsx @@ -15,15 +15,15 @@ import { Col, Row, Typography } from 'antd'; import { isUndefined } from 'lodash'; import React, { FC, useEffect, useState } from 'react'; import { useTranslation } from 'react-i18next'; -import Loader from '../../components/Loader/Loader'; -import { WORKFLOWS_METADATA_DOCS } from '../../constants/docs.constants'; -import { EntityType } from '../../enums/entity.enum'; -import { SearchIndexSampleData } from '../../generated/entity/data/searchIndex'; -import { TopicSampleData } from '../../generated/entity/data/topic'; -import { getSampleDataBySearchIndexId } from '../../rest/SearchIndexAPI'; -import { getSampleDataByTopicId } from '../../rest/topicsAPI'; -import { Transi18next } from '../../utils/CommonUtils'; -import ErrorPlaceHolder from '../common/ErrorWithPlaceholder/ErrorPlaceHolder'; +import { WORKFLOWS_METADATA_DOCS } from '../../../constants/docs.constants'; +import { EntityType } from '../../../enums/entity.enum'; +import { SearchIndexSampleData } from '../../../generated/entity/data/searchIndex'; +import { TopicSampleData } from '../../../generated/entity/data/topic'; +import { getSampleDataBySearchIndexId } from '../../../rest/SearchIndexAPI'; +import { getSampleDataByTopicId } from '../../../rest/topicsAPI'; +import { Transi18next } from '../../../utils/CommonUtils'; +import ErrorPlaceHolder from '../../common/ErrorWithPlaceholder/ErrorPlaceHolder'; +import Loader from '../../common/Loader/Loader'; import MessageCard from './MessageCard'; const SampleDataWithMessages: FC<{ diff --git a/openmetadata-ui/src/main/resources/ui/src/components/SampleDataWithMessages/message-card.less b/openmetadata-ui/src/main/resources/ui/src/components/Database/SampleDataWithMessages/message-card.less similarity index 95% rename from openmetadata-ui/src/main/resources/ui/src/components/SampleDataWithMessages/message-card.less rename to openmetadata-ui/src/main/resources/ui/src/components/Database/SampleDataWithMessages/message-card.less index 37a93188697c..1e0b2fa7337d 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/SampleDataWithMessages/message-card.less +++ b/openmetadata-ui/src/main/resources/ui/src/components/Database/SampleDataWithMessages/message-card.less @@ -10,7 +10,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -@import url('../../styles/variables.less'); +@import url('../../../styles/variables.less'); .message-card-collapse { background-color: @white; diff --git a/openmetadata-ui/src/main/resources/ui/src/components/SchemaEditor/SchemaEditor.test.tsx b/openmetadata-ui/src/main/resources/ui/src/components/Database/SchemaEditor/SchemaEditor.test.tsx similarity index 100% rename from openmetadata-ui/src/main/resources/ui/src/components/SchemaEditor/SchemaEditor.test.tsx rename to openmetadata-ui/src/main/resources/ui/src/components/Database/SchemaEditor/SchemaEditor.test.tsx diff --git a/openmetadata-ui/src/main/resources/ui/src/components/SchemaEditor/SchemaEditor.tsx b/openmetadata-ui/src/main/resources/ui/src/components/Database/SchemaEditor/SchemaEditor.tsx similarity index 93% rename from openmetadata-ui/src/main/resources/ui/src/components/SchemaEditor/SchemaEditor.tsx rename to openmetadata-ui/src/main/resources/ui/src/components/Database/SchemaEditor/SchemaEditor.tsx index 0c05a30730db..b1d0552bc9df 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/SchemaEditor/SchemaEditor.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/components/Database/SchemaEditor/SchemaEditor.tsx @@ -24,9 +24,9 @@ import 'codemirror/mode/sql/sql'; import { isUndefined } from 'lodash'; import React, { useEffect, useState } from 'react'; import { Controlled as CodeMirror } from 'react-codemirror2'; -import { JSON_TAB_SIZE } from '../../constants/constants'; -import { CSMode } from '../../enums/codemirror.enum'; -import { getSchemaEditorValue } from '../../utils/SchemaEditor.utils'; +import { JSON_TAB_SIZE } from '../../../constants/constants'; +import { CSMode } from '../../../enums/codemirror.enum'; +import { getSchemaEditorValue } from '../../../utils/SchemaEditor.utils'; type Mode = { name: CSMode; diff --git a/openmetadata-ui/src/main/resources/ui/src/components/SchemaTab/SchemaTab.component.tsx b/openmetadata-ui/src/main/resources/ui/src/components/Database/SchemaTab/SchemaTab.component.tsx similarity index 96% rename from openmetadata-ui/src/main/resources/ui/src/components/SchemaTab/SchemaTab.component.tsx rename to openmetadata-ui/src/main/resources/ui/src/components/Database/SchemaTab/SchemaTab.component.tsx index a8aa7c449451..45df72778f30 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/SchemaTab/SchemaTab.component.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/components/Database/SchemaTab/SchemaTab.component.tsx @@ -14,7 +14,7 @@ import { t } from 'i18next'; import { lowerCase } from 'lodash'; import React, { Fragment, FunctionComponent, useState } from 'react'; -import Searchbar from '../common/SearchBarComponent/SearchBar.component'; +import Searchbar from '../../common/SearchBarComponent/SearchBar.component'; import SchemaTable from '../SchemaTable/SchemaTable.component'; import { Props } from './SchemaTab.interfaces'; diff --git a/openmetadata-ui/src/main/resources/ui/src/components/SchemaTab/SchemaTab.interfaces.ts b/openmetadata-ui/src/main/resources/ui/src/components/Database/SchemaTab/SchemaTab.interfaces.ts similarity index 90% rename from openmetadata-ui/src/main/resources/ui/src/components/SchemaTab/SchemaTab.interfaces.ts rename to openmetadata-ui/src/main/resources/ui/src/components/Database/SchemaTab/SchemaTab.interfaces.ts index f796e3998353..f93780312623 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/SchemaTab/SchemaTab.interfaces.ts +++ b/openmetadata-ui/src/main/resources/ui/src/components/Database/SchemaTab/SchemaTab.interfaces.ts @@ -11,13 +11,13 @@ * limitations under the License. */ -import { ThreadType } from '../../generated/api/feed/createThread'; +import { ThreadType } from '../../../generated/api/feed/createThread'; import { ColumnJoins, Table, TableData, TablePartition, -} from '../../generated/entity/data/table'; +} from '../../../generated/entity/data/table'; export type Props = { columns: Table['columns']; diff --git a/openmetadata-ui/src/main/resources/ui/src/components/SchemaTab/SchemaTab.test.tsx b/openmetadata-ui/src/main/resources/ui/src/components/Database/SchemaTab/SchemaTab.test.tsx similarity index 98% rename from openmetadata-ui/src/main/resources/ui/src/components/SchemaTab/SchemaTab.test.tsx rename to openmetadata-ui/src/main/resources/ui/src/components/Database/SchemaTab/SchemaTab.test.tsx index b9d5a6aff26d..9f3131afd3f0 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/SchemaTab/SchemaTab.test.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/components/Database/SchemaTab/SchemaTab.test.tsx @@ -21,7 +21,7 @@ import { State, Table, TagSource, -} from '../../generated/entity/data/table'; +} from '../../../generated/entity/data/table'; import SchemaTab from './SchemaTab.component'; const mockColumns: Column[] = [ { diff --git a/openmetadata-ui/src/main/resources/ui/src/components/SchemaTable/SchemaTable.component.tsx b/openmetadata-ui/src/main/resources/ui/src/components/Database/SchemaTable/SchemaTable.component.tsx similarity index 90% rename from openmetadata-ui/src/main/resources/ui/src/components/SchemaTable/SchemaTable.component.tsx rename to openmetadata-ui/src/main/resources/ui/src/components/Database/SchemaTable/SchemaTable.component.tsx index 7ac871d623f1..eb2dfcac70c8 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/SchemaTable/SchemaTable.component.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/components/Database/SchemaTable/SchemaTable.component.tsx @@ -27,47 +27,47 @@ import { import { EntityTags, TagFilterOptions } from 'Models'; import React, { useEffect, useMemo, useState } from 'react'; import { useTranslation } from 'react-i18next'; -import { ReactComponent as IconEdit } from '../../assets/svg/edit-new.svg'; -import FilterTablePlaceHolder from '../../components/common/ErrorWithPlaceholder/FilterTablePlaceHolder'; -import EntityNameModal from '../../components/Modals/EntityNameModal/EntityNameModal.component'; -import { EntityName } from '../../components/Modals/EntityNameModal/EntityNameModal.interface'; -import { ColumnFilter } from '../../components/Table/ColumnFilter/ColumnFilter.component'; -import TableDescription from '../../components/TableDescription/TableDescription.component'; -import TableTags from '../../components/TableTags/TableTags.component'; +import { ReactComponent as IconEdit } from '../../../assets/svg/edit-new.svg'; import { DE_ACTIVE_COLOR, NO_DATA_PLACEHOLDER, -} from '../../constants/constants'; -import { TABLE_SCROLL_VALUE } from '../../constants/Table.constants'; -import { EntityType } from '../../enums/entity.enum'; -import { Column } from '../../generated/entity/data/table'; -import { TagSource } from '../../generated/type/schema'; -import { TagLabel } from '../../generated/type/tagLabel'; -import { useFqn } from '../../hooks/useFqn'; +} from '../../../constants/constants'; +import { TABLE_SCROLL_VALUE } from '../../../constants/Table.constants'; +import { usePermissionProvider } from '../../../context/PermissionProvider/PermissionProvider'; +import { + OperationPermission, + ResourceEntity, +} from '../../../context/PermissionProvider/PermissionProvider.interface'; +import { EntityType } from '../../../enums/entity.enum'; +import { Column } from '../../../generated/entity/data/table'; +import { TagSource } from '../../../generated/type/schema'; +import { TagLabel } from '../../../generated/type/tagLabel'; +import { useFqn } from '../../../hooks/useFqn'; import { getEntityName, getFrequentlyJoinedColumns, searchInColumns, -} from '../../utils/EntityUtils'; +} from '../../../utils/EntityUtils'; import { getAllTags, searchTagInData, -} from '../../utils/TableTags/TableTags.utils'; +} from '../../../utils/TableTags/TableTags.utils'; import { getFilterIcon, getTableExpandableConfig, makeData, prepareConstraintIcon, updateFieldTags, -} from '../../utils/TableUtils'; -import { showErrorToast } from '../../utils/ToastUtils'; -import Table from '../common/Table/Table'; -import { ModalWithMarkdownEditor } from '../Modals/ModalWithMarkdownEditor/ModalWithMarkdownEditor'; -import { usePermissionProvider } from '../PermissionProvider/PermissionProvider'; -import { - OperationPermission, - ResourceEntity, -} from '../PermissionProvider/PermissionProvider.interface'; +} from '../../../utils/TableUtils'; +import { showErrorToast } from '../../../utils/ToastUtils'; +import FilterTablePlaceHolder from '../../common/ErrorWithPlaceholder/FilterTablePlaceHolder'; +import Table from '../../common/Table/Table'; +import EntityNameModal from '../../Modals/EntityNameModal/EntityNameModal.component'; +import { EntityName } from '../../Modals/EntityNameModal/EntityNameModal.interface'; +import { ModalWithMarkdownEditor } from '../../Modals/ModalWithMarkdownEditor/ModalWithMarkdownEditor'; +import { ColumnFilter } from '../ColumnFilter/ColumnFilter.component'; +import TableDescription from '../TableDescription/TableDescription.component'; +import TableTags from '../TableTags/TableTags.component'; import { SchemaTableProps, TableCellRendered } from './SchemaTable.interface'; const SchemaTable = ({ diff --git a/openmetadata-ui/src/main/resources/ui/src/components/SchemaTable/SchemaTable.interface.ts b/openmetadata-ui/src/main/resources/ui/src/components/Database/SchemaTable/SchemaTable.interface.ts similarity index 89% rename from openmetadata-ui/src/main/resources/ui/src/components/SchemaTable/SchemaTable.interface.ts rename to openmetadata-ui/src/main/resources/ui/src/components/Database/SchemaTable/SchemaTable.interface.ts index 506a291b5697..d43b2728aa91 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/SchemaTable/SchemaTable.interface.ts +++ b/openmetadata-ui/src/main/resources/ui/src/components/Database/SchemaTable/SchemaTable.interface.ts @@ -12,8 +12,12 @@ */ import { ReactNode } from 'react'; -import { ThreadType } from '../../generated/api/feed/createThread'; -import { Column, ColumnJoins, Table } from '../../generated/entity/data/table'; +import { ThreadType } from '../../../generated/api/feed/createThread'; +import { + Column, + ColumnJoins, + Table, +} from '../../../generated/entity/data/table'; export interface SchemaTableProps { tableColumns: Column[]; diff --git a/openmetadata-ui/src/main/resources/ui/src/components/SchemaTable/SchemaTable.test.tsx b/openmetadata-ui/src/main/resources/ui/src/components/Database/SchemaTable/SchemaTable.test.tsx similarity index 87% rename from openmetadata-ui/src/main/resources/ui/src/components/SchemaTable/SchemaTable.test.tsx rename to openmetadata-ui/src/main/resources/ui/src/components/Database/SchemaTable/SchemaTable.test.tsx index 9b8d918d2652..279b1966382f 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/SchemaTable/SchemaTable.test.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/components/Database/SchemaTable/SchemaTable.test.tsx @@ -14,8 +14,8 @@ import { render, screen } from '@testing-library/react'; import React from 'react'; import { MemoryRouter } from 'react-router-dom'; -import { Column } from '../../generated/entity/data/container'; -import { Table, TablePartition } from '../../generated/entity/data/table'; +import { Column } from '../../../generated/entity/data/container'; +import { Table, TablePartition } from '../../../generated/entity/data/table'; import EntityTableV1 from './SchemaTable.component'; const onEntityFieldSelect = jest.fn(); @@ -123,7 +123,7 @@ const columnsWithDisplayName = [ }, ] as Column[]; -jest.mock('../../hooks/authHooks', () => { +jest.mock('../../../hooks/authHooks', () => { return { useAuth: jest.fn().mockReturnValue({ userPermissions: jest.fn().mockReturnValue(true), @@ -132,45 +132,42 @@ jest.mock('../../hooks/authHooks', () => { }; }); -jest.mock('../common/RichTextEditor/RichTextEditorPreviewer', () => { +jest.mock('../../common/RichTextEditor/RichTextEditorPreviewer', () => { return jest.fn().mockReturnValue(

RichTextEditorPreviewer

); }); -jest.mock('../Modals/ModalWithMarkdownEditor/ModalWithMarkdownEditor', () => ({ - ModalWithMarkdownEditor: jest.fn().mockReturnValue(

EditorModal

), -})); - jest.mock( - '../../components/common/ErrorWithPlaceholder/FilterTablePlaceHolder', - () => { - return jest.fn().mockReturnValue(

FilterTablePlaceHolder

); - } + '../../Modals/ModalWithMarkdownEditor/ModalWithMarkdownEditor', + () => ({ + ModalWithMarkdownEditor: jest.fn().mockReturnValue(

EditorModal

), + }) ); -jest.mock('../../utils/TagsUtils', () => ({ +jest.mock('../../common/ErrorWithPlaceholder/FilterTablePlaceHolder', () => { + return jest.fn().mockReturnValue(

FilterTablePlaceHolder

); +}); + +jest.mock('../../../utils/TagsUtils', () => ({ getAllTagsList: jest.fn(() => Promise.resolve([])), getTagsHierarchy: jest.fn().mockReturnValue([]), })); -jest.mock('../../utils/GlossaryUtils', () => ({ +jest.mock('../../../utils/GlossaryUtils', () => ({ getGlossaryTermsList: jest.fn(() => Promise.resolve([])), getGlossaryTermHierarchy: jest.fn().mockReturnValue([]), })); -jest.mock('../../components/TableTags/TableTags.component', () => { +jest.mock('../TableTags/TableTags.component', () => { return jest.fn().mockReturnValue(

TableTags

); }); -jest.mock( - '../../components/TableDescription/TableDescription.component', - () => { - return jest.fn().mockReturnValue(

TableDescription

); - } -); +jest.mock('../TableDescription/TableDescription.component', () => { + return jest.fn().mockReturnValue(

TableDescription

); +}); const mockTableScrollValue = jest.fn(); -jest.mock('../../constants/Table.constants', () => ({ +jest.mock('../../../constants/Table.constants', () => ({ get TABLE_SCROLL_VALUE() { return mockTableScrollValue(); }, diff --git a/openmetadata-ui/src/main/resources/ui/src/components/StoredProcedureVersion/StoredProcedureVersion.component.tsx b/openmetadata-ui/src/main/resources/ui/src/components/Database/StoredProcedureVersion/StoredProcedureVersion.component.tsx similarity index 85% rename from openmetadata-ui/src/main/resources/ui/src/components/StoredProcedureVersion/StoredProcedureVersion.component.tsx rename to openmetadata-ui/src/main/resources/ui/src/components/Database/StoredProcedureVersion/StoredProcedureVersion.component.tsx index 98257408a385..cc06d2cc184f 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/StoredProcedureVersion/StoredProcedureVersion.component.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/components/Database/StoredProcedureVersion/StoredProcedureVersion.component.tsx @@ -17,24 +17,24 @@ import { toString } from 'lodash'; import React, { useEffect, useMemo, useState } from 'react'; import { useTranslation } from 'react-i18next'; import { useHistory, useParams } from 'react-router-dom'; -import { CustomPropertyTable } from '../../components/common/CustomPropertyTable/CustomPropertyTable'; -import DescriptionV1 from '../../components/common/EntityDescription/DescriptionV1'; -import DataAssetsVersionHeader from '../../components/DataAssets/DataAssetsVersionHeader/DataAssetsVersionHeader'; -import EntityVersionTimeLine from '../../components/Entity/EntityVersionTimeLine/EntityVersionTimeLine'; -import Loader from '../../components/Loader/Loader'; -import TabsLabel from '../../components/TabsLabel/TabsLabel.component'; -import TagsContainerV2 from '../../components/Tag/TagsContainerV2/TagsContainerV2'; -import { getVersionPathWithTab } from '../../constants/constants'; -import { EntityField } from '../../constants/Feeds.constants'; -import { EntityTabs, EntityType } from '../../enums/entity.enum'; -import { ChangeDescription } from '../../generated/entity/data/table'; -import { TagSource } from '../../generated/type/tagLabel'; +import { getVersionPathWithTab } from '../../../constants/constants'; +import { EntityField } from '../../../constants/Feeds.constants'; +import { EntityTabs, EntityType } from '../../../enums/entity.enum'; +import { ChangeDescription } from '../../../generated/entity/data/table'; +import { TagSource } from '../../../generated/type/tagLabel'; import { getCommonExtraInfoForVersionDetails, getEntityVersionByField, getEntityVersionTags, -} from '../../utils/EntityVersionUtils'; -import DataProductsContainer from '../DataProductsContainer/DataProductsContainer.component'; +} from '../../../utils/EntityVersionUtils'; +import { CustomPropertyTable } from '../../common/CustomPropertyTable/CustomPropertyTable'; +import DescriptionV1 from '../../common/EntityDescription/DescriptionV1'; +import Loader from '../../common/Loader/Loader'; +import TabsLabel from '../../common/TabsLabel/TabsLabel.component'; +import DataAssetsVersionHeader from '../../DataAssets/DataAssetsVersionHeader/DataAssetsVersionHeader'; +import DataProductsContainer from '../../DataProducts/DataProductsContainer/DataProductsContainer.component'; +import EntityVersionTimeLine from '../../Entity/EntityVersionTimeLine/EntityVersionTimeLine'; +import TagsContainerV2 from '../../Tag/TagsContainerV2/TagsContainerV2'; import { StoredProcedureVersionProp } from './StoredProcedureVersion.interface'; const StoredProcedureVersion = ({ version, diff --git a/openmetadata-ui/src/main/resources/ui/src/components/StoredProcedureVersion/StoredProcedureVersion.interface.ts b/openmetadata-ui/src/main/resources/ui/src/components/Database/StoredProcedureVersion/StoredProcedureVersion.interface.ts similarity index 75% rename from openmetadata-ui/src/main/resources/ui/src/components/StoredProcedureVersion/StoredProcedureVersion.interface.ts rename to openmetadata-ui/src/main/resources/ui/src/components/Database/StoredProcedureVersion/StoredProcedureVersion.interface.ts index 48df1ff80119..562e2dfd3bc7 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/StoredProcedureVersion/StoredProcedureVersion.interface.ts +++ b/openmetadata-ui/src/main/resources/ui/src/components/Database/StoredProcedureVersion/StoredProcedureVersion.interface.ts @@ -11,11 +11,11 @@ * limitations under the License. */ -import { OperationPermission } from '../../components/PermissionProvider/PermissionProvider.interface'; -import { StoredProcedure } from '../../generated/entity/data/storedProcedure'; -import { EntityHistory } from '../../generated/type/entityHistory'; -import { TagLabel } from '../../generated/type/tagLabel'; -import { TitleBreadcrumbProps } from '../common/TitleBreadcrumb/TitleBreadcrumb.interface'; +import { OperationPermission } from '../../../context/PermissionProvider/PermissionProvider.interface'; +import { StoredProcedure } from '../../../generated/entity/data/storedProcedure'; +import { EntityHistory } from '../../../generated/type/entityHistory'; +import { TagLabel } from '../../../generated/type/tagLabel'; +import { TitleBreadcrumbProps } from '../../common/TitleBreadcrumb/TitleBreadcrumb.interface'; export interface StoredProcedureVersionProp { version: string; diff --git a/openmetadata-ui/src/main/resources/ui/src/components/StoredProcedureVersion/StoredProcedureVersion.test.tsx b/openmetadata-ui/src/main/resources/ui/src/components/Database/StoredProcedureVersion/StoredProcedureVersion.test.tsx similarity index 97% rename from openmetadata-ui/src/main/resources/ui/src/components/StoredProcedureVersion/StoredProcedureVersion.test.tsx rename to openmetadata-ui/src/main/resources/ui/src/components/Database/StoredProcedureVersion/StoredProcedureVersion.test.tsx index 0f6332093804..3c1d8a690116 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/StoredProcedureVersion/StoredProcedureVersion.test.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/components/Database/StoredProcedureVersion/StoredProcedureVersion.test.tsx @@ -14,7 +14,7 @@ import { act, render, screen } from '@testing-library/react'; import userEvent from '@testing-library/user-event'; import React from 'react'; -import { storedProcedureVersionMockProps } from '../../mocks/StoredProcedureVersion.mock'; +import { storedProcedureVersionMockProps } from '../../../mocks/StoredProcedureVersion.mock'; import StoredProcedureVersion from './StoredProcedureVersion.component'; const mockPush = jest.fn(); diff --git a/openmetadata-ui/src/main/resources/ui/src/components/TableDataCardBody/TableDataCardBody.test.tsx b/openmetadata-ui/src/main/resources/ui/src/components/Database/TableDataCardBody/TableDataCardBody.test.tsx similarity index 98% rename from openmetadata-ui/src/main/resources/ui/src/components/TableDataCardBody/TableDataCardBody.test.tsx rename to openmetadata-ui/src/main/resources/ui/src/components/Database/TableDataCardBody/TableDataCardBody.test.tsx index 05aa6b10eaad..8d6fd1dabb85 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/TableDataCardBody/TableDataCardBody.test.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/components/Database/TableDataCardBody/TableDataCardBody.test.tsx @@ -13,7 +13,7 @@ import { render } from '@testing-library/react'; import React from 'react'; -import { TAG_CONSTANT } from '../../constants/Tag.constants'; +import { TAG_CONSTANT } from '../../../constants/Tag.constants'; import TableDataCardBody from './TableDataCardBody'; jest.mock( diff --git a/openmetadata-ui/src/main/resources/ui/src/components/TableDataCardBody/TableDataCardBody.tsx b/openmetadata-ui/src/main/resources/ui/src/components/Database/TableDataCardBody/TableDataCardBody.tsx similarity index 85% rename from openmetadata-ui/src/main/resources/ui/src/components/TableDataCardBody/TableDataCardBody.tsx rename to openmetadata-ui/src/main/resources/ui/src/components/Database/TableDataCardBody/TableDataCardBody.tsx index 16da937edd9f..a38cdfe00014 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/TableDataCardBody/TableDataCardBody.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/components/Database/TableDataCardBody/TableDataCardBody.tsx @@ -15,11 +15,11 @@ import { isEmpty, isNil } from 'lodash'; import { ExtraInfo } from 'Models'; import React, { FunctionComponent } from 'react'; import { useTranslation } from 'react-i18next'; -import EntitySummaryDetails from '../../components/common/EntitySummaryDetails/EntitySummaryDetails'; -import RichTextEditorPreviewer from '../../components/common/RichTextEditor/RichTextEditorPreviewer'; -import TagsViewer from '../../components/Tag/TagsViewer/TagsViewer'; -import { TagLabel } from '../../generated/type/tagLabel'; -import { getTagValue } from '../../utils/CommonUtils'; +import { TagLabel } from '../../../generated/type/tagLabel'; +import { getTagValue } from '../../../utils/CommonUtils'; +import EntitySummaryDetails from '../../common/EntitySummaryDetails/EntitySummaryDetails'; +import RichTextEditorPreviewer from '../../common/RichTextEditor/RichTextEditorPreviewer'; +import TagsViewer from '../../Tag/TagsViewer/TagsViewer'; type Props = { description: string; diff --git a/openmetadata-ui/src/main/resources/ui/src/components/TableDescription/TableDescription.component.tsx b/openmetadata-ui/src/main/resources/ui/src/components/Database/TableDescription/TableDescription.component.tsx similarity index 85% rename from openmetadata-ui/src/main/resources/ui/src/components/TableDescription/TableDescription.component.tsx rename to openmetadata-ui/src/main/resources/ui/src/components/Database/TableDescription/TableDescription.component.tsx index 8c3ae8427839..da8c6dd9f044 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/TableDescription/TableDescription.component.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/components/Database/TableDescription/TableDescription.component.tsx @@ -14,11 +14,11 @@ import { Button, Space } from 'antd'; import React from 'react'; import { useTranslation } from 'react-i18next'; -import { ReactComponent as EditIcon } from '../../assets/svg/edit-new.svg'; -import RichTextEditorPreviewer from '../../components/common/RichTextEditor/RichTextEditorPreviewer'; -import { DE_ACTIVE_COLOR } from '../../constants/constants'; -import { EntityField } from '../../constants/Feeds.constants'; -import EntityTasks from '../../pages/TasksPage/EntityTasks/EntityTasks.component'; +import { ReactComponent as EditIcon } from '../../../assets/svg/edit-new.svg'; +import { DE_ACTIVE_COLOR } from '../../../constants/constants'; +import { EntityField } from '../../../constants/Feeds.constants'; +import EntityTasks from '../../../pages/TasksPage/EntityTasks/EntityTasks.component'; +import RichTextEditorPreviewer from '../../common/RichTextEditor/RichTextEditorPreviewer'; import { TableDescriptionProps } from './TableDescription.interface'; const TableDescription = ({ diff --git a/openmetadata-ui/src/main/resources/ui/src/components/TableDescription/TableDescription.interface.ts b/openmetadata-ui/src/main/resources/ui/src/components/Database/TableDescription/TableDescription.interface.ts similarity index 83% rename from openmetadata-ui/src/main/resources/ui/src/components/TableDescription/TableDescription.interface.ts rename to openmetadata-ui/src/main/resources/ui/src/components/Database/TableDescription/TableDescription.interface.ts index 3bf5306c28e1..44b73350d8b3 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/TableDescription/TableDescription.interface.ts +++ b/openmetadata-ui/src/main/resources/ui/src/components/Database/TableDescription/TableDescription.interface.ts @@ -11,9 +11,9 @@ * limitations under the License. */ -import { EntityType } from '../../enums/entity.enum'; -import { Column } from '../../generated/entity/data/table'; -import { ThreadType } from '../../generated/entity/feed/thread'; +import { EntityType } from '../../../enums/entity.enum'; +import { Column } from '../../../generated/entity/data/table'; +import { ThreadType } from '../../../generated/entity/feed/thread'; export interface TableDescriptionProps { index: number; diff --git a/openmetadata-ui/src/main/resources/ui/src/components/TableDescription/TableDescription.test.tsx b/openmetadata-ui/src/main/resources/ui/src/components/Database/TableDescription/TableDescription.test.tsx similarity index 89% rename from openmetadata-ui/src/main/resources/ui/src/components/TableDescription/TableDescription.test.tsx rename to openmetadata-ui/src/main/resources/ui/src/components/Database/TableDescription/TableDescription.test.tsx index 2b1bf68c6954..0da7d0c4cab3 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/TableDescription/TableDescription.test.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/components/Database/TableDescription/TableDescription.test.tsx @@ -13,19 +13,16 @@ import '@testing-library/jest-dom'; import { fireEvent, render, screen } from '@testing-library/react'; import React from 'react'; -import { EntityType } from '../../enums/entity.enum'; +import { EntityType } from '../../../enums/entity.enum'; import TableDescription from './TableDescription.component'; -jest.mock('../../pages/TasksPage/EntityTasks/EntityTasks.component', () => { +jest.mock('../../../pages/TasksPage/EntityTasks/EntityTasks.component', () => { return jest.fn().mockReturnValue(

EntityTasks

); }); -jest.mock( - '../../components/common/RichTextEditor/RichTextEditorPreviewer', - () => { - return jest.fn().mockReturnValue(

RichTextEditorPreviewer

); - } -); +jest.mock('../../common/RichTextEditor/RichTextEditorPreviewer', () => { + return jest.fn().mockReturnValue(

RichTextEditorPreviewer

); +}); describe('TableDescription Component', () => { const mockProps = { diff --git a/openmetadata-ui/src/main/resources/ui/src/components/TableProfiler/Component/ColumnPickerMenu.tsx b/openmetadata-ui/src/main/resources/ui/src/components/Database/TableProfiler/ColumnPickerMenu.tsx similarity index 100% rename from openmetadata-ui/src/main/resources/ui/src/components/TableProfiler/Component/ColumnPickerMenu.tsx rename to openmetadata-ui/src/main/resources/ui/src/components/Database/TableProfiler/ColumnPickerMenu.tsx diff --git a/openmetadata-ui/src/main/resources/ui/src/components/TableProfiler/Component/ColumnProfileTable.test.tsx b/openmetadata-ui/src/main/resources/ui/src/components/Database/TableProfiler/ColumnProfileTable/ColumnProfileTable.test.tsx similarity index 98% rename from openmetadata-ui/src/main/resources/ui/src/components/TableProfiler/Component/ColumnProfileTable.test.tsx rename to openmetadata-ui/src/main/resources/ui/src/components/Database/TableProfiler/ColumnProfileTable/ColumnProfileTable.test.tsx index 7f787f4f5b20..47109b735d14 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/TableProfiler/Component/ColumnProfileTable.test.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/components/Database/TableProfiler/ColumnProfileTable/ColumnProfileTable.test.tsx @@ -21,7 +21,7 @@ import { } from '@testing-library/react'; import React from 'react'; import { MemoryRouter } from 'react-router-dom'; -import { MOCK_TABLE } from '../../../mocks/TableData.mock'; +import { MOCK_TABLE } from '../../../../mocks/TableData.mock'; import ColumnProfileTable from './ColumnProfileTable'; jest.mock('../../../components/common/Table/Table', () => diff --git a/openmetadata-ui/src/main/resources/ui/src/components/TableProfiler/Component/ColumnProfileTable.tsx b/openmetadata-ui/src/main/resources/ui/src/components/Database/TableProfiler/ColumnProfileTable/ColumnProfileTable.tsx similarity index 87% rename from openmetadata-ui/src/main/resources/ui/src/components/TableProfiler/Component/ColumnProfileTable.tsx rename to openmetadata-ui/src/main/resources/ui/src/components/Database/TableProfiler/ColumnProfileTable/ColumnProfileTable.tsx index 4ee924544fb2..71f6d8d87b15 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/TableProfiler/Component/ColumnProfileTable.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/components/Database/TableProfiler/ColumnProfileTable/ColumnProfileTable.tsx @@ -30,47 +30,47 @@ import Qs from 'qs'; import React, { useEffect, useMemo, useState } from 'react'; import { useTranslation } from 'react-i18next'; import { Link, useHistory, useLocation } from 'react-router-dom'; -import { ReactComponent as DropDownIcon } from '../../../assets/svg/drop-down.svg'; -import { ReactComponent as SettingIcon } from '../../../assets/svg/ic-settings-primery.svg'; -import FilterTablePlaceHolder from '../../../components/common/ErrorWithPlaceholder/FilterTablePlaceHolder'; -import Table from '../../../components/common/Table/Table'; -import { TableProfilerTab } from '../../../components/ProfilerDashboard/profilerDashboard.interface'; -import { NO_DATA_PLACEHOLDER } from '../../../constants/constants'; -import { PAGE_HEADERS } from '../../../constants/PageHeaders.constant'; +import { ReactComponent as DropDownIcon } from '../../../../assets/svg/drop-down.svg'; +import { ReactComponent as SettingIcon } from '../../../../assets/svg/ic-settings-primery.svg'; +import { NO_DATA_PLACEHOLDER } from '../../../../constants/constants'; +import { PAGE_HEADERS } from '../../../../constants/PageHeaders.constant'; import { DEFAULT_TEST_VALUE, INITIAL_TEST_RESULT_SUMMARY, -} from '../../../constants/profiler.constant'; -import { ProfilerDashboardType } from '../../../enums/table.enum'; -import { Column, ColumnProfile } from '../../../generated/entity/data/table'; -import { TestCase, TestCaseStatus } from '../../../generated/tests/testCase'; -import { useFqn } from '../../../hooks/useFqn'; -import { formatNumberWithComma } from '../../../utils/CommonUtils'; -import { updateTestResults } from '../../../utils/DataQualityAndProfilerUtils'; -import { getEntityName, searchInColumns } from '../../../utils/EntityUtils'; +} from '../../../../constants/profiler.constant'; +import { ProfilerDashboardType } from '../../../../enums/table.enum'; +import { Column, ColumnProfile } from '../../../../generated/entity/data/table'; +import { TestCase, TestCaseStatus } from '../../../../generated/tests/testCase'; +import { useFqn } from '../../../../hooks/useFqn'; +import { formatNumberWithComma } from '../../../../utils/CommonUtils'; +import { updateTestResults } from '../../../../utils/DataQualityAndProfilerUtils'; +import { getEntityName, searchInColumns } from '../../../../utils/EntityUtils'; import { getAddCustomMetricPath, getAddDataQualityTableTestPath, -} from '../../../utils/RouterUtils'; -import { getEncodedFqn } from '../../../utils/StringsUtils'; -import { getTableExpandableConfig } from '../../../utils/TableUtils'; -import Searchbar from '../../common/SearchBarComponent/SearchBar.component'; -import { SummaryCard } from '../../common/SummaryCard/SummaryCard.component'; -import { SummaryCardProps } from '../../common/SummaryCard/SummaryCard.interface'; -import TestIndicator from '../../common/TestIndicator/TestIndicator'; -import DatePickerMenu from '../../DatePickerMenu/DatePickerMenu.component'; -import PageHeader from '../../PageHeader/PageHeader.component'; -import TabsLabel from '../../TabsLabel/TabsLabel.component'; +} from '../../../../utils/RouterUtils'; +import { getEncodedFqn } from '../../../../utils/StringsUtils'; +import { getTableExpandableConfig } from '../../../../utils/TableUtils'; +import DatePickerMenu from '../../../common/DatePickerMenu/DatePickerMenu.component'; +import FilterTablePlaceHolder from '../../../common/ErrorWithPlaceholder/FilterTablePlaceHolder'; +import Searchbar from '../../../common/SearchBarComponent/SearchBar.component'; +import { SummaryCard } from '../../../common/SummaryCard/SummaryCard.component'; +import { SummaryCardProps } from '../../../common/SummaryCard/SummaryCard.interface'; +import Table from '../../../common/Table/Table'; +import TabsLabel from '../../../common/TabsLabel/TabsLabel.component'; +import TestIndicator from '../../../common/TestIndicator/TestIndicator'; +import PageHeader from '../../../PageHeader/PageHeader.component'; +import { TableProfilerTab } from '../../Profiler/ProfilerDashboard/profilerDashboard.interface'; +import ColumnPickerMenu from '../ColumnPickerMenu'; +import ColumnSummary from '../ColumnSummary'; +import NoProfilerBanner from '../NoProfilerBanner/NoProfilerBanner.component'; +import ProfilerProgressWidget from '../ProfilerProgressWidget/ProfilerProgressWidget'; +import SingleColumnProfile from '../SingleColumnProfile'; import { columnTestResultType, ModifiedColumn, } from '../TableProfiler.interface'; import { useTableProfiler } from '../TableProfilerProvider'; -import ColumnPickerMenu from './ColumnPickerMenu'; -import ColumnSummary from './ColumnSummary'; -import NoProfilerBanner from './NoProfilerBanner.component'; -import ProfilerProgressWidget from './ProfilerProgressWidget'; -import SingleColumnProfile from './SingleColumnProfile'; const ColumnProfileTable = () => { const location = useLocation(); diff --git a/openmetadata-ui/src/main/resources/ui/src/components/TableProfiler/Component/ColumnSummary.tsx b/openmetadata-ui/src/main/resources/ui/src/components/Database/TableProfiler/ColumnSummary.tsx similarity index 89% rename from openmetadata-ui/src/main/resources/ui/src/components/TableProfiler/Component/ColumnSummary.tsx rename to openmetadata-ui/src/main/resources/ui/src/components/Database/TableProfiler/ColumnSummary.tsx index c23e2e2435ed..4b5183e010c5 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/TableProfiler/Component/ColumnSummary.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/components/Database/TableProfiler/ColumnSummary.tsx @@ -13,10 +13,10 @@ import { Space, Typography } from 'antd'; import { isEmpty } from 'lodash'; import React, { FC } from 'react'; -import RichTextEditorPreviewer from '../../../components/common/RichTextEditor/RichTextEditorPreviewer'; -import TagsViewer from '../../../components/Tag/TagsViewer/TagsViewer'; import { Column } from '../../../generated/entity/data/container'; import { getEntityName } from '../../../utils/EntityUtils'; +import RichTextEditorPreviewer from '../../common/RichTextEditor/RichTextEditorPreviewer'; +import TagsViewer from '../../Tag/TagsViewer/TagsViewer'; interface ColumnSummaryProps { column: Column; diff --git a/openmetadata-ui/src/main/resources/ui/src/components/TableProfiler/CustomMetricGraphs/CustomMetricGraphs.component.tsx b/openmetadata-ui/src/main/resources/ui/src/components/Database/TableProfiler/CustomMetricGraphs/CustomMetricGraphs.component.tsx similarity index 89% rename from openmetadata-ui/src/main/resources/ui/src/components/TableProfiler/CustomMetricGraphs/CustomMetricGraphs.component.tsx rename to openmetadata-ui/src/main/resources/ui/src/components/Database/TableProfiler/CustomMetricGraphs/CustomMetricGraphs.component.tsx index c1e9a0d5c642..5a2b42c61802 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/TableProfiler/CustomMetricGraphs/CustomMetricGraphs.component.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/components/Database/TableProfiler/CustomMetricGraphs/CustomMetricGraphs.component.tsx @@ -34,24 +34,27 @@ import { XAxis, YAxis, } from 'recharts'; -import { ReactComponent as IconDropdown } from '../../../assets/svg/menu.svg'; -import { GRAPH_BACKGROUND_COLOR } from '../../../constants/constants'; -import { TOTAL_ENTITY_CHART_COLOR } from '../../../constants/DataInsight.constants'; -import { PAGE_HEADERS } from '../../../constants/PageHeaders.constant'; -import { EntityType } from '../../../enums/entity.enum'; -import { CustomMetric } from '../../../generated/entity/data/table'; +import { ReactComponent as IconDropdown } from '../../../../assets/svg/menu.svg'; +import { GRAPH_BACKGROUND_COLOR } from '../../../../constants/constants'; +import { TOTAL_ENTITY_CHART_COLOR } from '../../../../constants/DataInsight.constants'; +import { PAGE_HEADERS } from '../../../../constants/PageHeaders.constant'; +import { EntityType } from '../../../../enums/entity.enum'; +import { CustomMetric } from '../../../../generated/entity/data/table'; import { deleteCustomMetric, putCustomMetric, -} from '../../../rest/customMetricAPI'; -import { axisTickFormatter, tooltipFormatter } from '../../../utils/ChartUtils'; -import { getRandomHexColor } from '../../../utils/DataInsightUtils'; -import { showErrorToast, showSuccessToast } from '../../../utils/ToastUtils'; -import DeleteWidgetModal from '../../common/DeleteWidget/DeleteWidgetModal'; -import ErrorPlaceHolder from '../../common/ErrorWithPlaceholder/ErrorPlaceHolder'; -import CustomMetricForm from '../../CustomMetricForm/CustomMetricForm.component'; -import PageHeader from '../../PageHeader/PageHeader.component'; -import ProfilerLatestValue from '../../ProfilerDashboard/component/ProfilerLatestValue'; +} from '../../../../rest/customMetricAPI'; +import { + axisTickFormatter, + tooltipFormatter, +} from '../../../../utils/ChartUtils'; +import { getRandomHexColor } from '../../../../utils/DataInsightUtils'; +import { showErrorToast, showSuccessToast } from '../../../../utils/ToastUtils'; +import DeleteWidgetModal from '../../../common/DeleteWidget/DeleteWidgetModal'; +import ErrorPlaceHolder from '../../../common/ErrorWithPlaceholder/ErrorPlaceHolder'; +import CustomMetricForm from '../../../DataQuality/CustomMetricForm/CustomMetricForm.component'; +import PageHeader from '../../../PageHeader/PageHeader.component'; +import ProfilerLatestValue from '../../Profiler/ProfilerLatestValue/ProfilerLatestValue'; import { useTableProfiler } from '../TableProfilerProvider'; import './custom-metric-graphs.style.less'; import { diff --git a/openmetadata-ui/src/main/resources/ui/src/components/TableProfiler/CustomMetricGraphs/CustomMetricGraphs.interface.ts b/openmetadata-ui/src/main/resources/ui/src/components/Database/TableProfiler/CustomMetricGraphs/CustomMetricGraphs.interface.ts similarity index 83% rename from openmetadata-ui/src/main/resources/ui/src/components/TableProfiler/CustomMetricGraphs/CustomMetricGraphs.interface.ts rename to openmetadata-ui/src/main/resources/ui/src/components/Database/TableProfiler/CustomMetricGraphs/CustomMetricGraphs.interface.ts index 73d6b15747ed..996784c7a57f 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/TableProfiler/CustomMetricGraphs/CustomMetricGraphs.interface.ts +++ b/openmetadata-ui/src/main/resources/ui/src/components/Database/TableProfiler/CustomMetricGraphs/CustomMetricGraphs.interface.ts @@ -10,8 +10,8 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -import { CustomMetric } from '../../../generated/tests/customMetric'; -import { MetricChartType } from '../../ProfilerDashboard/profilerDashboard.interface'; +import { CustomMetric } from '../../../../generated/tests/customMetric'; +import { MetricChartType } from '../../Profiler/ProfilerDashboard/profilerDashboard.interface'; export interface CustomMetricGraphsProps { customMetricsGraphData?: Record; diff --git a/openmetadata-ui/src/main/resources/ui/src/components/TableProfiler/CustomMetricGraphs/CustomMetricGraphs.test.tsx b/openmetadata-ui/src/main/resources/ui/src/components/Database/TableProfiler/CustomMetricGraphs/CustomMetricGraphs.test.tsx similarity index 92% rename from openmetadata-ui/src/main/resources/ui/src/components/TableProfiler/CustomMetricGraphs/CustomMetricGraphs.test.tsx rename to openmetadata-ui/src/main/resources/ui/src/components/Database/TableProfiler/CustomMetricGraphs/CustomMetricGraphs.test.tsx index fde6ad517b8d..241cd7184ee4 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/TableProfiler/CustomMetricGraphs/CustomMetricGraphs.test.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/components/Database/TableProfiler/CustomMetricGraphs/CustomMetricGraphs.test.tsx @@ -59,16 +59,22 @@ const mockProps = { ], }; -jest.mock('../../CustomMetricForm/CustomMetricForm.component', () => { - return jest.fn().mockImplementation(() =>
CustomMetricForm
); -}); -jest.mock('../../ProfilerDashboard/component/ProfilerLatestValue', () => { - return jest.fn().mockImplementation(() =>
ProfilerLatestValue
); -}); -jest.mock('../../common/DeleteWidget/DeleteWidgetModal', () => { +jest.mock( + '../../../DataQuality/CustomMetricForm/CustomMetricForm.component', + () => { + return jest.fn().mockImplementation(() =>
CustomMetricForm
); + } +); +jest.mock( + '../../Profiler/ProfilerDashboard/component/ProfilerLatestValue', + () => { + return jest.fn().mockImplementation(() =>
ProfilerLatestValue
); + } +); +jest.mock('../../../common/DeleteWidget/DeleteWidgetModal', () => { return jest.fn().mockImplementation(() =>
DeleteWidgetModal
); }); -jest.mock('../../common/ErrorWithPlaceholder/ErrorPlaceHolder', () => { +jest.mock('../../../common/ErrorWithPlaceholder/ErrorPlaceHolder', () => { return jest.fn().mockImplementation(() =>
ErrorPlaceHolder
); }); jest.mock('../TableProfilerProvider', () => { diff --git a/openmetadata-ui/src/main/resources/ui/src/components/TableProfiler/CustomMetricGraphs/custom-metric-graphs.style.less b/openmetadata-ui/src/main/resources/ui/src/components/Database/TableProfiler/CustomMetricGraphs/custom-metric-graphs.style.less similarity index 100% rename from openmetadata-ui/src/main/resources/ui/src/components/TableProfiler/CustomMetricGraphs/custom-metric-graphs.style.less rename to openmetadata-ui/src/main/resources/ui/src/components/Database/TableProfiler/CustomMetricGraphs/custom-metric-graphs.style.less diff --git a/openmetadata-ui/src/main/resources/ui/src/components/TableProfiler/Component/NoProfilerBanner.component.tsx b/openmetadata-ui/src/main/resources/ui/src/components/Database/TableProfiler/NoProfilerBanner/NoProfilerBanner.component.tsx similarity index 93% rename from openmetadata-ui/src/main/resources/ui/src/components/TableProfiler/Component/NoProfilerBanner.component.tsx rename to openmetadata-ui/src/main/resources/ui/src/components/Database/TableProfiler/NoProfilerBanner/NoProfilerBanner.component.tsx index 32a8dde318e8..0d787bfe0343 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/TableProfiler/Component/NoProfilerBanner.component.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/components/Database/TableProfiler/NoProfilerBanner/NoProfilerBanner.component.tsx @@ -13,7 +13,7 @@ import React from 'react'; import { useTranslation } from 'react-i18next'; import { Link } from 'react-router-dom'; -import { ReactComponent as NoDataIcon } from '../../../assets/svg/no-data-icon.svg'; +import { ReactComponent as NoDataIcon } from '../../../../assets/svg/no-data-icon.svg'; const NoProfilerBanner = () => { const { t } = useTranslation(); diff --git a/openmetadata-ui/src/main/resources/ui/src/components/TableProfiler/Component/NoProfilerBanner.test.tsx b/openmetadata-ui/src/main/resources/ui/src/components/Database/TableProfiler/NoProfilerBanner/NoProfilerBanner.test.tsx similarity index 100% rename from openmetadata-ui/src/main/resources/ui/src/components/TableProfiler/Component/NoProfilerBanner.test.tsx rename to openmetadata-ui/src/main/resources/ui/src/components/Database/TableProfiler/NoProfilerBanner/NoProfilerBanner.test.tsx diff --git a/openmetadata-ui/src/main/resources/ui/src/components/TableProfiler/Component/ProfilerProgressWidget.test.tsx b/openmetadata-ui/src/main/resources/ui/src/components/Database/TableProfiler/ProfilerProgressWidget/ProfilerProgressWidget.test.tsx similarity index 100% rename from openmetadata-ui/src/main/resources/ui/src/components/TableProfiler/Component/ProfilerProgressWidget.test.tsx rename to openmetadata-ui/src/main/resources/ui/src/components/Database/TableProfiler/ProfilerProgressWidget/ProfilerProgressWidget.test.tsx diff --git a/openmetadata-ui/src/main/resources/ui/src/components/TableProfiler/Component/ProfilerProgressWidget.tsx b/openmetadata-ui/src/main/resources/ui/src/components/Database/TableProfiler/ProfilerProgressWidget/ProfilerProgressWidget.tsx similarity index 100% rename from openmetadata-ui/src/main/resources/ui/src/components/TableProfiler/Component/ProfilerProgressWidget.tsx rename to openmetadata-ui/src/main/resources/ui/src/components/Database/TableProfiler/ProfilerProgressWidget/ProfilerProgressWidget.tsx diff --git a/openmetadata-ui/src/main/resources/ui/src/components/TableProfiler/Component/ProfilerSettingsModal.test.tsx b/openmetadata-ui/src/main/resources/ui/src/components/Database/TableProfiler/ProfilerSettingsModal/ProfilerSettingsModal.test.tsx similarity index 97% rename from openmetadata-ui/src/main/resources/ui/src/components/TableProfiler/Component/ProfilerSettingsModal.test.tsx rename to openmetadata-ui/src/main/resources/ui/src/components/Database/TableProfiler/ProfilerSettingsModal/ProfilerSettingsModal.test.tsx index a6c713259bbd..02ea657cf134 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/TableProfiler/Component/ProfilerSettingsModal.test.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/components/Database/TableProfiler/ProfilerSettingsModal/ProfilerSettingsModal.test.tsx @@ -20,8 +20,8 @@ import { screen, } from '@testing-library/react'; import React from 'react'; -import { MOCK_TABLE } from '../../../mocks/TableData.mock'; -import { getTableProfilerConfig } from '../../../rest/tableAPI'; +import { MOCK_TABLE } from '../../../../mocks/TableData.mock'; +import { getTableProfilerConfig } from '../../../../rest/tableAPI'; import { ProfilerSettingsModalProps } from '../TableProfiler.interface'; import ProfilerSettingsModal from './ProfilerSettingsModal'; diff --git a/openmetadata-ui/src/main/resources/ui/src/components/TableProfiler/Component/ProfilerSettingsModal.tsx b/openmetadata-ui/src/main/resources/ui/src/components/Database/TableProfiler/ProfilerSettingsModal/ProfilerSettingsModal.tsx similarity index 98% rename from openmetadata-ui/src/main/resources/ui/src/components/TableProfiler/Component/ProfilerSettingsModal.tsx rename to openmetadata-ui/src/main/resources/ui/src/components/Database/TableProfiler/ProfilerSettingsModal/ProfilerSettingsModal.tsx index 95ff949a9147..62e216e05be9 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/TableProfiler/Component/ProfilerSettingsModal.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/components/Database/TableProfiler/ProfilerSettingsModal/ProfilerSettingsModal.tsx @@ -40,7 +40,7 @@ import React, { useState, } from 'react'; import { useTranslation } from 'react-i18next'; -import { ReactComponent as IconDelete } from '../../../assets/svg/ic-delete.svg'; +import { ReactComponent as IconDelete } from '../../../../assets/svg/ic-delete.svg'; import { DEFAULT_INCLUDE_PROFILE, INTERVAL_TYPE_OPTIONS, @@ -50,21 +50,21 @@ import { PROFILE_SAMPLE_OPTIONS, SUPPORTED_COLUMN_DATA_TYPE_FOR_INTERVAL, TIME_BASED_PARTITION, -} from '../../../constants/profiler.constant'; -import { CSMode } from '../../../enums/codemirror.enum'; -import { PartitionIntervalType } from '../../../generated/api/data/createTable'; +} from '../../../../constants/profiler.constant'; +import { CSMode } from '../../../../enums/codemirror.enum'; +import { PartitionIntervalType } from '../../../../generated/api/data/createTable'; import { ProfileSampleType, TableProfilerConfig, -} from '../../../generated/entity/data/table'; +} from '../../../../generated/entity/data/table'; import { getTableProfilerConfig, putTableProfileConfig, -} from '../../../rest/tableAPI'; -import { reducerWithoutAction } from '../../../utils/CommonUtils'; -import { showErrorToast, showSuccessToast } from '../../../utils/ToastUtils'; +} from '../../../../rest/tableAPI'; +import { reducerWithoutAction } from '../../../../utils/CommonUtils'; +import { showErrorToast, showSuccessToast } from '../../../../utils/ToastUtils'; +import SliderWithInput from '../../../common/SliderWithInput/SliderWithInput'; import SchemaEditor from '../../SchemaEditor/SchemaEditor'; -import SliderWithInput from '../../SliderWithInput/SliderWithInput'; import '../table-profiler.less'; import { ProfilerForm, diff --git a/openmetadata-ui/src/main/resources/ui/src/components/TableProfiler/QualityTab/QualityTab.component.tsx b/openmetadata-ui/src/main/resources/ui/src/components/Database/TableProfiler/QualityTab/QualityTab.component.tsx similarity index 82% rename from openmetadata-ui/src/main/resources/ui/src/components/TableProfiler/QualityTab/QualityTab.component.tsx rename to openmetadata-ui/src/main/resources/ui/src/components/Database/TableProfiler/QualityTab/QualityTab.component.tsx index c5fef8919753..e5df09dc3e8d 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/TableProfiler/QualityTab/QualityTab.component.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/components/Database/TableProfiler/QualityTab/QualityTab.component.tsx @@ -17,32 +17,32 @@ import { isUndefined } from 'lodash'; import React, { useEffect, useMemo, useState } from 'react'; import { useTranslation } from 'react-i18next'; import { useHistory } from 'react-router-dom'; -import { SummaryPanel } from '../../../components/DataQuality/SummaryPannel/SummaryPanel.component'; -import DataQualityTab from '../../../components/ProfilerDashboard/component/DataQualityTab'; -import TestSuitePipelineTab from '../../../components/TestSuite/TestSuitePipelineTab/TestSuitePipelineTab.component'; -import { getTableTabPath } from '../../../constants/constants'; -import { PAGE_HEADERS } from '../../../constants/PageHeaders.constant'; +import { getTableTabPath } from '../../../../constants/constants'; +import { PAGE_HEADERS } from '../../../../constants/PageHeaders.constant'; import { TEST_CASE_STATUS_OPTION, TEST_CASE_TYPE_OPTION, -} from '../../../constants/profiler.constant'; -import { INITIAL_TEST_SUMMARY } from '../../../constants/TestSuite.constant'; -import { EntityTabs, TabSpecificField } from '../../../enums/entity.enum'; -import { ProfilerDashboardType } from '../../../enums/table.enum'; -import { Table } from '../../../generated/entity/data/table'; -import { TestCase } from '../../../generated/tests/testCase'; -import { EntityType as TestType } from '../../../generated/tests/testDefinition'; -import { useFqn } from '../../../hooks/useFqn'; -import { getTableDetailsByFQN } from '../../../rest/tableAPI'; +} from '../../../../constants/profiler.constant'; +import { INITIAL_TEST_SUMMARY } from '../../../../constants/TestSuite.constant'; +import { EntityTabs, TabSpecificField } from '../../../../enums/entity.enum'; +import { ProfilerDashboardType } from '../../../../enums/table.enum'; +import { Table } from '../../../../generated/entity/data/table'; +import { TestCase } from '../../../../generated/tests/testCase'; +import { EntityType as TestType } from '../../../../generated/tests/testDefinition'; +import { useFqn } from '../../../../hooks/useFqn'; +import { getTableDetailsByFQN } from '../../../../rest/tableAPI'; import { getBreadcrumbForTable, getEntityName, -} from '../../../utils/EntityUtils'; -import { getAddDataQualityTableTestPath } from '../../../utils/RouterUtils'; -import { showErrorToast } from '../../../utils/ToastUtils'; -import PageHeader from '../../PageHeader/PageHeader.component'; -import { TableProfilerTab } from '../../ProfilerDashboard/profilerDashboard.interface'; -import TabsLabel from '../../TabsLabel/TabsLabel.component'; +} from '../../../../utils/EntityUtils'; +import { getAddDataQualityTableTestPath } from '../../../../utils/RouterUtils'; +import { showErrorToast } from '../../../../utils/ToastUtils'; +import TabsLabel from '../../../common/TabsLabel/TabsLabel.component'; +import { SummaryPanel } from '../../../DataQuality/SummaryPannel/SummaryPanel.component'; +import TestSuitePipelineTab from '../../../DataQuality/TestSuite/TestSuitePipelineTab/TestSuitePipelineTab.component'; +import PageHeader from '../../../PageHeader/PageHeader.component'; +import DataQualityTab from '../../Profiler/DataQualityTab/DataQualityTab'; +import { TableProfilerTab } from '../../Profiler/ProfilerDashboard/profilerDashboard.interface'; import { useTableProfiler } from '../TableProfilerProvider'; export const QualityTab = () => { diff --git a/openmetadata-ui/src/main/resources/ui/src/components/TableProfiler/Component/SingleColumnProfile.tsx b/openmetadata-ui/src/main/resources/ui/src/components/Database/TableProfiler/SingleColumnProfile.tsx similarity index 94% rename from openmetadata-ui/src/main/resources/ui/src/components/TableProfiler/Component/SingleColumnProfile.tsx rename to openmetadata-ui/src/main/resources/ui/src/components/Database/TableProfiler/SingleColumnProfile.tsx index cffda262f510..c3c787dcb2b1 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/TableProfiler/Component/SingleColumnProfile.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/components/Database/TableProfiler/SingleColumnProfile.tsx @@ -16,8 +16,6 @@ import { first, isString, last, pick } from 'lodash'; import { DateRangeObject } from 'Models'; import React, { FC, useEffect, useMemo, useState } from 'react'; import { useTranslation } from 'react-i18next'; -import DataDistributionHistogram from '../../../components/Chart/DataDistributionHistogram.component'; -import ProfilerDetailsCard from '../../../components/ProfilerDashboard/component/ProfilerDetailsCard'; import { DEFAULT_RANGE_DATA, INITIAL_COLUMN_METRICS_VALUE, @@ -25,6 +23,8 @@ import { import { ColumnProfile } from '../../../generated/entity/data/container'; import { Table } from '../../../generated/entity/data/table'; import { getColumnProfilerList } from '../../../rest/tableAPI'; +import DataDistributionHistogram from '../../Visualisations/Chart/DataDistributionHistogram.component'; +import ProfilerDetailsCard from '../Profiler/ProfilerDetailsCard/ProfilerDetailsCard'; import { calculateColumnProfilerMetrics, @@ -33,8 +33,8 @@ import { } from '../../../utils/TableProfilerUtils'; import { ColumnMetricsInterface } from '../../../utils/TableProfilerUtils.interface'; import { showErrorToast } from '../../../utils/ToastUtils'; -import CustomMetricGraphs from '../CustomMetricGraphs/CustomMetricGraphs.component'; -import { useTableProfiler } from '../TableProfilerProvider'; +import CustomMetricGraphs from './CustomMetricGraphs/CustomMetricGraphs.component'; +import { useTableProfiler } from './TableProfilerProvider'; interface SingleColumnProfileProps { activeColumnFqn: string; diff --git a/openmetadata-ui/src/main/resources/ui/src/components/TableProfiler/TableProfiler.interface.ts b/openmetadata-ui/src/main/resources/ui/src/components/Database/TableProfiler/TableProfiler.interface.ts similarity index 90% rename from openmetadata-ui/src/main/resources/ui/src/components/TableProfiler/TableProfiler.interface.ts rename to openmetadata-ui/src/main/resources/ui/src/components/Database/TableProfiler/TableProfiler.interface.ts index c2ad4a9212e2..e11b8addc686 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/TableProfiler/TableProfiler.interface.ts +++ b/openmetadata-ui/src/main/resources/ui/src/components/Database/TableProfiler/TableProfiler.interface.ts @@ -13,7 +13,8 @@ import { DateRangeObject } from 'Models'; import { ReactNode } from 'react'; -import { SystemProfile } from '../../generated/api/data/createTableProfile'; +import { OperationPermission } from '../../../context/PermissionProvider/PermissionProvider.interface'; +import { SystemProfile } from '../../../generated/api/data/createTableProfile'; import { Column, ColumnProfilerConfig, @@ -22,10 +23,9 @@ import { Table, TableProfile, TableProfilerConfig, -} from '../../generated/entity/data/table'; -import { TestCase } from '../../generated/tests/testCase'; -import { ListTestCaseParams } from '../../rest/testAPI'; -import { OperationPermission } from '../PermissionProvider/PermissionProvider.interface'; +} from '../../../generated/entity/data/table'; +import { TestCase } from '../../../generated/tests/testCase'; +import { ListTestCaseParams } from '../../../rest/testAPI'; export interface TableProfilerProps { isTableDeleted?: boolean; diff --git a/openmetadata-ui/src/main/resources/ui/src/components/TableProfiler/TableProfiler.test.tsx b/openmetadata-ui/src/main/resources/ui/src/components/Database/TableProfiler/TableProfiler.test.tsx similarity index 96% rename from openmetadata-ui/src/main/resources/ui/src/components/TableProfiler/TableProfiler.test.tsx rename to openmetadata-ui/src/main/resources/ui/src/components/Database/TableProfiler/TableProfiler.test.tsx index a1d20f1a009b..c4f6fdf68d71 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/TableProfiler/TableProfiler.test.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/components/Database/TableProfiler/TableProfiler.test.tsx @@ -21,8 +21,8 @@ import { } from '@testing-library/react'; import React from 'react'; // internal imports -import { TEST_CASE } from '../../mocks/TableData.mock'; -import { OperationPermission } from '../PermissionProvider/PermissionProvider.interface'; +import { OperationPermission } from '../../../context/PermissionProvider/PermissionProvider.interface'; +import { TEST_CASE } from '../../../mocks/TableData.mock'; import TableProfilerV1 from './TableProfiler'; import { TableProfilerProps } from './TableProfiler.interface'; diff --git a/openmetadata-ui/src/main/resources/ui/src/components/TableProfiler/TableProfiler.tsx b/openmetadata-ui/src/main/resources/ui/src/components/Database/TableProfiler/TableProfiler.tsx similarity index 87% rename from openmetadata-ui/src/main/resources/ui/src/components/TableProfiler/TableProfiler.tsx rename to openmetadata-ui/src/main/resources/ui/src/components/Database/TableProfiler/TableProfiler.tsx index 8e036d96a20c..70e7f1ece154 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/TableProfiler/TableProfiler.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/components/Database/TableProfiler/TableProfiler.tsx @@ -16,15 +16,15 @@ import Qs from 'qs'; import React, { useMemo } from 'react'; import { useTranslation } from 'react-i18next'; import { useHistory, useLocation } from 'react-router-dom'; -import { ReactComponent as ColumnProfileIcon } from '../../assets/svg/column-profile.svg'; -import { ReactComponent as DataQualityIcon } from '../../assets/svg/data-quality.svg'; -import { ReactComponent as TableProfileIcon } from '../../assets/svg/table-profile.svg'; -import { TableProfilerTab } from '../ProfilerDashboard/profilerDashboard.interface'; -import { useTourProvider } from '../TourProvider/TourProvider'; -import ColumnProfileTable from './Component/ColumnProfileTable'; -import TableProfilerChart from './Component/TableProfilerChart'; +import { ReactComponent as ColumnProfileIcon } from '../../../assets/svg/column-profile.svg'; +import { ReactComponent as DataQualityIcon } from '../../../assets/svg/data-quality.svg'; +import { ReactComponent as TableProfileIcon } from '../../../assets/svg/table-profile.svg'; +import { useTourProvider } from '../../../context/TourProvider/TourProvider'; +import { TableProfilerTab } from '../Profiler/ProfilerDashboard/profilerDashboard.interface'; +import ColumnProfileTable from './ColumnProfileTable/ColumnProfileTable'; import { QualityTab } from './QualityTab/QualityTab.component'; import { TableProfilerProps } from './TableProfiler.interface'; +import TableProfilerChart from './TableProfilerChart/TableProfilerChart'; import { TableProfilerProvider } from './TableProfilerProvider'; const TableProfiler = (props: TableProfilerProps) => { diff --git a/openmetadata-ui/src/main/resources/ui/src/components/TableProfiler/Component/TableProfilerChart.test.tsx b/openmetadata-ui/src/main/resources/ui/src/components/Database/TableProfiler/TableProfilerChart/TableProfilerChart.test.tsx similarity index 96% rename from openmetadata-ui/src/main/resources/ui/src/components/TableProfiler/Component/TableProfilerChart.test.tsx rename to openmetadata-ui/src/main/resources/ui/src/components/Database/TableProfiler/TableProfilerChart/TableProfilerChart.test.tsx index 3e6319faa74d..42ae06642ee9 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/TableProfiler/Component/TableProfilerChart.test.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/components/Database/TableProfiler/TableProfilerChart/TableProfilerChart.test.tsx @@ -13,11 +13,11 @@ import { act, render, screen } from '@testing-library/react'; import React from 'react'; -import { DEFAULT_RANGE_DATA } from '../../../constants/profiler.constant'; +import { DEFAULT_RANGE_DATA } from '../../../../constants/profiler.constant'; import { getSystemProfileList, getTableProfilesList, -} from '../../../rest/tableAPI'; +} from '../../../../rest/tableAPI'; import TableProfilerChart from './TableProfilerChart'; const mockFQN = 'testFQN'; @@ -26,7 +26,7 @@ jest.mock('react-router-dom', () => ({ useParams: jest.fn().mockImplementation(() => ({ fqn: mockFQN })), useHistory: jest.fn(), })); -jest.mock('../../../rest/tableAPI'); +jest.mock('../../../../rest/tableAPI'); jest.mock('../../ProfilerDashboard/component/ProfilerLatestValue', () => { return jest.fn().mockImplementation(() =>
ProfilerLatestValue
); }); diff --git a/openmetadata-ui/src/main/resources/ui/src/components/TableProfiler/Component/TableProfilerChart.tsx b/openmetadata-ui/src/main/resources/ui/src/components/Database/TableProfiler/TableProfilerChart/TableProfilerChart.tsx similarity index 87% rename from openmetadata-ui/src/main/resources/ui/src/components/TableProfiler/Component/TableProfilerChart.tsx rename to openmetadata-ui/src/main/resources/ui/src/components/Database/TableProfiler/TableProfilerChart/TableProfilerChart.tsx index dcc35fd7f160..7cd3c8f76361 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/TableProfiler/Component/TableProfilerChart.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/components/Database/TableProfiler/TableProfilerChart/TableProfilerChart.tsx @@ -29,43 +29,43 @@ import { DateRangeObject } from 'Models'; import React, { useEffect, useMemo, useState } from 'react'; import { useTranslation } from 'react-i18next'; import { useHistory } from 'react-router-dom'; -import { ReactComponent as SettingIcon } from '../../../assets/svg/ic-settings-primery.svg'; -import { PAGE_HEADERS } from '../../../constants/PageHeaders.constant'; +import { ReactComponent as SettingIcon } from '../../../../assets/svg/ic-settings-primery.svg'; +import { PAGE_HEADERS } from '../../../../constants/PageHeaders.constant'; import { DEFAULT_RANGE_DATA, INITIAL_OPERATION_METRIC_VALUE, INITIAL_ROW_METRIC_VALUE, -} from '../../../constants/profiler.constant'; -import { ProfilerDashboardType } from '../../../enums/table.enum'; -import { TableProfile } from '../../../generated/entity/data/table'; -import { useFqn } from '../../../hooks/useFqn'; +} from '../../../../constants/profiler.constant'; +import { ProfilerDashboardType } from '../../../../enums/table.enum'; +import { TableProfile } from '../../../../generated/entity/data/table'; +import { useFqn } from '../../../../hooks/useFqn'; import { getSystemProfileList, getTableProfilesList, -} from '../../../rest/tableAPI'; +} from '../../../../rest/tableAPI'; import { getAddCustomMetricPath, getAddDataQualityTableTestPath, -} from '../../../utils/RouterUtils'; +} from '../../../../utils/RouterUtils'; import { calculateCustomMetrics, calculateRowCountMetrics, calculateSystemMetrics, -} from '../../../utils/TableProfilerUtils'; -import { showErrorToast } from '../../../utils/ToastUtils'; -import CustomBarChart from '../../Chart/CustomBarChart'; -import OperationDateBarChart from '../../Chart/OperationDateBarChart'; -import { SummaryCard } from '../../common/SummaryCard/SummaryCard.component'; -import DatePickerMenu from '../../DatePickerMenu/DatePickerMenu.component'; -import PageHeader from '../../PageHeader/PageHeader.component'; -import ProfilerDetailsCard from '../../ProfilerDashboard/component/ProfilerDetailsCard'; -import ProfilerLatestValue from '../../ProfilerDashboard/component/ProfilerLatestValue'; -import { MetricChartType } from '../../ProfilerDashboard/profilerDashboard.interface'; -import TabsLabel from '../../TabsLabel/TabsLabel.component'; +} from '../../../../utils/TableProfilerUtils'; +import { showErrorToast } from '../../../../utils/ToastUtils'; +import DatePickerMenu from '../../../common/DatePickerMenu/DatePickerMenu.component'; +import { SummaryCard } from '../../../common/SummaryCard/SummaryCard.component'; +import TabsLabel from '../../../common/TabsLabel/TabsLabel.component'; +import PageHeader from '../../../PageHeader/PageHeader.component'; +import CustomBarChart from '../../../Visualisations/Chart/CustomBarChart'; +import OperationDateBarChart from '../../../Visualisations/Chart/OperationDateBarChart'; +import { MetricChartType } from '../../Profiler/ProfilerDashboard/profilerDashboard.interface'; +import ProfilerDetailsCard from '../../Profiler/ProfilerDetailsCard/ProfilerDetailsCard'; +import ProfilerLatestValue from '../../Profiler/ProfilerLatestValue/ProfilerLatestValue'; import CustomMetricGraphs from '../CustomMetricGraphs/CustomMetricGraphs.component'; +import NoProfilerBanner from '../NoProfilerBanner/NoProfilerBanner.component'; import { TableProfilerChartProps } from '../TableProfiler.interface'; import { useTableProfiler } from '../TableProfilerProvider'; -import NoProfilerBanner from './NoProfilerBanner.component'; const TableProfilerChart = ({ entityFqn = '', diff --git a/openmetadata-ui/src/main/resources/ui/src/components/TableProfiler/TableProfilerProvider.tsx b/openmetadata-ui/src/main/resources/ui/src/components/Database/TableProfiler/TableProfilerProvider.tsx similarity index 89% rename from openmetadata-ui/src/main/resources/ui/src/components/TableProfiler/TableProfilerProvider.tsx rename to openmetadata-ui/src/main/resources/ui/src/components/Database/TableProfiler/TableProfilerProvider.tsx index d71623c69cbb..bf5b6d77bf2f 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/TableProfiler/TableProfilerProvider.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/components/Database/TableProfiler/TableProfilerProvider.tsx @@ -25,24 +25,24 @@ import React, { } from 'react'; import { useTranslation } from 'react-i18next'; import { useLocation } from 'react-router-dom'; -import { API_RES_MAX_SIZE } from '../../constants/constants'; -import { mockDatasetData } from '../../constants/mockTourData.constants'; -import { DEFAULT_RANGE_DATA } from '../../constants/profiler.constant'; -import { Table } from '../../generated/entity/data/table'; -import { ProfileSampleType } from '../../generated/metadataIngestion/databaseServiceProfilerPipeline'; -import { TestCase } from '../../generated/tests/testCase'; -import { useFqn } from '../../hooks/useFqn'; +import { API_RES_MAX_SIZE } from '../../../constants/constants'; +import { mockDatasetData } from '../../../constants/mockTourData.constants'; +import { DEFAULT_RANGE_DATA } from '../../../constants/profiler.constant'; +import { useTourProvider } from '../../../context/TourProvider/TourProvider'; +import { Table } from '../../../generated/entity/data/table'; +import { ProfileSampleType } from '../../../generated/metadataIngestion/databaseServiceProfilerPipeline'; +import { TestCase } from '../../../generated/tests/testCase'; +import { useFqn } from '../../../hooks/useFqn'; import { getLatestTableProfileByFqn, getTableDetailsByFQN, -} from '../../rest/tableAPI'; -import { getListTestCase, ListTestCaseParams } from '../../rest/testAPI'; -import { bytesToSize } from '../../utils/StringsUtils'; -import { generateEntityLink } from '../../utils/TableUtils'; -import { showErrorToast } from '../../utils/ToastUtils'; -import { TableProfilerTab } from '../ProfilerDashboard/profilerDashboard.interface'; -import { useTourProvider } from '../TourProvider/TourProvider'; -import ProfilerSettingsModal from './Component/ProfilerSettingsModal'; +} from '../../../rest/tableAPI'; +import { getListTestCase, ListTestCaseParams } from '../../../rest/testAPI'; +import { bytesToSize } from '../../../utils/StringsUtils'; +import { generateEntityLink } from '../../../utils/TableUtils'; +import { showErrorToast } from '../../../utils/ToastUtils'; +import { TableProfilerTab } from '../Profiler/ProfilerDashboard/profilerDashboard.interface'; +import ProfilerSettingsModal from './ProfilerSettingsModal/ProfilerSettingsModal'; import { OverallTableSummaryType, SplitTestCasesType, diff --git a/openmetadata-ui/src/main/resources/ui/src/components/TableProfiler/table-profiler.less b/openmetadata-ui/src/main/resources/ui/src/components/Database/TableProfiler/table-profiler.less similarity index 97% rename from openmetadata-ui/src/main/resources/ui/src/components/TableProfiler/table-profiler.less rename to openmetadata-ui/src/main/resources/ui/src/components/Database/TableProfiler/table-profiler.less index 0b8ed011ab0c..55ec0c749dfb 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/TableProfiler/table-profiler.less +++ b/openmetadata-ui/src/main/resources/ui/src/components/Database/TableProfiler/table-profiler.less @@ -11,7 +11,7 @@ * limitations under the License. */ -@import url('../../styles/variables.less'); +@import url('../../../styles/variables.less'); @succesColor: #28a745; @failedColor: #cb2431; diff --git a/openmetadata-ui/src/main/resources/ui/src/components/TableQueries/QueryCard.test.tsx b/openmetadata-ui/src/main/resources/ui/src/components/Database/TableQueries/QueryCard.test.tsx similarity index 96% rename from openmetadata-ui/src/main/resources/ui/src/components/TableQueries/QueryCard.test.tsx rename to openmetadata-ui/src/main/resources/ui/src/components/Database/TableQueries/QueryCard.test.tsx index 1e09f7ce014f..6b6726ba41b8 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/TableQueries/QueryCard.test.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/components/Database/TableQueries/QueryCard.test.tsx @@ -21,8 +21,8 @@ import { import React from 'react'; import { MemoryRouter } from 'react-router-dom'; import { act } from 'react-test-renderer'; -import { Query } from '../../generated/entity/data/query'; -import { DEFAULT_ENTITY_PERMISSION } from '../../utils/PermissionsUtils'; +import { Query } from '../../../generated/entity/data/query'; +import { DEFAULT_ENTITY_PERMISSION } from '../../../utils/PermissionsUtils'; import QueryCard from './QueryCard'; import { QueryCardProp } from './TableQueries.interface'; diff --git a/openmetadata-ui/src/main/resources/ui/src/components/TableQueries/QueryCard.tsx b/openmetadata-ui/src/main/resources/ui/src/components/Database/TableQueries/QueryCard.tsx similarity index 91% rename from openmetadata-ui/src/main/resources/ui/src/components/TableQueries/QueryCard.tsx rename to openmetadata-ui/src/main/resources/ui/src/components/Database/TableQueries/QueryCard.tsx index 92c66218e071..cc354b9963e9 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/TableQueries/QueryCard.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/components/Database/TableQueries/QueryCard.tsx @@ -20,25 +20,25 @@ import Qs from 'qs'; import React, { FC, useMemo, useState } from 'react'; import { useTranslation } from 'react-i18next'; import { useHistory, useLocation } from 'react-router-dom'; -import { ReactComponent as ExitFullScreen } from '../../assets/svg/exit-full-screen.svg'; -import { ReactComponent as FullScreen } from '../../assets/svg/full-screen.svg'; -import { ReactComponent as CopyIcon } from '../../assets/svg/icon-copy.svg'; +import { ReactComponent as ExitFullScreen } from '../../../assets/svg/exit-full-screen.svg'; +import { ReactComponent as FullScreen } from '../../../assets/svg/full-screen.svg'; +import { ReactComponent as CopyIcon } from '../../../assets/svg/icon-copy.svg'; import { getTableTabPath, ONE_MINUTE_IN_MILLISECOND, PIPE_SYMBOL, -} from '../../constants/constants'; +} from '../../../constants/constants'; import { QUERY_DATE_FORMAT, QUERY_LINE_HEIGHT, -} from '../../constants/Query.constant'; -import { CSMode } from '../../enums/codemirror.enum'; -import { EntityType } from '../../enums/entity.enum'; -import { useClipboard } from '../../hooks/useClipBoard'; -import { useFqn } from '../../hooks/useFqn'; -import { customFormatDateTime } from '../../utils/date-time/DateTimeUtils'; -import { parseSearchParams } from '../../utils/Query/QueryUtils'; -import { getQueryPath } from '../../utils/RouterUtils'; +} from '../../../constants/Query.constant'; +import { CSMode } from '../../../enums/codemirror.enum'; +import { EntityType } from '../../../enums/entity.enum'; +import { useClipboard } from '../../../hooks/useClipBoard'; +import { useFqn } from '../../../hooks/useFqn'; +import { customFormatDateTime } from '../../../utils/date-time/DateTimeUtils'; +import { parseSearchParams } from '../../../utils/Query/QueryUtils'; +import { getQueryPath } from '../../../utils/RouterUtils'; import SchemaEditor from '../SchemaEditor/SchemaEditor'; import QueryCardExtraOption from './QueryCardExtraOption/QueryCardExtraOption.component'; import QueryUsedByOtherTable from './QueryUsedByOtherTable/QueryUsedByOtherTable.component'; diff --git a/openmetadata-ui/src/main/resources/ui/src/components/TableQueries/QueryCardExtraOption/QueryCardExtraOption.component.tsx b/openmetadata-ui/src/main/resources/ui/src/components/Database/TableQueries/QueryCardExtraOption/QueryCardExtraOption.component.tsx similarity index 86% rename from openmetadata-ui/src/main/resources/ui/src/components/TableQueries/QueryCardExtraOption/QueryCardExtraOption.component.tsx rename to openmetadata-ui/src/main/resources/ui/src/components/Database/TableQueries/QueryCardExtraOption/QueryCardExtraOption.component.tsx index 2577356b0ef4..80accb5fa5af 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/TableQueries/QueryCardExtraOption/QueryCardExtraOption.component.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/components/Database/TableQueries/QueryCardExtraOption/QueryCardExtraOption.component.tsx @@ -14,21 +14,21 @@ import { Button, Dropdown, MenuProps, Space, Tag } from 'antd'; import { isUndefined, split } from 'lodash'; import React, { useMemo, useState } from 'react'; import { useTranslation } from 'react-i18next'; -import { ReactComponent as EditIcon } from '../../../assets/svg/edit-new.svg'; -import { ReactComponent as DeleteIcon } from '../../../assets/svg/ic-delete.svg'; -import { ReactComponent as IconDropdown } from '../../../assets/svg/menu.svg'; -import { ReactComponent as ThumbsUpFilled } from '../../../assets/svg/thumbs-up-filled.svg'; -import { ReactComponent as ThumbsUpOutline } from '../../../assets/svg/thumbs-up-outline.svg'; -import { NO_PERMISSION_FOR_ACTION } from '../../../constants/HelperTextUtil'; -import { pluralize } from '../../../utils/CommonUtils'; +import { ReactComponent as EditIcon } from '../../../../assets/svg/edit-new.svg'; +import { ReactComponent as DeleteIcon } from '../../../../assets/svg/ic-delete.svg'; +import { ReactComponent as IconDropdown } from '../../../../assets/svg/menu.svg'; +import { ReactComponent as ThumbsUpFilled } from '../../../../assets/svg/thumbs-up-filled.svg'; +import { ReactComponent as ThumbsUpOutline } from '../../../../assets/svg/thumbs-up-outline.svg'; +import { NO_PERMISSION_FOR_ACTION } from '../../../../constants/HelperTextUtil'; +import { pluralize } from '../../../../utils/CommonUtils'; import { QueryVoteType } from '../TableQueries.interface'; import { QueryCardExtraOptionProps } from './QueryCardExtraOption.interface'; import { AxiosError } from 'axios'; -import ConfirmationModal from '../../../components/Modals/ConfirmationModal/ConfirmationModal'; -import { deleteQuery } from '../../../rest/queryAPI'; -import { showErrorToast } from '../../../utils/ToastUtils'; -import { useAuthContext } from '../../Auth/AuthProviders/AuthProvider'; +import { deleteQuery } from '../../../../rest/queryAPI'; +import { showErrorToast } from '../../../../utils/ToastUtils'; +import { useAuthContext } from '../../../Auth/AuthProviders/AuthProvider'; +import ConfirmationModal from '../../../Modals/ConfirmationModal/ConfirmationModal'; import './query-card-extra-option.style.less'; const QueryCardExtraOption = ({ diff --git a/openmetadata-ui/src/main/resources/ui/src/components/TableQueries/QueryCardExtraOption/QueryCardExtraOption.interface.ts b/openmetadata-ui/src/main/resources/ui/src/components/Database/TableQueries/QueryCardExtraOption/QueryCardExtraOption.interface.ts similarity index 87% rename from openmetadata-ui/src/main/resources/ui/src/components/TableQueries/QueryCardExtraOption/QueryCardExtraOption.interface.ts rename to openmetadata-ui/src/main/resources/ui/src/components/Database/TableQueries/QueryCardExtraOption/QueryCardExtraOption.interface.ts index e2554781a2d4..cd9cf9a81cc5 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/TableQueries/QueryCardExtraOption/QueryCardExtraOption.interface.ts +++ b/openmetadata-ui/src/main/resources/ui/src/components/Database/TableQueries/QueryCardExtraOption/QueryCardExtraOption.interface.ts @@ -10,8 +10,8 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -import { OperationPermission } from '../../../components/PermissionProvider/PermissionProvider.interface'; -import { Query } from '../../../generated/entity/data/query'; +import { OperationPermission } from '../../../../context/PermissionProvider/PermissionProvider.interface'; +import { Query } from '../../../../generated/entity/data/query'; import { QueryVote } from '../TableQueries.interface'; export interface QueryCardExtraOptionProps { diff --git a/openmetadata-ui/src/main/resources/ui/src/components/TableQueries/QueryCardExtraOption/QueryCardExtraOption.test.tsx b/openmetadata-ui/src/main/resources/ui/src/components/Database/TableQueries/QueryCardExtraOption/QueryCardExtraOption.test.tsx similarity index 96% rename from openmetadata-ui/src/main/resources/ui/src/components/TableQueries/QueryCardExtraOption/QueryCardExtraOption.test.tsx rename to openmetadata-ui/src/main/resources/ui/src/components/Database/TableQueries/QueryCardExtraOption/QueryCardExtraOption.test.tsx index 4ac48696d96f..30ae00af0fce 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/TableQueries/QueryCardExtraOption/QueryCardExtraOption.test.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/components/Database/TableQueries/QueryCardExtraOption/QueryCardExtraOption.test.tsx @@ -12,11 +12,11 @@ */ import { act, fireEvent, render, screen } from '@testing-library/react'; import React from 'react'; -import { Query } from '../../../generated/entity/data/query'; -import { User } from '../../../generated/entity/teams/user'; -import { MOCK_QUERIES } from '../../../mocks/Queries.mock'; -import { deleteQuery } from '../../../rest/queryAPI'; -import { DEFAULT_ENTITY_PERMISSION } from '../../../utils/PermissionsUtils'; +import { Query } from '../../../../generated/entity/data/query'; +import { User } from '../../../../generated/entity/teams/user'; +import { MOCK_QUERIES } from '../../../../mocks/Queries.mock'; +import { deleteQuery } from '../../../../rest/queryAPI'; +import { DEFAULT_ENTITY_PERMISSION } from '../../../../utils/PermissionsUtils'; import QueryCardExtraOption from './QueryCardExtraOption.component'; import { QueryCardExtraOptionProps } from './QueryCardExtraOption.interface'; diff --git a/openmetadata-ui/src/main/resources/ui/src/components/TableQueries/QueryCardExtraOption/query-card-extra-option.style.less b/openmetadata-ui/src/main/resources/ui/src/components/Database/TableQueries/QueryCardExtraOption/query-card-extra-option.style.less similarity index 95% rename from openmetadata-ui/src/main/resources/ui/src/components/TableQueries/QueryCardExtraOption/query-card-extra-option.style.less rename to openmetadata-ui/src/main/resources/ui/src/components/Database/TableQueries/QueryCardExtraOption/query-card-extra-option.style.less index ff2d83ecb6e4..97ad978bb493 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/TableQueries/QueryCardExtraOption/query-card-extra-option.style.less +++ b/openmetadata-ui/src/main/resources/ui/src/components/Database/TableQueries/QueryCardExtraOption/query-card-extra-option.style.less @@ -10,7 +10,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -@import url('../../../styles/variables.less'); +@import url('../../../../styles/variables.less'); .query-card-extra-option { .button-size { diff --git a/openmetadata-ui/src/main/resources/ui/src/components/TableQueries/QueryUsedByOtherTable/QueryUsedByOtherTable.component.tsx b/openmetadata-ui/src/main/resources/ui/src/components/Database/TableQueries/QueryUsedByOtherTable/QueryUsedByOtherTable.component.tsx similarity index 92% rename from openmetadata-ui/src/main/resources/ui/src/components/TableQueries/QueryUsedByOtherTable/QueryUsedByOtherTable.component.tsx rename to openmetadata-ui/src/main/resources/ui/src/components/Database/TableQueries/QueryUsedByOtherTable/QueryUsedByOtherTable.component.tsx index c383ed660db9..eb65937c6fb0 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/TableQueries/QueryUsedByOtherTable/QueryUsedByOtherTable.component.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/components/Database/TableQueries/QueryUsedByOtherTable/QueryUsedByOtherTable.component.tsx @@ -16,17 +16,17 @@ import { isArray, isUndefined, slice, uniqBy } from 'lodash'; import React, { useEffect, useMemo, useState } from 'react'; import { useTranslation } from 'react-i18next'; import { Link } from 'react-router-dom'; -import { AsyncSelect } from '../../../components/AsyncSelect/AsyncSelect'; -import Loader from '../../../components/Loader/Loader'; import { getTableDetailsPath, INITIAL_PAGING_VALUE, PAGE_SIZE_MEDIUM, -} from '../../../constants/constants'; -import { QUERY_USED_BY_TABLE_VIEW_CAP } from '../../../constants/Query.constant'; -import { SearchIndex } from '../../../enums/search.enum'; -import { searchData } from '../../../rest/miscAPI'; -import { getEntityName } from '../../../utils/EntityUtils'; +} from '../../../../constants/constants'; +import { QUERY_USED_BY_TABLE_VIEW_CAP } from '../../../../constants/Query.constant'; +import { SearchIndex } from '../../../../enums/search.enum'; +import { searchData } from '../../../../rest/miscAPI'; +import { getEntityName } from '../../../../utils/EntityUtils'; +import { AsyncSelect } from '../../../common/AsyncSelect/AsyncSelect'; +import Loader from '../../../common/Loader/Loader'; import { QueryUsedByOtherTableProps, QueryUsedByTable, diff --git a/openmetadata-ui/src/main/resources/ui/src/components/TableQueries/QueryUsedByOtherTable/QueryUsedByOtherTable.test.tsx b/openmetadata-ui/src/main/resources/ui/src/components/Database/TableQueries/QueryUsedByOtherTable/QueryUsedByOtherTable.test.tsx similarity index 93% rename from openmetadata-ui/src/main/resources/ui/src/components/TableQueries/QueryUsedByOtherTable/QueryUsedByOtherTable.test.tsx rename to openmetadata-ui/src/main/resources/ui/src/components/Database/TableQueries/QueryUsedByOtherTable/QueryUsedByOtherTable.test.tsx index 53b5cc1e8d7c..cc585abe9577 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/TableQueries/QueryUsedByOtherTable/QueryUsedByOtherTable.test.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/components/Database/TableQueries/QueryUsedByOtherTable/QueryUsedByOtherTable.test.tsx @@ -14,10 +14,10 @@ import { render, screen, waitForElement } from '@testing-library/react'; import React from 'react'; import { MemoryRouter } from 'react-router-dom'; -import { Query } from '../../../generated/entity/data/query'; -import { MOCK_QUERIES } from '../../../mocks/Queries.mock'; -import { searchData } from '../../../rest/miscAPI'; -import { MOCK_EXPLORE_SEARCH_RESULTS } from '../../Explore/Explore.mock'; +import { Query } from '../../../../generated/entity/data/query'; +import { MOCK_QUERIES } from '../../../../mocks/Queries.mock'; +import { searchData } from '../../../../rest/miscAPI'; +import { MOCK_EXPLORE_SEARCH_RESULTS } from '../../../Explore/Explore.mock'; import { QueryUsedByOtherTableProps } from '../TableQueries.interface'; import QueryUsedByOtherTable from './QueryUsedByOtherTable.component'; diff --git a/openmetadata-ui/src/main/resources/ui/src/components/TableQueries/TableQueries.interface.ts b/openmetadata-ui/src/main/resources/ui/src/components/Database/TableQueries/TableQueries.interface.ts similarity index 88% rename from openmetadata-ui/src/main/resources/ui/src/components/TableQueries/TableQueries.interface.ts rename to openmetadata-ui/src/main/resources/ui/src/components/Database/TableQueries/TableQueries.interface.ts index ffc27dd94190..e432fe43ecb5 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/TableQueries/TableQueries.interface.ts +++ b/openmetadata-ui/src/main/resources/ui/src/components/Database/TableQueries/TableQueries.interface.ts @@ -13,10 +13,10 @@ import { DefaultOptionType } from 'antd/lib/select'; import { HTMLAttributes } from 'react'; -import { OperationPermission } from '../../components/PermissionProvider/PermissionProvider.interface'; -import { SearchDropdownOption } from '../../components/SearchDropdown/SearchDropdown.interface'; -import { Query } from '../../generated/entity/data/query'; -import { EntityReference } from '../../generated/type/entityReference'; +import { OperationPermission } from '../../../context/PermissionProvider/PermissionProvider.interface'; +import { Query } from '../../../generated/entity/data/query'; +import { EntityReference } from '../../../generated/type/entityReference'; +import { SearchDropdownOption } from '../../SearchDropdown/SearchDropdown.interface'; export enum QueryVoteType { 'votedUp' = 'votedUp', diff --git a/openmetadata-ui/src/main/resources/ui/src/components/TableQueries/TableQueries.test.tsx b/openmetadata-ui/src/main/resources/ui/src/components/Database/TableQueries/TableQueries.test.tsx similarity index 96% rename from openmetadata-ui/src/main/resources/ui/src/components/TableQueries/TableQueries.test.tsx rename to openmetadata-ui/src/main/resources/ui/src/components/Database/TableQueries/TableQueries.test.tsx index aad5c00e60c2..1939f2619ae2 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/TableQueries/TableQueries.test.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/components/Database/TableQueries/TableQueries.test.tsx @@ -19,8 +19,11 @@ import { } from '@testing-library/react'; import React from 'react'; import { MemoryRouter } from 'react-router-dom'; -import { MOCK_QUERIES, MOCK_QUERIES_ES_DATA } from '../../mocks/Queries.mock'; -import { getQueriesList } from '../../rest/queryAPI'; +import { + MOCK_QUERIES, + MOCK_QUERIES_ES_DATA, +} from '../../../mocks/Queries.mock'; +import { getQueriesList } from '../../../rest/queryAPI'; import TableQueries from './TableQueries'; import { TableQueriesProp } from './TableQueries.interface'; diff --git a/openmetadata-ui/src/main/resources/ui/src/components/TableQueries/TableQueries.tsx b/openmetadata-ui/src/main/resources/ui/src/components/Database/TableQueries/TableQueries.tsx similarity index 89% rename from openmetadata-ui/src/main/resources/ui/src/components/TableQueries/TableQueries.tsx rename to openmetadata-ui/src/main/resources/ui/src/components/Database/TableQueries/TableQueries.tsx index 36e7ffab022c..e8ea111c1c8b 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/TableQueries/TableQueries.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/components/Database/TableQueries/TableQueries.tsx @@ -19,39 +19,39 @@ import Qs from 'qs'; import React, { FC, useEffect, useMemo, useState } from 'react'; import { useTranslation } from 'react-i18next'; import { useHistory, useLocation } from 'react-router-dom'; -import { usePermissionProvider } from '../../components/PermissionProvider/PermissionProvider'; -import { - OperationPermission, - ResourceEntity, -} from '../../components/PermissionProvider/PermissionProvider.interface'; -import { USAGE_DOCS } from '../../constants/docs.constants'; -import { NO_PERMISSION_FOR_ACTION } from '../../constants/HelperTextUtil'; +import { USAGE_DOCS } from '../../../constants/docs.constants'; +import { NO_PERMISSION_FOR_ACTION } from '../../../constants/HelperTextUtil'; import { QUERY_PAGE_ERROR_STATE, QUERY_PAGE_LOADING_STATE, -} from '../../constants/Query.constant'; -import { ERROR_PLACEHOLDER_TYPE } from '../../enums/common.enum'; -import { Query } from '../../generated/entity/data/query'; -import { usePaging } from '../../hooks/paging/usePaging'; -import { useFqn } from '../../hooks/useFqn'; +} from '../../../constants/Query.constant'; +import { usePermissionProvider } from '../../../context/PermissionProvider/PermissionProvider'; +import { + OperationPermission, + ResourceEntity, +} from '../../../context/PermissionProvider/PermissionProvider.interface'; +import { ERROR_PLACEHOLDER_TYPE } from '../../../enums/common.enum'; +import { Query } from '../../../generated/entity/data/query'; +import { usePaging } from '../../../hooks/paging/usePaging'; +import { useFqn } from '../../../hooks/useFqn'; import { getQueriesList, getQueryById, ListQueriesParams, patchQueries, updateQueryVote, -} from '../../rest/queryAPI'; -import { DEFAULT_ENTITY_PERMISSION } from '../../utils/PermissionsUtils'; +} from '../../../rest/queryAPI'; +import { DEFAULT_ENTITY_PERMISSION } from '../../../utils/PermissionsUtils'; import { parseSearchParams, stringifySearchParams, -} from '../../utils/Query/QueryUtils'; -import { getAddQueryPath } from '../../utils/RouterUtils'; -import { showErrorToast } from '../../utils/ToastUtils'; -import ErrorPlaceHolder from '../common/ErrorWithPlaceholder/ErrorPlaceHolder'; -import NextPrevious from '../common/NextPrevious/NextPrevious'; -import { PagingHandlerParams } from '../common/NextPrevious/NextPrevious.interface'; -import Loader from '../Loader/Loader'; +} from '../../../utils/Query/QueryUtils'; +import { getAddQueryPath } from '../../../utils/RouterUtils'; +import { showErrorToast } from '../../../utils/ToastUtils'; +import ErrorPlaceHolder from '../../common/ErrorWithPlaceholder/ErrorPlaceHolder'; +import Loader from '../../common/Loader/Loader'; +import NextPrevious from '../../common/NextPrevious/NextPrevious'; +import { PagingHandlerParams } from '../../common/NextPrevious/NextPrevious.interface'; import QueryCard from './QueryCard'; import { QueryVote, TableQueriesProp } from './TableQueries.interface'; import TableQueryRightPanel from './TableQueryRightPanel/TableQueryRightPanel.component'; diff --git a/openmetadata-ui/src/main/resources/ui/src/components/TableQueries/TableQueryRightPanel/TableQueryRightPanel.component.tsx b/openmetadata-ui/src/main/resources/ui/src/components/Database/TableQueries/TableQueryRightPanel/TableQueryRightPanel.component.tsx similarity index 90% rename from openmetadata-ui/src/main/resources/ui/src/components/TableQueries/TableQueryRightPanel/TableQueryRightPanel.component.tsx rename to openmetadata-ui/src/main/resources/ui/src/components/Database/TableQueries/TableQueryRightPanel/TableQueryRightPanel.component.tsx index e98f08112ebd..f844adf31f5b 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/TableQueries/TableQueryRightPanel/TableQueryRightPanel.component.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/components/Database/TableQueries/TableQueryRightPanel/TableQueryRightPanel.component.tsx @@ -16,17 +16,17 @@ import { Button, Col, Drawer, Row, Space, Typography } from 'antd'; import React, { useState } from 'react'; import { useTranslation } from 'react-i18next'; import { Link } from 'react-router-dom'; -import { ReactComponent as EditIcon } from '../../../assets/svg/edit-new.svg'; -import { ReactComponent as IconUser } from '../../../assets/svg/user.svg'; -import Description from '../../../components/common/EntityDescription/Description'; -import ProfilePicture from '../../../components/common/ProfilePicture/ProfilePicture'; -import { UserTeamSelectableList } from '../../../components/common/UserTeamSelectableList/UserTeamSelectableList.component'; -import Loader from '../../../components/Loader/Loader'; -import TagsInput from '../../../components/TagsInput/TagsInput.component'; -import { DE_ACTIVE_COLOR, getUserPath } from '../../../constants/constants'; -import { Query } from '../../../generated/entity/data/query'; -import { TagLabel } from '../../../generated/type/tagLabel'; -import { getEntityName } from '../../../utils/EntityUtils'; +import { ReactComponent as EditIcon } from '../../../../assets/svg/edit-new.svg'; +import { ReactComponent as IconUser } from '../../../../assets/svg/user.svg'; +import { DE_ACTIVE_COLOR, getUserPath } from '../../../../constants/constants'; +import { Query } from '../../../../generated/entity/data/query'; +import { TagLabel } from '../../../../generated/type/tagLabel'; +import { getEntityName } from '../../../../utils/EntityUtils'; +import Description from '../../../common/EntityDescription/Description'; +import Loader from '../../../common/Loader/Loader'; +import ProfilePicture from '../../../common/ProfilePicture/ProfilePicture'; +import { UserTeamSelectableList } from '../../../common/UserTeamSelectableList/UserTeamSelectableList.component'; +import TagsInput from '../../../TagsInput/TagsInput.component'; import { TableQueryRightPanelProps } from './TableQueryRightPanel.interface'; const TableQueryRightPanel = ({ diff --git a/openmetadata-ui/src/main/resources/ui/src/components/TableQueries/TableQueryRightPanel/TableQueryRightPanel.interface.ts b/openmetadata-ui/src/main/resources/ui/src/components/Database/TableQueries/TableQueryRightPanel/TableQueryRightPanel.interface.ts similarity index 86% rename from openmetadata-ui/src/main/resources/ui/src/components/TableQueries/TableQueryRightPanel/TableQueryRightPanel.interface.ts rename to openmetadata-ui/src/main/resources/ui/src/components/Database/TableQueries/TableQueryRightPanel/TableQueryRightPanel.interface.ts index 4156d6891c49..14a2ca878b54 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/TableQueries/TableQueryRightPanel/TableQueryRightPanel.interface.ts +++ b/openmetadata-ui/src/main/resources/ui/src/components/Database/TableQueries/TableQueryRightPanel/TableQueryRightPanel.interface.ts @@ -11,8 +11,8 @@ * limitations under the License. */ -import { OperationPermission } from '../../../components/PermissionProvider/PermissionProvider.interface'; -import { Query } from '../../../generated/entity/data/query'; +import { OperationPermission } from '../../../../context/PermissionProvider/PermissionProvider.interface'; +import { Query } from '../../../../generated/entity/data/query'; export interface TableQueryRightPanelProps { query: Query; diff --git a/openmetadata-ui/src/main/resources/ui/src/components/TableQueries/TableQueryRightPanel/TableQueryRightPanel.test.tsx b/openmetadata-ui/src/main/resources/ui/src/components/Database/TableQueries/TableQueryRightPanel/TableQueryRightPanel.test.tsx similarity index 93% rename from openmetadata-ui/src/main/resources/ui/src/components/TableQueries/TableQueryRightPanel/TableQueryRightPanel.test.tsx rename to openmetadata-ui/src/main/resources/ui/src/components/Database/TableQueries/TableQueryRightPanel/TableQueryRightPanel.test.tsx index 8453a455f073..e05e54b66c65 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/TableQueries/TableQueryRightPanel/TableQueryRightPanel.test.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/components/Database/TableQueries/TableQueryRightPanel/TableQueryRightPanel.test.tsx @@ -14,10 +14,10 @@ import { render, screen } from '@testing-library/react'; import React from 'react'; import { MemoryRouter } from 'react-router-dom'; -import { Query } from '../../../generated/entity/data/query'; -import { MOCK_PERMISSIONS } from '../../../mocks/Glossary.mock'; -import { MOCK_QUERIES } from '../../../mocks/Queries.mock'; -import { DEFAULT_ENTITY_PERMISSION } from '../../../utils/PermissionsUtils'; +import { Query } from '../../../../generated/entity/data/query'; +import { MOCK_PERMISSIONS } from '../../../../mocks/Glossary.mock'; +import { MOCK_QUERIES } from '../../../../mocks/Queries.mock'; +import { DEFAULT_ENTITY_PERMISSION } from '../../../../utils/PermissionsUtils'; import TableQueryRightPanel from './TableQueryRightPanel.component'; import { TableQueryRightPanelProps } from './TableQueryRightPanel.interface'; diff --git a/openmetadata-ui/src/main/resources/ui/src/components/TableQueries/table-queries.style.less b/openmetadata-ui/src/main/resources/ui/src/components/Database/TableQueries/table-queries.style.less similarity index 96% rename from openmetadata-ui/src/main/resources/ui/src/components/TableQueries/table-queries.style.less rename to openmetadata-ui/src/main/resources/ui/src/components/Database/TableQueries/table-queries.style.less index a20c07ff8785..5705602a6557 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/TableQueries/table-queries.style.less +++ b/openmetadata-ui/src/main/resources/ui/src/components/Database/TableQueries/table-queries.style.less @@ -10,7 +10,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -@import url('../../styles/variables.less'); +@import url('../../../styles/variables.less'); @summary-panel-offset: 236px; .query-entity-button { diff --git a/openmetadata-ui/src/main/resources/ui/src/components/TableTags/TableTags.component.tsx b/openmetadata-ui/src/main/resources/ui/src/components/Database/TableTags/TableTags.component.tsx similarity index 90% rename from openmetadata-ui/src/main/resources/ui/src/components/TableTags/TableTags.component.tsx rename to openmetadata-ui/src/main/resources/ui/src/components/Database/TableTags/TableTags.component.tsx index 941bdf8eb03e..23e67b89f9fb 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/TableTags/TableTags.component.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/components/Database/TableTags/TableTags.component.tsx @@ -14,9 +14,9 @@ import classNames from 'classnames'; import { lowerCase } from 'lodash'; import React from 'react'; -import TagsContainerV2 from '../../components/Tag/TagsContainerV2/TagsContainerV2'; -import { EntityField } from '../../constants/Feeds.constants'; -import EntityTasks from '../../pages/TasksPage/EntityTasks/EntityTasks.component'; +import { EntityField } from '../../../constants/Feeds.constants'; +import EntityTasks from '../../../pages/TasksPage/EntityTasks/EntityTasks.component'; +import TagsContainerV2 from '../../Tag/TagsContainerV2/TagsContainerV2'; import { TableTagsComponentProps, TableUnion } from './TableTags.interface'; const TableTags = ({ diff --git a/openmetadata-ui/src/main/resources/ui/src/components/TableTags/TableTags.interface.ts b/openmetadata-ui/src/main/resources/ui/src/components/Database/TableTags/TableTags.interface.ts similarity index 70% rename from openmetadata-ui/src/main/resources/ui/src/components/TableTags/TableTags.interface.ts rename to openmetadata-ui/src/main/resources/ui/src/components/Database/TableTags/TableTags.interface.ts index 470b65aa8303..ed1f5de90065 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/TableTags/TableTags.interface.ts +++ b/openmetadata-ui/src/main/resources/ui/src/components/Database/TableTags/TableTags.interface.ts @@ -12,14 +12,14 @@ */ import { EntityTags, TagOption } from 'Models'; -import { EntityType } from '../../enums/entity.enum'; -import { ThreadType } from '../../generated/api/feed/createThread'; -import { MlFeature } from '../../generated/entity/data/mlmodel'; -import { Task } from '../../generated/entity/data/pipeline'; -import { Column } from '../../generated/entity/data/table'; -import { Field } from '../../generated/entity/data/topic'; -import { TagLabel, TagSource } from '../../generated/type/tagLabel'; -import { ChartType } from '../../pages/DashboardDetailsPage/DashboardDetailsPage.component'; +import { EntityType } from '../../../enums/entity.enum'; +import { ThreadType } from '../../../generated/api/feed/createThread'; +import { MlFeature } from '../../../generated/entity/data/mlmodel'; +import { Task } from '../../../generated/entity/data/pipeline'; +import { Column } from '../../../generated/entity/data/table'; +import { Field } from '../../../generated/entity/data/topic'; +import { TagLabel, TagSource } from '../../../generated/type/tagLabel'; +import { ChartType } from '../../../pages/DashboardDetailsPage/DashboardDetailsPage.component'; export interface TableTagsComponentProps { tags: TagLabel[]; diff --git a/openmetadata-ui/src/main/resources/ui/src/components/TableTags/TableTags.test.tsx b/openmetadata-ui/src/main/resources/ui/src/components/Database/TableTags/TableTags.test.tsx similarity index 93% rename from openmetadata-ui/src/main/resources/ui/src/components/TableTags/TableTags.test.tsx rename to openmetadata-ui/src/main/resources/ui/src/components/Database/TableTags/TableTags.test.tsx index cdccb21dfbb3..ded5b6d521cb 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/TableTags/TableTags.test.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/components/Database/TableTags/TableTags.test.tsx @@ -14,12 +14,12 @@ import { render, screen } from '@testing-library/react'; import React from 'react'; import { MemoryRouter } from 'react-router-dom'; -import { EntityType } from '../../enums/entity.enum'; -import { Constraint, DataType } from '../../generated/entity/data/table'; -import { LabelType, State, TagSource } from '../../generated/type/schema'; +import { EntityType } from '../../../enums/entity.enum'; +import { Constraint, DataType } from '../../../generated/entity/data/table'; +import { LabelType, State, TagSource } from '../../../generated/type/schema'; import TableTags from './TableTags.component'; -jest.mock('../../utils/FeedElementUtils', () => ({ +jest.mock('../../../utils/FeedElementUtils', () => ({ getFieldThreadElement: jest .fn() .mockReturnValue( @@ -27,7 +27,7 @@ jest.mock('../../utils/FeedElementUtils', () => ({ ), })); -jest.mock('../../pages/TasksPage/EntityTasks/EntityTasks.component', () => { +jest.mock('../../../pages/TasksPage/EntityTasks/EntityTasks.component', () => { return jest.fn().mockImplementation(() =>
EntityTasks
); }); diff --git a/openmetadata-ui/src/main/resources/ui/src/components/TableVersion/TableVersion.component.tsx b/openmetadata-ui/src/main/resources/ui/src/components/Database/TableVersion/TableVersion.component.tsx similarity index 86% rename from openmetadata-ui/src/main/resources/ui/src/components/TableVersion/TableVersion.component.tsx rename to openmetadata-ui/src/main/resources/ui/src/components/Database/TableVersion/TableVersion.component.tsx index 705e85a7f8b9..c09542d59249 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/TableVersion/TableVersion.component.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/components/Database/TableVersion/TableVersion.component.tsx @@ -17,33 +17,33 @@ import { cloneDeep, toString } from 'lodash'; import React, { useEffect, useMemo, useState } from 'react'; import { useTranslation } from 'react-i18next'; import { useHistory, useParams } from 'react-router-dom'; -import { CustomPropertyTable } from '../../components/common/CustomPropertyTable/CustomPropertyTable'; -import DescriptionV1 from '../../components/common/EntityDescription/DescriptionV1'; -import DataAssetsVersionHeader from '../../components/DataAssets/DataAssetsVersionHeader/DataAssetsVersionHeader'; -import EntityVersionTimeLine from '../../components/Entity/EntityVersionTimeLine/EntityVersionTimeLine'; -import Loader from '../../components/Loader/Loader'; -import TabsLabel from '../../components/TabsLabel/TabsLabel.component'; -import TagsContainerV2 from '../../components/Tag/TagsContainerV2/TagsContainerV2'; -import VersionTable from '../../components/VersionTable/VersionTable.component'; -import { FQN_SEPARATOR_CHAR } from '../../constants/char.constants'; -import { getVersionPathWithTab } from '../../constants/constants'; -import { EntityField } from '../../constants/Feeds.constants'; -import { EntityTabs, EntityType, FqnPart } from '../../enums/entity.enum'; +import { FQN_SEPARATOR_CHAR } from '../../../constants/char.constants'; +import { getVersionPathWithTab } from '../../../constants/constants'; +import { EntityField } from '../../../constants/Feeds.constants'; +import { EntityTabs, EntityType, FqnPart } from '../../../enums/entity.enum'; import { ChangeDescription, Column, ColumnJoins, -} from '../../generated/entity/data/table'; -import { TagSource } from '../../generated/type/tagLabel'; -import { getPartialNameFromTableFQN } from '../../utils/CommonUtils'; +} from '../../../generated/entity/data/table'; +import { TagSource } from '../../../generated/type/tagLabel'; +import { getPartialNameFromTableFQN } from '../../../utils/CommonUtils'; import { getColumnsDataWithVersionChanges, getCommonExtraInfoForVersionDetails, getConstraintChanges, getEntityVersionByField, getEntityVersionTags, -} from '../../utils/EntityVersionUtils'; -import DataProductsContainer from '../DataProductsContainer/DataProductsContainer.component'; +} from '../../../utils/EntityVersionUtils'; +import { CustomPropertyTable } from '../../common/CustomPropertyTable/CustomPropertyTable'; +import DescriptionV1 from '../../common/EntityDescription/DescriptionV1'; +import Loader from '../../common/Loader/Loader'; +import TabsLabel from '../../common/TabsLabel/TabsLabel.component'; +import DataAssetsVersionHeader from '../../DataAssets/DataAssetsVersionHeader/DataAssetsVersionHeader'; +import DataProductsContainer from '../../DataProducts/DataProductsContainer/DataProductsContainer.component'; +import EntityVersionTimeLine from '../../Entity/EntityVersionTimeLine/EntityVersionTimeLine'; +import VersionTable from '../../Entity/VersionTable/VersionTable.component'; +import TagsContainerV2 from '../../Tag/TagsContainerV2/TagsContainerV2'; import { TableVersionProp } from './TableVersion.interface'; const TableVersion: React.FC = ({ diff --git a/openmetadata-ui/src/main/resources/ui/src/components/TableVersion/TableVersion.interface.ts b/openmetadata-ui/src/main/resources/ui/src/components/Database/TableVersion/TableVersion.interface.ts similarity index 75% rename from openmetadata-ui/src/main/resources/ui/src/components/TableVersion/TableVersion.interface.ts rename to openmetadata-ui/src/main/resources/ui/src/components/Database/TableVersion/TableVersion.interface.ts index a89248441d6c..daece1670eae 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/TableVersion/TableVersion.interface.ts +++ b/openmetadata-ui/src/main/resources/ui/src/components/Database/TableVersion/TableVersion.interface.ts @@ -11,11 +11,11 @@ * limitations under the License. */ -import { OperationPermission } from '../../components/PermissionProvider/PermissionProvider.interface'; -import { Table } from '../../generated/entity/data/table'; -import { EntityHistory } from '../../generated/type/entityHistory'; -import { TagLabel } from '../../generated/type/tagLabel'; -import { TitleBreadcrumbProps } from '../common/TitleBreadcrumb/TitleBreadcrumb.interface'; +import { OperationPermission } from '../../../context/PermissionProvider/PermissionProvider.interface'; +import { Table } from '../../../generated/entity/data/table'; +import { EntityHistory } from '../../../generated/type/entityHistory'; +import { TagLabel } from '../../../generated/type/tagLabel'; +import { TitleBreadcrumbProps } from '../../common/TitleBreadcrumb/TitleBreadcrumb.interface'; export interface TableVersionProp { version: string; diff --git a/openmetadata-ui/src/main/resources/ui/src/components/TableVersion/TableVersion.test.tsx b/openmetadata-ui/src/main/resources/ui/src/components/Database/TableVersion/TableVersion.test.tsx similarity index 98% rename from openmetadata-ui/src/main/resources/ui/src/components/TableVersion/TableVersion.test.tsx rename to openmetadata-ui/src/main/resources/ui/src/components/Database/TableVersion/TableVersion.test.tsx index a1fe3eaad97e..aa16c9591b1a 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/TableVersion/TableVersion.test.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/components/Database/TableVersion/TableVersion.test.tsx @@ -14,7 +14,7 @@ import { act, render, screen } from '@testing-library/react'; import userEvent from '@testing-library/user-event'; import React from 'react'; -import { tableVersionMockProps } from '../../mocks/TableVersion.mock'; +import { tableVersionMockProps } from '../../../mocks/TableVersion.mock'; import TableVersion from './TableVersion.component'; const mockPush = jest.fn(); diff --git a/openmetadata-ui/src/main/resources/ui/src/components/Domain/AddDomainForm/AddDomainForm.component.tsx b/openmetadata-ui/src/main/resources/ui/src/components/Domain/AddDomainForm/AddDomainForm.component.tsx index e90f9c2a68f2..e53a746d98b8 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/Domain/AddDomainForm/AddDomainForm.component.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/components/Domain/AddDomainForm/AddDomainForm.component.tsx @@ -17,12 +17,12 @@ import React, { useMemo } from 'react'; import { useTranslation } from 'react-i18next'; import { UserTag } from '../../../components/common/UserTag/UserTag.component'; import { UserTagSize } from '../../../components/common/UserTag/UserTag.interface'; -import { usePermissionProvider } from '../../../components/PermissionProvider/PermissionProvider'; -import { ResourceEntity } from '../../../components/PermissionProvider/PermissionProvider.interface'; import { ENTITY_NAME_REGEX, HEX_COLOR_CODE_REGEX, } from '../../../constants/regex.constants'; +import { usePermissionProvider } from '../../../context/PermissionProvider/PermissionProvider'; +import { ResourceEntity } from '../../../context/PermissionProvider/PermissionProvider.interface'; import { CreateDataProduct } from '../../../generated/api/domains/createDataProduct'; import { CreateDomain, diff --git a/openmetadata-ui/src/main/resources/ui/src/components/Domain/DomainDetailsPage/DomainDetailsPage.component.tsx b/openmetadata-ui/src/main/resources/ui/src/components/Domain/DomainDetailsPage/DomainDetailsPage.component.tsx index e70296c606cc..f4c0baf4d17a 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/Domain/DomainDetailsPage/DomainDetailsPage.component.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/components/Domain/DomainDetailsPage/DomainDetailsPage.component.tsx @@ -41,7 +41,6 @@ import { ReactComponent as DomainIcon } from '../../../assets/svg/ic-domain.svg' import { ReactComponent as VersionIcon } from '../../../assets/svg/ic-version.svg'; import { ReactComponent as IconDropdown } from '../../../assets/svg/menu.svg'; import { ReactComponent as StyleIcon } from '../../../assets/svg/style.svg'; -import { AssetSelectionModal } from '../../../components/Assets/AssetsSelectionModal/AssetSelectionModal'; import { ManageButtonItemLabel } from '../../../components/common/ManageButtonContentItem/ManageButtonContentItem.component'; import { EntityHeader } from '../../../components/Entity/EntityHeader/EntityHeader.component'; import EntitySummaryPanel from '../../../components/Explore/EntitySummaryPanel/EntitySummaryPanel.component'; @@ -51,15 +50,14 @@ import AssetsTabs, { import { AssetsOfEntity } from '../../../components/Glossary/GlossaryTerms/tabs/AssetsTabs.interface'; import EntityNameModal from '../../../components/Modals/EntityNameModal/EntityNameModal.component'; import PageLayoutV1 from '../../../components/PageLayoutV1/PageLayoutV1'; -import { usePermissionProvider } from '../../../components/PermissionProvider/PermissionProvider'; -import { - OperationPermission, - ResourceEntity, -} from '../../../components/PermissionProvider/PermissionProvider.interface'; -import TabsLabel from '../../../components/TabsLabel/TabsLabel.component'; import { FQN_SEPARATOR_CHAR } from '../../../constants/char.constants'; import { DE_ACTIVE_COLOR, ERROR_MESSAGE } from '../../../constants/constants'; import { EntityField } from '../../../constants/Feeds.constants'; +import { usePermissionProvider } from '../../../context/PermissionProvider/PermissionProvider'; +import { + OperationPermission, + ResourceEntity, +} from '../../../context/PermissionProvider/PermissionProvider.interface'; import { EntityType } from '../../../enums/entity.enum'; import { SearchIndex } from '../../../enums/search.enum'; import { CreateDataProduct } from '../../../generated/api/domains/createDataProduct'; @@ -89,6 +87,8 @@ import { } from '../../../utils/StringsUtils'; import { showErrorToast } from '../../../utils/ToastUtils'; import DeleteWidgetModal from '../../common/DeleteWidget/DeleteWidgetModal'; +import TabsLabel from '../../common/TabsLabel/TabsLabel.component'; +import { AssetSelectionModal } from '../../DataAssets/AssetsSelectionModal/AssetSelectionModal'; import { EntityDetailsObjectInterface } from '../../Explore/ExplorePage.interface'; import StyleModal from '../../Modals/StyleModal/StyleModal.component'; import AddDataProductModal from '../AddDataProductModal/AddDataProductModal.component'; diff --git a/openmetadata-ui/src/main/resources/ui/src/components/Domain/DomainLeftPanel/DomainLeftPanel.component.tsx b/openmetadata-ui/src/main/resources/ui/src/components/Domain/DomainLeftPanel/DomainLeftPanel.component.tsx index cd2091822a58..e7a1bb8a11d2 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/Domain/DomainLeftPanel/DomainLeftPanel.component.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/components/Domain/DomainLeftPanel/DomainLeftPanel.component.tsx @@ -18,16 +18,16 @@ import { useHistory } from 'react-router-dom'; import { ReactComponent as DomainIcon } from '../../../assets/svg/ic-domain.svg'; import { ReactComponent as PlusIcon } from '../../../assets/svg/plus-primary.svg'; import LeftPanelCard from '../../../components/common/LeftPanelCard/LeftPanelCard'; -import { usePermissionProvider } from '../../../components/PermissionProvider/PermissionProvider'; -import { ResourceEntity } from '../../../components/PermissionProvider/PermissionProvider.interface'; -import GlossaryV1Skeleton from '../../../components/Skeleton/GlossaryV1/GlossaryV1LeftPanelSkeleton.component'; import { ROUTES } from '../../../constants/constants'; +import { usePermissionProvider } from '../../../context/PermissionProvider/PermissionProvider'; +import { ResourceEntity } from '../../../context/PermissionProvider/PermissionProvider.interface'; import { Operation } from '../../../generated/entity/policies/policy'; import { useFqn } from '../../../hooks/useFqn'; import { getEntityName } from '../../../utils/EntityUtils'; import Fqn from '../../../utils/Fqn'; import { checkPermission } from '../../../utils/PermissionsUtils'; import { getDomainPath } from '../../../utils/RouterUtils'; +import GlossaryV1Skeleton from '../../common/Skeleton/GlossaryV1/GlossaryV1LeftPanelSkeleton.component'; import { DomainLeftPanelProps } from './DomainLeftPanel.interface'; const DomainsLeftPanel = ({ domains }: DomainLeftPanelProps) => { diff --git a/openmetadata-ui/src/main/resources/ui/src/components/Domain/DomainPage.component.tsx b/openmetadata-ui/src/main/resources/ui/src/components/Domain/DomainPage.component.tsx index d5ca5d81e879..3b1a846fff18 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/Domain/DomainPage.component.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/components/Domain/DomainPage.component.tsx @@ -18,11 +18,10 @@ import React, { useEffect, useMemo, useState } from 'react'; import { useTranslation } from 'react-i18next'; import { useHistory } from 'react-router-dom'; import ErrorPlaceHolder from '../../components/common/ErrorWithPlaceholder/ErrorPlaceHolder'; -import Loader from '../../components/Loader/Loader'; import PageLayoutV1 from '../../components/PageLayoutV1/PageLayoutV1'; -import { usePermissionProvider } from '../../components/PermissionProvider/PermissionProvider'; -import { ResourceEntity } from '../../components/PermissionProvider/PermissionProvider.interface'; import { ROUTES } from '../../constants/constants'; +import { usePermissionProvider } from '../../context/PermissionProvider/PermissionProvider'; +import { ResourceEntity } from '../../context/PermissionProvider/PermissionProvider.interface'; import { ERROR_PLACEHOLDER_TYPE } from '../../enums/common.enum'; import { Domain } from '../../generated/entity/domains/domain'; import { Operation } from '../../generated/entity/policies/policy'; @@ -31,6 +30,7 @@ import { getDomainByName, patchDomains } from '../../rest/domainAPI'; import { checkPermission } from '../../utils/PermissionsUtils'; import { getDomainPath } from '../../utils/RouterUtils'; import { showErrorToast } from '../../utils/ToastUtils'; +import Loader from '../common/Loader/Loader'; import './domain.less'; import DomainDetailsPage from './DomainDetailsPage/DomainDetailsPage.component'; import DomainsLeftPanel from './DomainLeftPanel/DomainLeftPanel.component'; diff --git a/openmetadata-ui/src/main/resources/ui/src/components/Domain/DomainProvider/DomainProvider.tsx b/openmetadata-ui/src/main/resources/ui/src/components/Domain/DomainProvider/DomainProvider.tsx index f7e42ada51d9..b820585c36bf 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/Domain/DomainProvider/DomainProvider.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/components/Domain/DomainProvider/DomainProvider.tsx @@ -27,11 +27,11 @@ import { DEFAULT_DOMAIN_VALUE, PAGE_SIZE_LARGE, } from '../../../constants/constants'; +import { usePermissionProvider } from '../../../context/PermissionProvider/PermissionProvider'; import { Domain } from '../../../generated/entity/domains/domain'; import { getDomainList } from '../../../rest/domainAPI'; import { getEntityName } from '../../../utils/EntityUtils'; import { showErrorToast } from '../../../utils/ToastUtils'; -import { usePermissionProvider } from '../../PermissionProvider/PermissionProvider'; import { DomainContextType } from './DomainProvider.interface'; export const DomainContext = React.createContext({} as DomainContextType); diff --git a/openmetadata-ui/src/main/resources/ui/src/components/Domain/DomainTabs/DataProductsTab/DataProductsTab.component.tsx b/openmetadata-ui/src/main/resources/ui/src/components/Domain/DomainTabs/DataProductsTab/DataProductsTab.component.tsx index c7ef8f3bde52..2d562f4f123e 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/Domain/DomainTabs/DataProductsTab/DataProductsTab.component.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/components/Domain/DomainTabs/DataProductsTab/DataProductsTab.component.tsx @@ -34,9 +34,9 @@ import { getEncodedFqn, } from '../../../../utils/StringsUtils'; import ErrorPlaceHolder from '../../../common/ErrorWithPlaceholder/ErrorPlaceHolder'; +import Loader from '../../../common/Loader/Loader'; import EntitySummaryPanel from '../../../Explore/EntitySummaryPanel/EntitySummaryPanel.component'; import ExploreSearchCard from '../../../ExploreV1/ExploreSearchCard/ExploreSearchCard'; -import Loader from '../../../Loader/Loader'; import PageLayoutV1 from '../../../PageLayoutV1/PageLayoutV1'; import { SourceType } from '../../../SearchedData/SearchedData.interface'; import { DataProductsTabProps } from './DataProductsTab.interface'; diff --git a/openmetadata-ui/src/main/resources/ui/src/components/Domain/DomainTabs/DataProductsTab/DataProductsTab.interface.ts b/openmetadata-ui/src/main/resources/ui/src/components/Domain/DomainTabs/DataProductsTab/DataProductsTab.interface.ts index bcdde53fc865..4a9ce15f36b9 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/Domain/DomainTabs/DataProductsTab/DataProductsTab.interface.ts +++ b/openmetadata-ui/src/main/resources/ui/src/components/Domain/DomainTabs/DataProductsTab/DataProductsTab.interface.ts @@ -10,7 +10,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -import { OperationPermission } from '../../../../components/PermissionProvider/PermissionProvider.interface'; +import { OperationPermission } from '../../../../context/PermissionProvider/PermissionProvider.interface'; export interface DataProductsTabRef { refreshDataProducts: () => void; diff --git a/openmetadata-ui/src/main/resources/ui/src/components/Domain/DomainTabs/DocumentationTab/DocumentationTab.component.tsx b/openmetadata-ui/src/main/resources/ui/src/components/Domain/DomainTabs/DocumentationTab/DocumentationTab.component.tsx index b5e507902984..a0e55718663c 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/Domain/DomainTabs/DocumentationTab/DocumentationTab.component.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/components/Domain/DomainTabs/DocumentationTab/DocumentationTab.component.tsx @@ -21,11 +21,10 @@ import { UserSelectableList } from '../../../../components/common/UserSelectable import { UserTeamSelectableList } from '../../../../components/common/UserTeamSelectableList/UserTeamSelectableList.component'; import DomainExperts from '../../../../components/Domain/DomainExperts/DomainExperts.component'; import DomainTypeSelectForm from '../../../../components/Domain/DomainTypeSelectForm/DomainTypeSelectForm.component'; -import { usePermissionProvider } from '../../../../components/PermissionProvider/PermissionProvider'; -import { ResourceEntity } from '../../../../components/PermissionProvider/PermissionProvider.interface'; -import TagButton from '../../../../components/TagButton/TagButton.component'; import { DE_ACTIVE_COLOR } from '../../../../constants/constants'; import { EntityField } from '../../../../constants/Feeds.constants'; +import { usePermissionProvider } from '../../../../context/PermissionProvider/PermissionProvider'; +import { ResourceEntity } from '../../../../context/PermissionProvider/PermissionProvider.interface'; import { EntityType } from '../../../../enums/entity.enum'; import { DataProduct } from '../../../../generated/entity/domains/dataProduct'; import { @@ -44,7 +43,8 @@ import { import { getEntityName } from '../../../../utils/EntityUtils'; import { getEntityVersionByField } from '../../../../utils/EntityVersionUtils'; import { checkPermission } from '../../../../utils/PermissionsUtils'; -import FormItemLabel from '../../../Form/FormItemLabel'; +import FormItemLabel from '../../../common/Form/FormItemLabel'; +import TagButton from '../../../common/TagButton/TagButton.component'; import '../../domain.less'; import { DocumentationEntity, diff --git a/openmetadata-ui/src/main/resources/ui/src/components/Domain/DomainVersion/DomainVersion.component.tsx b/openmetadata-ui/src/main/resources/ui/src/components/Domain/DomainVersion/DomainVersion.component.tsx index e9fb93e73de4..df050a474b96 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/Domain/DomainVersion/DomainVersion.component.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/components/Domain/DomainVersion/DomainVersion.component.tsx @@ -28,8 +28,8 @@ import { } from '../../../utils/RouterUtils'; import { showErrorToast } from '../../../utils/ToastUtils'; import ErrorPlaceHolder from '../../common/ErrorWithPlaceholder/ErrorPlaceHolder'; +import Loader from '../../common/Loader/Loader'; import EntityVersionTimeLine from '../../Entity/EntityVersionTimeLine/EntityVersionTimeLine'; -import Loader from '../../Loader/Loader'; import PageLayoutV1 from '../../PageLayoutV1/PageLayoutV1'; import DomainDetailsPage from '../DomainDetailsPage/DomainDetailsPage.component'; diff --git a/openmetadata-ui/src/main/resources/ui/src/components/Entity/EntityInfoDrawer/EdgeInfoDrawer.component.tsx b/openmetadata-ui/src/main/resources/ui/src/components/Entity/EntityInfoDrawer/EdgeInfoDrawer.component.tsx index b07d6c52e57f..97d63d956cb6 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/Entity/EntityInfoDrawer/EdgeInfoDrawer.component.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/components/Entity/EntityInfoDrawer/EdgeInfoDrawer.component.tsx @@ -27,9 +27,9 @@ import { getNameFromFQN } from '../../../utils/CommonUtils'; import { getLineageDetailsObject } from '../../../utils/EntityLineageUtils'; import entityUtilClassBase from '../../../utils/EntityUtilClassBase'; import { getEntityName } from '../../../utils/EntityUtils'; -import Loader from '../../Loader/Loader'; +import Loader from '../../common/Loader/Loader'; +import SchemaEditor from '../../Database/SchemaEditor/SchemaEditor'; import { ModalWithQueryEditor } from '../../Modals/ModalWithQueryEditor/ModalWithQueryEditor'; -import SchemaEditor from '../../SchemaEditor/SchemaEditor'; import './entity-info-drawer.less'; import { EdgeInfoDrawerInfo, diff --git a/openmetadata-ui/src/main/resources/ui/src/components/Entity/EntityLineage/AppPipelineModel/AddPipeLineModal.tsx b/openmetadata-ui/src/main/resources/ui/src/components/Entity/EntityLineage/AppPipelineModel/AddPipeLineModal.tsx index 54850f9dc060..0658120f6b26 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/Entity/EntityLineage/AppPipelineModel/AddPipeLineModal.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/components/Entity/EntityLineage/AppPipelineModel/AddPipeLineModal.tsx @@ -31,8 +31,8 @@ import { import Fqn from '../../../../utils/Fqn'; import { getEntityIcon } from '../../../../utils/TableUtils'; import { showErrorToast } from '../../../../utils/ToastUtils'; +import '../../../ActivityFeed/FeedEditor/feed-editor.less'; import ErrorPlaceHolder from '../../../common/ErrorWithPlaceholder/ErrorPlaceHolder'; -import '../../../FeedEditor/feed-editor.less'; import './add-pipeline-modal.less'; interface AddPipeLineModalType { diff --git a/openmetadata-ui/src/main/resources/ui/src/components/Entity/EntityLineage/CustomControls.component.tsx b/openmetadata-ui/src/main/resources/ui/src/components/Entity/EntityLineage/CustomControls.component.tsx index 120f6aa13c68..d3e7b71fd4dc 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/Entity/EntityLineage/CustomControls.component.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/components/Entity/EntityLineage/CustomControls.component.tsx @@ -35,6 +35,7 @@ import { LINEAGE_DEFAULT_QUICK_FILTERS, ZOOM_TRANSITION_DURATION, } from '../../../constants/Lineage.constants'; +import { useLineageProvider } from '../../../context/LineageProvider/LineageProvider'; import { SearchIndex } from '../../../enums/search.enum'; import { getAssetsPageQuickFilters } from '../../../utils/AdvancedSearchUtils'; import { handleSearchFilterOption } from '../../../utils/CommonUtils'; @@ -47,7 +48,6 @@ import { import { ExploreQuickFilterField } from '../../Explore/ExplorePage.interface'; import ExploreQuickFilters from '../../Explore/ExploreQuickFilters'; import { AssetsOfEntity } from '../../Glossary/GlossaryTerms/tabs/AssetsTabs.interface'; -import { useLineageProvider } from '../../LineageProvider/LineageProvider'; import { ControlProps, LineageConfig } from './EntityLineage.interface'; import LineageConfigModal from './LineageConfigModal'; diff --git a/openmetadata-ui/src/main/resources/ui/src/components/Entity/EntityLineage/CustomControls.test.tsx b/openmetadata-ui/src/main/resources/ui/src/components/Entity/EntityLineage/CustomControls.test.tsx index a3564f4d9e08..da39f3d352f3 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/Entity/EntityLineage/CustomControls.test.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/components/Entity/EntityLineage/CustomControls.test.tsx @@ -42,7 +42,7 @@ jest.mock('reactflow', () => ({ }), })); -jest.mock('../../LineageProvider/LineageProvider', () => ({ +jest.mock('../../../context/LineageProvider/LineageProvider', () => ({ useLineageProvider: jest.fn().mockImplementation(() => ({ toggleColumnView: mockOnExpandColumnClick, onLineageEditClick: mockOnEditLineageClick, diff --git a/openmetadata-ui/src/main/resources/ui/src/components/Entity/EntityLineage/CustomEdge.component.tsx b/openmetadata-ui/src/main/resources/ui/src/components/Entity/EntityLineage/CustomEdge.component.tsx index 3e4c8ed775b8..e00748d64ded 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/Entity/EntityLineage/CustomEdge.component.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/components/Entity/EntityLineage/CustomEdge.component.tsx @@ -21,11 +21,11 @@ import { ReactComponent as IconTimesCircle } from '../../../assets/svg/ic-times- import { ReactComponent as PipelineIcon } from '../../../assets/svg/pipeline-grey.svg'; import { INFO_COLOR } from '../../../constants/constants'; import { FOREIGN_OBJECT_SIZE } from '../../../constants/Lineage.constants'; +import { useLineageProvider } from '../../../context/LineageProvider/LineageProvider'; import { EntityType } from '../../../enums/entity.enum'; import { StatusType } from '../../../generated/entity/data/pipeline'; import { getEntityName } from '../../../utils/EntityUtils'; import EntityPopOverCard from '../../common/PopOverCard/EntityPopOverCard'; -import { useLineageProvider } from '../../LineageProvider/LineageProvider'; import { CustomEdgeData } from './EntityLineage.interface'; interface LineageEdgeIconProps { diff --git a/openmetadata-ui/src/main/resources/ui/src/components/Entity/EntityLineage/CustomNodeV1.component.tsx b/openmetadata-ui/src/main/resources/ui/src/components/Entity/EntityLineage/CustomNodeV1.component.tsx index 6583768daa52..d45843e74741 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/Entity/EntityLineage/CustomNodeV1.component.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/components/Entity/EntityLineage/CustomNodeV1.component.tsx @@ -27,12 +27,12 @@ import { } from 'reactflow'; import { ReactComponent as IconTimesCircle } from '../../../assets/svg/ic-times-circle.svg'; import { BORDER_COLOR } from '../../../constants/constants'; +import { useLineageProvider } from '../../../context/LineageProvider/LineageProvider'; import { EntityLineageNodeType, EntityType } from '../../../enums/entity.enum'; import { formTwoDigitNumber } from '../../../utils/CommonUtils'; import { checkUpstreamDownstream } from '../../../utils/EntityLineageUtils'; import { getEntityName } from '../../../utils/EntityUtils'; import { getConstraintIcon, getEntityIcon } from '../../../utils/TableUtils'; -import { useLineageProvider } from '../../LineageProvider/LineageProvider'; import './custom-node.less'; import { getCollapseHandle, diff --git a/openmetadata-ui/src/main/resources/ui/src/components/Entity/EntityLineage/CustomNodeV1.test.tsx b/openmetadata-ui/src/main/resources/ui/src/components/Entity/EntityLineage/CustomNodeV1.test.tsx index 3d65ff76158d..631024e8e6c1 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/Entity/EntityLineage/CustomNodeV1.test.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/components/Entity/EntityLineage/CustomNodeV1.test.tsx @@ -69,7 +69,7 @@ const mockNodeDataProps2 = { const onMockColumnClick = jest.fn(); -jest.mock('../../LineageProvider/LineageProvider', () => ({ +jest.mock('../../../context/LineageProvider/LineageProvider', () => ({ useLineageProvider: jest.fn().mockImplementation(() => ({ tracedNodes: [], tracedColumns: [], diff --git a/openmetadata-ui/src/main/resources/ui/src/components/Entity/EntityList/EntityList.tsx b/openmetadata-ui/src/main/resources/ui/src/components/Entity/EntityList/EntityList.tsx index 22a164f3d8d4..561a2f28a8ad 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/Entity/EntityList/EntityList.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/components/Entity/EntityList/EntityList.tsx @@ -19,7 +19,7 @@ import { EntityReference } from '../../../generated/entity/type'; import entityUtilClassBase from '../../../utils/EntityUtilClassBase'; import { getEntityName } from '../../../utils/EntityUtils'; import { getEntityIcon } from '../../../utils/TableUtils'; -import EntityListSkeleton from '../../Skeleton/MyData/EntityListSkeleton/EntityListSkeleton.component'; +import EntityListSkeleton from '../../common/Skeleton/MyData/EntityListSkeleton/EntityListSkeleton.component'; import './entity.less'; interface AntdEntityListProp { diff --git a/openmetadata-ui/src/main/resources/ui/src/components/Entity/EntityRightPanel/EntityRightPanel.test.tsx b/openmetadata-ui/src/main/resources/ui/src/components/Entity/EntityRightPanel/EntityRightPanel.test.tsx index d0aa37a37bf9..e346f9d592b7 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/Entity/EntityRightPanel/EntityRightPanel.test.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/components/Entity/EntityRightPanel/EntityRightPanel.test.tsx @@ -19,9 +19,12 @@ import { EntityReference } from '../../../generated/entity/type'; import entityRightPanelClassBase from '../../../utils/EntityRightPanelClassBase'; import EntityRightPanel from './EntityRightPanel'; -jest.mock('../../DataProductsContainer/DataProductsContainer.component', () => { - return jest.fn().mockImplementation(() =>
DataProductsContainer
); -}); +jest.mock( + '../../DataProducts/DataProductsContainer/DataProductsContainer.component', + () => { + return jest.fn().mockImplementation(() =>
DataProductsContainer
); + } +); jest.mock('../../Tag/TagsContainerV2/TagsContainerV2', () => { return jest.fn().mockImplementation(() =>
TagsContainerV2
); diff --git a/openmetadata-ui/src/main/resources/ui/src/components/Entity/EntityRightPanel/EntityRightPanel.tsx b/openmetadata-ui/src/main/resources/ui/src/components/Entity/EntityRightPanel/EntityRightPanel.tsx index 5fab9f7bd943..2473f1d3e758 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/Entity/EntityRightPanel/EntityRightPanel.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/components/Entity/EntityRightPanel/EntityRightPanel.tsx @@ -23,7 +23,7 @@ import type { ExtentionEntities, ExtentionEntitiesKeys, } from '../../common/CustomPropertyTable/CustomPropertyTable.interface'; -import DataProductsContainer from '../../DataProductsContainer/DataProductsContainer.component'; +import DataProductsContainer from '../../DataProducts/DataProductsContainer/DataProductsContainer.component'; import TagsContainerV2 from '../../Tag/TagsContainerV2/TagsContainerV2'; import { DisplayType } from '../../Tag/TagsViewer/TagsViewer.interface'; diff --git a/openmetadata-ui/src/main/resources/ui/src/components/Task/TaskTab/TaskTab.component.test.tsx b/openmetadata-ui/src/main/resources/ui/src/components/Entity/Task/TaskTab/TaskTab.component.test.tsx similarity index 67% rename from openmetadata-ui/src/main/resources/ui/src/components/Task/TaskTab/TaskTab.component.test.tsx rename to openmetadata-ui/src/main/resources/ui/src/components/Entity/Task/TaskTab/TaskTab.component.test.tsx index d3f24657d3da..e0c85acd3075 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/Task/TaskTab/TaskTab.component.test.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/components/Entity/Task/TaskTab/TaskTab.component.test.tsx @@ -14,13 +14,13 @@ import { render, screen } from '@testing-library/react'; import React from 'react'; import { MemoryRouter } from 'react-router-dom'; -import { EntityType } from '../../../enums/entity.enum'; -import { TASK_COLUMNS, TASK_FEED } from '../../../mocks/Task.mock'; -import { mockUserData } from '../../Users/mocks/User.mocks'; +import { EntityType } from '../../../../enums/entity.enum'; +import { TASK_COLUMNS, TASK_FEED } from '../../../../mocks/Task.mock'; +import { mockUserData } from '../../../Settings/Users/mocks/User.mocks'; import { TaskTab } from './TaskTab.component'; import { TaskTabProps } from './TaskTab.interface'; -jest.mock('../../../rest/feedsAPI', () => ({ +jest.mock('../../../../rest/feedsAPI', () => ({ updateTask: jest.fn().mockImplementation(() => Promise.resolve()), updateThread: jest.fn().mockImplementation(() => Promise.resolve()), })); @@ -34,62 +34,56 @@ jest.mock('react-router-dom', () => ({ useHistory: jest.fn(), })); -jest.mock( - '../../../components/ActivityFeed/ActivityFeedCard/ActivityFeedCardV1', - () => { - return jest.fn().mockImplementation(() =>

ActivityFeedCardV1

); - } -); +jest.mock('../../../ActivityFeed/ActivityFeedCard/ActivityFeedCardV1', () => { + return jest.fn().mockImplementation(() =>

ActivityFeedCardV1

); +}); -jest.mock( - '../../../components/ActivityFeed/ActivityFeedEditor/ActivityFeedEditor', - () => { - return jest.fn().mockImplementation(() =>

ActivityFeedEditor

); - } -); +jest.mock('../../../ActivityFeed/ActivityFeedEditor/ActivityFeedEditor', () => { + return jest.fn().mockImplementation(() =>

ActivityFeedEditor

); +}); -jest.mock('../../../components/common/AssigneeList/AssigneeList', () => { +jest.mock('../../../common/AssigneeList/AssigneeList', () => { return jest.fn().mockImplementation(() =>

AssigneeList

); }); -jest.mock('../../../components/common/OwnerLabel/OwnerLabel.component', () => ({ +jest.mock('../../../common/OwnerLabel/OwnerLabel.component', () => ({ OwnerLabel: jest.fn().mockImplementation(() =>

OwnerLabel

), })); -jest.mock('../../../components/InlineEdit/InlineEdit.component', () => { +jest.mock('../../../common/InlineEdit/InlineEdit.component', () => { return jest.fn().mockImplementation(() =>

InlineEdit

); }); -jest.mock('../../../pages/TasksPage/shared/Assignees', () => { +jest.mock('../../../../pages/TasksPage/shared/Assignees', () => { return jest.fn().mockImplementation(() =>

Assignees

); }); -jest.mock('../../../pages/TasksPage/shared/DescriptionTask', () => { +jest.mock('../../../../pages/TasksPage/shared/DescriptionTask', () => { return jest.fn().mockImplementation(() =>

DescriptionTask

); }); -jest.mock('../../../pages/TasksPage/shared/TagsTask', () => { +jest.mock('../../../../pages/TasksPage/shared/TagsTask', () => { return jest.fn().mockImplementation(() =>

TagsTask

); }); -jest.mock('../../common/PopOverCard/EntityPopOverCard', () => { +jest.mock('../../../common/PopOverCard/EntityPopOverCard', () => { return jest.fn().mockImplementation(() =>

EntityPopOverCard

); }); -jest.mock('../../../utils/CommonUtils', () => ({ +jest.mock('../../../../utils/CommonUtils', () => ({ getNameFromFQN: jest.fn().mockReturnValue('getNameFromFQN'), })); -jest.mock('../../../utils/EntityUtils', () => ({ +jest.mock('../../../../utils/EntityUtils', () => ({ getEntityName: jest.fn().mockReturnValue('getEntityName'), })); -jest.mock('../../../utils/FeedUtils', () => ({ +jest.mock('../../../../utils/FeedUtils', () => ({ getEntityFQN: jest.fn().mockReturnValue('getEntityFQN'), })); -jest.mock('../../../utils/TasksUtils', () => ({ - ...jest.requireActual('../../../utils/TasksUtils'), +jest.mock('../../../../utils/TasksUtils', () => ({ + ...jest.requireActual('../../../../utils/TasksUtils'), fetchOptions: jest.fn().mockReturnValue('getEntityLink'), getTaskDetailPath: jest.fn().mockReturnValue('/'), isDescriptionTask: jest.fn().mockReturnValue(false), @@ -97,24 +91,24 @@ jest.mock('../../../utils/TasksUtils', () => ({ generateOptions: jest.fn().mockReturnValue([]), })); -jest.mock('../../../utils/ToastUtils', () => ({ +jest.mock('../../../../utils/ToastUtils', () => ({ showErrorToast: jest.fn(), showSuccessToast: jest.fn(), })); -jest.mock('../../Auth/AuthProviders/AuthProvider', () => ({ +jest.mock('../../../Auth/AuthProviders/AuthProvider', () => ({ useAuthContext: jest.fn(() => ({ currentUser: mockUserData, })), })); -jest.mock('../../../rest/feedsAPI', () => ({ +jest.mock('../../../../rest/feedsAPI', () => ({ updateTask: jest.fn(), updateThread: jest.fn(), })); jest.mock( - '../../../components/ActivityFeed/ActivityFeedProvider/ActivityFeedProvider', + '../../../ActivityFeed/ActivityFeedProvider/ActivityFeedProvider', () => ({ useActivityFeedProvider: jest.fn().mockImplementation(() => ({ postFeed: jest.fn(), @@ -125,7 +119,7 @@ jest.mock( }) ); -jest.mock('../../../hooks/authHooks', () => ({ +jest.mock('../../../../hooks/authHooks', () => ({ useAuth: () => { return { isAdminUser: false, diff --git a/openmetadata-ui/src/main/resources/ui/src/components/Task/TaskTab/TaskTab.component.tsx b/openmetadata-ui/src/main/resources/ui/src/components/Entity/Task/TaskTab/TaskTab.component.tsx similarity index 90% rename from openmetadata-ui/src/main/resources/ui/src/components/Task/TaskTab/TaskTab.component.tsx rename to openmetadata-ui/src/main/resources/ui/src/components/Entity/Task/TaskTab/TaskTab.component.tsx index 8e9fa867211b..83915e5366bc 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/Task/TaskTab/TaskTab.component.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/components/Entity/Task/TaskTab/TaskTab.component.tsx @@ -46,46 +46,42 @@ import React, { } from 'react'; import { useTranslation } from 'react-i18next'; import { useHistory } from 'react-router-dom'; -import { ReactComponent as EditIcon } from '../../../assets/svg/edit-new.svg'; -import { ReactComponent as TaskCloseIcon } from '../../../assets/svg/ic-close-task.svg'; -import { ReactComponent as TaskOpenIcon } from '../../../assets/svg/ic-open-task.svg'; -import ActivityFeedCardV1 from '../../../components/ActivityFeed/ActivityFeedCard/ActivityFeedCardV1'; -import ActivityFeedEditor from '../../../components/ActivityFeed/ActivityFeedEditor/ActivityFeedEditor'; -import { useActivityFeedProvider } from '../../../components/ActivityFeed/ActivityFeedProvider/ActivityFeedProvider'; -import AssigneeList from '../../../components/common/AssigneeList/AssigneeList'; -import { OwnerLabel } from '../../../components/common/OwnerLabel/OwnerLabel.component'; -import InlineEdit from '../../../components/InlineEdit/InlineEdit.component'; -import { DE_ACTIVE_COLOR } from '../../../constants/constants'; -import { TaskOperation } from '../../../constants/Feeds.constants'; -import { TASK_TYPES } from '../../../constants/Task.constant'; -import { TaskType } from '../../../generated/api/feed/createThread'; -import { ResolveTask } from '../../../generated/api/feed/resolveTask'; -import { CreateTestCaseResolutionStatus } from '../../../generated/api/tests/createTestCaseResolutionStatus'; +import { ReactComponent as EditIcon } from '../../../../assets/svg/edit-new.svg'; +import { ReactComponent as TaskCloseIcon } from '../../../../assets/svg/ic-close-task.svg'; +import { ReactComponent as TaskOpenIcon } from '../../../../assets/svg/ic-open-task.svg'; +import { DE_ACTIVE_COLOR } from '../../../../constants/constants'; +import { TaskOperation } from '../../../../constants/Feeds.constants'; +import { TASK_TYPES } from '../../../../constants/Task.constant'; +import { usePermissionProvider } from '../../../../context/PermissionProvider/PermissionProvider'; +import { ResourceEntity } from '../../../../context/PermissionProvider/PermissionProvider.interface'; +import { TaskType } from '../../../../generated/api/feed/createThread'; +import { ResolveTask } from '../../../../generated/api/feed/resolveTask'; +import { CreateTestCaseResolutionStatus } from '../../../../generated/api/tests/createTestCaseResolutionStatus'; import { TaskDetails, ThreadTaskStatus, -} from '../../../generated/entity/feed/thread'; -import { Operation } from '../../../generated/entity/policies/policy'; +} from '../../../../generated/entity/feed/thread'; +import { Operation } from '../../../../generated/entity/policies/policy'; import { TestCaseFailureReasonType, TestCaseResolutionStatusTypes, -} from '../../../generated/tests/testCaseResolutionStatus'; -import { TagLabel } from '../../../generated/type/tagLabel'; -import { useAuth } from '../../../hooks/authHooks'; -import Assignees from '../../../pages/TasksPage/shared/Assignees'; -import DescriptionTask from '../../../pages/TasksPage/shared/DescriptionTask'; -import TagsTask from '../../../pages/TasksPage/shared/TagsTask'; +} from '../../../../generated/tests/testCaseResolutionStatus'; +import { TagLabel } from '../../../../generated/type/tagLabel'; +import { useAuth } from '../../../../hooks/authHooks'; +import Assignees from '../../../../pages/TasksPage/shared/Assignees'; +import DescriptionTask from '../../../../pages/TasksPage/shared/DescriptionTask'; +import TagsTask from '../../../../pages/TasksPage/shared/TagsTask'; import { Option, TaskAction, TaskActionMode, -} from '../../../pages/TasksPage/TasksPage.interface'; -import { updateTask, updateThread } from '../../../rest/feedsAPI'; -import { postTestCaseIncidentStatus } from '../../../rest/incidentManagerAPI'; -import { getNameFromFQN } from '../../../utils/CommonUtils'; -import EntityLink from '../../../utils/EntityLink'; -import { getEntityFQN } from '../../../utils/FeedUtils'; -import { checkPermission } from '../../../utils/PermissionsUtils'; +} from '../../../../pages/TasksPage/TasksPage.interface'; +import { updateTask, updateThread } from '../../../../rest/feedsAPI'; +import { postTestCaseIncidentStatus } from '../../../../rest/incidentManagerAPI'; +import { getNameFromFQN } from '../../../../utils/CommonUtils'; +import EntityLink from '../../../../utils/EntityLink'; +import { getEntityFQN } from '../../../../utils/FeedUtils'; +import { checkPermission } from '../../../../utils/PermissionsUtils'; import { fetchOptions, generateOptions, @@ -94,14 +90,18 @@ import { isDescriptionTask, isTagsTask, TASK_ACTION_LIST, -} from '../../../utils/TasksUtils'; -import { showErrorToast, showSuccessToast } from '../../../utils/ToastUtils'; -import { useAuthContext } from '../../Auth/AuthProviders/AuthProvider'; -import EntityPopOverCard from '../../common/PopOverCard/EntityPopOverCard'; -import RichTextEditor from '../../common/RichTextEditor/RichTextEditor'; -import { EditorContentRef } from '../../Modals/ModalWithMarkdownEditor/ModalWithMarkdownEditor.interface'; -import { usePermissionProvider } from '../../PermissionProvider/PermissionProvider'; -import { ResourceEntity } from '../../PermissionProvider/PermissionProvider.interface'; +} from '../../../../utils/TasksUtils'; +import { showErrorToast, showSuccessToast } from '../../../../utils/ToastUtils'; +import ActivityFeedCardV1 from '../../../ActivityFeed/ActivityFeedCard/ActivityFeedCardV1'; +import ActivityFeedEditor from '../../../ActivityFeed/ActivityFeedEditor/ActivityFeedEditor'; +import { useActivityFeedProvider } from '../../../ActivityFeed/ActivityFeedProvider/ActivityFeedProvider'; +import { useAuthContext } from '../../../Auth/AuthProviders/AuthProvider'; +import AssigneeList from '../../../common/AssigneeList/AssigneeList'; +import InlineEdit from '../../../common/InlineEdit/InlineEdit.component'; +import { OwnerLabel } from '../../../common/OwnerLabel/OwnerLabel.component'; +import EntityPopOverCard from '../../../common/PopOverCard/EntityPopOverCard'; +import RichTextEditor from '../../../common/RichTextEditor/RichTextEditor'; +import { EditorContentRef } from '../../../Modals/ModalWithMarkdownEditor/ModalWithMarkdownEditor.interface'; import TaskTabIncidentManagerHeader from '../TaskTabIncidentManagerHeader/TaskTabIncidentManagerHeader.component'; import './task-tab.less'; import { TaskTabProps } from './TaskTab.interface'; diff --git a/openmetadata-ui/src/main/resources/ui/src/components/Task/TaskTab/TaskTab.interface.ts b/openmetadata-ui/src/main/resources/ui/src/components/Entity/Task/TaskTab/TaskTab.interface.ts similarity index 78% rename from openmetadata-ui/src/main/resources/ui/src/components/Task/TaskTab/TaskTab.interface.ts rename to openmetadata-ui/src/main/resources/ui/src/components/Entity/Task/TaskTab/TaskTab.interface.ts index a8043b57d5bb..c3f3bc909791 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/Task/TaskTab/TaskTab.interface.ts +++ b/openmetadata-ui/src/main/resources/ui/src/components/Entity/Task/TaskTab/TaskTab.interface.ts @@ -10,10 +10,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -import { EntityType } from '../../../enums/entity.enum'; -import { Column } from '../../../generated/entity/data/table'; -import { Thread } from '../../../generated/entity/feed/thread'; -import { EntityReference } from '../../../generated/entity/type'; +import { EntityType } from '../../../../enums/entity.enum'; +import { Column } from '../../../../generated/entity/data/table'; +import { Thread } from '../../../../generated/entity/feed/thread'; +import { EntityReference } from '../../../../generated/entity/type'; export type TaskTabProps = { taskThread: Thread; diff --git a/openmetadata-ui/src/main/resources/ui/src/components/Task/TaskTab/task-tab.less b/openmetadata-ui/src/main/resources/ui/src/components/Entity/Task/TaskTab/task-tab.less similarity index 93% rename from openmetadata-ui/src/main/resources/ui/src/components/Task/TaskTab/task-tab.less rename to openmetadata-ui/src/main/resources/ui/src/components/Entity/Task/TaskTab/task-tab.less index 96ca7cde4dfc..90d439b890eb 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/Task/TaskTab/task-tab.less +++ b/openmetadata-ui/src/main/resources/ui/src/components/Entity/Task/TaskTab/task-tab.less @@ -11,7 +11,7 @@ * limitations under the License. */ -@import (reference) url('../../../styles/variables.less'); +@import (reference) url('../../../../styles/variables.less'); .assignees-edit-input { .ant-space-item:first-child { diff --git a/openmetadata-ui/src/main/resources/ui/src/components/Task/TaskTabIncidentManagerHeader/TaskTabIncidentManagerHeader.component.tsx b/openmetadata-ui/src/main/resources/ui/src/components/Entity/Task/TaskTabIncidentManagerHeader/TaskTabIncidentManagerHeader.component.tsx similarity index 87% rename from openmetadata-ui/src/main/resources/ui/src/components/Task/TaskTabIncidentManagerHeader/TaskTabIncidentManagerHeader.component.tsx rename to openmetadata-ui/src/main/resources/ui/src/components/Entity/Task/TaskTabIncidentManagerHeader/TaskTabIncidentManagerHeader.component.tsx index a7817eb61f51..8e0b2238168b 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/Task/TaskTabIncidentManagerHeader/TaskTabIncidentManagerHeader.component.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/components/Entity/Task/TaskTabIncidentManagerHeader/TaskTabIncidentManagerHeader.component.tsx @@ -14,17 +14,17 @@ import { Col, Row, Space, Steps, Typography } from 'antd'; import { isEmpty, isUndefined, last, toLower } from 'lodash'; import React, { ReactNode, useMemo } from 'react'; import { useTranslation } from 'react-i18next'; -import { NO_DATA_PLACEHOLDER } from '../../../constants/constants'; -import { TEST_CASE_STATUS } from '../../../constants/TestSuite.constant'; -import { Thread } from '../../../generated/entity/feed/thread'; -import { TestCaseResolutionStatusTypes } from '../../../generated/tests/testCaseResolutionStatus'; -import { formatDateTime } from '../../../utils/date-time/DateTimeUtils'; -import { getEntityName } from '../../../utils/EntityUtils'; -import { useActivityFeedProvider } from '../../ActivityFeed/ActivityFeedProvider/ActivityFeedProvider'; -import AssigneeList from '../../common/AssigneeList/AssigneeList'; -import { OwnerLabel } from '../../common/OwnerLabel/OwnerLabel.component'; -import RichTextEditorPreviewer from '../../common/RichTextEditor/RichTextEditorPreviewer'; -import Severity from '../../IncidentManager/Severity/Severity.component'; +import { NO_DATA_PLACEHOLDER } from '../../../../constants/constants'; +import { TEST_CASE_STATUS } from '../../../../constants/TestSuite.constant'; +import { Thread } from '../../../../generated/entity/feed/thread'; +import { TestCaseResolutionStatusTypes } from '../../../../generated/tests/testCaseResolutionStatus'; +import { formatDateTime } from '../../../../utils/date-time/DateTimeUtils'; +import { getEntityName } from '../../../../utils/EntityUtils'; +import { useActivityFeedProvider } from '../../../ActivityFeed/ActivityFeedProvider/ActivityFeedProvider'; +import AssigneeList from '../../../common/AssigneeList/AssigneeList'; +import { OwnerLabel } from '../../../common/OwnerLabel/OwnerLabel.component'; +import RichTextEditorPreviewer from '../../../common/RichTextEditor/RichTextEditorPreviewer'; +import Severity from '../../../DataQuality/IncidentManager/Severity/Severity.component'; import './task-tab-incident-manager-header.style.less'; const TaskTabIncidentManagerHeader = ({ thread }: { thread: Thread }) => { diff --git a/openmetadata-ui/src/main/resources/ui/src/components/Task/TaskTabIncidentManagerHeader/TaskTabIncidentManagerHeader.test.tsx b/openmetadata-ui/src/main/resources/ui/src/components/Entity/Task/TaskTabIncidentManagerHeader/TaskTabIncidentManagerHeader.test.tsx similarity index 97% rename from openmetadata-ui/src/main/resources/ui/src/components/Task/TaskTabIncidentManagerHeader/TaskTabIncidentManagerHeader.test.tsx rename to openmetadata-ui/src/main/resources/ui/src/components/Entity/Task/TaskTabIncidentManagerHeader/TaskTabIncidentManagerHeader.test.tsx index 3149f6655631..c8934da67437 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/Task/TaskTabIncidentManagerHeader/TaskTabIncidentManagerHeader.test.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/components/Entity/Task/TaskTabIncidentManagerHeader/TaskTabIncidentManagerHeader.test.tsx @@ -17,8 +17,8 @@ import { screen, } from '@testing-library/react'; import React from 'react'; -import { Thread } from '../../../generated/entity/feed/thread'; -import { useActivityFeedProvider } from '../../ActivityFeed/ActivityFeedProvider/ActivityFeedProvider'; +import { Thread } from '../../../../generated/entity/feed/thread'; +import { useActivityFeedProvider } from '../../../ActivityFeed/ActivityFeedProvider/ActivityFeedProvider'; import TaskTabIncidentManagerHeader from './TaskTabIncidentManagerHeader.component'; const mockProps = { diff --git a/openmetadata-ui/src/main/resources/ui/src/components/Task/TaskTabIncidentManagerHeader/task-tab-incident-manager-header.style.less b/openmetadata-ui/src/main/resources/ui/src/components/Entity/Task/TaskTabIncidentManagerHeader/task-tab-incident-manager-header.style.less similarity index 92% rename from openmetadata-ui/src/main/resources/ui/src/components/Task/TaskTabIncidentManagerHeader/task-tab-incident-manager-header.style.less rename to openmetadata-ui/src/main/resources/ui/src/components/Entity/Task/TaskTabIncidentManagerHeader/task-tab-incident-manager-header.style.less index cfcc229ce09e..473d72ce58cc 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/Task/TaskTabIncidentManagerHeader/task-tab-incident-manager-header.style.less +++ b/openmetadata-ui/src/main/resources/ui/src/components/Entity/Task/TaskTabIncidentManagerHeader/task-tab-incident-manager-header.style.less @@ -10,7 +10,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -@import (reference) url('../../../styles/variables.less'); +@import (reference) url('../../../../styles/variables.less'); .task-resolution-steps-container { border-radius: 10px; diff --git a/openmetadata-ui/src/main/resources/ui/src/components/VersionTable/VersionTable.component.tsx b/openmetadata-ui/src/main/resources/ui/src/components/Entity/VersionTable/VersionTable.component.tsx similarity index 90% rename from openmetadata-ui/src/main/resources/ui/src/components/VersionTable/VersionTable.component.tsx rename to openmetadata-ui/src/main/resources/ui/src/components/Entity/VersionTable/VersionTable.component.tsx index 1cb9db22af46..668987b72345 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/VersionTable/VersionTable.component.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/components/Entity/VersionTable/VersionTable.component.tsx @@ -16,25 +16,25 @@ import { ColumnsType } from 'antd/lib/table'; import { isEmpty, isUndefined } from 'lodash'; import React, { useCallback, useEffect, useMemo, useState } from 'react'; import { useTranslation } from 'react-i18next'; -import FilterTablePlaceHolder from '../../components/common/ErrorWithPlaceholder/FilterTablePlaceHolder'; -import { NO_DATA_PLACEHOLDER } from '../../constants/constants'; -import { TABLE_SCROLL_VALUE } from '../../constants/Table.constants'; -import { TableConstraint } from '../../generated/api/data/createTable'; -import { SearchIndexField } from '../../generated/entity/data/searchIndex'; -import { Column } from '../../generated/entity/data/table'; +import { NO_DATA_PLACEHOLDER } from '../../../constants/constants'; +import { TABLE_SCROLL_VALUE } from '../../../constants/Table.constants'; +import { TableConstraint } from '../../../generated/api/data/createTable'; +import { SearchIndexField } from '../../../generated/entity/data/searchIndex'; +import { Column } from '../../../generated/entity/data/table'; import { getFrequentlyJoinedColumns, searchInColumns, -} from '../../utils/EntityUtils'; -import { getFilterTags } from '../../utils/TableTags/TableTags.utils'; +} from '../../../utils/EntityUtils'; +import { getFilterTags } from '../../../utils/TableTags/TableTags.utils'; import { getTableExpandableConfig, makeData, prepareConstraintIcon, -} from '../../utils/TableUtils'; -import RichTextEditorPreviewer from '../common/RichTextEditor/RichTextEditorPreviewer'; -import Searchbar from '../common/SearchBarComponent/SearchBar.component'; -import TagsViewer from '../Tag/TagsViewer/TagsViewer'; +} from '../../../utils/TableUtils'; +import FilterTablePlaceHolder from '../../common/ErrorWithPlaceholder/FilterTablePlaceHolder'; +import RichTextEditorPreviewer from '../../common/RichTextEditor/RichTextEditorPreviewer'; +import Searchbar from '../../common/SearchBarComponent/SearchBar.component'; +import TagsViewer from '../../Tag/TagsViewer/TagsViewer'; import { VersionTableProps } from './VersionTable.interfaces'; function VersionTable({ diff --git a/openmetadata-ui/src/main/resources/ui/src/components/VersionTable/VersionTable.interfaces.ts b/openmetadata-ui/src/main/resources/ui/src/components/Entity/VersionTable/VersionTable.interfaces.ts similarity index 89% rename from openmetadata-ui/src/main/resources/ui/src/components/VersionTable/VersionTable.interfaces.ts rename to openmetadata-ui/src/main/resources/ui/src/components/Entity/VersionTable/VersionTable.interfaces.ts index edbcad759220..a4d2fd956831 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/VersionTable/VersionTable.interfaces.ts +++ b/openmetadata-ui/src/main/resources/ui/src/components/Entity/VersionTable/VersionTable.interfaces.ts @@ -11,13 +11,13 @@ * limitations under the License. */ -import { SearchIndexField } from '../../generated/entity/data/searchIndex'; +import { SearchIndexField } from '../../../generated/entity/data/searchIndex'; import { Column, ColumnJoins, FieldChange, TableConstraint, -} from '../../generated/entity/data/table'; +} from '../../../generated/entity/data/table'; export interface VersionTableProps { columnName: string; diff --git a/openmetadata-ui/src/main/resources/ui/src/components/VersionTable/VersionTable.test.tsx b/openmetadata-ui/src/main/resources/ui/src/components/Entity/VersionTable/VersionTable.test.tsx similarity index 78% rename from openmetadata-ui/src/main/resources/ui/src/components/VersionTable/VersionTable.test.tsx rename to openmetadata-ui/src/main/resources/ui/src/components/Entity/VersionTable/VersionTable.test.tsx index 85680c809612..e5f0bdbc15c4 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/VersionTable/VersionTable.test.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/components/Entity/VersionTable/VersionTable.test.tsx @@ -13,23 +13,22 @@ import { render, screen } from '@testing-library/react'; import React from 'react'; -import { mockVersionTableProps } from '../../mocks/VersionTable.mock'; +import { mockVersionTableProps } from '../../../mocks/VersionTable.mock'; import VersionTable from './VersionTable.component'; -jest.mock( - '../../components/common/ErrorWithPlaceholder/FilterTablePlaceHolder', - () => jest.fn().mockImplementation(() =>
FilterTablePlaceHolder
) +jest.mock('../../common/ErrorWithPlaceholder/FilterTablePlaceHolder', () => + jest.fn().mockImplementation(() =>
FilterTablePlaceHolder
) ); -jest.mock('../common/SearchBarComponent/SearchBar.component', () => +jest.mock('../../common/SearchBarComponent/SearchBar.component', () => jest.fn().mockImplementation(() =>
SearchBar
) ); -jest.mock('../Tag/TagsViewer/TagsViewer', () => +jest.mock('../../Tag/TagsViewer/TagsViewer', () => jest.fn().mockImplementation(() =>
TagsViewer
) ); -jest.mock('../common/RichTextEditor/RichTextEditorPreviewer', () => +jest.mock('../../common/RichTextEditor/RichTextEditorPreviewer', () => jest .fn() .mockImplementation(({ markdown }) => ( diff --git a/openmetadata-ui/src/main/resources/ui/src/components/Voting/Voting.component.test.tsx b/openmetadata-ui/src/main/resources/ui/src/components/Entity/Voting/Voting.component.test.tsx similarity index 97% rename from openmetadata-ui/src/main/resources/ui/src/components/Voting/Voting.component.test.tsx rename to openmetadata-ui/src/main/resources/ui/src/components/Entity/Voting/Voting.component.test.tsx index 67da0ed44f90..4b170b9f8cc9 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/Voting/Voting.component.test.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/components/Entity/Voting/Voting.component.test.tsx @@ -13,7 +13,7 @@ import { fireEvent, render, screen } from '@testing-library/react'; import React from 'react'; -import { QueryVoteType } from '../../components/TableQueries/TableQueries.interface'; +import { QueryVoteType } from '../../Database/TableQueries/TableQueries.interface'; import Voting from './Voting.component'; import { VotingProps } from './voting.interface'; diff --git a/openmetadata-ui/src/main/resources/ui/src/components/Voting/Voting.component.tsx b/openmetadata-ui/src/main/resources/ui/src/components/Entity/Voting/Voting.component.tsx similarity index 89% rename from openmetadata-ui/src/main/resources/ui/src/components/Voting/Voting.component.tsx rename to openmetadata-ui/src/main/resources/ui/src/components/Entity/Voting/Voting.component.tsx index a0c080b97241..7a06bb394d6e 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/Voting/Voting.component.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/components/Entity/Voting/Voting.component.tsx @@ -13,9 +13,9 @@ import { Button, Typography } from 'antd'; import React from 'react'; -import { ReactComponent as ThumbsUpFilled } from '../../assets/svg/thumbs-up-filled.svg'; -import { ReactComponent as ThumbsUpOutline } from '../../assets/svg/thumbs-up-outline.svg'; -import { QueryVoteType } from '../../components/TableQueries/TableQueries.interface'; +import { ReactComponent as ThumbsUpFilled } from '../../../assets/svg/thumbs-up-filled.svg'; +import { ReactComponent as ThumbsUpOutline } from '../../../assets/svg/thumbs-up-outline.svg'; +import { QueryVoteType } from '../../Database/TableQueries/TableQueries.interface'; import { VotingProps } from './voting.interface'; const Voting = ({ votes, disabled, voteStatus, onUpdateVote }: VotingProps) => { diff --git a/openmetadata-ui/src/main/resources/ui/src/components/Voting/voting.interface.ts b/openmetadata-ui/src/main/resources/ui/src/components/Entity/Voting/voting.interface.ts similarity index 85% rename from openmetadata-ui/src/main/resources/ui/src/components/Voting/voting.interface.ts rename to openmetadata-ui/src/main/resources/ui/src/components/Entity/Voting/voting.interface.ts index 1aca7acc8944..ae41072b1914 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/Voting/voting.interface.ts +++ b/openmetadata-ui/src/main/resources/ui/src/components/Entity/Voting/voting.interface.ts @@ -11,8 +11,8 @@ * limitations under the License. */ -import { QueryVoteType } from '../../components/TableQueries/TableQueries.interface'; -import { Votes } from '../../generated/type/votes'; +import { Votes } from '../../../generated/type/votes'; +import { QueryVoteType } from '../../Database/TableQueries/TableQueries.interface'; export interface VotingProps { votes?: Votes; diff --git a/openmetadata-ui/src/main/resources/ui/src/components/Explore/AdvanceSearchProvider/AdvanceSearchProvider.component.tsx b/openmetadata-ui/src/main/resources/ui/src/components/Explore/AdvanceSearchProvider/AdvanceSearchProvider.component.tsx index 37b1dcb45c9e..e5c606dceefd 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/Explore/AdvanceSearchProvider/AdvanceSearchProvider.component.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/components/Explore/AdvanceSearchProvider/AdvanceSearchProvider.component.tsx @@ -39,7 +39,7 @@ import { EntitiesSupportedCustomProperties } from '../../../utils/CustomProperti import { elasticSearchFormat } from '../../../utils/QueryBuilderElasticsearchFormatUtils'; import searchClassBase from '../../../utils/SearchClassBase'; import { getEntityTypeFromSearchIndex } from '../../../utils/SearchUtils'; -import Loader from '../../Loader/Loader'; +import Loader from '../../common/Loader/Loader'; import { AdvancedSearchModal } from '../AdvanceSearchModal.component'; import { ExploreSearchIndex, UrlParams } from '../ExplorePage.interface'; import { diff --git a/openmetadata-ui/src/main/resources/ui/src/components/Explore/EntitySummaryPanel/ContainerSummary/ContainerSummary.component.tsx b/openmetadata-ui/src/main/resources/ui/src/components/Explore/EntitySummaryPanel/ContainerSummary/ContainerSummary.component.tsx index d2f367cec747..1420e0d7411d 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/Explore/EntitySummaryPanel/ContainerSummary/ContainerSummary.component.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/components/Explore/EntitySummaryPanel/ContainerSummary/ContainerSummary.component.tsx @@ -26,8 +26,8 @@ import { DRAWER_NAVIGATION_OPTIONS, getEntityOverview, } from '../../../../utils/EntityUtils'; +import SummaryPanelSkeleton from '../../../common/Skeleton/SummaryPanelSkeleton/SummaryPanelSkeleton.component'; import SummaryTagsDescription from '../../../common/SummaryTagsDescription/SummaryTagsDescription.component'; -import SummaryPanelSkeleton from '../../../Skeleton/SummaryPanelSkeleton/SummaryPanelSkeleton.component'; import CommonEntitySummaryInfo from '../CommonEntitySummaryInfo/CommonEntitySummaryInfo'; import SummaryList from '../SummaryList/SummaryList.component'; import { BasicEntityInfo } from '../SummaryList/SummaryList.interface'; diff --git a/openmetadata-ui/src/main/resources/ui/src/components/Explore/EntitySummaryPanel/DashboardSummary/DashboardSummary.component.tsx b/openmetadata-ui/src/main/resources/ui/src/components/Explore/EntitySummaryPanel/DashboardSummary/DashboardSummary.component.tsx index 0b391421fa36..224b6f058a2a 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/Explore/EntitySummaryPanel/DashboardSummary/DashboardSummary.component.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/components/Explore/EntitySummaryPanel/DashboardSummary/DashboardSummary.component.tsx @@ -30,10 +30,10 @@ import { DRAWER_NAVIGATION_OPTIONS, getEntityOverview, } from '../../../../utils/EntityUtils'; +import SummaryPanelSkeleton from '../../../common/Skeleton/SummaryPanelSkeleton/SummaryPanelSkeleton.component'; import SummaryTagsDescription from '../../../common/SummaryTagsDescription/SummaryTagsDescription.component'; -import { ChartType } from '../../../DashboardDetails/DashboardDetails.interface'; +import { ChartType } from '../../../Dashboard/DashboardDetails/DashboardDetails.interface'; import { SearchedDataProps } from '../../../SearchedData/SearchedData.interface'; -import SummaryPanelSkeleton from '../../../Skeleton/SummaryPanelSkeleton/SummaryPanelSkeleton.component'; import CommonEntitySummaryInfo from '../CommonEntitySummaryInfo/CommonEntitySummaryInfo'; import SummaryList from '../SummaryList/SummaryList.component'; import { BasicEntityInfo } from '../SummaryList/SummaryList.interface'; diff --git a/openmetadata-ui/src/main/resources/ui/src/components/Explore/EntitySummaryPanel/DataModelSummary/DataModelSummary.component.tsx b/openmetadata-ui/src/main/resources/ui/src/components/Explore/EntitySummaryPanel/DataModelSummary/DataModelSummary.component.tsx index 4717ee7ab631..32d8e4145ce0 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/Explore/EntitySummaryPanel/DataModelSummary/DataModelSummary.component.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/components/Explore/EntitySummaryPanel/DataModelSummary/DataModelSummary.component.tsx @@ -26,8 +26,8 @@ import { DRAWER_NAVIGATION_OPTIONS, getEntityOverview, } from '../../../../utils/EntityUtils'; +import SummaryPanelSkeleton from '../../../common/Skeleton/SummaryPanelSkeleton/SummaryPanelSkeleton.component'; import SummaryTagsDescription from '../../../common/SummaryTagsDescription/SummaryTagsDescription.component'; -import SummaryPanelSkeleton from '../../../Skeleton/SummaryPanelSkeleton/SummaryPanelSkeleton.component'; import CommonEntitySummaryInfo from '../CommonEntitySummaryInfo/CommonEntitySummaryInfo'; import SummaryList from '../SummaryList/SummaryList.component'; import { BasicEntityInfo } from '../SummaryList/SummaryList.interface'; diff --git a/openmetadata-ui/src/main/resources/ui/src/components/Explore/EntitySummaryPanel/DataProductSummary/DataProductSummary.component.tsx b/openmetadata-ui/src/main/resources/ui/src/components/Explore/EntitySummaryPanel/DataProductSummary/DataProductSummary.component.tsx index aac9781e9491..a50a9fd2048f 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/Explore/EntitySummaryPanel/DataProductSummary/DataProductSummary.component.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/components/Explore/EntitySummaryPanel/DataProductSummary/DataProductSummary.component.tsx @@ -17,7 +17,7 @@ import { DataProduct } from '../../../../generated/entity/domains/dataProduct'; import { getEntityName } from '../../../../utils/EntityUtils'; import { OwnerLabel } from '../../../common/OwnerLabel/OwnerLabel.component'; import RichTextEditorPreviewer from '../../../common/RichTextEditor/RichTextEditorPreviewer'; -import SummaryPanelSkeleton from '../../../Skeleton/SummaryPanelSkeleton/SummaryPanelSkeleton.component'; +import SummaryPanelSkeleton from '../../../common/Skeleton/SummaryPanelSkeleton/SummaryPanelSkeleton.component'; interface DataProductSummaryProps { entityDetails: DataProduct; diff --git a/openmetadata-ui/src/main/resources/ui/src/components/Explore/EntitySummaryPanel/DatabaseSchemaSummary/DatabaseSchemaSummary.component.tsx b/openmetadata-ui/src/main/resources/ui/src/components/Explore/EntitySummaryPanel/DatabaseSchemaSummary/DatabaseSchemaSummary.component.tsx index 09cee6265846..a464e4b39e84 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/Explore/EntitySummaryPanel/DatabaseSchemaSummary/DatabaseSchemaSummary.component.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/components/Explore/EntitySummaryPanel/DatabaseSchemaSummary/DatabaseSchemaSummary.component.tsx @@ -14,13 +14,13 @@ import { Col, Divider, Row } from 'antd'; import { get } from 'lodash'; import React, { useMemo } from 'react'; import SummaryTagsDescription from '../../../../components/common/SummaryTagsDescription/SummaryTagsDescription.component'; -import SummaryPanelSkeleton from '../../../../components/Skeleton/SummaryPanelSkeleton/SummaryPanelSkeleton.component'; import { ExplorePageTabs } from '../../../../enums/Explore.enum'; import { getSortedTagsWithHighlight } from '../../../../utils/EntitySummaryPanelUtils'; import { DRAWER_NAVIGATION_OPTIONS, getEntityOverview, } from '../../../../utils/EntityUtils'; +import SummaryPanelSkeleton from '../../../common/Skeleton/SummaryPanelSkeleton/SummaryPanelSkeleton.component'; import CommonEntitySummaryInfo from '../CommonEntitySummaryInfo/CommonEntitySummaryInfo'; import { DatabaseSchemaSummaryProps } from './DatabaseSchemaSummary.interface'; diff --git a/openmetadata-ui/src/main/resources/ui/src/components/Explore/EntitySummaryPanel/DatabaseSummary/DatabaseSummary.component.tsx b/openmetadata-ui/src/main/resources/ui/src/components/Explore/EntitySummaryPanel/DatabaseSummary/DatabaseSummary.component.tsx index 8eed11795624..1c2ea8b27f9f 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/Explore/EntitySummaryPanel/DatabaseSummary/DatabaseSummary.component.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/components/Explore/EntitySummaryPanel/DatabaseSummary/DatabaseSummary.component.tsx @@ -16,7 +16,6 @@ import { get } from 'lodash'; import React, { useMemo } from 'react'; import { useTranslation } from 'react-i18next'; import SummaryTagsDescription from '../../../../components/common/SummaryTagsDescription/SummaryTagsDescription.component'; -import SummaryPanelSkeleton from '../../../../components/Skeleton/SummaryPanelSkeleton/SummaryPanelSkeleton.component'; import { SummaryEntityType } from '../../../../enums/EntitySummary.enum'; import { ExplorePageTabs } from '../../../../enums/Explore.enum'; import { @@ -27,6 +26,7 @@ import { DRAWER_NAVIGATION_OPTIONS, getEntityOverview, } from '../../../../utils/EntityUtils'; +import SummaryPanelSkeleton from '../../../common/Skeleton/SummaryPanelSkeleton/SummaryPanelSkeleton.component'; import CommonEntitySummaryInfo from '../CommonEntitySummaryInfo/CommonEntitySummaryInfo'; import SummaryList from '../SummaryList/SummaryList.component'; import { BasicEntityInfo } from '../SummaryList/SummaryList.interface'; diff --git a/openmetadata-ui/src/main/resources/ui/src/components/Explore/EntitySummaryPanel/EntitySummaryPanel.component.tsx b/openmetadata-ui/src/main/resources/ui/src/components/Explore/EntitySummaryPanel/EntitySummaryPanel.component.tsx index ed7935212275..2ddfb9c88325 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/Explore/EntitySummaryPanel/EntitySummaryPanel.component.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/components/Explore/EntitySummaryPanel/EntitySummaryPanel.component.tsx @@ -15,6 +15,11 @@ import { Drawer, Typography } from 'antd'; import { get } from 'lodash'; import React, { useEffect, useMemo, useState } from 'react'; import { Link, useParams } from 'react-router-dom'; +import { usePermissionProvider } from '../../../context/PermissionProvider/PermissionProvider'; +import { + OperationPermission, + ResourceEntity, +} from '../../../context/PermissionProvider/PermissionProvider.interface'; import { ERROR_PLACEHOLDER_TYPE, SIZE } from '../../../enums/common.enum'; import { EntityType } from '../../../enums/entity.enum'; import { ExplorePageTabs } from '../../../enums/Explore.enum'; @@ -44,12 +49,7 @@ import { DEFAULT_ENTITY_PERMISSION } from '../../../utils/PermissionsUtils'; import searchClassBase from '../../../utils/SearchClassBase'; import { stringToHTML } from '../../../utils/StringsUtils'; import ErrorPlaceHolder from '../../common/ErrorWithPlaceholder/ErrorPlaceHolder'; -import Loader from '../../Loader/Loader'; -import { usePermissionProvider } from '../../PermissionProvider/PermissionProvider'; -import { - OperationPermission, - ResourceEntity, -} from '../../PermissionProvider/PermissionProvider.interface'; +import Loader from '../../common/Loader/Loader'; import ContainerSummary from './ContainerSummary/ContainerSummary.component'; import DashboardSummary from './DashboardSummary/DashboardSummary.component'; import DatabaseSchemaSummary from './DatabaseSchemaSummary/DatabaseSchemaSummary.component'; diff --git a/openmetadata-ui/src/main/resources/ui/src/components/Explore/EntitySummaryPanel/GlossaryTermSummary/GlossaryTermSummary.component.tsx b/openmetadata-ui/src/main/resources/ui/src/components/Explore/EntitySummaryPanel/GlossaryTermSummary/GlossaryTermSummary.component.tsx index 36e0c9cbde86..3fdb69c05ee3 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/Explore/EntitySummaryPanel/GlossaryTermSummary/GlossaryTermSummary.component.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/components/Explore/EntitySummaryPanel/GlossaryTermSummary/GlossaryTermSummary.component.tsx @@ -20,8 +20,8 @@ import { GlossaryTerm } from '../../../../generated/entity/data/glossaryTerm'; import { getGlossaryTermByFQN } from '../../../../rest/glossaryAPI'; import { getFormattedEntityData } from '../../../../utils/EntitySummaryPanelUtils'; import { OwnerLabel } from '../../../common/OwnerLabel/OwnerLabel.component'; -import SummaryPanelSkeleton from '../../../Skeleton/SummaryPanelSkeleton/SummaryPanelSkeleton.component'; -import TagButton from '../../../TagButton/TagButton.component'; +import SummaryPanelSkeleton from '../../../common/Skeleton/SummaryPanelSkeleton/SummaryPanelSkeleton.component'; +import TagButton from '../../../common/TagButton/TagButton.component'; import SummaryList from '../SummaryList/SummaryList.component'; import { BasicEntityInfo } from '../SummaryList/SummaryList.interface'; import { GlossaryTermSummaryProps } from './GlossaryTermSummary.interface'; diff --git a/openmetadata-ui/src/main/resources/ui/src/components/Explore/EntitySummaryPanel/MlModelSummary/MlModelSummary.component.tsx b/openmetadata-ui/src/main/resources/ui/src/components/Explore/EntitySummaryPanel/MlModelSummary/MlModelSummary.component.tsx index 7e299a344020..515c6e084b86 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/Explore/EntitySummaryPanel/MlModelSummary/MlModelSummary.component.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/components/Explore/EntitySummaryPanel/MlModelSummary/MlModelSummary.component.tsx @@ -26,9 +26,9 @@ import { DRAWER_NAVIGATION_OPTIONS, getEntityOverview, } from '../../../../utils/EntityUtils'; +import SummaryPanelSkeleton from '../../../common/Skeleton/SummaryPanelSkeleton/SummaryPanelSkeleton.component'; import SummaryTagsDescription from '../../../common/SummaryTagsDescription/SummaryTagsDescription.component'; import { SearchedDataProps } from '../../../SearchedData/SearchedData.interface'; -import SummaryPanelSkeleton from '../../../Skeleton/SummaryPanelSkeleton/SummaryPanelSkeleton.component'; import CommonEntitySummaryInfo from '../CommonEntitySummaryInfo/CommonEntitySummaryInfo'; import SummaryList from '../SummaryList/SummaryList.component'; import { BasicEntityInfo } from '../SummaryList/SummaryList.interface'; diff --git a/openmetadata-ui/src/main/resources/ui/src/components/Explore/EntitySummaryPanel/PipelineSummary/PipelineSummary.component.tsx b/openmetadata-ui/src/main/resources/ui/src/components/Explore/EntitySummaryPanel/PipelineSummary/PipelineSummary.component.tsx index 1b94a05b6c7c..225ec3beb251 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/Explore/EntitySummaryPanel/PipelineSummary/PipelineSummary.component.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/components/Explore/EntitySummaryPanel/PipelineSummary/PipelineSummary.component.tsx @@ -26,9 +26,9 @@ import { DRAWER_NAVIGATION_OPTIONS, getEntityOverview, } from '../../../../utils/EntityUtils'; +import SummaryPanelSkeleton from '../../../common/Skeleton/SummaryPanelSkeleton/SummaryPanelSkeleton.component'; import SummaryTagsDescription from '../../../common/SummaryTagsDescription/SummaryTagsDescription.component'; import { SearchedDataProps } from '../../../SearchedData/SearchedData.interface'; -import SummaryPanelSkeleton from '../../../Skeleton/SummaryPanelSkeleton/SummaryPanelSkeleton.component'; import CommonEntitySummaryInfo from '../CommonEntitySummaryInfo/CommonEntitySummaryInfo'; import SummaryList from '../SummaryList/SummaryList.component'; import { BasicEntityInfo } from '../SummaryList/SummaryList.interface'; diff --git a/openmetadata-ui/src/main/resources/ui/src/components/Explore/EntitySummaryPanel/SearchIndexSummary/SearchIndexSummary.component.tsx b/openmetadata-ui/src/main/resources/ui/src/components/Explore/EntitySummaryPanel/SearchIndexSummary/SearchIndexSummary.component.tsx index 720092d867e2..dc69bb0b388f 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/Explore/EntitySummaryPanel/SearchIndexSummary/SearchIndexSummary.component.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/components/Explore/EntitySummaryPanel/SearchIndexSummary/SearchIndexSummary.component.tsx @@ -26,8 +26,8 @@ import { DRAWER_NAVIGATION_OPTIONS, getEntityOverview, } from '../../../../utils/EntityUtils'; +import SummaryPanelSkeleton from '../../../common/Skeleton/SummaryPanelSkeleton/SummaryPanelSkeleton.component'; import SummaryTagsDescription from '../../../common/SummaryTagsDescription/SummaryTagsDescription.component'; -import SummaryPanelSkeleton from '../../../Skeleton/SummaryPanelSkeleton/SummaryPanelSkeleton.component'; import CommonEntitySummaryInfo from '../CommonEntitySummaryInfo/CommonEntitySummaryInfo'; import SummaryList from '../SummaryList/SummaryList.component'; import { BasicEntityInfo } from '../SummaryList/SummaryList.interface'; diff --git a/openmetadata-ui/src/main/resources/ui/src/components/Explore/EntitySummaryPanel/ServiceSummary/ServiceSummary.component.tsx b/openmetadata-ui/src/main/resources/ui/src/components/Explore/EntitySummaryPanel/ServiceSummary/ServiceSummary.component.tsx index 42874461342d..3e2b50553e2a 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/Explore/EntitySummaryPanel/ServiceSummary/ServiceSummary.component.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/components/Explore/EntitySummaryPanel/ServiceSummary/ServiceSummary.component.tsx @@ -14,12 +14,12 @@ import { Col, Divider, Row } from 'antd'; import { get } from 'lodash'; import React, { useMemo } from 'react'; import SummaryTagsDescription from '../../../../components/common/SummaryTagsDescription/SummaryTagsDescription.component'; -import SummaryPanelSkeleton from '../../../../components/Skeleton/SummaryPanelSkeleton/SummaryPanelSkeleton.component'; import { getSortedTagsWithHighlight } from '../../../../utils/EntitySummaryPanelUtils'; import { DRAWER_NAVIGATION_OPTIONS, getEntityOverview, } from '../../../../utils/EntityUtils'; +import SummaryPanelSkeleton from '../../../common/Skeleton/SummaryPanelSkeleton/SummaryPanelSkeleton.component'; import CommonEntitySummaryInfo from '../CommonEntitySummaryInfo/CommonEntitySummaryInfo'; import { ServiceSummaryProps } from './ServiceSummary.interface'; diff --git a/openmetadata-ui/src/main/resources/ui/src/components/Explore/EntitySummaryPanel/StoredProcedureSummary/StoredProcedureSummary.component.tsx b/openmetadata-ui/src/main/resources/ui/src/components/Explore/EntitySummaryPanel/StoredProcedureSummary/StoredProcedureSummary.component.tsx index 2e9000aa61ec..d0111e0f7cdf 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/Explore/EntitySummaryPanel/StoredProcedureSummary/StoredProcedureSummary.component.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/components/Explore/EntitySummaryPanel/StoredProcedureSummary/StoredProcedureSummary.component.tsx @@ -23,9 +23,9 @@ import { DRAWER_NAVIGATION_OPTIONS, getEntityOverview, } from '../../../../utils/EntityUtils'; +import SummaryPanelSkeleton from '../../../common/Skeleton/SummaryPanelSkeleton/SummaryPanelSkeleton.component'; import SummaryTagsDescription from '../../../common/SummaryTagsDescription/SummaryTagsDescription.component'; -import SchemaEditor from '../../../SchemaEditor/SchemaEditor'; -import SummaryPanelSkeleton from '../../../Skeleton/SummaryPanelSkeleton/SummaryPanelSkeleton.component'; +import SchemaEditor from '../../../Database/SchemaEditor/SchemaEditor'; import CommonEntitySummaryInfo from '../CommonEntitySummaryInfo/CommonEntitySummaryInfo'; import { StoredProcedureSummaryProps } from './StoredProcedureSummary.interface'; diff --git a/openmetadata-ui/src/main/resources/ui/src/components/Explore/EntitySummaryPanel/TableSummary/TableSummary.component.tsx b/openmetadata-ui/src/main/resources/ui/src/components/Explore/EntitySummaryPanel/TableSummary/TableSummary.component.tsx index 9a18514d4fee..dfef255210ec 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/Explore/EntitySummaryPanel/TableSummary/TableSummary.component.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/components/Explore/EntitySummaryPanel/TableSummary/TableSummary.component.tsx @@ -24,6 +24,11 @@ import { useTranslation } from 'react-i18next'; import { useLocation } from 'react-router-dom'; import { ROUTES } from '../../../../constants/constants'; import { mockTablePermission } from '../../../../constants/mockTourData.constants'; +import { usePermissionProvider } from '../../../../context/PermissionProvider/PermissionProvider'; +import { + OperationPermission, + ResourceEntity, +} from '../../../../context/PermissionProvider/PermissionProvider.interface'; import { SummaryEntityType } from '../../../../enums/EntitySummary.enum'; import { ExplorePageTabs } from '../../../../enums/Explore.enum'; import { Table, TestSummary } from '../../../../generated/entity/data/table'; @@ -41,13 +46,8 @@ import { getEntityOverview, } from '../../../../utils/EntityUtils'; import { DEFAULT_ENTITY_PERMISSION } from '../../../../utils/PermissionsUtils'; +import SummaryPanelSkeleton from '../../../common/Skeleton/SummaryPanelSkeleton/SummaryPanelSkeleton.component'; import SummaryTagsDescription from '../../../common/SummaryTagsDescription/SummaryTagsDescription.component'; -import { usePermissionProvider } from '../../../PermissionProvider/PermissionProvider'; -import { - OperationPermission, - ResourceEntity, -} from '../../../PermissionProvider/PermissionProvider.interface'; -import SummaryPanelSkeleton from '../../../Skeleton/SummaryPanelSkeleton/SummaryPanelSkeleton.component'; import CommonEntitySummaryInfo from '../CommonEntitySummaryInfo/CommonEntitySummaryInfo'; import SummaryList from '../SummaryList/SummaryList.component'; import { BasicEntityInfo } from '../SummaryList/SummaryList.interface'; diff --git a/openmetadata-ui/src/main/resources/ui/src/components/Explore/EntitySummaryPanel/TagsSummary/TagsSummary.component.tsx b/openmetadata-ui/src/main/resources/ui/src/components/Explore/EntitySummaryPanel/TagsSummary/TagsSummary.component.tsx index 2899dc4fa067..0acd0d2fc848 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/Explore/EntitySummaryPanel/TagsSummary/TagsSummary.component.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/components/Explore/EntitySummaryPanel/TagsSummary/TagsSummary.component.tsx @@ -16,9 +16,9 @@ import React, { useCallback, useEffect, useMemo, useState } from 'react'; import { useTranslation } from 'react-i18next'; import { SearchIndex } from '../../../../enums/search.enum'; import { searchData } from '../../../../rest/miscAPI'; +import SummaryPanelSkeleton from '../../../common/Skeleton/SummaryPanelSkeleton/SummaryPanelSkeleton.component'; import TableDataCardV2 from '../../../common/TableDataCardV2/TableDataCardV2'; import { SourceType } from '../../../SearchedData/SearchedData.interface'; -import SummaryPanelSkeleton from '../../../Skeleton/SummaryPanelSkeleton/SummaryPanelSkeleton.component'; import { EntityUnion } from '../../ExplorePage.interface'; import { TagsSummaryProps } from './TagsSummary.interface'; diff --git a/openmetadata-ui/src/main/resources/ui/src/components/Explore/EntitySummaryPanel/TopicSummary/TopicSummary.component.tsx b/openmetadata-ui/src/main/resources/ui/src/components/Explore/EntitySummaryPanel/TopicSummary/TopicSummary.component.tsx index 0f612ad78a26..bbc10a2a93e3 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/Explore/EntitySummaryPanel/TopicSummary/TopicSummary.component.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/components/Explore/EntitySummaryPanel/TopicSummary/TopicSummary.component.tsx @@ -30,10 +30,10 @@ import { } from '../../../../utils/EntityUtils'; import { bytesToSize } from '../../../../utils/StringsUtils'; import { getConfigObject } from '../../../../utils/TopicDetailsUtils'; +import SummaryPanelSkeleton from '../../../common/Skeleton/SummaryPanelSkeleton/SummaryPanelSkeleton.component'; import SummaryTagsDescription from '../../../common/SummaryTagsDescription/SummaryTagsDescription.component'; import { SearchedDataProps } from '../../../SearchedData/SearchedData.interface'; -import SummaryPanelSkeleton from '../../../Skeleton/SummaryPanelSkeleton/SummaryPanelSkeleton.component'; -import { TopicConfigObjectInterface } from '../../../TopicDetails/TopicDetails.interface'; +import { TopicConfigObjectInterface } from '../../../Topic/TopicDetails/TopicDetails.interface'; import SummaryList from '../SummaryList/SummaryList.component'; import { BasicEntityInfo } from '../SummaryList/SummaryList.interface'; diff --git a/openmetadata-ui/src/main/resources/ui/src/components/ExploreV1/ExploreSearchCard/ExploreSearchCard.tsx b/openmetadata-ui/src/main/resources/ui/src/components/ExploreV1/ExploreSearchCard/ExploreSearchCard.tsx index 7e24b97f8981..096f78aa5e82 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/ExploreV1/ExploreSearchCard/ExploreSearchCard.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/components/ExploreV1/ExploreSearchCard/ExploreSearchCard.tsx @@ -17,6 +17,7 @@ import { ExtraInfo } from 'Models'; import React, { forwardRef, useMemo } from 'react'; import { useTranslation } from 'react-i18next'; import { Link, useParams } from 'react-router-dom'; +import { useTourProvider } from '../../../context/TourProvider/TourProvider'; import { EntityType } from '../../../enums/entity.enum'; import { OwnerType } from '../../../enums/user.enum'; import { EntityReference } from '../../../generated/entity/type'; @@ -30,8 +31,7 @@ import searchClassBase from '../../../utils/SearchClassBase'; import { stringToHTML } from '../../../utils/StringsUtils'; import { getEntityIcon, getUsagePercentile } from '../../../utils/TableUtils'; import TitleBreadcrumb from '../../common/TitleBreadcrumb/TitleBreadcrumb.component'; -import TableDataCardBody from '../../TableDataCardBody/TableDataCardBody'; -import { useTourProvider } from '../../TourProvider/TourProvider'; +import TableDataCardBody from '../../Database/TableDataCardBody/TableDataCardBody'; import './explore-search-card.less'; import { ExploreSearchCardProps } from './ExploreSearchCard.interface'; diff --git a/openmetadata-ui/src/main/resources/ui/src/components/ExploreV1/ExploreV1.component.tsx b/openmetadata-ui/src/main/resources/ui/src/components/ExploreV1/ExploreV1.component.tsx index 205ffbd7a577..6defefdf3a81 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/ExploreV1/ExploreV1.component.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/components/ExploreV1/ExploreV1.component.tsx @@ -56,12 +56,12 @@ import { highlightEntityNameAndDescription } from '../../utils/EntityUtils'; import { getSelectedValuesFromQuickFilter } from '../../utils/Explore.utils'; import { getApplicationDetailsPath } from '../../utils/RouterUtils'; import searchClassBase from '../../utils/SearchClassBase'; +import Loader from '../common/Loader/Loader'; import { ExploreProps, ExploreQuickFilterField, ExploreSearchIndex, } from '../Explore/ExplorePage.interface'; -import Loader from '../Loader/Loader'; import PageLayoutV1 from '../PageLayoutV1/PageLayoutV1'; import SearchedData from '../SearchedData/SearchedData'; import { SearchedDataProps } from '../SearchedData/SearchedData.interface'; diff --git a/openmetadata-ui/src/main/resources/ui/src/components/Glossary/GlossaryDetails/GlossaryDetails.component.tsx b/openmetadata-ui/src/main/resources/ui/src/components/Glossary/GlossaryDetails/GlossaryDetails.component.tsx index 18c1acf187b5..0e8d11b4fecb 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/Glossary/GlossaryDetails/GlossaryDetails.component.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/components/Glossary/GlossaryDetails/GlossaryDetails.component.tsx @@ -28,7 +28,7 @@ import { getEntityName } from '../../../utils/EntityUtils'; import { getEntityVersionByField } from '../../../utils/EntityVersionUtils'; import { ActivityFeedTab } from '../../ActivityFeed/ActivityFeedTab/ActivityFeedTab.component'; import DescriptionV1 from '../../common/EntityDescription/DescriptionV1'; -import TabsLabel from '../../TabsLabel/TabsLabel.component'; +import TabsLabel from '../../common/TabsLabel/TabsLabel.component'; import GlossaryDetailsRightPanel from '../GlossaryDetailsRightPanel/GlossaryDetailsRightPanel.component'; import GlossaryHeader from '../GlossaryHeader/GlossaryHeader.component'; import GlossaryTermTab from '../GlossaryTermTab/GlossaryTermTab.component'; diff --git a/openmetadata-ui/src/main/resources/ui/src/components/Glossary/GlossaryDetails/GlossaryDetails.interface.ts b/openmetadata-ui/src/main/resources/ui/src/components/Glossary/GlossaryDetails/GlossaryDetails.interface.ts index c9ffb55067e1..48cea3166c85 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/Glossary/GlossaryDetails/GlossaryDetails.interface.ts +++ b/openmetadata-ui/src/main/resources/ui/src/components/Glossary/GlossaryDetails/GlossaryDetails.interface.ts @@ -11,10 +11,10 @@ * limitations under the License. */ +import { OperationPermission } from '../../../context/PermissionProvider/PermissionProvider.interface'; import { Glossary } from '../../../generated/entity/data/glossary'; import { GlossaryTerm } from '../../../generated/entity/data/glossaryTerm'; -import { OperationPermission } from '../../PermissionProvider/PermissionProvider.interface'; -import { VotingDataProps } from '../../Voting/voting.interface'; +import { VotingDataProps } from '../../Entity/Voting/voting.interface'; export enum GlossaryTabs { TERMS = 'terms', diff --git a/openmetadata-ui/src/main/resources/ui/src/components/Glossary/GlossaryDetails/GlossaryDetails.test.tsx b/openmetadata-ui/src/main/resources/ui/src/components/Glossary/GlossaryDetails/GlossaryDetails.test.tsx index 1c36b0b6dc24..d8fd176edf8b 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/Glossary/GlossaryDetails/GlossaryDetails.test.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/components/Glossary/GlossaryDetails/GlossaryDetails.test.tsx @@ -13,8 +13,8 @@ import { act, render, screen } from '@testing-library/react'; import React from 'react'; +import { OperationPermission } from '../../../context/PermissionProvider/PermissionProvider.interface'; import { mockedGlossaries } from '../../../mocks/Glossary.mock'; -import { OperationPermission } from '../../PermissionProvider/PermissionProvider.interface'; import GlossaryDetails from './GlossaryDetails.component'; jest.mock('../GlossaryTermTab/GlossaryTermTab.component', () => { diff --git a/openmetadata-ui/src/main/resources/ui/src/components/Glossary/GlossaryDetailsRightPanel/GlossaryDetailsRightPanel.component.tsx b/openmetadata-ui/src/main/resources/ui/src/components/Glossary/GlossaryDetailsRightPanel/GlossaryDetailsRightPanel.component.tsx index 427bc441c0a7..9204dbc2288f 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/Glossary/GlossaryDetailsRightPanel/GlossaryDetailsRightPanel.component.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/components/Glossary/GlossaryDetailsRightPanel/GlossaryDetailsRightPanel.component.tsx @@ -20,8 +20,6 @@ import { ReactComponent as PlusIcon } from '../../../assets/svg/plus-primary.svg import ProfilePicture from '../../../components/common/ProfilePicture/ProfilePicture'; import { UserSelectableList } from '../../../components/common/UserSelectableList/UserSelectableList.component'; import { UserTeamSelectableList } from '../../../components/common/UserTeamSelectableList/UserTeamSelectableList.component'; -import { OperationPermission } from '../../../components/PermissionProvider/PermissionProvider.interface'; -import TagButton from '../../../components/TagButton/TagButton.component'; import { DE_ACTIVE_COLOR, getTeamAndUserDetailsPath, @@ -29,6 +27,7 @@ import { NO_DATA_PLACEHOLDER, } from '../../../constants/constants'; import { EntityField } from '../../../constants/Feeds.constants'; +import { OperationPermission } from '../../../context/PermissionProvider/PermissionProvider.interface'; import { EntityType } from '../../../enums/entity.enum'; import { Glossary, TagSource } from '../../../generated/entity/data/glossary'; import { @@ -48,6 +47,7 @@ import { import { CustomPropertyTable } from '../../common/CustomPropertyTable/CustomPropertyTable'; import { ExtentionEntitiesKeys } from '../../common/CustomPropertyTable/CustomPropertyTable.interface'; import { DomainLabel } from '../../common/DomainLabel/DomainLabel.component'; +import TagButton from '../../common/TagButton/TagButton.component'; import TagsContainerV2 from '../../Tag/TagsContainerV2/TagsContainerV2'; import { DisplayType } from '../../Tag/TagsViewer/TagsViewer.interface'; import GlossaryReviewers from './GlossaryReviewers'; diff --git a/openmetadata-ui/src/main/resources/ui/src/components/Glossary/GlossaryDetailsRightPanel/GlossaryDetailsRightPanel.test.tsx b/openmetadata-ui/src/main/resources/ui/src/components/Glossary/GlossaryDetailsRightPanel/GlossaryDetailsRightPanel.test.tsx index 7d30f2fd59b1..08f28b887cd2 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/Glossary/GlossaryDetailsRightPanel/GlossaryDetailsRightPanel.test.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/components/Glossary/GlossaryDetailsRightPanel/GlossaryDetailsRightPanel.test.tsx @@ -13,9 +13,9 @@ import { render } from '@testing-library/react'; import React from 'react'; import { BrowserRouter } from 'react-router-dom'; +import { OperationPermission } from '../../../context/PermissionProvider/PermissionProvider.interface'; import { EntityType } from '../../../enums/entity.enum'; import { mockedGlossaries } from '../../../mocks/Glossary.mock'; -import { OperationPermission } from '../../PermissionProvider/PermissionProvider.interface'; import GlossaryDetailsRightPanel from './GlossaryDetailsRightPanel.component'; const mockPermissions = { 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 33222eaa52aa..a758abe51470 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 @@ -44,8 +44,6 @@ import { useEntityExportModalProvider } from '../../../components/Entity/EntityE import { EntityHeader } from '../../../components/Entity/EntityHeader/EntityHeader.component'; import EntityDeleteModal from '../../../components/Modals/EntityDeleteModal/EntityDeleteModal'; import EntityNameModal from '../../../components/Modals/EntityNameModal/EntityNameModal.component'; -import Voting from '../../../components/Voting/Voting.component'; -import { VotingDataProps } from '../../../components/Voting/voting.interface'; import { FQN_SEPARATOR_CHAR } from '../../../constants/char.constants'; import { DE_ACTIVE_COLOR } from '../../../constants/constants'; import { EntityAction, EntityType } from '../../../enums/entity.enum'; @@ -71,6 +69,8 @@ import { getGlossaryTermsVersionsPath, getGlossaryVersionsPath, } from '../../../utils/RouterUtils'; +import Voting from '../../Entity/Voting/Voting.component'; +import { VotingDataProps } from '../../Entity/Voting/voting.interface'; import { useFqn } from '../../../hooks/useFqn'; import { showErrorToast } from '../../../utils/ToastUtils'; diff --git a/openmetadata-ui/src/main/resources/ui/src/components/Glossary/GlossaryHeader/GlossaryHeader.interface.tsx b/openmetadata-ui/src/main/resources/ui/src/components/Glossary/GlossaryHeader/GlossaryHeader.interface.tsx index 2be877c8abc1..0a8abc9d51a9 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/Glossary/GlossaryHeader/GlossaryHeader.interface.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/components/Glossary/GlossaryHeader/GlossaryHeader.interface.tsx @@ -10,10 +10,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ +import { OperationPermission } from '../../../context/PermissionProvider/PermissionProvider.interface'; import { Glossary } from '../../../generated/entity/data/glossary'; import { GlossaryTerm } from '../../../generated/entity/data/glossaryTerm'; -import { OperationPermission } from '../../PermissionProvider/PermissionProvider.interface'; -import { VotingDataProps } from '../../Voting/voting.interface'; +import { VotingDataProps } from '../../Entity/Voting/voting.interface'; export interface GlossaryHeaderProps { isVersionView?: boolean; diff --git a/openmetadata-ui/src/main/resources/ui/src/components/Glossary/GlossaryTermModal/GlossaryTermModal.component.tsx b/openmetadata-ui/src/main/resources/ui/src/components/Glossary/GlossaryTermModal/GlossaryTermModal.component.tsx index 0371867e4991..decb00054c94 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/Glossary/GlossaryTermModal/GlossaryTermModal.component.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/components/Glossary/GlossaryTermModal/GlossaryTermModal.component.tsx @@ -18,7 +18,7 @@ import { useTranslation } from 'react-i18next'; import { GlossaryTerm } from '../../../generated/entity/data/glossaryTerm'; import { getGlossaryTermByFQN } from '../../../rest/glossaryAPI'; import { showErrorToast } from '../../../utils/ToastUtils'; -import Loader from '../../Loader/Loader'; +import Loader from '../../common/Loader/Loader'; import AddGlossaryTermForm from '../AddGlossaryTermForm/AddGlossaryTermForm.component'; import { GlossaryTermForm } from '../AddGlossaryTermForm/AddGlossaryTermForm.interface'; 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 7dbd4909ba2b..b723eb484249 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 @@ -39,7 +39,6 @@ import ErrorPlaceHolder from '../../../components/common/ErrorWithPlaceholder/Er import { OwnerLabel } from '../../../components/common/OwnerLabel/OwnerLabel.component'; import RichTextEditorPreviewer from '../../../components/common/RichTextEditor/RichTextEditorPreviewer'; import StatusBadge from '../../../components/common/StatusBadge/StatusBadge.component'; -import Loader from '../../../components/Loader/Loader'; import { DE_ACTIVE_COLOR } from '../../../constants/constants'; import { GLOSSARIES_DOCS } from '../../../constants/docs.constants'; import { TABLE_CONSTANTS } from '../../../constants/Teams.constants'; @@ -64,7 +63,8 @@ import { getTableExpandableConfig, } from '../../../utils/TableUtils'; import { showErrorToast } from '../../../utils/ToastUtils'; -import { DraggableBodyRowProps } from '../../Draggable/DraggableBodyRowProps.interface'; +import { DraggableBodyRowProps } from '../../common/Draggable/DraggableBodyRowProps.interface'; +import Loader from '../../common/Loader/Loader'; import { GlossaryTermTabProps, ModifiedGlossaryTerm, diff --git a/openmetadata-ui/src/main/resources/ui/src/components/Glossary/GlossaryTermTab/GlossaryTermTab.interface.ts b/openmetadata-ui/src/main/resources/ui/src/components/Glossary/GlossaryTermTab/GlossaryTermTab.interface.ts index 466400d7e51c..a0c8da520e05 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/Glossary/GlossaryTermTab/GlossaryTermTab.interface.ts +++ b/openmetadata-ui/src/main/resources/ui/src/components/Glossary/GlossaryTermTab/GlossaryTermTab.interface.ts @@ -11,9 +11,9 @@ * limitations under the License. */ +import { OperationPermission } from '../../../context/PermissionProvider/PermissionProvider.interface'; import { Glossary } from '../../../generated/entity/data/glossary'; import { GlossaryTerm } from '../../../generated/entity/data/glossaryTerm'; -import { OperationPermission } from '../../PermissionProvider/PermissionProvider.interface'; export interface GlossaryTermTabProps { selectedData: Glossary | GlossaryTerm; diff --git a/openmetadata-ui/src/main/resources/ui/src/components/Glossary/GlossaryTerms/GlossaryTermsV1.component.tsx b/openmetadata-ui/src/main/resources/ui/src/components/Glossary/GlossaryTerms/GlossaryTermsV1.component.tsx index 971a2dc0956f..948b8d5cd257 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/Glossary/GlossaryTerms/GlossaryTermsV1.component.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/components/Glossary/GlossaryTerms/GlossaryTermsV1.component.tsx @@ -44,9 +44,9 @@ import { getEncodedFqn, } from '../../../utils/StringsUtils'; import { ActivityFeedTab } from '../../ActivityFeed/ActivityFeedTab/ActivityFeedTab.component'; -import { AssetSelectionModal } from '../../Assets/AssetsSelectionModal/AssetSelectionModal'; import { CustomPropertyTable } from '../../common/CustomPropertyTable/CustomPropertyTable'; -import TabsLabel from '../../TabsLabel/TabsLabel.component'; +import TabsLabel from '../../common/TabsLabel/TabsLabel.component'; +import { AssetSelectionModal } from '../../DataAssets/AssetsSelectionModal/AssetSelectionModal'; import { GlossaryTabs } from '../GlossaryDetails/GlossaryDetails.interface'; import GlossaryHeader from '../GlossaryHeader/GlossaryHeader.component'; import GlossaryTermTab from '../GlossaryTermTab/GlossaryTermTab.component'; diff --git a/openmetadata-ui/src/main/resources/ui/src/components/Glossary/GlossaryTerms/GlossaryTermsV1.interface.ts b/openmetadata-ui/src/main/resources/ui/src/components/Glossary/GlossaryTerms/GlossaryTermsV1.interface.ts index 6bcb02186cc8..5d78694557c6 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/Glossary/GlossaryTerms/GlossaryTermsV1.interface.ts +++ b/openmetadata-ui/src/main/resources/ui/src/components/Glossary/GlossaryTerms/GlossaryTermsV1.interface.ts @@ -10,10 +10,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ +import { OperationPermission } from '../../../context/PermissionProvider/PermissionProvider.interface'; import { GlossaryTerm } from '../../../generated/entity/data/glossaryTerm'; +import { VotingDataProps } from '../../Entity/Voting/voting.interface'; import { EntityDetailsObjectInterface } from '../../Explore/ExplorePage.interface'; -import { OperationPermission } from '../../PermissionProvider/PermissionProvider.interface'; -import { VotingDataProps } from '../../Voting/voting.interface'; export interface GlossaryTermsV1Props { isVersionView?: boolean; diff --git a/openmetadata-ui/src/main/resources/ui/src/components/Glossary/GlossaryTerms/GlossaryTermsV1.test.tsx b/openmetadata-ui/src/main/resources/ui/src/components/Glossary/GlossaryTerms/GlossaryTermsV1.test.tsx index 1569d5a7d1d6..de5962704d32 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/Glossary/GlossaryTerms/GlossaryTermsV1.test.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/components/Glossary/GlossaryTerms/GlossaryTermsV1.test.tsx @@ -13,11 +13,11 @@ import { render, screen } from '@testing-library/react'; import React from 'react'; +import { OperationPermission } from '../../../context/PermissionProvider/PermissionProvider.interface'; import { mockedGlossaryTerms, MOCK_ASSETS_DATA, } from '../../../mocks/Glossary.mock'; -import { OperationPermission } from '../../PermissionProvider/PermissionProvider.interface'; import GlossaryTerms from './GlossaryTermsV1.component'; jest.mock('react-router-dom', () => ({ diff --git a/openmetadata-ui/src/main/resources/ui/src/components/Glossary/GlossaryTerms/tabs/AssetsTabs.interface.ts b/openmetadata-ui/src/main/resources/ui/src/components/Glossary/GlossaryTerms/tabs/AssetsTabs.interface.ts index e3adf7538d46..c69acd09c503 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/Glossary/GlossaryTerms/tabs/AssetsTabs.interface.ts +++ b/openmetadata-ui/src/main/resources/ui/src/components/Glossary/GlossaryTerms/tabs/AssetsTabs.interface.ts @@ -11,8 +11,8 @@ * limitations under the License. */ +import { OperationPermission } from '../../../../context/PermissionProvider/PermissionProvider.interface'; import { EntityDetailsObjectInterface } from '../../../Explore/ExplorePage.interface'; -import { OperationPermission } from '../../../PermissionProvider/PermissionProvider.interface'; export enum AssetsOfEntity { GLOSSARY = 'GLOSSARY', diff --git a/openmetadata-ui/src/main/resources/ui/src/components/Glossary/GlossaryTerms/tabs/GlossaryOverviewTab.component.tsx b/openmetadata-ui/src/main/resources/ui/src/components/Glossary/GlossaryTerms/tabs/GlossaryOverviewTab.component.tsx index 16546b1a5562..8960718f51eb 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/Glossary/GlossaryTerms/tabs/GlossaryOverviewTab.component.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/components/Glossary/GlossaryTerms/tabs/GlossaryOverviewTab.component.tsx @@ -13,6 +13,7 @@ import { Col, Row, Space } from 'antd'; import React, { useMemo, useState } from 'react'; import { EntityField } from '../../../../constants/Feeds.constants'; +import { OperationPermission } from '../../../../context/PermissionProvider/PermissionProvider.interface'; import { EntityType } from '../../../../enums/entity.enum'; import { Glossary } from '../../../../generated/entity/data/glossary'; import { GlossaryTerm } from '../../../../generated/entity/data/glossaryTerm'; @@ -24,7 +25,6 @@ import { getEntityVersionTags, } from '../../../../utils/EntityVersionUtils'; import DescriptionV1 from '../../../common/EntityDescription/DescriptionV1'; -import { OperationPermission } from '../../../PermissionProvider/PermissionProvider.interface'; import TagsContainerV2 from '../../../Tag/TagsContainerV2/TagsContainerV2'; import { DisplayType } from '../../../Tag/TagsViewer/TagsViewer.interface'; import GlossaryDetailsRightPanel from '../../GlossaryDetailsRightPanel/GlossaryDetailsRightPanel.component'; diff --git a/openmetadata-ui/src/main/resources/ui/src/components/Glossary/GlossaryTerms/tabs/GlossaryTermReferences.tsx b/openmetadata-ui/src/main/resources/ui/src/components/Glossary/GlossaryTerms/tabs/GlossaryTermReferences.tsx index 1e0f7050c3ac..f9f8918584c5 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/Glossary/GlossaryTerms/tabs/GlossaryTermReferences.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/components/Glossary/GlossaryTerms/tabs/GlossaryTermReferences.tsx @@ -19,8 +19,6 @@ import React, { useCallback, useEffect, useState } from 'react'; import { ReactComponent as EditIcon } from '../../../../assets/svg/edit-new.svg'; import { ReactComponent as ExternalLinkIcon } from '../../../../assets/svg/external-links.svg'; import { ReactComponent as PlusIcon } from '../../../../assets/svg/plus-primary.svg'; -import { OperationPermission } from '../../../../components/PermissionProvider/PermissionProvider.interface'; -import TagButton from '../../../../components/TagButton/TagButton.component'; import { DE_ACTIVE_COLOR, NO_DATA_PLACEHOLDER, @@ -30,6 +28,7 @@ import { } from '../../../../constants/constants'; import { EntityField } from '../../../../constants/Feeds.constants'; import { NO_PERMISSION_FOR_ACTION } from '../../../../constants/HelperTextUtil'; +import { OperationPermission } from '../../../../context/PermissionProvider/PermissionProvider.interface'; import { GlossaryTerm, TermReference, @@ -41,6 +40,7 @@ import { getDiffByFieldName, } from '../../../../utils/EntityVersionUtils'; import { VersionStatus } from '../../../../utils/EntityVersionUtils.interface'; +import TagButton from '../../../common/TagButton/TagButton.component'; import GlossaryTermReferencesModal from '../GlossaryTermReferencesModal.component'; interface GlossaryTermReferencesProps { diff --git a/openmetadata-ui/src/main/resources/ui/src/components/Glossary/GlossaryTerms/tabs/GlossaryTermSynonyms.tsx b/openmetadata-ui/src/main/resources/ui/src/components/Glossary/GlossaryTerms/tabs/GlossaryTermSynonyms.tsx index e9735dbfdb55..ffa0be4ce5d6 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/Glossary/GlossaryTerms/tabs/GlossaryTermSynonyms.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/components/Glossary/GlossaryTerms/tabs/GlossaryTermSynonyms.tsx @@ -18,14 +18,13 @@ import { cloneDeep, isEmpty, isEqual } from 'lodash'; import React, { useCallback, useEffect, useState } from 'react'; import { ReactComponent as EditIcon } from '../../../../assets/svg/edit-new.svg'; import { ReactComponent as PlusIcon } from '../../../../assets/svg/plus-primary.svg'; -import { OperationPermission } from '../../../../components/PermissionProvider/PermissionProvider.interface'; -import TagButton from '../../../../components/TagButton/TagButton.component'; import { DE_ACTIVE_COLOR, NO_DATA_PLACEHOLDER, } from '../../../../constants/constants'; import { EntityField } from '../../../../constants/Feeds.constants'; import { NO_PERMISSION_FOR_ACTION } from '../../../../constants/HelperTextUtil'; +import { OperationPermission } from '../../../../context/PermissionProvider/PermissionProvider.interface'; import { GlossaryTerm } from '../../../../generated/entity/data/glossaryTerm'; import { ChangeDescription } from '../../../../generated/entity/type'; import { @@ -33,6 +32,7 @@ import { getChangedEntityOldValue, getDiffByFieldName, } from '../../../../utils/EntityVersionUtils'; +import TagButton from '../../../common/TagButton/TagButton.component'; interface GlossaryTermSynonymsProps { isVersionView?: boolean; diff --git a/openmetadata-ui/src/main/resources/ui/src/components/Glossary/GlossaryTerms/tabs/RelatedTerms.tsx b/openmetadata-ui/src/main/resources/ui/src/components/Glossary/GlossaryTerms/tabs/RelatedTerms.tsx index e5d908c60dee..2c9acf7af0c8 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/Glossary/GlossaryTerms/tabs/RelatedTerms.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/components/Glossary/GlossaryTerms/tabs/RelatedTerms.tsx @@ -20,9 +20,7 @@ import { useHistory } from 'react-router-dom'; import { ReactComponent as IconTerm } from '../../../../assets/svg/book.svg'; import { ReactComponent as EditIcon } from '../../../../assets/svg/edit-new.svg'; import { ReactComponent as PlusIcon } from '../../../../assets/svg/plus-primary.svg'; -import { OperationPermission } from '../../../../components/PermissionProvider/PermissionProvider.interface'; import TagSelectForm from '../../../../components/Tag/TagsSelectForm/TagsSelectForm.component'; -import TagButton from '../../../../components/TagButton/TagButton.component'; import { DE_ACTIVE_COLOR, NO_DATA_PLACEHOLDER, @@ -30,6 +28,7 @@ import { } from '../../../../constants/constants'; import { EntityField } from '../../../../constants/Feeds.constants'; import { NO_PERMISSION_FOR_ACTION } from '../../../../constants/HelperTextUtil'; +import { OperationPermission } from '../../../../context/PermissionProvider/PermissionProvider.interface'; import { SearchIndex } from '../../../../enums/search.enum'; import { GlossaryTerm } from '../../../../generated/entity/data/glossaryTerm'; import { @@ -48,6 +47,7 @@ import { import { VersionStatus } from '../../../../utils/EntityVersionUtils.interface'; import { getEntityReferenceFromGlossary } from '../../../../utils/GlossaryUtils'; import { getGlossaryPath } from '../../../../utils/RouterUtils'; +import TagButton from '../../../common/TagButton/TagButton.component'; interface RelatedTermsProps { isVersionView?: boolean; diff --git a/openmetadata-ui/src/main/resources/ui/src/components/Glossary/GlossaryV1.component.tsx b/openmetadata-ui/src/main/resources/ui/src/components/Glossary/GlossaryV1.component.tsx index dca870f18e82..89595e4975c7 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/Glossary/GlossaryV1.component.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/components/Glossary/GlossaryV1.component.tsx @@ -18,12 +18,16 @@ import React, { useCallback, useEffect, useMemo, useState } from 'react'; import { useTranslation } from 'react-i18next'; import { useHistory, useParams } from 'react-router-dom'; import { withActivityFeed } from '../../components/AppRouter/withActivityFeed'; -import Loader from '../../components/Loader/Loader'; import { HTTP_STATUS_CODE } from '../../constants/Auth.constants'; import { API_RES_MAX_SIZE, getGlossaryTermDetailsPath, } from '../../constants/constants'; +import { usePermissionProvider } from '../../context/PermissionProvider/PermissionProvider'; +import { + OperationPermission, + ResourceEntity, +} from '../../context/PermissionProvider/PermissionProvider.interface'; import { EntityAction } from '../../enums/entity.enum'; import { CreateThread, @@ -44,12 +48,8 @@ import { DEFAULT_ENTITY_PERMISSION } from '../../utils/PermissionsUtils'; import { showErrorToast } from '../../utils/ToastUtils'; import { useActivityFeedProvider } from '../ActivityFeed/ActivityFeedProvider/ActivityFeedProvider'; import ActivityThreadPanel from '../ActivityFeed/ActivityThreadPanel/ActivityThreadPanel'; +import Loader from '../common/Loader/Loader'; import EntityDeleteModal from '../Modals/EntityDeleteModal/EntityDeleteModal'; -import { usePermissionProvider } from '../PermissionProvider/PermissionProvider'; -import { - OperationPermission, - ResourceEntity, -} from '../PermissionProvider/PermissionProvider.interface'; import { GlossaryTermForm } from './AddGlossaryTermForm/AddGlossaryTermForm.interface'; import GlossaryDetails from './GlossaryDetails/GlossaryDetails.component'; import GlossaryTermModal from './GlossaryTermModal/GlossaryTermModal.component'; diff --git a/openmetadata-ui/src/main/resources/ui/src/components/Glossary/GlossaryV1.interfaces.ts b/openmetadata-ui/src/main/resources/ui/src/components/Glossary/GlossaryV1.interfaces.ts index c8fab0e7ab83..20b4b9bde402 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/Glossary/GlossaryV1.interfaces.ts +++ b/openmetadata-ui/src/main/resources/ui/src/components/Glossary/GlossaryV1.interfaces.ts @@ -11,9 +11,9 @@ * limitations under the License. */ import { LoadingState } from 'Models'; -import { VotingDataProps } from '../../components/Voting/voting.interface'; import { Glossary } from '../../generated/entity/data/glossary'; import { GlossaryTerm } from '../../generated/entity/data/glossaryTerm'; +import { VotingDataProps } from '../Entity/Voting/voting.interface'; import { EntityDetailsObjectInterface } from '../Explore/ExplorePage.interface'; export type GlossaryV1Props = { diff --git a/openmetadata-ui/src/main/resources/ui/src/components/Glossary/GlossaryVersion/GlossaryVersion.component.tsx b/openmetadata-ui/src/main/resources/ui/src/components/Glossary/GlossaryVersion/GlossaryVersion.component.tsx index 2a19a15993d3..49a6e24ca139 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/Glossary/GlossaryVersion/GlossaryVersion.component.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/components/Glossary/GlossaryVersion/GlossaryVersion.component.tsx @@ -30,8 +30,8 @@ import { getGlossaryVersionsPath, } from '../../../utils/RouterUtils'; import { showErrorToast } from '../../../utils/ToastUtils'; +import Loader from '../../common/Loader/Loader'; import EntityVersionTimeLine from '../../Entity/EntityVersionTimeLine/EntityVersionTimeLine'; -import Loader from '../../Loader/Loader'; import PageLayoutV1 from '../../PageLayoutV1/PageLayoutV1'; import GlossaryV1Component from '../GlossaryV1.component'; diff --git a/openmetadata-ui/src/main/resources/ui/src/components/Lineage/Lineage.component.tsx b/openmetadata-ui/src/main/resources/ui/src/components/Lineage/Lineage.component.tsx index c457e501ec7e..f03afe704004 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/Lineage/Lineage.component.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/components/Lineage/Lineage.component.tsx @@ -27,6 +27,7 @@ import { MAX_ZOOM_VALUE, MIN_ZOOM_VALUE, } from '../../constants/Lineage.constants'; +import { useLineageProvider } from '../../context/LineageProvider/LineageProvider'; import { customEdges, dragHandle, @@ -37,10 +38,9 @@ import { onNodeMouseMove, } from '../../utils/EntityLineageUtils'; import { getEntityBreadcrumbs } from '../../utils/EntityUtils'; +import Loader from '../common/Loader/Loader'; import TitleBreadcrumb from '../common/TitleBreadcrumb/TitleBreadcrumb.component'; import CustomControlsComponent from '../Entity/EntityLineage/CustomControls.component'; -import { useLineageProvider } from '../LineageProvider/LineageProvider'; -import Loader from '../Loader/Loader'; import { LineageProps } from './Lineage.interface'; const Lineage = ({ diff --git a/openmetadata-ui/src/main/resources/ui/src/components/MlModelDetail/MlModel.interface.ts b/openmetadata-ui/src/main/resources/ui/src/components/MlModel/MlModelDetail/MlModel.interface.ts similarity index 82% rename from openmetadata-ui/src/main/resources/ui/src/components/MlModelDetail/MlModel.interface.ts rename to openmetadata-ui/src/main/resources/ui/src/components/MlModel/MlModelDetail/MlModel.interface.ts index f613c66cfd11..efc6d2bbe1c8 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/MlModelDetail/MlModel.interface.ts +++ b/openmetadata-ui/src/main/resources/ui/src/components/MlModel/MlModelDetail/MlModel.interface.ts @@ -11,9 +11,9 @@ * limitations under the License. */ -import { OperationPermission } from '../../components/PermissionProvider/PermissionProvider.interface'; -import { ThreadType } from '../../generated/api/feed/createThread'; -import { Mlmodel } from '../../generated/entity/data/mlmodel'; +import { OperationPermission } from '../../../context/PermissionProvider/PermissionProvider.interface'; +import { ThreadType } from '../../../generated/api/feed/createThread'; +import { Mlmodel } from '../../../generated/entity/data/mlmodel'; export interface MlModelFeaturesListProp { mlFeatures: Mlmodel['mlFeatures']; diff --git a/openmetadata-ui/src/main/resources/ui/src/components/MlModelDetail/MlModelDetail.component.test.tsx b/openmetadata-ui/src/main/resources/ui/src/components/MlModel/MlModelDetail/MlModelDetail.component.test.tsx similarity index 91% rename from openmetadata-ui/src/main/resources/ui/src/components/MlModelDetail/MlModelDetail.component.test.tsx rename to openmetadata-ui/src/main/resources/ui/src/components/MlModel/MlModelDetail/MlModelDetail.component.test.tsx index d2c1b487e4e4..488416081539 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/MlModelDetail/MlModelDetail.component.test.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/components/MlModel/MlModelDetail/MlModelDetail.component.test.tsx @@ -19,10 +19,10 @@ import { } from '@testing-library/react'; import React from 'react'; import { MemoryRouter } from 'react-router-dom'; -import { LeafNodes } from '../../components/Entity/EntityLineage/EntityLineage.interface'; -import { EntityTabs } from '../../enums/entity.enum'; -import { Mlmodel } from '../../generated/entity/data/mlmodel'; -import { Paging } from '../../generated/type/paging'; +import { EntityTabs } from '../../../enums/entity.enum'; +import { Mlmodel } from '../../../generated/entity/data/mlmodel'; +import { Paging } from '../../../generated/type/paging'; +import { LeafNodes } from '../../Entity/EntityLineage/EntityLineage.interface'; import MlModelDetailComponent from './MlModelDetail.component'; const mockData = { @@ -190,23 +190,15 @@ jest.mock('react-router-dom', () => ({ useParams: jest.fn().mockImplementation(() => mockParams), })); -jest.mock('../../components/FeedEditor/FeedEditor', () => { - return jest.fn().mockReturnValue(

ActivityFeedEditor

); -}); - -jest.mock('../../components/TabsLabel/TabsLabel.component', () => { +jest.mock('../../common/TabsLabel/TabsLabel.component', () => { return jest.fn().mockImplementation(({ name }) =>

{name}

); }); -jest.mock('../common/EntityDescription/Description', () => { +jest.mock('../../common/EntityDescription/DescriptionV1', () => { return jest.fn().mockReturnValue(

Description

); }); -jest.mock('../common/RichTextEditor/RichTextEditorPreviewer', () => { - return jest.fn().mockReturnValue(

RichTextEditorPreviewer

); -}); - -jest.mock('../../components/Lineage/Lineage.component', () => { +jest.mock('../../Lineage/Lineage.component', () => { return jest.fn().mockReturnValue(

EntityLineage.component

); }); @@ -214,15 +206,15 @@ jest.mock('./MlModelFeaturesList', () => { return jest.fn().mockReturnValue(

MlModelFeaturesList

); }); -jest.mock('../ActivityFeed/ActivityThreadPanel/ActivityThreadPanel', () => { +jest.mock('../../ActivityFeed/ActivityThreadPanel/ActivityThreadPanel', () => { return jest.fn().mockReturnValue(

ActivityThreadPanel

); }); -jest.mock('../../components/PageLayoutV1/PageLayoutV1', () => { +jest.mock('../../PageLayoutV1/PageLayoutV1', () => { return jest.fn().mockImplementation(({ children }) =>
{children}
); }); -jest.mock('../../utils/CommonUtils', () => { +jest.mock('../../../utils/CommonUtils', () => { return { getEntityName: jest.fn().mockReturnValue('entityName'), getEntityPlaceHolder: jest.fn().mockReturnValue('entityPlaceholder'), @@ -232,14 +224,14 @@ jest.mock('../../utils/CommonUtils', () => { }; }); -jest.mock('../../utils/TableUtils', () => { +jest.mock('../../../utils/TableUtils', () => { return { getTagsWithoutTier: jest.fn().mockReturnValue([]), getTierTags: jest.fn().mockReturnValue(undefined), }; }); -jest.mock('../common/CustomPropertyTable/CustomPropertyTable', () => ({ +jest.mock('../../common/CustomPropertyTable/CustomPropertyTable', () => ({ CustomPropertyTable: jest .fn() .mockReturnValue(

CustomPropertyTable.component

), diff --git a/openmetadata-ui/src/main/resources/ui/src/components/MlModelDetail/MlModelDetail.component.tsx b/openmetadata-ui/src/main/resources/ui/src/components/MlModel/MlModelDetail/MlModelDetail.component.tsx similarity index 86% rename from openmetadata-ui/src/main/resources/ui/src/components/MlModelDetail/MlModelDetail.component.tsx rename to openmetadata-ui/src/main/resources/ui/src/components/MlModel/MlModelDetail/MlModelDetail.component.tsx index a444a8823a63..bf50833ee9d3 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/MlModelDetail/MlModelDetail.component.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/components/MlModel/MlModelDetail/MlModelDetail.component.tsx @@ -19,40 +19,40 @@ import { EntityTags } from 'Models'; import React, { FC, useCallback, useEffect, useMemo, useState } from 'react'; import { useTranslation } from 'react-i18next'; import { useHistory, useParams } from 'react-router-dom'; -import { useActivityFeedProvider } from '../../components/ActivityFeed/ActivityFeedProvider/ActivityFeedProvider'; -import { ActivityFeedTab } from '../../components/ActivityFeed/ActivityFeedTab/ActivityFeedTab.component'; -import { withActivityFeed } from '../../components/AppRouter/withActivityFeed'; -import DescriptionV1 from '../../components/common/EntityDescription/DescriptionV1'; -import { DataAssetsHeader } from '../../components/DataAssets/DataAssetsHeader/DataAssetsHeader.component'; -import { EntityName } from '../../components/Modals/EntityNameModal/EntityNameModal.interface'; -import PageLayoutV1 from '../../components/PageLayoutV1/PageLayoutV1'; -import TabsLabel from '../../components/TabsLabel/TabsLabel.component'; -import { getMlModelDetailsPath } from '../../constants/constants'; -import { FEED_COUNT_INITIAL_DATA } from '../../constants/entity.constants'; -import { EntityTabs, EntityType } from '../../enums/entity.enum'; -import { MlHyperParameter } from '../../generated/api/data/createMlModel'; -import { Tag } from '../../generated/entity/classification/tag'; -import { Mlmodel, MlStore } from '../../generated/entity/data/mlmodel'; -import { ThreadType } from '../../generated/entity/feed/thread'; -import { TagLabel } from '../../generated/type/schema'; -import { useFqn } from '../../hooks/useFqn'; -import { FeedCounts } from '../../interface/feed.interface'; -import { restoreMlmodel } from '../../rest/mlModelAPI'; -import { getEmptyPlaceholder, getFeedCounts } from '../../utils/CommonUtils'; -import { getEntityName } from '../../utils/EntityUtils'; -import { DEFAULT_ENTITY_PERMISSION } from '../../utils/PermissionsUtils'; -import { getTagsWithoutTier, getTierTags } from '../../utils/TableUtils'; -import { createTagObject, updateTierTag } from '../../utils/TagsUtils'; -import { showErrorToast, showSuccessToast } from '../../utils/ToastUtils'; -import ActivityThreadPanel from '../ActivityFeed/ActivityThreadPanel/ActivityThreadPanel'; -import { useAuthContext } from '../Auth/AuthProviders/AuthProvider'; -import { CustomPropertyTable } from '../common/CustomPropertyTable/CustomPropertyTable'; -import EntityRightPanel from '../Entity/EntityRightPanel/EntityRightPanel'; -import Lineage from '../Lineage/Lineage.component'; -import LineageProvider from '../LineageProvider/LineageProvider'; -import { usePermissionProvider } from '../PermissionProvider/PermissionProvider'; -import { ResourceEntity } from '../PermissionProvider/PermissionProvider.interface'; -import { SourceType } from '../SearchedData/SearchedData.interface'; +import { getMlModelDetailsPath } from '../../../constants/constants'; +import { FEED_COUNT_INITIAL_DATA } from '../../../constants/entity.constants'; +import LineageProvider from '../../../context/LineageProvider/LineageProvider'; +import { usePermissionProvider } from '../../../context/PermissionProvider/PermissionProvider'; +import { ResourceEntity } from '../../../context/PermissionProvider/PermissionProvider.interface'; +import { EntityTabs, EntityType } from '../../../enums/entity.enum'; +import { MlHyperParameter } from '../../../generated/api/data/createMlModel'; +import { Tag } from '../../../generated/entity/classification/tag'; +import { Mlmodel, MlStore } from '../../../generated/entity/data/mlmodel'; +import { ThreadType } from '../../../generated/entity/feed/thread'; +import { TagLabel } from '../../../generated/type/schema'; +import { useFqn } from '../../../hooks/useFqn'; +import { FeedCounts } from '../../../interface/feed.interface'; +import { restoreMlmodel } from '../../../rest/mlModelAPI'; +import { getEmptyPlaceholder, getFeedCounts } from '../../../utils/CommonUtils'; +import { getEntityName } from '../../../utils/EntityUtils'; +import { DEFAULT_ENTITY_PERMISSION } from '../../../utils/PermissionsUtils'; +import { getTagsWithoutTier, getTierTags } from '../../../utils/TableUtils'; +import { createTagObject, updateTierTag } from '../../../utils/TagsUtils'; +import { showErrorToast, showSuccessToast } from '../../../utils/ToastUtils'; +import { useActivityFeedProvider } from '../../ActivityFeed/ActivityFeedProvider/ActivityFeedProvider'; +import { ActivityFeedTab } from '../../ActivityFeed/ActivityFeedTab/ActivityFeedTab.component'; +import ActivityThreadPanel from '../../ActivityFeed/ActivityThreadPanel/ActivityThreadPanel'; +import { withActivityFeed } from '../../AppRouter/withActivityFeed'; +import { useAuthContext } from '../../Auth/AuthProviders/AuthProvider'; +import { CustomPropertyTable } from '../../common/CustomPropertyTable/CustomPropertyTable'; +import DescriptionV1 from '../../common/EntityDescription/DescriptionV1'; +import TabsLabel from '../../common/TabsLabel/TabsLabel.component'; +import { DataAssetsHeader } from '../../DataAssets/DataAssetsHeader/DataAssetsHeader.component'; +import EntityRightPanel from '../../Entity/EntityRightPanel/EntityRightPanel'; +import Lineage from '../../Lineage/Lineage.component'; +import { EntityName } from '../../Modals/EntityNameModal/EntityNameModal.interface'; +import PageLayoutV1 from '../../PageLayoutV1/PageLayoutV1'; +import { SourceType } from '../../SearchedData/SearchedData.interface'; import { MlModelDetailProp } from './MlModelDetail.interface'; import MlModelFeaturesList from './MlModelFeaturesList'; diff --git a/openmetadata-ui/src/main/resources/ui/src/components/MlModelDetail/MlModelDetail.interface.ts b/openmetadata-ui/src/main/resources/ui/src/components/MlModel/MlModelDetail/MlModelDetail.interface.ts similarity index 81% rename from openmetadata-ui/src/main/resources/ui/src/components/MlModelDetail/MlModelDetail.interface.ts rename to openmetadata-ui/src/main/resources/ui/src/components/MlModel/MlModelDetail/MlModelDetail.interface.ts index 4bd239ed4fef..922780e0c03a 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/MlModelDetail/MlModelDetail.interface.ts +++ b/openmetadata-ui/src/main/resources/ui/src/components/MlModel/MlModelDetail/MlModelDetail.interface.ts @@ -12,10 +12,10 @@ */ import { HTMLAttributes } from 'react'; -import { DataAssetWithDomains } from '../../components/DataAssets/DataAssetsHeader/DataAssetsHeader.interface'; -import { QueryVote } from '../../components/TableQueries/TableQueries.interface'; -import { CreateThread } from '../../generated/api/feed/createThread'; -import { Mlmodel } from '../../generated/entity/data/mlmodel'; +import { CreateThread } from '../../../generated/api/feed/createThread'; +import { Mlmodel } from '../../../generated/entity/data/mlmodel'; +import { DataAssetWithDomains } from '../../DataAssets/DataAssetsHeader/DataAssetsHeader.interface'; +import { QueryVote } from '../../Database/TableQueries/TableQueries.interface'; export interface MlModelDetailProp extends HTMLAttributes { updateMlModelDetailsState?: (data: DataAssetWithDomains) => void; diff --git a/openmetadata-ui/src/main/resources/ui/src/components/MlModelDetail/MlModelFeaturesList.test.tsx b/openmetadata-ui/src/main/resources/ui/src/components/MlModel/MlModelDetail/MlModelFeaturesList.test.tsx similarity index 85% rename from openmetadata-ui/src/main/resources/ui/src/components/MlModelDetail/MlModelFeaturesList.test.tsx rename to openmetadata-ui/src/main/resources/ui/src/components/MlModel/MlModelDetail/MlModelFeaturesList.test.tsx index 884626f2c464..af3a60eb66b7 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/MlModelDetail/MlModelFeaturesList.test.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/components/MlModel/MlModelDetail/MlModelFeaturesList.test.tsx @@ -13,8 +13,8 @@ import { render, screen } from '@testing-library/react'; import React from 'react'; import { MemoryRouter } from 'react-router-dom'; -import { Mlmodel } from '../../generated/entity/data/mlmodel'; -import { DEFAULT_ENTITY_PERMISSION } from '../../utils/PermissionsUtils'; +import { Mlmodel } from '../../../generated/entity/data/mlmodel'; +import { DEFAULT_ENTITY_PERMISSION } from '../../../utils/PermissionsUtils'; import MlModelFeaturesList from './MlModelFeaturesList'; const mockData = { @@ -117,38 +117,31 @@ const mockData = { deleted: false, }; -jest.mock('../../utils/CommonUtils', () => ({ +jest.mock('../../../utils/CommonUtils', () => ({ getEntityName: jest.fn().mockReturnValue('entityName'), getHtmlForNonAdminAction: jest.fn().mockReturnValue('admin action'), })); -jest.mock('../common/RichTextEditor/RichTextEditorPreviewer', () => { +jest.mock('../../common/RichTextEditor/RichTextEditorPreviewer', () => { return jest.fn().mockReturnValue(

RichTextEditorPreviewer

); }); -jest.mock('..//TableTags/TableTags.component', () => { +jest.mock('../../Database/TableTags/TableTags.component', () => { return jest.fn().mockReturnValue(

TableTags

); }); -jest.mock('../TableDescription/TableDescription.component', () => { +jest.mock('../../Database/TableDescription/TableDescription.component', () => { return jest.fn().mockReturnValue(

TableDescription

); }); -jest.mock('../Modals/ModalWithMarkdownEditor/ModalWithMarkdownEditor', () => ({ - ModalWithMarkdownEditor: jest - .fn() - .mockReturnValue(

ModalWithMarkdownEditor

), -})); - -jest.mock('../../utils/TableUtils', () => ({ - getAllTagsList: jest.fn().mockImplementation(() => Promise.resolve([])), - getTagsHierarchy: jest.fn().mockReturnValue([]), -})); - -jest.mock('../../utils/GlossaryUtils', () => ({ - getGlossaryTermHierarchy: jest.fn().mockReturnValue([]), - getGlossaryTermsList: jest.fn().mockImplementation(() => Promise.resolve([])), -})); +jest.mock( + '../../Modals/ModalWithMarkdownEditor/ModalWithMarkdownEditor', + () => ({ + ModalWithMarkdownEditor: jest + .fn() + .mockReturnValue(

ModalWithMarkdownEditor

), + }) +); const handleFeaturesUpdate = jest.fn(); diff --git a/openmetadata-ui/src/main/resources/ui/src/components/MlModelDetail/MlModelFeaturesList.tsx b/openmetadata-ui/src/main/resources/ui/src/components/MlModel/MlModelDetail/MlModelFeaturesList.tsx similarity index 93% rename from openmetadata-ui/src/main/resources/ui/src/components/MlModelDetail/MlModelFeaturesList.tsx rename to openmetadata-ui/src/main/resources/ui/src/components/MlModel/MlModelDetail/MlModelFeaturesList.tsx index 73c3c27d1b03..6ed72fdc6f08 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/MlModelDetail/MlModelFeaturesList.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/components/MlModel/MlModelDetail/MlModelFeaturesList.tsx @@ -16,15 +16,15 @@ import { isEmpty } from 'lodash'; import { EntityTags } from 'Models'; import React, { Fragment, useMemo, useState } from 'react'; import { useTranslation } from 'react-i18next'; -import TableDescription from '../../components/TableDescription/TableDescription.component'; -import TableTags from '../../components/TableTags/TableTags.component'; -import { EntityType } from '../../enums/entity.enum'; -import { MlFeature } from '../../generated/entity/data/mlmodel'; -import { TagSource } from '../../generated/type/schema'; -import { getEntityName } from '../../utils/EntityUtils'; -import { createTagObject } from '../../utils/TagsUtils'; -import ErrorPlaceHolder from '../common/ErrorWithPlaceholder/ErrorPlaceHolder'; -import { ModalWithMarkdownEditor } from '../Modals/ModalWithMarkdownEditor/ModalWithMarkdownEditor'; +import { EntityType } from '../../../enums/entity.enum'; +import { MlFeature } from '../../../generated/entity/data/mlmodel'; +import { TagSource } from '../../../generated/type/schema'; +import { getEntityName } from '../../../utils/EntityUtils'; +import { createTagObject } from '../../../utils/TagsUtils'; +import ErrorPlaceHolder from '../../common/ErrorWithPlaceholder/ErrorPlaceHolder'; +import TableDescription from '../../Database/TableDescription/TableDescription.component'; +import TableTags from '../../Database/TableTags/TableTags.component'; +import { ModalWithMarkdownEditor } from '../../Modals/ModalWithMarkdownEditor/ModalWithMarkdownEditor'; import { MlModelFeaturesListProp } from './MlModel.interface'; import SourceList from './SourceList.component'; diff --git a/openmetadata-ui/src/main/resources/ui/src/components/MlModelDetail/SourceList.component.tsx b/openmetadata-ui/src/main/resources/ui/src/components/MlModel/MlModelDetail/SourceList.component.tsx similarity index 94% rename from openmetadata-ui/src/main/resources/ui/src/components/MlModelDetail/SourceList.component.tsx rename to openmetadata-ui/src/main/resources/ui/src/components/MlModel/MlModelDetail/SourceList.component.tsx index 53bd0f0ec2f3..b22da0a543e4 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/MlModelDetail/SourceList.component.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/components/MlModel/MlModelDetail/SourceList.component.tsx @@ -16,9 +16,9 @@ import { Col, Row, Space, Typography } from 'antd'; import React, { useMemo, useState } from 'react'; import { useTranslation } from 'react-i18next'; import { Link } from 'react-router-dom'; -import { EntityType } from '../../enums/entity.enum'; -import { MlFeature } from '../../generated/entity/data/mlmodel'; -import entityUtilClassBase from '../../utils/EntityUtilClassBase'; +import { EntityType } from '../../../enums/entity.enum'; +import { MlFeature } from '../../../generated/entity/data/mlmodel'; +import entityUtilClassBase from '../../../utils/EntityUtilClassBase'; import './source-list.less'; const SourceList = ({ feature }: { feature: MlFeature }) => { diff --git a/openmetadata-ui/src/main/resources/ui/src/components/MlModelDetail/source-list.less b/openmetadata-ui/src/main/resources/ui/src/components/MlModel/MlModelDetail/source-list.less similarity index 100% rename from openmetadata-ui/src/main/resources/ui/src/components/MlModelDetail/source-list.less rename to openmetadata-ui/src/main/resources/ui/src/components/MlModel/MlModelDetail/source-list.less diff --git a/openmetadata-ui/src/main/resources/ui/src/components/MlModelVersion/MlModelVersion.component.tsx b/openmetadata-ui/src/main/resources/ui/src/components/MlModel/MlModelVersion/MlModelVersion.component.tsx similarity index 88% rename from openmetadata-ui/src/main/resources/ui/src/components/MlModelVersion/MlModelVersion.component.tsx rename to openmetadata-ui/src/main/resources/ui/src/components/MlModel/MlModelVersion/MlModelVersion.component.tsx index c01db70248d9..9ee214961ee2 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/MlModelVersion/MlModelVersion.component.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/components/MlModel/MlModelVersion/MlModelVersion.component.tsx @@ -25,31 +25,32 @@ import classNames from 'classnames'; import React, { FC, useCallback, useEffect, useMemo, useState } from 'react'; import { useTranslation } from 'react-i18next'; import { useHistory, useParams } from 'react-router-dom'; -import { CustomPropertyTable } from '../../components/common/CustomPropertyTable/CustomPropertyTable'; -import DescriptionV1 from '../../components/common/EntityDescription/DescriptionV1'; -import ErrorPlaceHolder from '../../components/common/ErrorWithPlaceholder/ErrorPlaceHolder'; -import RichTextEditorPreviewer from '../../components/common/RichTextEditor/RichTextEditorPreviewer'; -import DataAssetsVersionHeader from '../../components/DataAssets/DataAssetsVersionHeader/DataAssetsVersionHeader'; -import EntityVersionTimeLine from '../../components/Entity/EntityVersionTimeLine/EntityVersionTimeLine'; -import SourceList from '../../components/MlModelDetail/SourceList.component'; -import TabsLabel from '../../components/TabsLabel/TabsLabel.component'; -import TagsContainerV2 from '../../components/Tag/TagsContainerV2/TagsContainerV2'; -import TagsViewer from '../../components/Tag/TagsViewer/TagsViewer'; -import { getVersionPathWithTab } from '../../constants/constants'; -import { EntityField } from '../../constants/Feeds.constants'; -import { EntityTabs, EntityType } from '../../enums/entity.enum'; -import { ChangeDescription } from '../../generated/entity/data/dashboard'; -import { MlFeature } from '../../generated/entity/data/mlmodel'; -import { TagSource } from '../../generated/type/tagLabel'; +import { getVersionPathWithTab } from '../../../constants/constants'; +import { EntityField } from '../../../constants/Feeds.constants'; +import { EntityTabs, EntityType } from '../../../enums/entity.enum'; +import { ChangeDescription } from '../../../generated/entity/data/dashboard'; +import { MlFeature } from '../../../generated/entity/data/mlmodel'; +import { TagSource } from '../../../generated/type/tagLabel'; import { getCommonExtraInfoForVersionDetails, getEntityVersionByField, getEntityVersionTags, -} from '../../utils/EntityVersionUtils'; -import { getMlFeatureVersionData } from '../../utils/MlModelVersionUtils'; -import { getFilterTags } from '../../utils/TableTags/TableTags.utils'; -import DataProductsContainer from '../DataProductsContainer/DataProductsContainer.component'; -import Loader from '../Loader/Loader'; +} from '../../../utils/EntityVersionUtils'; +import { getMlFeatureVersionData } from '../../../utils/MlModelVersionUtils'; +import { getFilterTags } from '../../../utils/TableTags/TableTags.utils'; +import { CustomPropertyTable } from '../../common/CustomPropertyTable/CustomPropertyTable'; +import DescriptionV1 from '../../common/EntityDescription/DescriptionV1'; +import ErrorPlaceHolder from '../../common/ErrorWithPlaceholder/ErrorPlaceHolder'; +import Loader from '../../common/Loader/Loader'; +import RichTextEditorPreviewer from '../../common/RichTextEditor/RichTextEditorPreviewer'; +import TabsLabel from '../../common/TabsLabel/TabsLabel.component'; +import DataAssetsVersionHeader from '../../DataAssets/DataAssetsVersionHeader/DataAssetsVersionHeader'; +import DataProductsContainer from '../../DataProducts/DataProductsContainer/DataProductsContainer.component'; +import EntityVersionTimeLine from '../../Entity/EntityVersionTimeLine/EntityVersionTimeLine'; +import TagsContainerV2 from '../../Tag/TagsContainerV2/TagsContainerV2'; +import TagsViewer from '../../Tag/TagsViewer/TagsViewer'; + +import SourceList from '../MlModelDetail/SourceList.component'; import { MlModelVersionProp } from './MlModelVersion.interface'; const MlModelVersion: FC = ({ diff --git a/openmetadata-ui/src/main/resources/ui/src/components/MlModelVersion/MlModelVersion.interface.tsx b/openmetadata-ui/src/main/resources/ui/src/components/MlModel/MlModelVersion/MlModelVersion.interface.tsx similarity index 75% rename from openmetadata-ui/src/main/resources/ui/src/components/MlModelVersion/MlModelVersion.interface.tsx rename to openmetadata-ui/src/main/resources/ui/src/components/MlModel/MlModelVersion/MlModelVersion.interface.tsx index 3f0d557539f8..5659020c2442 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/MlModelVersion/MlModelVersion.interface.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/components/MlModel/MlModelVersion/MlModelVersion.interface.tsx @@ -11,11 +11,11 @@ * limitations under the License. */ -import { OperationPermission } from '../../components/PermissionProvider/PermissionProvider.interface'; -import { Mlmodel } from '../../generated/entity/data/mlmodel'; -import { EntityHistory } from '../../generated/type/entityHistory'; -import { TagLabel } from '../../generated/type/tagLabel'; -import { TitleBreadcrumbProps } from '../common/TitleBreadcrumb/TitleBreadcrumb.interface'; +import { OperationPermission } from '../../../context/PermissionProvider/PermissionProvider.interface'; +import { Mlmodel } from '../../../generated/entity/data/mlmodel'; +import { EntityHistory } from '../../../generated/type/entityHistory'; +import { TagLabel } from '../../../generated/type/tagLabel'; +import { TitleBreadcrumbProps } from '../../common/TitleBreadcrumb/TitleBreadcrumb.interface'; export interface MlModelVersionProp { version: string; diff --git a/openmetadata-ui/src/main/resources/ui/src/components/MlModelVersion/MlModelVersion.test.tsx b/openmetadata-ui/src/main/resources/ui/src/components/MlModel/MlModelVersion/MlModelVersion.test.tsx similarity index 81% rename from openmetadata-ui/src/main/resources/ui/src/components/MlModelVersion/MlModelVersion.test.tsx rename to openmetadata-ui/src/main/resources/ui/src/components/MlModel/MlModelVersion/MlModelVersion.test.tsx index fbbeafc3a995..1aa335b8fd25 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/MlModelVersion/MlModelVersion.test.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/components/MlModel/MlModelVersion/MlModelVersion.test.tsx @@ -17,51 +17,43 @@ import React from 'react'; import { mlModelVersionMockProps, mockMlModelDetails, -} from '../../mocks/MlModelVersion.mock'; +} from '../../../mocks/MlModelVersion.mock'; import MlModelVersion from './MlModelVersion.component'; const mockPush = jest.fn(); jest.mock( - '../../components/DataAssets/DataAssetsVersionHeader/DataAssetsVersionHeader', + '../../DataAssets/DataAssetsVersionHeader/DataAssetsVersionHeader', () => jest.fn().mockImplementation(() =>
DataAssetsVersionHeader
) ); -jest.mock('../../components/TabsLabel/TabsLabel.component', () => +jest.mock('../../common/TabsLabel/TabsLabel.component', () => jest.fn().mockImplementation(({ name }) =>
{name}
) ); -jest.mock('../../components/Tag/TagsContainerV2/TagsContainerV2', () => +jest.mock('../../Tag/TagsContainerV2/TagsContainerV2', () => jest.fn().mockImplementation(() =>
TagsContainerV2
) ); -jest.mock( - '../../components/common/CustomPropertyTable/CustomPropertyTable', - () => ({ - CustomPropertyTable: jest - .fn() - .mockImplementation(() =>
CustomPropertyTable
), - }) -); +jest.mock('../../common/CustomPropertyTable/CustomPropertyTable', () => ({ + CustomPropertyTable: jest + .fn() + .mockImplementation(() =>
CustomPropertyTable
), +})); -jest.mock('../../components/common/EntityDescription/DescriptionV1', () => +jest.mock('../../common/EntityDescription/DescriptionV1', () => jest.fn().mockImplementation(() =>
DescriptionV1
) ); -jest.mock('../../components/common/ErrorWithPlaceholder/ErrorPlaceHolder', () => +jest.mock('../../common/ErrorWithPlaceholder/ErrorPlaceHolder', () => jest.fn().mockImplementation(() =>
ErrorPlaceHolder
) ); -jest.mock( - '../../components/Entity/EntityVersionTimeLine/EntityVersionTimeLine', - () => jest.fn().mockImplementation(() =>
EntityVersionTimeLine
) -); - -jest.mock('../../components/VersionTable/VersionTable.component', () => - jest.fn().mockImplementation(() =>
VersionTable
) +jest.mock('../../Entity/EntityVersionTimeLine/EntityVersionTimeLine', () => + jest.fn().mockImplementation(() =>
EntityVersionTimeLine
) ); -jest.mock('../../components/Loader/Loader', () => +jest.mock('../../common/Loader/Loader', () => jest.fn().mockImplementation(() =>
Loader
) ); diff --git a/openmetadata-ui/src/main/resources/ui/src/components/Modals/ModalWithMarkdownEditor/ModalWithMarkdownEditor.tsx b/openmetadata-ui/src/main/resources/ui/src/components/Modals/ModalWithMarkdownEditor/ModalWithMarkdownEditor.tsx index 473c76c0f5f5..72a0698b719e 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/Modals/ModalWithMarkdownEditor/ModalWithMarkdownEditor.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/components/Modals/ModalWithMarkdownEditor/ModalWithMarkdownEditor.tsx @@ -16,8 +16,8 @@ import { AxiosError } from 'axios'; import React, { FunctionComponent, useRef, useState } from 'react'; import { useTranslation } from 'react-i18next'; import { showErrorToast } from '../../../utils/ToastUtils'; +import Loader from '../../common/Loader/Loader'; import RichTextEditor from '../../common/RichTextEditor/RichTextEditor'; -import Loader from '../../Loader/Loader'; import './modal-with-markdown-editor.less'; import { EditorContentRef, diff --git a/openmetadata-ui/src/main/resources/ui/src/components/Modals/ModalWithQueryEditor/ModalWithQueryEditor.tsx b/openmetadata-ui/src/main/resources/ui/src/components/Modals/ModalWithQueryEditor/ModalWithQueryEditor.tsx index 803f6b42044c..b835382702bb 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/Modals/ModalWithQueryEditor/ModalWithQueryEditor.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/components/Modals/ModalWithQueryEditor/ModalWithQueryEditor.tsx @@ -17,8 +17,8 @@ import React, { useEffect, useState } from 'react'; import { useTranslation } from 'react-i18next'; import { CSMode } from '../../../enums/codemirror.enum'; import { showErrorToast } from '../../../utils/ToastUtils'; -import Loader from '../../Loader/Loader'; -import SchemaEditor from '../../SchemaEditor/SchemaEditor'; +import Loader from '../../common/Loader/Loader'; +import SchemaEditor from '../../Database/SchemaEditor/SchemaEditor'; import { ModalWithQueryEditorProps } from './ModalWithQueryEditor.interface'; export const ModalWithQueryEditor = ({ diff --git a/openmetadata-ui/src/main/resources/ui/src/components/Modals/SchemaModal/SchemaModal.interface.ts b/openmetadata-ui/src/main/resources/ui/src/components/Modals/SchemaModal/SchemaModal.interface.ts index 060e2cb50801..bf5de73c0deb 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/Modals/SchemaModal/SchemaModal.interface.ts +++ b/openmetadata-ui/src/main/resources/ui/src/components/Modals/SchemaModal/SchemaModal.interface.ts @@ -12,7 +12,7 @@ */ import { HTMLAttributes } from 'react'; -import { SampleDataType } from '../../SampleDataTable/SampleData.interface'; +import { SampleDataType } from '../../Database/SampleDataTable/SampleData.interface'; export interface SchemaModalProp extends HTMLAttributes { onClose: () => void; diff --git a/openmetadata-ui/src/main/resources/ui/src/components/Modals/SchemaModal/SchemaModal.tsx b/openmetadata-ui/src/main/resources/ui/src/components/Modals/SchemaModal/SchemaModal.tsx index 65b1d41190af..9e8a82347e53 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/Modals/SchemaModal/SchemaModal.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/components/Modals/SchemaModal/SchemaModal.tsx @@ -16,7 +16,7 @@ import classNames from 'classnames'; import { t } from 'i18next'; import { clone } from 'lodash'; import React, { FC, useEffect, useState } from 'react'; -import SchemaEditor from '../../SchemaEditor/SchemaEditor'; +import SchemaEditor from '../../Database/SchemaEditor/SchemaEditor'; import CloseIcon from '../CloseIcon.component'; import './schema-modal.less'; import { SchemaModalProp } from './SchemaModal.interface'; diff --git a/openmetadata-ui/src/main/resources/ui/src/components/Modals/StyleModal/StyleModal.component.tsx b/openmetadata-ui/src/main/resources/ui/src/components/Modals/StyleModal/StyleModal.component.tsx index a598fa2626da..cb1940f442a0 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/Modals/StyleModal/StyleModal.component.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/components/Modals/StyleModal/StyleModal.component.tsx @@ -17,7 +17,7 @@ import React from 'react'; import { useTranslation } from 'react-i18next'; import { HEX_COLOR_CODE_REGEX } from '../../../constants/regex.constants'; import ColorPicker from '../../common/ColorPicker/ColorPicker.component'; -import FormItemLabel from '../../Form/FormItemLabel'; +import FormItemLabel from '../../common/Form/FormItemLabel'; import { StyleModalProps, StyleWithInput } from './StyleModal.interface'; const StyleModal = ({ open, onCancel, onSubmit, style }: StyleModalProps) => { diff --git a/openmetadata-ui/src/main/resources/ui/src/components/CustomizableComponents/AddWidgetModal/AddWidgetModal.interface.ts b/openmetadata-ui/src/main/resources/ui/src/components/MyData/CustomizableComponents/AddWidgetModal/AddWidgetModal.interface.ts similarity index 94% rename from openmetadata-ui/src/main/resources/ui/src/components/CustomizableComponents/AddWidgetModal/AddWidgetModal.interface.ts rename to openmetadata-ui/src/main/resources/ui/src/components/MyData/CustomizableComponents/AddWidgetModal/AddWidgetModal.interface.ts index 52f306f9051c..a33f035a420d 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/CustomizableComponents/AddWidgetModal/AddWidgetModal.interface.ts +++ b/openmetadata-ui/src/main/resources/ui/src/components/MyData/CustomizableComponents/AddWidgetModal/AddWidgetModal.interface.ts @@ -12,7 +12,7 @@ */ import { ReactNode } from 'react'; -import { Document } from '../../../generated/entity/docStore/document'; +import { Document } from '../../../../generated/entity/docStore/document'; export interface AddWidgetModalProps { open: boolean; diff --git a/openmetadata-ui/src/main/resources/ui/src/components/CustomizableComponents/AddWidgetModal/AddWidgetModal.test.tsx b/openmetadata-ui/src/main/resources/ui/src/components/MyData/CustomizableComponents/AddWidgetModal/AddWidgetModal.test.tsx similarity index 97% rename from openmetadata-ui/src/main/resources/ui/src/components/CustomizableComponents/AddWidgetModal/AddWidgetModal.test.tsx rename to openmetadata-ui/src/main/resources/ui/src/components/MyData/CustomizableComponents/AddWidgetModal/AddWidgetModal.test.tsx index dec77d63896e..8e1d94b63135 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/CustomizableComponents/AddWidgetModal/AddWidgetModal.test.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/components/MyData/CustomizableComponents/AddWidgetModal/AddWidgetModal.test.tsx @@ -14,8 +14,8 @@ import { act, render, screen } from '@testing-library/react'; import userEvent from '@testing-library/user-event'; import React from 'react'; -import { mockWidgetsData } from '../../../mocks/AddWidgetModal.mock'; -import { getAllKnowledgePanels } from '../../../rest/DocStoreAPI'; +import { mockWidgetsData } from '../../../../mocks/AddWidgetModal.mock'; +import { getAllKnowledgePanels } from '../../../../rest/DocStoreAPI'; import AddWidgetModal from './AddWidgetModal'; import { AddWidgetModalProps } from './AddWidgetModal.interface'; diff --git a/openmetadata-ui/src/main/resources/ui/src/components/CustomizableComponents/AddWidgetModal/AddWidgetModal.tsx b/openmetadata-ui/src/main/resources/ui/src/components/MyData/CustomizableComponents/AddWidgetModal/AddWidgetModal.tsx similarity index 86% rename from openmetadata-ui/src/main/resources/ui/src/components/CustomizableComponents/AddWidgetModal/AddWidgetModal.tsx rename to openmetadata-ui/src/main/resources/ui/src/components/MyData/CustomizableComponents/AddWidgetModal/AddWidgetModal.tsx index 53dbb3ff9eff..0348b721be9d 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/CustomizableComponents/AddWidgetModal/AddWidgetModal.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/components/MyData/CustomizableComponents/AddWidgetModal/AddWidgetModal.tsx @@ -17,15 +17,15 @@ import { AxiosError } from 'axios'; import { isEmpty, toString } from 'lodash'; import React, { useCallback, useEffect, useMemo, useState } from 'react'; import { useTranslation } from 'react-i18next'; -import { LIGHT_GREEN_COLOR } from '../../../constants/constants'; -import { ERROR_PLACEHOLDER_TYPE } from '../../../enums/common.enum'; -import { WidgetWidths } from '../../../enums/CustomizablePage.enum'; -import { Document } from '../../../generated/entity/docStore/document'; -import { getAllKnowledgePanels } from '../../../rest/DocStoreAPI'; -import { getWidgetWidthLabelFromKey } from '../../../utils/CustomizableLandingPageUtils'; -import { showErrorToast } from '../../../utils/ToastUtils'; -import ErrorPlaceHolder from '../../common/ErrorWithPlaceholder/ErrorPlaceHolder'; -import Loader from '../../Loader/Loader'; +import { LIGHT_GREEN_COLOR } from '../../../../constants/constants'; +import { ERROR_PLACEHOLDER_TYPE } from '../../../../enums/common.enum'; +import { WidgetWidths } from '../../../../enums/CustomizablePage.enum'; +import { Document } from '../../../../generated/entity/docStore/document'; +import { getAllKnowledgePanels } from '../../../../rest/DocStoreAPI'; +import { getWidgetWidthLabelFromKey } from '../../../../utils/CustomizableLandingPageUtils'; +import { showErrorToast } from '../../../../utils/ToastUtils'; +import ErrorPlaceHolder from '../../../common/ErrorWithPlaceholder/ErrorPlaceHolder'; +import Loader from '../../../common/Loader/Loader'; import './add-widget-modal.less'; import { AddWidgetModalProps, diff --git a/openmetadata-ui/src/main/resources/ui/src/components/CustomizableComponents/AddWidgetModal/AddWidgetTabContent.test.tsx b/openmetadata-ui/src/main/resources/ui/src/components/MyData/CustomizableComponents/AddWidgetModal/AddWidgetTabContent.test.tsx similarity index 98% rename from openmetadata-ui/src/main/resources/ui/src/components/CustomizableComponents/AddWidgetModal/AddWidgetTabContent.test.tsx rename to openmetadata-ui/src/main/resources/ui/src/components/MyData/CustomizableComponents/AddWidgetModal/AddWidgetTabContent.test.tsx index 3535d606476a..a67b4b092a85 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/CustomizableComponents/AddWidgetModal/AddWidgetTabContent.test.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/components/MyData/CustomizableComponents/AddWidgetModal/AddWidgetTabContent.test.tsx @@ -17,7 +17,7 @@ import React from 'react'; import { mockWidget, mockWidgetSizes, -} from '../../../mocks/AddWidgetTabContent.mock'; +} from '../../../../mocks/AddWidgetTabContent.mock'; import { AddWidgetTabContentProps } from './AddWidgetModal.interface'; import AddWidgetTabContent from './AddWidgetTabContent'; diff --git a/openmetadata-ui/src/main/resources/ui/src/components/CustomizableComponents/AddWidgetModal/AddWidgetTabContent.tsx b/openmetadata-ui/src/main/resources/ui/src/components/MyData/CustomizableComponents/AddWidgetModal/AddWidgetTabContent.tsx similarity index 97% rename from openmetadata-ui/src/main/resources/ui/src/components/CustomizableComponents/AddWidgetModal/AddWidgetTabContent.tsx rename to openmetadata-ui/src/main/resources/ui/src/components/MyData/CustomizableComponents/AddWidgetModal/AddWidgetTabContent.tsx index 522310243095..f4c040236d86 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/CustomizableComponents/AddWidgetModal/AddWidgetTabContent.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/components/MyData/CustomizableComponents/AddWidgetModal/AddWidgetTabContent.tsx @@ -25,7 +25,7 @@ import { } from 'antd'; import React, { useCallback, useMemo, useState } from 'react'; import { useTranslation } from 'react-i18next'; -import customizePageClassBase from '../../../utils/CustomizePageClassBase'; +import customizePageClassBase from '../../../../utils/CustomizePageClassBase'; import { AddWidgetTabContentProps } from './AddWidgetModal.interface'; function AddWidgetTabContent({ diff --git a/openmetadata-ui/src/main/resources/ui/src/components/CustomizableComponents/AddWidgetModal/add-widget-modal.less b/openmetadata-ui/src/main/resources/ui/src/components/MyData/CustomizableComponents/AddWidgetModal/add-widget-modal.less similarity index 95% rename from openmetadata-ui/src/main/resources/ui/src/components/CustomizableComponents/AddWidgetModal/add-widget-modal.less rename to openmetadata-ui/src/main/resources/ui/src/components/MyData/CustomizableComponents/AddWidgetModal/add-widget-modal.less index 4c9dbf46ce0e..67219ba9d674 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/CustomizableComponents/AddWidgetModal/add-widget-modal.less +++ b/openmetadata-ui/src/main/resources/ui/src/components/MyData/CustomizableComponents/AddWidgetModal/add-widget-modal.less @@ -11,7 +11,7 @@ * limitations under the License. */ -@import url('../../../styles/variables.less'); +@import url('../../../../styles/variables.less'); .add-widget-modal { .ant-modal-body { diff --git a/openmetadata-ui/src/main/resources/ui/src/components/CustomizableComponents/CustomizeMyData/CustomizeMyData.interface.ts b/openmetadata-ui/src/main/resources/ui/src/components/MyData/CustomizableComponents/CustomizeMyData/CustomizeMyData.interface.ts similarity index 85% rename from openmetadata-ui/src/main/resources/ui/src/components/CustomizableComponents/CustomizeMyData/CustomizeMyData.interface.ts rename to openmetadata-ui/src/main/resources/ui/src/components/MyData/CustomizableComponents/CustomizeMyData/CustomizeMyData.interface.ts index 227fcb20be5f..18d402af23a0 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/CustomizableComponents/CustomizeMyData/CustomizeMyData.interface.ts +++ b/openmetadata-ui/src/main/resources/ui/src/components/MyData/CustomizableComponents/CustomizeMyData/CustomizeMyData.interface.ts @@ -11,8 +11,8 @@ * limitations under the License. */ -import { Document } from '../../../generated/entity/docStore/document'; -import { Persona } from '../../../generated/entity/teams/persona'; +import { Document } from '../../../../generated/entity/docStore/document'; +import { Persona } from '../../../../generated/entity/teams/persona'; export interface CustomizeMyDataProps { personaDetails?: Persona; diff --git a/openmetadata-ui/src/main/resources/ui/src/components/CustomizableComponents/CustomizeMyData/CustomizeMyData.test.tsx b/openmetadata-ui/src/main/resources/ui/src/components/MyData/CustomizableComponents/CustomizeMyData/CustomizeMyData.test.tsx similarity index 97% rename from openmetadata-ui/src/main/resources/ui/src/components/CustomizableComponents/CustomizeMyData/CustomizeMyData.test.tsx rename to openmetadata-ui/src/main/resources/ui/src/components/MyData/CustomizableComponents/CustomizeMyData/CustomizeMyData.test.tsx index 075361388861..c321e8fb1e66 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/CustomizableComponents/CustomizeMyData/CustomizeMyData.test.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/components/MyData/CustomizableComponents/CustomizeMyData/CustomizeMyData.test.tsx @@ -14,7 +14,7 @@ import { act, render, screen } from '@testing-library/react'; import userEvent from '@testing-library/user-event'; import React from 'react'; -import { PageType } from '../../../generated/system/ui/page'; +import { PageType } from '../../../../generated/system/ui/page'; import { mockActiveAnnouncementData, mockCustomizePageClassBase, @@ -22,8 +22,8 @@ import { mockDocumentData, mockPersonaName, mockUserData, -} from '../../../mocks/MyDataPage.mock'; -import { WidgetConfig } from '../../../pages/CustomizablePage/CustomizablePage.interface'; +} from '../../../../mocks/MyDataPage.mock'; +import { WidgetConfig } from '../../../../pages/CustomizablePage/CustomizablePage.interface'; import CustomizeMyData from './CustomizeMyData'; import { CustomizeMyDataProps } from './CustomizeMyData.interface'; diff --git a/openmetadata-ui/src/main/resources/ui/src/components/CustomizableComponents/CustomizeMyData/CustomizeMyData.tsx b/openmetadata-ui/src/main/resources/ui/src/components/MyData/CustomizableComponents/CustomizeMyData/CustomizeMyData.tsx similarity index 88% rename from openmetadata-ui/src/main/resources/ui/src/components/CustomizableComponents/CustomizeMyData/CustomizeMyData.tsx rename to openmetadata-ui/src/main/resources/ui/src/components/MyData/CustomizableComponents/CustomizeMyData/CustomizeMyData.tsx index d5ea15db8d52..b57d96dd3d12 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/CustomizableComponents/CustomizeMyData/CustomizeMyData.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/components/MyData/CustomizableComponents/CustomizeMyData/CustomizeMyData.tsx @@ -18,21 +18,21 @@ import React, { useCallback, useEffect, useMemo, useState } from 'react'; import RGL, { Layout, WidthProvider } from 'react-grid-layout'; import { useTranslation } from 'react-i18next'; import { Link, useHistory } from 'react-router-dom'; -import gridBgImg from '../../../assets/img/grid-bg-img.png'; +import gridBgImg from '../../../../assets/img/grid-bg-img.png'; import { GlobalSettingOptions, GlobalSettingsMenuCategory, -} from '../../../constants/GlobalSettings.constants'; -import { LandingPageWidgetKeys } from '../../../enums/CustomizablePage.enum'; -import { AssetsType } from '../../../enums/entity.enum'; -import { Document } from '../../../generated/entity/docStore/document'; -import { EntityReference } from '../../../generated/entity/type'; -import { useFqn } from '../../../hooks/useFqn'; -import { useGridLayoutDirection } from '../../../hooks/useGridLayoutDirection'; -import { WidgetConfig } from '../../../pages/CustomizablePage/CustomizablePage.interface'; -import '../../../pages/MyDataPage/my-data.less'; -import { getUserById } from '../../../rest/userAPI'; -import { Transi18next } from '../../../utils/CommonUtils'; +} from '../../../../constants/GlobalSettings.constants'; +import { LandingPageWidgetKeys } from '../../../../enums/CustomizablePage.enum'; +import { AssetsType } from '../../../../enums/entity.enum'; +import { Document } from '../../../../generated/entity/docStore/document'; +import { EntityReference } from '../../../../generated/entity/type'; +import { useFqn } from '../../../../hooks/useFqn'; +import { useGridLayoutDirection } from '../../../../hooks/useGridLayoutDirection'; +import { WidgetConfig } from '../../../../pages/CustomizablePage/CustomizablePage.interface'; +import '../../../../pages/MyDataPage/my-data.less'; +import { getUserById } from '../../../../rest/userAPI'; +import { Transi18next } from '../../../../utils/CommonUtils'; import { getAddWidgetHandler, getLayoutUpdateHandler, @@ -40,17 +40,17 @@ import { getRemoveWidgetHandler, getUniqueFilteredLayout, getWidgetFromKey, -} from '../../../utils/CustomizableLandingPageUtils'; -import customizePageClassBase from '../../../utils/CustomizePageClassBase'; -import { getEntityName } from '../../../utils/EntityUtils'; +} from '../../../../utils/CustomizableLandingPageUtils'; +import customizePageClassBase from '../../../../utils/CustomizePageClassBase'; +import { getEntityName } from '../../../../utils/EntityUtils'; import { getPersonaDetailsPath, getSettingPath, -} from '../../../utils/RouterUtils'; -import { showErrorToast } from '../../../utils/ToastUtils'; -import ActivityFeedProvider from '../../ActivityFeed/ActivityFeedProvider/ActivityFeedProvider'; -import { useAuthContext } from '../../Auth/AuthProviders/AuthProvider'; -import PageLayoutV1 from '../../PageLayoutV1/PageLayoutV1'; +} from '../../../../utils/RouterUtils'; +import { showErrorToast } from '../../../../utils/ToastUtils'; +import ActivityFeedProvider from '../../../ActivityFeed/ActivityFeedProvider/ActivityFeedProvider'; +import { useAuthContext } from '../../../Auth/AuthProviders/AuthProvider'; +import PageLayoutV1 from '../../../PageLayoutV1/PageLayoutV1'; import AddWidgetModal from '../AddWidgetModal/AddWidgetModal'; import './customize-my-data.less'; import { CustomizeMyDataProps } from './CustomizeMyData.interface'; diff --git a/openmetadata-ui/src/main/resources/ui/src/components/CustomizableComponents/CustomizeMyData/customize-my-data.less b/openmetadata-ui/src/main/resources/ui/src/components/MyData/CustomizableComponents/CustomizeMyData/customize-my-data.less similarity index 91% rename from openmetadata-ui/src/main/resources/ui/src/components/CustomizableComponents/CustomizeMyData/customize-my-data.less rename to openmetadata-ui/src/main/resources/ui/src/components/MyData/CustomizableComponents/CustomizeMyData/customize-my-data.less index 868e6b16dda9..1c81628ebf8e 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/CustomizableComponents/CustomizeMyData/customize-my-data.less +++ b/openmetadata-ui/src/main/resources/ui/src/components/MyData/CustomizableComponents/CustomizeMyData/customize-my-data.less @@ -10,7 +10,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -@import (reference) url('../../../styles/variables.less'); +@import (reference) url('../../../../styles/variables.less'); .grid-container { .react-grid-item.react-grid-placeholder { diff --git a/openmetadata-ui/src/main/resources/ui/src/components/CustomizableComponents/EmptyWidgetPlaceholder/EmptyWidgetPlaceholder.interface.ts b/openmetadata-ui/src/main/resources/ui/src/components/MyData/CustomizableComponents/EmptyWidgetPlaceholder/EmptyWidgetPlaceholder.interface.ts similarity index 94% rename from openmetadata-ui/src/main/resources/ui/src/components/CustomizableComponents/EmptyWidgetPlaceholder/EmptyWidgetPlaceholder.interface.ts rename to openmetadata-ui/src/main/resources/ui/src/components/MyData/CustomizableComponents/EmptyWidgetPlaceholder/EmptyWidgetPlaceholder.interface.ts index 66f035edc6d2..6cf04f4a0eea 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/CustomizableComponents/EmptyWidgetPlaceholder/EmptyWidgetPlaceholder.interface.ts +++ b/openmetadata-ui/src/main/resources/ui/src/components/MyData/CustomizableComponents/EmptyWidgetPlaceholder/EmptyWidgetPlaceholder.interface.ts @@ -10,7 +10,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -import { SIZE } from '../../../enums/common.enum'; +import { SIZE } from '../../../../enums/common.enum'; export interface EmptyWidgetPlaceholderProps { iconHeight?: SIZE; diff --git a/openmetadata-ui/src/main/resources/ui/src/components/CustomizableComponents/EmptyWidgetPlaceholder/EmptyWidgetPlaceholder.test.tsx b/openmetadata-ui/src/main/resources/ui/src/components/MyData/CustomizableComponents/EmptyWidgetPlaceholder/EmptyWidgetPlaceholder.test.tsx similarity index 96% rename from openmetadata-ui/src/main/resources/ui/src/components/CustomizableComponents/EmptyWidgetPlaceholder/EmptyWidgetPlaceholder.test.tsx rename to openmetadata-ui/src/main/resources/ui/src/components/MyData/CustomizableComponents/EmptyWidgetPlaceholder/EmptyWidgetPlaceholder.test.tsx index 023214e77bc9..e7257385bca8 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/CustomizableComponents/EmptyWidgetPlaceholder/EmptyWidgetPlaceholder.test.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/components/MyData/CustomizableComponents/EmptyWidgetPlaceholder/EmptyWidgetPlaceholder.test.tsx @@ -14,8 +14,8 @@ import { act, render, screen } from '@testing-library/react'; import userEvent from '@testing-library/user-event'; import React from 'react'; -import { SIZE } from '../../../enums/common.enum'; -import { LandingPageWidgetKeys } from '../../../enums/CustomizablePage.enum'; +import { SIZE } from '../../../../enums/common.enum'; +import { LandingPageWidgetKeys } from '../../../../enums/CustomizablePage.enum'; import EmptyWidgetPlaceholder from './EmptyWidgetPlaceholder'; import { EmptyWidgetPlaceholderProps } from './EmptyWidgetPlaceholder.interface'; diff --git a/openmetadata-ui/src/main/resources/ui/src/components/CustomizableComponents/EmptyWidgetPlaceholder/EmptyWidgetPlaceholder.tsx b/openmetadata-ui/src/main/resources/ui/src/components/MyData/CustomizableComponents/EmptyWidgetPlaceholder/EmptyWidgetPlaceholder.tsx similarity index 95% rename from openmetadata-ui/src/main/resources/ui/src/components/CustomizableComponents/EmptyWidgetPlaceholder/EmptyWidgetPlaceholder.tsx rename to openmetadata-ui/src/main/resources/ui/src/components/MyData/CustomizableComponents/EmptyWidgetPlaceholder/EmptyWidgetPlaceholder.tsx index 7130c453c8cc..b0f983831c11 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/CustomizableComponents/EmptyWidgetPlaceholder/EmptyWidgetPlaceholder.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/components/MyData/CustomizableComponents/EmptyWidgetPlaceholder/EmptyWidgetPlaceholder.tsx @@ -16,8 +16,8 @@ import { Button, Card, Col, Row, Space, Typography } from 'antd'; import { isUndefined } from 'lodash'; import React, { useCallback } from 'react'; import { useTranslation } from 'react-i18next'; -import { ReactComponent as AddPlaceHolderIcon } from '../../../assets/svg/add-placeholder.svg'; -import { SIZE } from '../../../enums/common.enum'; +import { ReactComponent as AddPlaceHolderIcon } from '../../../../assets/svg/add-placeholder.svg'; +import { SIZE } from '../../../../enums/common.enum'; import './empty-widget-placeholder.less'; import { EmptyWidgetPlaceholderProps } from './EmptyWidgetPlaceholder.interface'; diff --git a/openmetadata-ui/src/main/resources/ui/src/components/CustomizableComponents/EmptyWidgetPlaceholder/empty-widget-placeholder.less b/openmetadata-ui/src/main/resources/ui/src/components/MyData/CustomizableComponents/EmptyWidgetPlaceholder/empty-widget-placeholder.less similarity index 94% rename from openmetadata-ui/src/main/resources/ui/src/components/CustomizableComponents/EmptyWidgetPlaceholder/empty-widget-placeholder.less rename to openmetadata-ui/src/main/resources/ui/src/components/MyData/CustomizableComponents/EmptyWidgetPlaceholder/empty-widget-placeholder.less index f773daa611dc..f2c15f709827 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/CustomizableComponents/EmptyWidgetPlaceholder/empty-widget-placeholder.less +++ b/openmetadata-ui/src/main/resources/ui/src/components/MyData/CustomizableComponents/EmptyWidgetPlaceholder/empty-widget-placeholder.less @@ -10,7 +10,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -@import url('../../../styles/variables.less'); +@import url('../../../../styles/variables.less'); .ant-card.ant-card-bordered.empty-widget-placeholder { background-color: @grey-1; diff --git a/openmetadata-ui/src/main/resources/ui/src/components/GithubStarCard/GithubStarCard.component.tsx b/openmetadata-ui/src/main/resources/ui/src/components/MyData/GithubStarCard/GithubStarCard.component.tsx similarity index 88% rename from openmetadata-ui/src/main/resources/ui/src/components/GithubStarCard/GithubStarCard.component.tsx rename to openmetadata-ui/src/main/resources/ui/src/components/MyData/GithubStarCard/GithubStarCard.component.tsx index eb8f4f05203a..c5aa0172265c 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/GithubStarCard/GithubStarCard.component.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/components/MyData/GithubStarCard/GithubStarCard.component.tsx @@ -17,20 +17,20 @@ import { CookieStorage } from 'cookie-storage'; import React, { useCallback, useEffect, useMemo, useState } from 'react'; import { useTranslation } from 'react-i18next'; import { Link, useLocation } from 'react-router-dom'; -import { ReactComponent as CloseIcon } from '../../assets/svg/close.svg'; -import { ReactComponent as StarGithubIcon } from '../../assets/svg/ic-star-github.svg'; -import { ReactComponent as StarIcon } from '../../assets/svg/ic-start-filled-github.svg'; +import { ReactComponent as CloseIcon } from '../../../assets/svg/close.svg'; +import { ReactComponent as StarGithubIcon } from '../../../assets/svg/ic-star-github.svg'; +import { ReactComponent as StarIcon } from '../../../assets/svg/ic-start-filled-github.svg'; import { BLACK_COLOR, ROUTES, STAR_OMD_USER, TWO_MINUTE_IN_MILLISECOND, -} from '../../constants/constants'; -import { OMD_REPOSITORY_LINK } from '../../constants/docs.constants'; -import { getRepositoryData } from '../../rest/commonAPI'; -import { getReleaseVersionExpiry } from '../../utils/WhatsNewModal.util'; -import { useAuthContext } from '../Auth/AuthProviders/AuthProvider'; -import { COOKIE_VERSION } from '../Modals/WhatsNewModal/whatsNewData'; +} from '../../../constants/constants'; +import { OMD_REPOSITORY_LINK } from '../../../constants/docs.constants'; +import { getRepositoryData } from '../../../rest/commonAPI'; +import { getReleaseVersionExpiry } from '../../../utils/WhatsNewModal.util'; +import { useAuthContext } from '../../Auth/AuthProviders/AuthProvider'; +import { COOKIE_VERSION } from '../../Modals/WhatsNewModal/whatsNewData'; import './github-star-card.style.less'; const cookieStorage = new CookieStorage(); diff --git a/openmetadata-ui/src/main/resources/ui/src/components/GithubStarCard/GithubStarCard.test.tsx b/openmetadata-ui/src/main/resources/ui/src/components/MyData/GithubStarCard/GithubStarCard.test.tsx similarity index 98% rename from openmetadata-ui/src/main/resources/ui/src/components/GithubStarCard/GithubStarCard.test.tsx rename to openmetadata-ui/src/main/resources/ui/src/components/MyData/GithubStarCard/GithubStarCard.test.tsx index c6c332afbbc4..09a56a1ecd8f 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/GithubStarCard/GithubStarCard.test.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/components/MyData/GithubStarCard/GithubStarCard.test.tsx @@ -14,7 +14,7 @@ import { act, fireEvent, render, screen } from '@testing-library/react'; import React from 'react'; import { useLocation } from 'react-router-dom'; -import { TWO_MINUTE_IN_MILLISECOND } from '../../constants/constants'; +import { TWO_MINUTE_IN_MILLISECOND } from '../../../constants/constants'; import GithubStarCard from './GithubStarCard.component'; const mockLinkButton = jest.fn(); diff --git a/openmetadata-ui/src/main/resources/ui/src/components/GithubStarCard/github-star-card.style.less b/openmetadata-ui/src/main/resources/ui/src/components/MyData/GithubStarCard/github-star-card.style.less similarity index 97% rename from openmetadata-ui/src/main/resources/ui/src/components/GithubStarCard/github-star-card.style.less rename to openmetadata-ui/src/main/resources/ui/src/components/MyData/GithubStarCard/github-star-card.style.less index 3ec559eb9a16..51b50bc3250d 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/GithubStarCard/github-star-card.style.less +++ b/openmetadata-ui/src/main/resources/ui/src/components/MyData/GithubStarCard/github-star-card.style.less @@ -11,7 +11,7 @@ * limitations under the License. */ -@import (reference) url('../../styles/variables.less'); +@import (reference) url('../../../styles/variables.less'); .github-star-popup-card { border: none; diff --git a/openmetadata-ui/src/main/resources/ui/src/components/MyData/MyDataWidget/MyDataWidget.component.tsx b/openmetadata-ui/src/main/resources/ui/src/components/MyData/MyDataWidget/MyDataWidget.component.tsx index 78102b25b99d..6a54ff439ecb 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/MyData/MyDataWidget/MyDataWidget.component.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/components/MyData/MyDataWidget/MyDataWidget.component.tsx @@ -33,8 +33,8 @@ import { getEntityName } from '../../../utils/EntityUtils'; import { getEntityIcon } from '../../../utils/TableUtils'; import { useAuthContext } from '../../Auth/AuthProviders/AuthProvider'; import ErrorPlaceHolder from '../../common/ErrorWithPlaceholder/ErrorPlaceHolder'; +import EntityListSkeleton from '../../common/Skeleton/MyData/EntityListSkeleton/EntityListSkeleton.component'; import { SourceType } from '../../SearchedData/SearchedData.interface'; -import EntityListSkeleton from '../../Skeleton/MyData/EntityListSkeleton/EntityListSkeleton.component'; import './my-data-widget.less'; const MyDataWidgetInternal = ({ diff --git a/openmetadata-ui/src/main/resources/ui/src/components/Persona/AddEditPersona/AddEditPersona.component.tsx b/openmetadata-ui/src/main/resources/ui/src/components/MyData/Persona/AddEditPersona/AddEditPersona.component.tsx similarity index 87% rename from openmetadata-ui/src/main/resources/ui/src/components/Persona/AddEditPersona/AddEditPersona.component.tsx rename to openmetadata-ui/src/main/resources/ui/src/components/MyData/Persona/AddEditPersona/AddEditPersona.component.tsx index b5924085eacf..bac2e3d0b384 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/Persona/AddEditPersona/AddEditPersona.component.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/components/MyData/Persona/AddEditPersona/AddEditPersona.component.tsx @@ -19,20 +19,20 @@ import { compare } from 'fast-json-patch'; import { isEmpty } from 'lodash'; import React, { useCallback, useMemo, useState } from 'react'; import { useTranslation } from 'react-i18next'; -import { VALIDATION_MESSAGES } from '../../../constants/constants'; -import { ENTITY_NAME_REGEX } from '../../../constants/regex.constants'; -import { Persona } from '../../../generated/entity/teams/persona'; -import { EntityReference } from '../../../generated/entity/type'; +import { VALIDATION_MESSAGES } from '../../../../constants/constants'; +import { ENTITY_NAME_REGEX } from '../../../../constants/regex.constants'; +import { Persona } from '../../../../generated/entity/teams/persona'; +import { EntityReference } from '../../../../generated/entity/type'; import { FieldTypes, FormItemLayout, -} from '../../../interface/FormUtils.interface'; -import { createPersona, updatePersona } from '../../../rest/PersonaAPI'; -import { getEntityName } from '../../../utils/EntityUtils'; -import { generateFormFields, getField } from '../../../utils/formUtils'; -import { showErrorToast } from '../../../utils/ToastUtils'; -import { UserTag } from '../../common/UserTag/UserTag.component'; -import { UserTagSize } from '../../common/UserTag/UserTag.interface'; +} from '../../../../interface/FormUtils.interface'; +import { createPersona, updatePersona } from '../../../../rest/PersonaAPI'; +import { getEntityName } from '../../../../utils/EntityUtils'; +import { generateFormFields, getField } from '../../../../utils/formUtils'; +import { showErrorToast } from '../../../../utils/ToastUtils'; +import { UserTag } from '../../../common/UserTag/UserTag.component'; +import { UserTagSize } from '../../../common/UserTag/UserTag.interface'; import { AddPersonaFormProps } from './AddEditPersona.interface'; export const AddEditPersonaForm = ({ diff --git a/openmetadata-ui/src/main/resources/ui/src/components/Persona/AddEditPersona/AddEditPersona.interface.ts b/openmetadata-ui/src/main/resources/ui/src/components/MyData/Persona/AddEditPersona/AddEditPersona.interface.ts similarity index 90% rename from openmetadata-ui/src/main/resources/ui/src/components/Persona/AddEditPersona/AddEditPersona.interface.ts rename to openmetadata-ui/src/main/resources/ui/src/components/MyData/Persona/AddEditPersona/AddEditPersona.interface.ts index cdb5bb042283..a831ae74da31 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/Persona/AddEditPersona/AddEditPersona.interface.ts +++ b/openmetadata-ui/src/main/resources/ui/src/components/MyData/Persona/AddEditPersona/AddEditPersona.interface.ts @@ -11,7 +11,7 @@ * limitations under the License. */ -import { Persona } from '../../../generated/entity/teams/persona'; +import { Persona } from '../../../../generated/entity/teams/persona'; export interface AddPersonaFormProps { onCancel: () => void; diff --git a/openmetadata-ui/src/main/resources/ui/src/components/Persona/PersonaDetailsCard/PersonaDetailsCard.test.tsx b/openmetadata-ui/src/main/resources/ui/src/components/MyData/Persona/PersonaDetailsCard/PersonaDetailsCard.test.tsx similarity index 100% rename from openmetadata-ui/src/main/resources/ui/src/components/Persona/PersonaDetailsCard/PersonaDetailsCard.test.tsx rename to openmetadata-ui/src/main/resources/ui/src/components/MyData/Persona/PersonaDetailsCard/PersonaDetailsCard.test.tsx diff --git a/openmetadata-ui/src/main/resources/ui/src/components/Persona/PersonaDetailsCard/PersonaDetailsCard.tsx b/openmetadata-ui/src/main/resources/ui/src/components/MyData/Persona/PersonaDetailsCard/PersonaDetailsCard.tsx similarity index 86% rename from openmetadata-ui/src/main/resources/ui/src/components/Persona/PersonaDetailsCard/PersonaDetailsCard.tsx rename to openmetadata-ui/src/main/resources/ui/src/components/MyData/Persona/PersonaDetailsCard/PersonaDetailsCard.tsx index 5e2bd637c2ab..adaa39a25b7b 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/Persona/PersonaDetailsCard/PersonaDetailsCard.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/components/MyData/Persona/PersonaDetailsCard/PersonaDetailsCard.tsx @@ -14,10 +14,10 @@ import { Card, Space, Typography } from 'antd'; import React, { useCallback } from 'react'; import { useTranslation } from 'react-i18next'; import { useHistory } from 'react-router-dom'; -import { Persona } from '../../../generated/entity/teams/persona'; -import { getEntityName } from '../../../utils/EntityUtils'; -import { getPersonaDetailsPath } from '../../../utils/RouterUtils'; -import RichTextEditorPreviewer from '../../common/RichTextEditor/RichTextEditorPreviewer'; +import { Persona } from '../../../../generated/entity/teams/persona'; +import { getEntityName } from '../../../../utils/EntityUtils'; +import { getPersonaDetailsPath } from '../../../../utils/RouterUtils'; +import RichTextEditorPreviewer from '../../../common/RichTextEditor/RichTextEditorPreviewer'; interface PersonaDetailsCardProps { persona: Persona; diff --git a/openmetadata-ui/src/main/resources/ui/src/components/Persona/PersonaSelectableList/PersonaSelectableList.component.tsx b/openmetadata-ui/src/main/resources/ui/src/components/MyData/Persona/PersonaSelectableList/PersonaSelectableList.component.tsx similarity index 86% rename from openmetadata-ui/src/main/resources/ui/src/components/Persona/PersonaSelectableList/PersonaSelectableList.component.tsx rename to openmetadata-ui/src/main/resources/ui/src/components/MyData/Persona/PersonaSelectableList/PersonaSelectableList.component.tsx index 79f610e8531d..82a6133fde1b 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/Persona/PersonaSelectableList/PersonaSelectableList.component.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/components/MyData/Persona/PersonaSelectableList/PersonaSelectableList.component.tsx @@ -14,13 +14,16 @@ import { Button, Popover } from 'antd'; import { noop } from 'lodash'; import React, { useCallback, useState } from 'react'; import { useTranslation } from 'react-i18next'; -import { ReactComponent as EditIcon } from '../../../assets/svg/edit-new.svg'; -import { DE_ACTIVE_COLOR, PAGE_SIZE_LARGE } from '../../../constants/constants'; -import { EntityType } from '../../../enums/entity.enum'; -import { EntityReference } from '../../../generated/entity/type'; -import { getAllPersonas } from '../../../rest/PersonaAPI'; -import { getEntityReferenceListFromEntities } from '../../../utils/EntityUtils'; -import { SelectableList } from '../../common/SelectableList/SelectableList.component'; +import { ReactComponent as EditIcon } from '../../../../assets/svg/edit-new.svg'; +import { + DE_ACTIVE_COLOR, + PAGE_SIZE_LARGE, +} from '../../../../constants/constants'; +import { EntityType } from '../../../../enums/entity.enum'; +import { EntityReference } from '../../../../generated/entity/type'; +import { getAllPersonas } from '../../../../rest/PersonaAPI'; +import { getEntityReferenceListFromEntities } from '../../../../utils/EntityUtils'; +import { SelectableList } from '../../../common/SelectableList/SelectableList.component'; import { PersonaSelectableListProps } from './PersonaSelectableList.interface'; export const PersonaSelectableList = ({ diff --git a/openmetadata-ui/src/main/resources/ui/src/components/Persona/PersonaSelectableList/PersonaSelectableList.interface.ts b/openmetadata-ui/src/main/resources/ui/src/components/MyData/Persona/PersonaSelectableList/PersonaSelectableList.interface.ts similarity index 93% rename from openmetadata-ui/src/main/resources/ui/src/components/Persona/PersonaSelectableList/PersonaSelectableList.interface.ts rename to openmetadata-ui/src/main/resources/ui/src/components/MyData/Persona/PersonaSelectableList/PersonaSelectableList.interface.ts index 3c16659d1dc4..3fb462c17127 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/Persona/PersonaSelectableList/PersonaSelectableList.interface.ts +++ b/openmetadata-ui/src/main/resources/ui/src/components/MyData/Persona/PersonaSelectableList/PersonaSelectableList.interface.ts @@ -12,7 +12,7 @@ */ import { PopoverProps } from 'antd'; import { ReactNode } from 'react'; -import { EntityReference } from '../../../generated/entity/type'; +import { EntityReference } from '../../../../generated/entity/type'; export type PersonaSelectableListProps = { hasPermission: boolean; diff --git a/openmetadata-ui/src/main/resources/ui/src/components/MyData/RightSidebar/AnnouncementsWidget.tsx b/openmetadata-ui/src/main/resources/ui/src/components/MyData/RightSidebar/AnnouncementsWidget.tsx index 8e274ddd644e..7fb73ae47f6e 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/MyData/RightSidebar/AnnouncementsWidget.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/components/MyData/RightSidebar/AnnouncementsWidget.tsx @@ -22,7 +22,7 @@ import { WidgetCommonProps } from '../../../pages/CustomizablePage/CustomizableP import FeedCardBodyV1 from '../../ActivityFeed/ActivityFeedCard/FeedCardBody/FeedCardBodyV1'; import FeedCardHeaderV1 from '../../ActivityFeed/ActivityFeedCard/FeedCardHeader/FeedCardHeaderV1'; import ErrorPlaceHolder from '../../common/ErrorWithPlaceholder/ErrorPlaceHolder'; -import Loader from '../../Loader/Loader'; +import Loader from '../../common/Loader/Loader'; import './announcements-widget.less'; export interface AnnouncementsWidgetProps extends WidgetCommonProps { diff --git a/openmetadata-ui/src/main/resources/ui/src/components/WelcomeScreen/WelcomScreen.test.tsx b/openmetadata-ui/src/main/resources/ui/src/components/MyData/WelcomeScreen/WelcomScreen.test.tsx similarity index 100% rename from openmetadata-ui/src/main/resources/ui/src/components/WelcomeScreen/WelcomScreen.test.tsx rename to openmetadata-ui/src/main/resources/ui/src/components/MyData/WelcomeScreen/WelcomScreen.test.tsx diff --git a/openmetadata-ui/src/main/resources/ui/src/components/WelcomeScreen/WelcomeScreen.component.tsx b/openmetadata-ui/src/main/resources/ui/src/components/MyData/WelcomeScreen/WelcomeScreen.component.tsx similarity index 87% rename from openmetadata-ui/src/main/resources/ui/src/components/WelcomeScreen/WelcomeScreen.component.tsx rename to openmetadata-ui/src/main/resources/ui/src/components/MyData/WelcomeScreen/WelcomeScreen.component.tsx index 6840e3006b22..720d365ef548 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/WelcomeScreen/WelcomeScreen.component.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/components/MyData/WelcomeScreen/WelcomeScreen.component.tsx @@ -11,17 +11,16 @@ * limitations under the License. */ import { Button, Card, Col, Divider, Row, Space, Typography } from 'antd'; -import React, { useMemo } from 'react'; -import WelcomeScreenImg from '../../assets/img/welcome-screen.png'; -import { ReactComponent as CloseIcon } from '../../assets/svg/close.svg'; -import { ReactComponent as LineArrowRight } from '../../assets/svg/line-arrow-right.svg'; - import { split } from 'lodash'; +import React, { useMemo } from 'react'; import { useTranslation } from 'react-i18next'; import { Link } from 'react-router-dom'; -import { ROUTES } from '../../constants/constants'; -import { getEntityName } from '../../utils/EntityUtils'; -import { useAuthContext } from '../Auth/AuthProviders/AuthProvider'; +import WelcomeScreenImg from '../../../assets/img/welcome-screen.png'; +import { ReactComponent as CloseIcon } from '../../../assets/svg/close.svg'; +import { ReactComponent as LineArrowRight } from '../../../assets/svg/line-arrow-right.svg'; +import { ROUTES } from '../../../constants/constants'; +import { getEntityName } from '../../../utils/EntityUtils'; +import { useAuthContext } from '../../Auth/AuthProviders/AuthProvider'; import './welcome-screen.style.less'; const { Paragraph, Text } = Typography; diff --git a/openmetadata-ui/src/main/resources/ui/src/components/WelcomeScreen/welcome-screen.style.less b/openmetadata-ui/src/main/resources/ui/src/components/MyData/WelcomeScreen/welcome-screen.style.less similarity index 96% rename from openmetadata-ui/src/main/resources/ui/src/components/WelcomeScreen/welcome-screen.style.less rename to openmetadata-ui/src/main/resources/ui/src/components/MyData/WelcomeScreen/welcome-screen.style.less index 8ed901e2dc32..87fa3ec5521a 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/WelcomeScreen/welcome-screen.style.less +++ b/openmetadata-ui/src/main/resources/ui/src/components/MyData/WelcomeScreen/welcome-screen.style.less @@ -10,7 +10,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -@import url(../../styles/variables.less); +@import url(../../../styles/variables.less); .welcome-screen-container { .ant-card-head { diff --git a/openmetadata-ui/src/main/resources/ui/src/components/Widgets/FeedsWidget/FeedsWidget.component.tsx b/openmetadata-ui/src/main/resources/ui/src/components/MyData/Widgets/FeedsWidget/FeedsWidget.component.tsx similarity index 86% rename from openmetadata-ui/src/main/resources/ui/src/components/Widgets/FeedsWidget/FeedsWidget.component.tsx rename to openmetadata-ui/src/main/resources/ui/src/components/MyData/Widgets/FeedsWidget/FeedsWidget.component.tsx index 7e1b67fc7ae1..2114c05bafc7 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/Widgets/FeedsWidget/FeedsWidget.component.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/components/MyData/Widgets/FeedsWidget/FeedsWidget.component.tsx @@ -17,31 +17,31 @@ import { isUndefined } from 'lodash'; import React, { useCallback, useEffect, useMemo, useState } from 'react'; import { useTranslation } from 'react-i18next'; import { Link, useHistory } from 'react-router-dom'; -import ActivityFeedListV1 from '../../../components/ActivityFeed/ActivityFeedList/ActivityFeedListV1.component'; -import { useActivityFeedProvider } from '../../../components/ActivityFeed/ActivityFeedProvider/ActivityFeedProvider'; -import { ActivityFeedTabs } from '../../../components/ActivityFeed/ActivityFeedTab/ActivityFeedTab.interface'; -import { useTourProvider } from '../../../components/TourProvider/TourProvider'; -import { ROUTES } from '../../../constants/constants'; -import { FEED_COUNT_INITIAL_DATA } from '../../../constants/entity.constants'; -import { mockFeedData } from '../../../constants/mockTourData.constants'; -import { EntityTabs, EntityType } from '../../../enums/entity.enum'; -import { FeedFilter } from '../../../enums/mydata.enum'; +import { ROUTES } from '../../../../constants/constants'; +import { FEED_COUNT_INITIAL_DATA } from '../../../../constants/entity.constants'; +import { mockFeedData } from '../../../../constants/mockTourData.constants'; +import { useTourProvider } from '../../../../context/TourProvider/TourProvider'; +import { EntityTabs, EntityType } from '../../../../enums/entity.enum'; +import { FeedFilter } from '../../../../enums/mydata.enum'; import { ThreadTaskStatus, ThreadType, -} from '../../../generated/entity/feed/thread'; -import { FeedCounts } from '../../../interface/feed.interface'; -import { WidgetCommonProps } from '../../../pages/CustomizablePage/CustomizablePage.interface'; -import { getFeedCount } from '../../../rest/feedsAPI'; +} from '../../../../generated/entity/feed/thread'; +import { FeedCounts } from '../../../../interface/feed.interface'; +import { WidgetCommonProps } from '../../../../pages/CustomizablePage/CustomizablePage.interface'; +import { getFeedCount } from '../../../../rest/feedsAPI'; import { getCountBadge, getEntityDetailLink, Transi18next, -} from '../../../utils/CommonUtils'; -import { getEntityUserLink } from '../../../utils/EntityUtils'; -import { showErrorToast } from '../../../utils/ToastUtils'; -import { useAuthContext } from '../../Auth/AuthProviders/AuthProvider'; -import FeedsFilterPopover from '../../common/FeedsFilterPopover/FeedsFilterPopover.component'; +} from '../../../../utils/CommonUtils'; +import { getEntityUserLink } from '../../../../utils/EntityUtils'; +import { showErrorToast } from '../../../../utils/ToastUtils'; +import ActivityFeedListV1 from '../../../ActivityFeed/ActivityFeedList/ActivityFeedListV1.component'; +import { useActivityFeedProvider } from '../../../ActivityFeed/ActivityFeedProvider/ActivityFeedProvider'; +import { ActivityFeedTabs } from '../../../ActivityFeed/ActivityFeedTab/ActivityFeedTab.interface'; +import { useAuthContext } from '../../../Auth/AuthProviders/AuthProvider'; +import FeedsFilterPopover from '../../../common/FeedsFilterPopover/FeedsFilterPopover.component'; import './feeds-widget.less'; const FeedsWidget = ({ diff --git a/openmetadata-ui/src/main/resources/ui/src/components/Widgets/FeedsWidget/FeedsWidget.test.tsx b/openmetadata-ui/src/main/resources/ui/src/components/MyData/Widgets/FeedsWidget/FeedsWidget.test.tsx similarity index 100% rename from openmetadata-ui/src/main/resources/ui/src/components/Widgets/FeedsWidget/FeedsWidget.test.tsx rename to openmetadata-ui/src/main/resources/ui/src/components/MyData/Widgets/FeedsWidget/FeedsWidget.test.tsx diff --git a/openmetadata-ui/src/main/resources/ui/src/components/Widgets/FeedsWidget/feeds-widget.less b/openmetadata-ui/src/main/resources/ui/src/components/MyData/Widgets/FeedsWidget/feeds-widget.less similarity index 95% rename from openmetadata-ui/src/main/resources/ui/src/components/Widgets/FeedsWidget/feeds-widget.less rename to openmetadata-ui/src/main/resources/ui/src/components/MyData/Widgets/FeedsWidget/feeds-widget.less index f12fb49899a1..75ad30e282e4 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/Widgets/FeedsWidget/feeds-widget.less +++ b/openmetadata-ui/src/main/resources/ui/src/components/MyData/Widgets/FeedsWidget/feeds-widget.less @@ -11,7 +11,7 @@ * limitations under the License. */ -@import url('../../../styles/variables.less'); +@import url('../../../../styles/variables.less'); .feeds-widget-container { background: #ffffff; border: 1px solid @border-color; diff --git a/openmetadata-ui/src/main/resources/ui/src/components/KPIWidget/KPIWidget.component.tsx b/openmetadata-ui/src/main/resources/ui/src/components/MyData/Widgets/KPIWidget/KPIWidget.component.tsx similarity index 89% rename from openmetadata-ui/src/main/resources/ui/src/components/KPIWidget/KPIWidget.component.tsx rename to openmetadata-ui/src/main/resources/ui/src/components/MyData/Widgets/KPIWidget/KPIWidget.component.tsx index feae9c6d50b9..80dc707a1f17 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/KPIWidget/KPIWidget.component.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/components/MyData/Widgets/KPIWidget/KPIWidget.component.tsx @@ -26,30 +26,30 @@ import { XAxis, YAxis, } from 'recharts'; -import { ReactComponent as KPIEmptyIcon } from '../../assets/svg/KPI-not-data-placeholder.svg'; +import { ReactComponent as KPIEmptyIcon } from '../../../../assets/svg/KPI-not-data-placeholder.svg'; import { CHART_WIDGET_DAYS_DURATION, GRAPH_BACKGROUND_COLOR, -} from '../../constants/constants'; -import { KPI_WIDGET_GRAPH_COLORS } from '../../constants/DataInsight.constants'; -import { DATA_INSIGHT_DOCS } from '../../constants/docs.constants'; -import { SIZE } from '../../enums/common.enum'; -import { WidgetWidths } from '../../enums/CustomizablePage.enum'; -import { Kpi, KpiResult } from '../../generated/dataInsight/kpi/kpi'; -import { UIKpiResult } from '../../interface/data-insight.interface'; +} from '../../../../constants/constants'; +import { KPI_WIDGET_GRAPH_COLORS } from '../../../../constants/DataInsight.constants'; +import { DATA_INSIGHT_DOCS } from '../../../../constants/docs.constants'; +import { SIZE } from '../../../../enums/common.enum'; +import { WidgetWidths } from '../../../../enums/CustomizablePage.enum'; +import { Kpi, KpiResult } from '../../../../generated/dataInsight/kpi/kpi'; +import { UIKpiResult } from '../../../../interface/data-insight.interface'; import { getLatestKpiResult, getListKpiResult, getListKPIs, -} from '../../rest/KpiAPI'; -import { Transi18next } from '../../utils/CommonUtils'; -import { getKpiGraphData } from '../../utils/DataInsightUtils'; +} from '../../../../rest/KpiAPI'; +import { Transi18next } from '../../../../utils/CommonUtils'; +import { getKpiGraphData } from '../../../../utils/DataInsightUtils'; import { getCurrentMillis, getEpochMillisForPastDays, -} from '../../utils/date-time/DateTimeUtils'; -import { showErrorToast } from '../../utils/ToastUtils'; -import KPILatestResultsV1 from '../DataInsightDetail/KPILatestResultsV1'; +} from '../../../../utils/date-time/DateTimeUtils'; +import { showErrorToast } from '../../../../utils/ToastUtils'; +import KPILatestResultsV1 from '../../../DataInsightDetail/KPILatestResultsV1'; import './kpi-widget.less'; import { KPIWidgetProps } from './KPIWidget.interface'; diff --git a/openmetadata-ui/src/main/resources/ui/src/components/KPIWidget/KPIWidget.interface.ts b/openmetadata-ui/src/main/resources/ui/src/components/MyData/Widgets/KPIWidget/KPIWidget.interface.ts similarity index 87% rename from openmetadata-ui/src/main/resources/ui/src/components/KPIWidget/KPIWidget.interface.ts rename to openmetadata-ui/src/main/resources/ui/src/components/MyData/Widgets/KPIWidget/KPIWidget.interface.ts index e80ede01f088..326ef97286e4 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/KPIWidget/KPIWidget.interface.ts +++ b/openmetadata-ui/src/main/resources/ui/src/components/MyData/Widgets/KPIWidget/KPIWidget.interface.ts @@ -11,7 +11,7 @@ * limitations under the License. */ -import { WidgetCommonProps } from '../../pages/CustomizablePage/CustomizablePage.interface'; +import { WidgetCommonProps } from '../../../../pages/CustomizablePage/CustomizablePage.interface'; export interface KPIWidgetProps extends WidgetCommonProps { selectedDays?: number; diff --git a/openmetadata-ui/src/main/resources/ui/src/components/KPIWidget/kpi-widget.less b/openmetadata-ui/src/main/resources/ui/src/components/MyData/Widgets/KPIWidget/kpi-widget.less similarity index 100% rename from openmetadata-ui/src/main/resources/ui/src/components/KPIWidget/kpi-widget.less rename to openmetadata-ui/src/main/resources/ui/src/components/MyData/Widgets/KPIWidget/kpi-widget.less diff --git a/openmetadata-ui/src/main/resources/ui/src/components/Widgets/RecentlyViewed/RecentlyViewed.test.tsx b/openmetadata-ui/src/main/resources/ui/src/components/MyData/Widgets/RecentlyViewed/RecentlyViewed.test.tsx similarity index 97% rename from openmetadata-ui/src/main/resources/ui/src/components/Widgets/RecentlyViewed/RecentlyViewed.test.tsx rename to openmetadata-ui/src/main/resources/ui/src/components/MyData/Widgets/RecentlyViewed/RecentlyViewed.test.tsx index e37a9d8d9c97..25d457d26fde 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/Widgets/RecentlyViewed/RecentlyViewed.test.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/components/MyData/Widgets/RecentlyViewed/RecentlyViewed.test.tsx @@ -12,7 +12,7 @@ */ import { act, fireEvent, render, screen } from '@testing-library/react'; import React from 'react'; -import { getRecentlyViewedData } from '../../../utils/CommonUtils'; +import { getRecentlyViewedData } from '../../../../utils/CommonUtils'; import RecentlyViewed from './RecentlyViewed'; const mockProp = { diff --git a/openmetadata-ui/src/main/resources/ui/src/components/Widgets/RecentlyViewed/RecentlyViewed.tsx b/openmetadata-ui/src/main/resources/ui/src/components/MyData/Widgets/RecentlyViewed/RecentlyViewed.tsx similarity index 87% rename from openmetadata-ui/src/main/resources/ui/src/components/Widgets/RecentlyViewed/RecentlyViewed.tsx rename to openmetadata-ui/src/main/resources/ui/src/components/MyData/Widgets/RecentlyViewed/RecentlyViewed.tsx index d468c6ff8ab5..dd0a6c89d496 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/Widgets/RecentlyViewed/RecentlyViewed.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/components/MyData/Widgets/RecentlyViewed/RecentlyViewed.tsx @@ -17,20 +17,20 @@ import { isEmpty, isUndefined } from 'lodash'; import React, { useCallback, useEffect, useState } from 'react'; import { useTranslation } from 'react-i18next'; import { Link } from 'react-router-dom'; -import { ReactComponent as RecentlyViewedEmptyIcon } from '../../../assets/svg/recently-viewed-no-data-placeholder.svg'; -import { RECENTLY_VIEWED } from '../../../constants/docs.constants'; -import { ERROR_PLACEHOLDER_TYPE, SIZE } from '../../../enums/common.enum'; -import { EntityReference } from '../../../generated/type/entityReference'; -import { WidgetCommonProps } from '../../../pages/CustomizablePage/CustomizablePage.interface'; +import { ReactComponent as RecentlyViewedEmptyIcon } from '../../../../assets/svg/recently-viewed-no-data-placeholder.svg'; +import { RECENTLY_VIEWED } from '../../../../constants/docs.constants'; +import { ERROR_PLACEHOLDER_TYPE, SIZE } from '../../../../enums/common.enum'; +import { EntityReference } from '../../../../generated/type/entityReference'; +import { WidgetCommonProps } from '../../../../pages/CustomizablePage/CustomizablePage.interface'; import { getRecentlyViewedData, prepareLabel, -} from '../../../utils/CommonUtils'; -import entityUtilClassBase from '../../../utils/EntityUtilClassBase'; -import { getEntityName } from '../../../utils/EntityUtils'; -import { getEntityIcon } from '../../../utils/TableUtils'; -import ErrorPlaceHolder from '../../common/ErrorWithPlaceholder/ErrorPlaceHolder'; -import EntityListSkeleton from '../../Skeleton/MyData/EntityListSkeleton/EntityListSkeleton.component'; +} from '../../../../utils/CommonUtils'; +import entityUtilClassBase from '../../../../utils/EntityUtilClassBase'; +import { getEntityName } from '../../../../utils/EntityUtils'; +import { getEntityIcon } from '../../../../utils/TableUtils'; +import ErrorPlaceHolder from '../../../common/ErrorWithPlaceholder/ErrorPlaceHolder'; +import EntityListSkeleton from '../../../common/Skeleton/MyData/EntityListSkeleton/EntityListSkeleton.component'; import './recently-viewed.less'; const RecentlyViewed = ({ diff --git a/openmetadata-ui/src/main/resources/ui/src/components/Widgets/RecentlyViewed/recently-viewed.less b/openmetadata-ui/src/main/resources/ui/src/components/MyData/Widgets/RecentlyViewed/recently-viewed.less similarity index 95% rename from openmetadata-ui/src/main/resources/ui/src/components/Widgets/RecentlyViewed/recently-viewed.less rename to openmetadata-ui/src/main/resources/ui/src/components/MyData/Widgets/RecentlyViewed/recently-viewed.less index 441cc74490ac..1c1826c34411 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/Widgets/RecentlyViewed/recently-viewed.less +++ b/openmetadata-ui/src/main/resources/ui/src/components/MyData/Widgets/RecentlyViewed/recently-viewed.less @@ -11,7 +11,7 @@ * limitations under the License. */ -@import url('../../../styles/variables.less'); +@import url('../../../../styles/variables.less'); .right-panel-heading { margin-bottom: 8px !important; diff --git a/openmetadata-ui/src/main/resources/ui/src/components/TotalDataAssetsWidget/TotalDataAssetsWidget.component.tsx b/openmetadata-ui/src/main/resources/ui/src/components/MyData/Widgets/TotalDataAssetsWidget/TotalDataAssetsWidget.component.tsx similarity index 85% rename from openmetadata-ui/src/main/resources/ui/src/components/TotalDataAssetsWidget/TotalDataAssetsWidget.component.tsx rename to openmetadata-ui/src/main/resources/ui/src/components/MyData/Widgets/TotalDataAssetsWidget/TotalDataAssetsWidget.component.tsx index 3952a89ab7e1..f42866fb19e9 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/TotalDataAssetsWidget/TotalDataAssetsWidget.component.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/components/MyData/Widgets/TotalDataAssetsWidget/TotalDataAssetsWidget.component.tsx @@ -31,27 +31,26 @@ import { XAxis, YAxis, } from 'recharts'; -import { ReactComponent as TotalDataAssetsEmptyIcon } from '../../assets/svg/data-insight-no-data-placeholder.svg'; -import { CHART_WIDGET_DAYS_DURATION } from '../../constants/constants'; -import { TOTAL_ENTITY_CHART_COLOR } from '../../constants/DataInsight.constants'; -import { SIZE } from '../../enums/common.enum'; -import { WidgetWidths } from '../../enums/CustomizablePage.enum'; -import { DataReportIndex } from '../../generated/dataInsight/dataInsightChart'; +import { ReactComponent as TotalDataAssetsEmptyIcon } from '../../../../assets/svg/data-insight-no-data-placeholder.svg'; +import { CHART_WIDGET_DAYS_DURATION } from '../../../../constants/constants'; +import { TOTAL_ENTITY_CHART_COLOR } from '../../../../constants/DataInsight.constants'; +import { SIZE } from '../../../../enums/common.enum'; +import { WidgetWidths } from '../../../../enums/CustomizablePage.enum'; +import { DataReportIndex } from '../../../../generated/dataInsight/dataInsightChart'; import { DataInsightChartResult, DataInsightChartType, -} from '../../generated/dataInsight/dataInsightChartResult'; -import { getAggregateChartData } from '../../rest/DataInsightAPI'; -import { axisTickFormatter } from '../../utils/ChartUtils'; -import { getGraphDataByEntityType } from '../../utils/DataInsightUtils'; +} from '../../../../generated/dataInsight/dataInsightChartResult'; +import { getAggregateChartData } from '../../../../rest/DataInsightAPI'; +import { axisTickFormatter } from '../../../../utils/ChartUtils'; +import { getGraphDataByEntityType } from '../../../../utils/DataInsightUtils'; import { getCurrentMillis, getEpochMillisForPastDays, -} from '../../utils/date-time/DateTimeUtils'; -import { showErrorToast } from '../../utils/ToastUtils'; -import '../DataInsightDetail/data-insight-detail.less'; -import { EmptyGraphPlaceholder } from '../DataInsightDetail/EmptyGraphPlaceholder'; -import TotalEntityInsightSummary from '../DataInsightDetail/TotalEntityInsightSummary.component'; +} from '../../../../utils/date-time/DateTimeUtils'; +import { showErrorToast } from '../../../../utils/ToastUtils'; +import { EmptyGraphPlaceholder } from '../../../DataInsightDetail/EmptyGraphPlaceholder'; +import TotalEntityInsightSummary from '../../../DataInsightDetail/TotalEntityInsightSummary.component'; import './total-data-assets-widget.less'; import { TotalDataAssetsWidgetProps } from './TotalDataAssetsWidget.interface'; diff --git a/openmetadata-ui/src/main/resources/ui/src/components/TotalDataAssetsWidget/TotalDataAssetsWidget.interface.ts b/openmetadata-ui/src/main/resources/ui/src/components/MyData/Widgets/TotalDataAssetsWidget/TotalDataAssetsWidget.interface.ts similarity index 87% rename from openmetadata-ui/src/main/resources/ui/src/components/TotalDataAssetsWidget/TotalDataAssetsWidget.interface.ts rename to openmetadata-ui/src/main/resources/ui/src/components/MyData/Widgets/TotalDataAssetsWidget/TotalDataAssetsWidget.interface.ts index 16793b91bb91..7671144d5957 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/TotalDataAssetsWidget/TotalDataAssetsWidget.interface.ts +++ b/openmetadata-ui/src/main/resources/ui/src/components/MyData/Widgets/TotalDataAssetsWidget/TotalDataAssetsWidget.interface.ts @@ -11,7 +11,7 @@ * limitations under the License. */ -import { WidgetCommonProps } from '../../pages/CustomizablePage/CustomizablePage.interface'; +import { WidgetCommonProps } from '../../../../pages/CustomizablePage/CustomizablePage.interface'; export interface TotalDataAssetsWidgetProps extends WidgetCommonProps { selectedDays?: number; diff --git a/openmetadata-ui/src/main/resources/ui/src/components/TotalDataAssetsWidget/total-data-assets-widget.less b/openmetadata-ui/src/main/resources/ui/src/components/MyData/Widgets/TotalDataAssetsWidget/total-data-assets-widget.less similarity index 100% rename from openmetadata-ui/src/main/resources/ui/src/components/TotalDataAssetsWidget/total-data-assets-widget.less rename to openmetadata-ui/src/main/resources/ui/src/components/MyData/Widgets/TotalDataAssetsWidget/total-data-assets-widget.less diff --git a/openmetadata-ui/src/main/resources/ui/src/components/NavBar/NavBar.tsx b/openmetadata-ui/src/main/resources/ui/src/components/NavBar/NavBar.tsx index b8d2bf96b03c..9edeeadabd72 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/NavBar/NavBar.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/components/NavBar/NavBar.tsx @@ -47,6 +47,8 @@ import { NOTIFICATION_READ_TIMER, SOCKET_EVENTS, } from '../../constants/constants'; +import { useGlobalSearchProvider } from '../../context/GlobalSearchProvider/GlobalSearchProvider'; +import { useWebSocketConnector } from '../../context/WebSocketProvider/WebSocketProvider'; import { EntityTabs, EntityType } from '../../enums/entity.enum'; import brandImageClassBase from '../../utils/BrandImage/BrandImageClassBase'; import { @@ -74,11 +76,9 @@ import SearchOptions from '../AppBar/SearchOptions'; import Suggestions from '../AppBar/Suggestions'; import CmdKIcon from '../common/CmdKIcon/CmdKIcon.component'; import { useDomainProvider } from '../Domain/DomainProvider/DomainProvider'; -import { useGlobalSearchProvider } from '../GlobalSearchProvider/GlobalSearchProvider'; import WhatsNewModal from '../Modals/WhatsNewModal/WhatsNewModal'; import NotificationBox from '../NotificationBox/NotificationBox.component'; -import { UserProfileIcon } from '../Users/UserProfileIcon/UserProfileIcon.component'; -import { useWebSocketConnector } from '../WebSocketProvider/WebSocketProvider'; +import { UserProfileIcon } from '../Settings/Users/UserProfileIcon/UserProfileIcon.component'; import './nav-bar.less'; import { NavBarProps } from './NavBar.interface'; import popupAlertsCardsClassBase from './PopupAlertClassBase'; diff --git a/openmetadata-ui/src/main/resources/ui/src/components/NavBar/PopupAlertClassBase.ts b/openmetadata-ui/src/main/resources/ui/src/components/NavBar/PopupAlertClassBase.ts index 068beee67ba7..f58d94a49d41 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/NavBar/PopupAlertClassBase.ts +++ b/openmetadata-ui/src/main/resources/ui/src/components/NavBar/PopupAlertClassBase.ts @@ -11,8 +11,8 @@ * limitations under the License. */ -import GithubStarCard from '../GithubStarCard/GithubStarCard.component'; import WhatsNewAlert from '../Modals/WhatsNewModal/WhatsNewAlert/WhatsNewAlert.component'; +import GithubStarCard from '../MyData/GithubStarCard/GithubStarCard.component'; class PopupAlertsCardsClassBase { public alertsCards() { diff --git a/openmetadata-ui/src/main/resources/ui/src/components/NotificationBox/NotificationBox.component.tsx b/openmetadata-ui/src/main/resources/ui/src/components/NotificationBox/NotificationBox.component.tsx index 3eedbaee8e35..731f4679bdc7 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/NotificationBox/NotificationBox.component.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/components/NotificationBox/NotificationBox.component.tsx @@ -33,7 +33,7 @@ import { getFeedsWithFilter } from '../../rest/feedsAPI'; import { getEntityFQN, getEntityType } from '../../utils/FeedUtils'; import { showErrorToast } from '../../utils/ToastUtils'; import { useAuthContext } from '../Auth/AuthProviders/AuthProvider'; -import Loader from '../Loader/Loader'; +import Loader from '../common/Loader/Loader'; import './notification-box.less'; import { NotificationBoxProp } from './NotificationBox.interface'; import { getFilters, tabsInfo } from './NotificationBox.utils'; diff --git a/openmetadata-ui/src/main/resources/ui/src/components/PageLayoutV1/PageLayoutV1.tsx b/openmetadata-ui/src/main/resources/ui/src/components/PageLayoutV1/PageLayoutV1.tsx index c9c2b13f0aa5..3d03682e20e7 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/PageLayoutV1/PageLayoutV1.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/components/PageLayoutV1/PageLayoutV1.tsx @@ -21,7 +21,7 @@ import React, { ReactNode, useMemo, } from 'react'; -import DocumentTitle from '../../components/DocumentTitle/DocumentTitle'; +import DocumentTitle from '../common/DocumentTitle/DocumentTitle'; import './../../styles/layout/page-layout.less'; interface PageLayoutProp extends HTMLAttributes { diff --git a/openmetadata-ui/src/main/resources/ui/src/components/Execution/Execution.component.test.tsx b/openmetadata-ui/src/main/resources/ui/src/components/Pipeline/Execution/Execution.component.test.tsx similarity index 89% rename from openmetadata-ui/src/main/resources/ui/src/components/Execution/Execution.component.test.tsx rename to openmetadata-ui/src/main/resources/ui/src/components/Pipeline/Execution/Execution.component.test.tsx index 33417efd714a..7f35381f1c2e 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/Execution/Execution.component.test.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/components/Pipeline/Execution/Execution.component.test.tsx @@ -23,26 +23,18 @@ jest.mock('./TreeView/TreeViewTab.component', () => jest.fn().mockImplementation(() =>
TreeViewTab
) ); -jest.mock('../../assets/svg/calendar.svg', () => - jest.fn().mockImplementation(() =>
Calendar
) -); - -jest.mock('../../assets/svg/filter.svg', () => - jest.fn().mockImplementation(() =>
FilterIcon
) -); - -jest.mock('../../utils/ToastUtils', () => ({ +jest.mock('../../../utils/ToastUtils', () => ({ showErrorToast: jest.fn(), })); -jest.mock('../../utils/date-time/DateTimeUtils', () => ({ +jest.mock('../../../utils/date-time/DateTimeUtils', () => ({ getCurrentMillis: jest.fn().mockImplementation((data) => data), getEpochMillisForPastDays: jest .fn() .mockImplementation(() =>
StatusIndicator
), })); -jest.mock('../../rest/pipelineAPI', () => ({ +jest.mock('../../../rest/pipelineAPI', () => ({ getPipelineStatus: jest.fn().mockImplementation(() => Promise.resolve({ data: [], diff --git a/openmetadata-ui/src/main/resources/ui/src/components/Execution/Execution.component.tsx b/openmetadata-ui/src/main/resources/ui/src/components/Pipeline/Execution/Execution.component.tsx similarity index 92% rename from openmetadata-ui/src/main/resources/ui/src/components/Execution/Execution.component.tsx rename to openmetadata-ui/src/main/resources/ui/src/components/Pipeline/Execution/Execution.component.tsx index 2f67dd542553..9d62a70b205a 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/Execution/Execution.component.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/components/Pipeline/Execution/Execution.component.tsx @@ -28,21 +28,21 @@ import classNames from 'classnames'; import { isNaN, map } from 'lodash'; import React, { useCallback, useEffect, useMemo, useState } from 'react'; import { useTranslation } from 'react-i18next'; -import { ReactComponent as Calendar } from '../../assets/svg/calendar.svg'; -import { ReactComponent as FilterIcon } from '../../assets/svg/filter.svg'; +import { ReactComponent as Calendar } from '../../../assets/svg/calendar.svg'; +import { ReactComponent as FilterIcon } from '../../../assets/svg/filter.svg'; import { EXECUTION_FILTER_RANGE, MenuOptions, -} from '../../constants/execution.constants'; -import { PIPELINE_EXECUTION_TABS } from '../../constants/pipeline.constants'; -import { PipelineStatus, Task } from '../../generated/entity/data/pipeline'; -import { getPipelineStatus } from '../../rest/pipelineAPI'; +} from '../../../constants/execution.constants'; +import { PIPELINE_EXECUTION_TABS } from '../../../constants/pipeline.constants'; +import { PipelineStatus, Task } from '../../../generated/entity/data/pipeline'; +import { getPipelineStatus } from '../../../rest/pipelineAPI'; import { getCurrentMillis, getEpochMillisForPastDays, -} from '../../utils/date-time/DateTimeUtils'; -import { showErrorToast } from '../../utils/ToastUtils'; -import Searchbar from '../common/SearchBarComponent/SearchBar.component'; +} from '../../../utils/date-time/DateTimeUtils'; +import { showErrorToast } from '../../../utils/ToastUtils'; +import Searchbar from '../../common/SearchBarComponent/SearchBar.component'; import './execution.less'; import ListView from './ListView/ListViewTab.component'; import TreeViewTab from './TreeView/TreeViewTab.component'; diff --git a/openmetadata-ui/src/main/resources/ui/src/components/Execution/ListView/ListViewTab.component.test.tsx b/openmetadata-ui/src/main/resources/ui/src/components/Pipeline/Execution/ListView/ListViewTab.component.test.tsx similarity index 88% rename from openmetadata-ui/src/main/resources/ui/src/components/Execution/ListView/ListViewTab.component.test.tsx rename to openmetadata-ui/src/main/resources/ui/src/components/Pipeline/Execution/ListView/ListViewTab.component.test.tsx index 8131772d96b7..6ccbfdc2885c 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/Execution/ListView/ListViewTab.component.test.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/components/Pipeline/Execution/ListView/ListViewTab.component.test.tsx @@ -13,15 +13,15 @@ import { render, screen } from '@testing-library/react'; import React from 'react'; -import { StatusType } from '../../../generated/entity/data/pipeline'; -import { EXECUTION_LIST_MOCK } from '../../../mocks/PipelineVersion.mock'; +import { StatusType } from '../../../../generated/entity/data/pipeline'; +import { EXECUTION_LIST_MOCK } from '../../../../mocks/PipelineVersion.mock'; import ListView from './ListViewTab.component'; -jest.mock('../../common/ErrorWithPlaceholder/FilterTablePlaceHolder', () => +jest.mock('../../../common/ErrorWithPlaceholder/FilterTablePlaceHolder', () => jest.fn().mockImplementation(() =>
FilterTablePlaceHolder
) ); -jest.mock('../../../utils/executionUtils', () => ({ +jest.mock('../../../../utils/executionUtils', () => ({ getTableViewData: jest.fn().mockImplementation((data) => data), StatusIndicator: jest .fn() diff --git a/openmetadata-ui/src/main/resources/ui/src/components/Execution/ListView/ListViewTab.component.tsx b/openmetadata-ui/src/main/resources/ui/src/components/Pipeline/Execution/ListView/ListViewTab.component.tsx similarity index 89% rename from openmetadata-ui/src/main/resources/ui/src/components/Execution/ListView/ListViewTab.component.tsx rename to openmetadata-ui/src/main/resources/ui/src/components/Pipeline/Execution/ListView/ListViewTab.component.tsx index 92a20ba7f90b..49596fa888de 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/Execution/ListView/ListViewTab.component.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/components/Pipeline/Execution/ListView/ListViewTab.component.tsx @@ -16,13 +16,13 @@ import { useTranslation } from 'react-i18next'; import { PipelineStatus, StatusType, -} from '../../../generated/entity/data/pipeline'; +} from '../../../../generated/entity/data/pipeline'; import { getTableViewData, StatusIndicator, -} from '../../../utils/executionUtils'; -import FilterTablePlaceHolder from '../../common/ErrorWithPlaceholder/FilterTablePlaceHolder'; -import Table from '../../common/Table/Table'; +} from '../../../../utils/executionUtils'; +import FilterTablePlaceHolder from '../../../common/ErrorWithPlaceholder/FilterTablePlaceHolder'; +import Table from '../../../common/Table/Table'; interface ListViewProps { executions: Array | undefined; diff --git a/openmetadata-ui/src/main/resources/ui/src/components/Execution/TreeView/TreeViewTab.component.tsx b/openmetadata-ui/src/main/resources/ui/src/components/Pipeline/Execution/TreeView/TreeViewTab.component.tsx similarity index 89% rename from openmetadata-ui/src/main/resources/ui/src/components/Execution/TreeView/TreeViewTab.component.tsx rename to openmetadata-ui/src/main/resources/ui/src/components/Pipeline/Execution/TreeView/TreeViewTab.component.tsx index 2648cca21fe8..3373a724ae17 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/Execution/TreeView/TreeViewTab.component.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/components/Pipeline/Execution/TreeView/TreeViewTab.component.tsx @@ -16,10 +16,13 @@ import Tree from 'antd/lib/tree'; import { isEmpty } from 'lodash'; import React, { useMemo } from 'react'; import { useTranslation } from 'react-i18next'; -import { ReactComponent as ArrowSvg } from '../../../assets/svg/vector.svg'; -import { PipelineStatus, Task } from '../../../generated/entity/data/pipeline'; -import { formatDateTime } from '../../../utils/date-time/DateTimeUtils'; -import { getTreeData, getTreeViewData } from '../../../utils/executionUtils'; +import { ReactComponent as ArrowSvg } from '../../../../assets/svg/vector.svg'; +import { + PipelineStatus, + Task, +} from '../../../../generated/entity/data/pipeline'; +import { formatDateTime } from '../../../../utils/date-time/DateTimeUtils'; +import { getTreeData, getTreeViewData } from '../../../../utils/executionUtils'; import './tree-view-tab.less'; interface TreeViewProps { diff --git a/openmetadata-ui/src/main/resources/ui/src/components/Execution/TreeView/tree-view-tab.less b/openmetadata-ui/src/main/resources/ui/src/components/Pipeline/Execution/TreeView/tree-view-tab.less similarity index 100% rename from openmetadata-ui/src/main/resources/ui/src/components/Execution/TreeView/tree-view-tab.less rename to openmetadata-ui/src/main/resources/ui/src/components/Pipeline/Execution/TreeView/tree-view-tab.less diff --git a/openmetadata-ui/src/main/resources/ui/src/components/Execution/execution.less b/openmetadata-ui/src/main/resources/ui/src/components/Pipeline/Execution/execution.less similarity index 100% rename from openmetadata-ui/src/main/resources/ui/src/components/Execution/execution.less rename to openmetadata-ui/src/main/resources/ui/src/components/Pipeline/Execution/execution.less diff --git a/openmetadata-ui/src/main/resources/ui/src/components/PipelineDetails/PipelineDetails.component.tsx b/openmetadata-ui/src/main/resources/ui/src/components/Pipeline/PipelineDetails/PipelineDetails.component.tsx similarity index 87% rename from openmetadata-ui/src/main/resources/ui/src/components/PipelineDetails/PipelineDetails.component.tsx rename to openmetadata-ui/src/main/resources/ui/src/components/Pipeline/PipelineDetails/PipelineDetails.component.tsx index 5b371e4b1bff..ee1a6b494c95 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/PipelineDetails/PipelineDetails.component.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/components/Pipeline/PipelineDetails/PipelineDetails.component.tsx @@ -20,65 +20,65 @@ import { EntityTags, TagFilterOptions } from 'Models'; import React, { useCallback, useEffect, useMemo, useState } from 'react'; import { useTranslation } from 'react-i18next'; import { Link, useHistory, useParams } from 'react-router-dom'; -import { ReactComponent as ExternalLinkIcon } from '../../assets/svg/external-links.svg'; -import { useActivityFeedProvider } from '../../components/ActivityFeed/ActivityFeedProvider/ActivityFeedProvider'; -import { ActivityFeedTab } from '../../components/ActivityFeed/ActivityFeedTab/ActivityFeedTab.component'; -import { CustomPropertyTable } from '../../components/common/CustomPropertyTable/CustomPropertyTable'; -import DescriptionV1 from '../../components/common/EntityDescription/DescriptionV1'; -import { DataAssetsHeader } from '../../components/DataAssets/DataAssetsHeader/DataAssetsHeader.component'; -import ExecutionsTab from '../../components/Execution/Execution.component'; -import { EntityName } from '../../components/Modals/EntityNameModal/EntityNameModal.interface'; -import PageLayoutV1 from '../../components/PageLayoutV1/PageLayoutV1'; -import { ColumnFilter } from '../../components/Table/ColumnFilter/ColumnFilter.component'; -import TableDescription from '../../components/TableDescription/TableDescription.component'; -import TableTags from '../../components/TableTags/TableTags.component'; -import TabsLabel from '../../components/TabsLabel/TabsLabel.component'; -import TasksDAGView from '../../components/TasksDAGView/TasksDAGView'; +import { ReactComponent as ExternalLinkIcon } from '../../../assets/svg/external-links.svg'; import { getPipelineDetailsPath, NO_DATA_PLACEHOLDER, -} from '../../constants/constants'; -import { FEED_COUNT_INITIAL_DATA } from '../../constants/entity.constants'; -import { PIPELINE_TASK_TABS } from '../../constants/pipeline.constants'; -import { EntityTabs, EntityType } from '../../enums/entity.enum'; -import { CreateThread } from '../../generated/api/feed/createThread'; -import { Tag } from '../../generated/entity/classification/tag'; +} from '../../../constants/constants'; +import { FEED_COUNT_INITIAL_DATA } from '../../../constants/entity.constants'; +import { PIPELINE_TASK_TABS } from '../../../constants/pipeline.constants'; +import LineageProvider from '../../../context/LineageProvider/LineageProvider'; +import { usePermissionProvider } from '../../../context/PermissionProvider/PermissionProvider'; +import { ResourceEntity } from '../../../context/PermissionProvider/PermissionProvider.interface'; +import { EntityTabs, EntityType } from '../../../enums/entity.enum'; +import { CreateThread } from '../../../generated/api/feed/createThread'; +import { Tag } from '../../../generated/entity/classification/tag'; import { Pipeline, PipelineStatus, TagLabel, Task, -} from '../../generated/entity/data/pipeline'; -import { ThreadType } from '../../generated/entity/feed/thread'; -import { TagSource } from '../../generated/type/schema'; -import { FeedCounts } from '../../interface/feed.interface'; -import { postThread } from '../../rest/feedsAPI'; -import { restorePipeline } from '../../rest/pipelineAPI'; -import { getFeedCounts } from '../../utils/CommonUtils'; -import { getEntityName } from '../../utils/EntityUtils'; -import { DEFAULT_ENTITY_PERMISSION } from '../../utils/PermissionsUtils'; +} from '../../../generated/entity/data/pipeline'; +import { ThreadType } from '../../../generated/entity/feed/thread'; +import { TagSource } from '../../../generated/type/schema'; +import { FeedCounts } from '../../../interface/feed.interface'; +import { postThread } from '../../../rest/feedsAPI'; +import { restorePipeline } from '../../../rest/pipelineAPI'; +import { getFeedCounts } from '../../../utils/CommonUtils'; +import { getEntityName } from '../../../utils/EntityUtils'; +import { DEFAULT_ENTITY_PERMISSION } from '../../../utils/PermissionsUtils'; import { getAllTags, searchTagInData, -} from '../../utils/TableTags/TableTags.utils'; +} from '../../../utils/TableTags/TableTags.utils'; import { getFilterIcon, getTagsWithoutTier, getTierTags, -} from '../../utils/TableUtils'; -import { createTagObject, updateTierTag } from '../../utils/TagsUtils'; -import { showErrorToast, showSuccessToast } from '../../utils/ToastUtils'; -import ActivityThreadPanel from '../ActivityFeed/ActivityThreadPanel/ActivityThreadPanel'; -import { withActivityFeed } from '../AppRouter/withActivityFeed'; -import { useAuthContext } from '../Auth/AuthProviders/AuthProvider'; -import { OwnerLabel } from '../common/OwnerLabel/OwnerLabel.component'; -import EntityRightPanel from '../Entity/EntityRightPanel/EntityRightPanel'; -import Lineage from '../Lineage/Lineage.component'; -import LineageProvider from '../LineageProvider/LineageProvider'; -import { ModalWithMarkdownEditor } from '../Modals/ModalWithMarkdownEditor/ModalWithMarkdownEditor'; -import { usePermissionProvider } from '../PermissionProvider/PermissionProvider'; -import { ResourceEntity } from '../PermissionProvider/PermissionProvider.interface'; -import { SourceType } from '../SearchedData/SearchedData.interface'; +} from '../../../utils/TableUtils'; +import { createTagObject, updateTierTag } from '../../../utils/TagsUtils'; +import { showErrorToast, showSuccessToast } from '../../../utils/ToastUtils'; +import { useActivityFeedProvider } from '../../ActivityFeed/ActivityFeedProvider/ActivityFeedProvider'; +import { ActivityFeedTab } from '../../ActivityFeed/ActivityFeedTab/ActivityFeedTab.component'; +import ActivityThreadPanel from '../../ActivityFeed/ActivityThreadPanel/ActivityThreadPanel'; +import { withActivityFeed } from '../../AppRouter/withActivityFeed'; +import { useAuthContext } from '../../Auth/AuthProviders/AuthProvider'; +import { CustomPropertyTable } from '../../common/CustomPropertyTable/CustomPropertyTable'; +import DescriptionV1 from '../../common/EntityDescription/DescriptionV1'; +import { OwnerLabel } from '../../common/OwnerLabel/OwnerLabel.component'; +import TabsLabel from '../../common/TabsLabel/TabsLabel.component'; +import { DataAssetsHeader } from '../../DataAssets/DataAssetsHeader/DataAssetsHeader.component'; +import { ColumnFilter } from '../../Database/ColumnFilter/ColumnFilter.component'; +import TableDescription from '../../Database/TableDescription/TableDescription.component'; +import TableTags from '../../Database/TableTags/TableTags.component'; +import EntityRightPanel from '../../Entity/EntityRightPanel/EntityRightPanel'; +import Lineage from '../../Lineage/Lineage.component'; +import { EntityName } from '../../Modals/EntityNameModal/EntityNameModal.interface'; +import { ModalWithMarkdownEditor } from '../../Modals/ModalWithMarkdownEditor/ModalWithMarkdownEditor'; +import PageLayoutV1 from '../../PageLayoutV1/PageLayoutV1'; +import { SourceType } from '../../SearchedData/SearchedData.interface'; +import ExecutionsTab from '../Execution/Execution.component'; +import TasksDAGView from '../TasksDAGView/TasksDAGView'; import './pipeline-details.style.less'; import { PipeLineDetailsProp } from './PipelineDetails.interface'; diff --git a/openmetadata-ui/src/main/resources/ui/src/components/PipelineDetails/PipelineDetails.interface.ts b/openmetadata-ui/src/main/resources/ui/src/components/Pipeline/PipelineDetails/PipelineDetails.interface.ts similarity index 81% rename from openmetadata-ui/src/main/resources/ui/src/components/PipelineDetails/PipelineDetails.interface.ts rename to openmetadata-ui/src/main/resources/ui/src/components/Pipeline/PipelineDetails/PipelineDetails.interface.ts index 30f19eceb154..9c7795fbbece 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/PipelineDetails/PipelineDetails.interface.ts +++ b/openmetadata-ui/src/main/resources/ui/src/components/Pipeline/PipelineDetails/PipelineDetails.interface.ts @@ -12,10 +12,10 @@ */ import { Operation } from 'fast-json-patch'; -import { DataAssetWithDomains } from '../../components/DataAssets/DataAssetsHeader/DataAssetsHeader.interface'; -import { QueryVote } from '../../components/TableQueries/TableQueries.interface'; -import { Pipeline } from '../../generated/entity/data/pipeline'; -import { Paging } from '../../generated/type/paging'; +import { Pipeline } from '../../../generated/entity/data/pipeline'; +import { Paging } from '../../../generated/type/paging'; +import { DataAssetWithDomains } from '../../DataAssets/DataAssetsHeader/DataAssetsHeader.interface'; +import { QueryVote } from '../../Database/TableQueries/TableQueries.interface'; export interface PipeLineDetailsProp { updatePipelineDetailsState?: (data: DataAssetWithDomains) => void; diff --git a/openmetadata-ui/src/main/resources/ui/src/components/PipelineDetails/PipelineDetails.test.tsx b/openmetadata-ui/src/main/resources/ui/src/components/Pipeline/PipelineDetails/PipelineDetails.test.tsx similarity index 80% rename from openmetadata-ui/src/main/resources/ui/src/components/PipelineDetails/PipelineDetails.test.tsx rename to openmetadata-ui/src/main/resources/ui/src/components/Pipeline/PipelineDetails/PipelineDetails.test.tsx index 14421ccea5b1..809c1d2398cf 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/PipelineDetails/PipelineDetails.test.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/components/Pipeline/PipelineDetails/PipelineDetails.test.tsx @@ -23,10 +23,10 @@ import { } from '@testing-library/react'; import React from 'react'; import { MemoryRouter, useParams } from 'react-router-dom'; -import { EntityTabs } from '../../enums/entity.enum'; -import { Pipeline } from '../../generated/entity/data/pipeline'; -import { Paging } from '../../generated/type/paging'; -import { DEFAULT_ENTITY_PERMISSION } from '../../utils/PermissionsUtils'; +import { EntityTabs } from '../../../enums/entity.enum'; +import { Pipeline } from '../../../generated/entity/data/pipeline'; +import { Paging } from '../../../generated/type/paging'; +import { DEFAULT_ENTITY_PERMISSION } from '../../../utils/PermissionsUtils'; import PipelineDetails from './PipelineDetails.component'; import { PipeLineDetailsProp } from './PipelineDetails.interface'; @@ -70,21 +70,21 @@ const PipelineDetailsProps: PipeLineDetailsProp = { }; jest.mock( - `../../components/ActivityFeed/ActivityFeedTab/ActivityFeedTab.component`, + `../../ActivityFeed/ActivityFeedTab/ActivityFeedTab.component`, () => ({ ActivityFeedTab: jest.fn().mockReturnValue(

testActivityFeedTab

), }) ); -jest.mock('../common/OwnerLabel/OwnerLabel.component', () => ({ +jest.mock('../../common/OwnerLabel/OwnerLabel.component', () => ({ OwnerLabel: jest.fn().mockReturnValue(

OwnerLabel

), })); -jest.mock('../Entity/EntityRightPanel/EntityRightPanel', () => { +jest.mock('../../Entity/EntityRightPanel/EntityRightPanel', () => { return jest.fn().mockReturnValue(

EntityRightPanel

); }); -jest.mock('../Auth/AuthProviders/AuthProvider', () => ({ +jest.mock('../../Auth/AuthProviders/AuthProvider', () => ({ useAuthContext: jest.fn().mockReturnValue({ currentUser: { id: 'testUser', @@ -92,45 +92,45 @@ jest.mock('../Auth/AuthProviders/AuthProvider', () => ({ }), })); -jest.mock('../../components/Execution/Execution.component', () => { +jest.mock('../Execution/Execution.component', () => { return jest.fn().mockImplementation(() =>

Executions

); }); -jest.mock('../../components/Table/ColumnFilter/ColumnFilter.component', () => { +jest.mock('../../Database/ColumnFilter/ColumnFilter.component', () => { return jest.fn().mockImplementation(() =>

ColumnFilter

); }); -jest.mock( - '../../components/TableDescription/TableDescription.component', - () => { - return jest.fn().mockImplementation(() =>

TableDescription

); - } -); +jest.mock('../../Database/TableDescription/TableDescription.component', () => { + return jest.fn().mockImplementation(() =>

TableDescription

); +}); jest.mock( - `../../components/DataAssets/DataAssetsHeader/DataAssetsHeader.component`, + '../../DataAssets/DataAssetsHeader/DataAssetsHeader.component', () => ({ DataAssetsHeader: jest.fn().mockReturnValue(

testDataAssetsHeader

), }) ); -jest.mock('../Modals/ModalWithMarkdownEditor/ModalWithMarkdownEditor', () => ({ - ModalWithMarkdownEditor: jest - .fn() - .mockReturnValue(

testModalWithMarkdownEditor

), -})); +jest.mock( + '../../Modals/ModalWithMarkdownEditor/ModalWithMarkdownEditor', + () => ({ + ModalWithMarkdownEditor: jest + .fn() + .mockReturnValue(

testModalWithMarkdownEditor

), + }) +); -jest.mock('../../components/TabsLabel/TabsLabel.component', () => { +jest.mock('../../common/TabsLabel/TabsLabel.component', () => { return jest.fn().mockImplementation(({ name }) =>

{name}

); }); -jest.mock('../PermissionProvider/PermissionProvider', () => ({ +jest.mock('../../../context/PermissionProvider/PermissionProvider', () => ({ usePermissionProvider: jest.fn().mockReturnValue({ permissions: DEFAULT_ENTITY_PERMISSION, }), })); -jest.mock('../../components/common/EntityDescription/DescriptionV1', () => { +jest.mock('../../common/EntityDescription/DescriptionV1', () => { return jest.fn().mockReturnValue(

DescriptionV1

); }); @@ -140,11 +140,11 @@ jest.mock('react-router-dom', () => ({ useHistory: jest.fn().mockReturnValue({ push: jest.fn() }), })); -jest.mock('../LineageProvider/LineageProvider', () => { +jest.mock('../../../context/LineageProvider/LineageProvider', () => { return jest.fn().mockImplementation(({ children }) =>
{children}
); }); -jest.mock('../Lineage/Lineage.component', () => { +jest.mock('../../Lineage/Lineage.component', () => { return jest .fn() .mockReturnValue(

Lineage

); @@ -154,52 +154,49 @@ jest.mock('../TasksDAGView/TasksDAGView', () => { return jest.fn().mockReturnValue(

Tasks DAG

); }); -jest.mock('../PageLayoutV1/PageLayoutV1', () => { +jest.mock('../../PageLayoutV1/PageLayoutV1', () => { return jest.fn().mockImplementation(({ children }) =>
{children}
); }); -jest.mock('../../utils/TableTags/TableTags.utils', () => ({ +jest.mock('../../../utils/TableTags/TableTags.utils', () => ({ getAllTags: jest.fn().mockReturnValue([]), searchTagInData: jest.fn().mockReturnValue([]), })); -jest.mock('../../utils/EntityUtils', () => ({ +jest.mock('../../../utils/EntityUtils', () => ({ getEntityName: jest.fn().mockReturnValue('testEntityName'), })); -jest.mock('../common/CustomPropertyTable/CustomPropertyTable', () => ({ +jest.mock('../../common/CustomPropertyTable/CustomPropertyTable', () => ({ CustomPropertyTable: jest .fn() .mockReturnValue(

CustomPropertyTable.component

), })); -jest.mock('../../utils/CommonUtils', () => ({ +jest.mock('../../../utils/CommonUtils', () => ({ getFeedCounts: jest.fn().mockReturnValue({}), })); -jest.mock('../../utils/TagsUtils', () => ({ +jest.mock('../../../utils/TagsUtils', () => ({ createTagObject: jest.fn().mockReturnValue([]), updateTierTag: jest.fn().mockReturnValue([]), })); -jest.mock('../../utils/ToastUtils', () => ({ +jest.mock('../../../utils/ToastUtils', () => ({ showErrorToast: jest.fn(), showSuccessToast: jest.fn(), })); -jest.mock( - '../../components/ActivityFeed/ActivityThreadPanel/ActivityThreadPanel', - () => ({ - ActivityThreadPanel: jest.fn().mockReturnValue(

ActivityThreadPanel

), - }) -); +jest.mock('../../ActivityFeed/ActivityThreadPanel/ActivityThreadPanel', () => ({ + ActivityThreadPanel: jest.fn().mockReturnValue(

ActivityThreadPanel

), +})); -jest.mock('../AppRouter/withActivityFeed', () => ({ +jest.mock('../../AppRouter/withActivityFeed', () => ({ withActivityFeed: jest.fn().mockImplementation((component) => component), })); jest.mock( - '../../components/ActivityFeed/ActivityFeedProvider/ActivityFeedProvider', + '../../ActivityFeed/ActivityFeedProvider/ActivityFeedProvider', () => ({ useActivityFeedProvider: jest.fn().mockReturnValue({ feedCount: 0, @@ -214,7 +211,7 @@ jest.mock( }) ); -jest.mock('../../utils/TableUtils', () => ({ +jest.mock('../../../utils/TableUtils', () => ({ getFilterIcon: jest.fn().mockReturnValue(

FilterIcon

), getTagsWithoutTier: jest.fn().mockReturnValue([]), getTierTags: jest.fn().mockReturnValue([]), @@ -223,7 +220,7 @@ jest.mock('../../utils/TableUtils', () => ({ jest.mock('../Execution/Execution.component', () => { return jest.fn().mockImplementation(() =>

Executions

); }); -jest.mock('../../components/TableTags/TableTags.component', () => +jest.mock('../../Database/TableTags/TableTags.component', () => jest .fn() .mockImplementation(() => ( diff --git a/openmetadata-ui/src/main/resources/ui/src/components/PipelineDetails/pipeline-details.style.less b/openmetadata-ui/src/main/resources/ui/src/components/Pipeline/PipelineDetails/pipeline-details.style.less similarity index 92% rename from openmetadata-ui/src/main/resources/ui/src/components/PipelineDetails/pipeline-details.style.less rename to openmetadata-ui/src/main/resources/ui/src/components/Pipeline/PipelineDetails/pipeline-details.style.less index 986f2f2c593a..f4570792300e 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/PipelineDetails/pipeline-details.style.less +++ b/openmetadata-ui/src/main/resources/ui/src/components/Pipeline/PipelineDetails/pipeline-details.style.less @@ -11,7 +11,7 @@ * limitations under the License. */ -@import (reference) url('../../styles/variables.less'); +@import (reference) url('../../../styles/variables.less'); .task-dag-view-card { .ant-card-body { padding: 0px; diff --git a/openmetadata-ui/src/main/resources/ui/src/components/PipelineVersion/PipelineVersion.component.tsx b/openmetadata-ui/src/main/resources/ui/src/components/Pipeline/PipelineVersion/PipelineVersion.component.tsx similarity index 84% rename from openmetadata-ui/src/main/resources/ui/src/components/PipelineVersion/PipelineVersion.component.tsx rename to openmetadata-ui/src/main/resources/ui/src/components/Pipeline/PipelineVersion/PipelineVersion.component.tsx index b76bab803132..bb4025efd999 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/PipelineVersion/PipelineVersion.component.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/components/Pipeline/PipelineVersion/PipelineVersion.component.tsx @@ -17,30 +17,33 @@ import classNames from 'classnames'; import { t } from 'i18next'; import React, { FC, useEffect, useMemo, useState } from 'react'; import { useHistory, useParams } from 'react-router-dom'; -import { CustomPropertyTable } from '../../components/common/CustomPropertyTable/CustomPropertyTable'; -import DescriptionV1 from '../../components/common/EntityDescription/DescriptionV1'; -import RichTextEditorPreviewer from '../../components/common/RichTextEditor/RichTextEditorPreviewer'; -import DataAssetsVersionHeader from '../../components/DataAssets/DataAssetsVersionHeader/DataAssetsVersionHeader'; -import EntityVersionTimeLine from '../../components/Entity/EntityVersionTimeLine/EntityVersionTimeLine'; -import Loader from '../../components/Loader/Loader'; -import TabsLabel from '../../components/TabsLabel/TabsLabel.component'; -import TagsContainerV2 from '../../components/Tag/TagsContainerV2/TagsContainerV2'; -import TagsViewer from '../../components/Tag/TagsViewer/TagsViewer'; -import { getVersionPathWithTab } from '../../constants/constants'; -import { EntityField } from '../../constants/Feeds.constants'; -import { TABLE_SCROLL_VALUE } from '../../constants/Table.constants'; -import { EntityTabs, EntityType } from '../../enums/entity.enum'; -import { ChangeDescription, Task } from '../../generated/entity/data/pipeline'; -import { TagSource } from '../../generated/type/schema'; -import { getEntityName } from '../../utils/EntityUtils'; +import { getVersionPathWithTab } from '../../../constants/constants'; +import { EntityField } from '../../../constants/Feeds.constants'; +import { TABLE_SCROLL_VALUE } from '../../../constants/Table.constants'; +import { EntityTabs, EntityType } from '../../../enums/entity.enum'; +import { + ChangeDescription, + Task, +} from '../../../generated/entity/data/pipeline'; +import { TagSource } from '../../../generated/type/schema'; +import { getEntityName } from '../../../utils/EntityUtils'; import { getCommonExtraInfoForVersionDetails, getEntityVersionByField, getEntityVersionTags, -} from '../../utils/EntityVersionUtils'; -import { getUpdatedPipelineTasks } from '../../utils/PipelineVersionUtils'; -import { getFilterTags } from '../../utils/TableTags/TableTags.utils'; -import DataProductsContainer from '../DataProductsContainer/DataProductsContainer.component'; +} from '../../../utils/EntityVersionUtils'; +import { getUpdatedPipelineTasks } from '../../../utils/PipelineVersionUtils'; +import { getFilterTags } from '../../../utils/TableTags/TableTags.utils'; +import { CustomPropertyTable } from '../../common/CustomPropertyTable/CustomPropertyTable'; +import DescriptionV1 from '../../common/EntityDescription/DescriptionV1'; +import Loader from '../../common/Loader/Loader'; +import RichTextEditorPreviewer from '../../common/RichTextEditor/RichTextEditorPreviewer'; +import TabsLabel from '../../common/TabsLabel/TabsLabel.component'; +import DataAssetsVersionHeader from '../../DataAssets/DataAssetsVersionHeader/DataAssetsVersionHeader'; +import DataProductsContainer from '../../DataProducts/DataProductsContainer/DataProductsContainer.component'; +import EntityVersionTimeLine from '../../Entity/EntityVersionTimeLine/EntityVersionTimeLine'; +import TagsContainerV2 from '../../Tag/TagsContainerV2/TagsContainerV2'; +import TagsViewer from '../../Tag/TagsViewer/TagsViewer'; import { PipelineVersionProp } from './PipelineVersion.interface'; const PipelineVersion: FC = ({ diff --git a/openmetadata-ui/src/main/resources/ui/src/components/PipelineVersion/PipelineVersion.interface.ts b/openmetadata-ui/src/main/resources/ui/src/components/Pipeline/PipelineVersion/PipelineVersion.interface.ts similarity index 75% rename from openmetadata-ui/src/main/resources/ui/src/components/PipelineVersion/PipelineVersion.interface.ts rename to openmetadata-ui/src/main/resources/ui/src/components/Pipeline/PipelineVersion/PipelineVersion.interface.ts index a20f366efa30..4e4a1583684f 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/PipelineVersion/PipelineVersion.interface.ts +++ b/openmetadata-ui/src/main/resources/ui/src/components/Pipeline/PipelineVersion/PipelineVersion.interface.ts @@ -11,11 +11,11 @@ * limitations under the License. */ -import { OperationPermission } from '../../components/PermissionProvider/PermissionProvider.interface'; -import { Pipeline } from '../../generated/entity/data/pipeline'; -import { EntityHistory } from '../../generated/type/entityHistory'; -import { TagLabel } from '../../generated/type/tagLabel'; -import { TitleBreadcrumbProps } from '../common/TitleBreadcrumb/TitleBreadcrumb.interface'; +import { OperationPermission } from '../../../context/PermissionProvider/PermissionProvider.interface'; +import { Pipeline } from '../../../generated/entity/data/pipeline'; +import { EntityHistory } from '../../../generated/type/entityHistory'; +import { TagLabel } from '../../../generated/type/tagLabel'; +import { TitleBreadcrumbProps } from '../../common/TitleBreadcrumb/TitleBreadcrumb.interface'; export interface PipelineVersionProp { version: string; diff --git a/openmetadata-ui/src/main/resources/ui/src/components/PipelineVersion/PipelineVersion.test.tsx b/openmetadata-ui/src/main/resources/ui/src/components/Pipeline/PipelineVersion/PipelineVersion.test.tsx similarity index 80% rename from openmetadata-ui/src/main/resources/ui/src/components/PipelineVersion/PipelineVersion.test.tsx rename to openmetadata-ui/src/main/resources/ui/src/components/Pipeline/PipelineVersion/PipelineVersion.test.tsx index 430e45700977..d22292e56ce1 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/PipelineVersion/PipelineVersion.test.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/components/Pipeline/PipelineVersion/PipelineVersion.test.tsx @@ -18,61 +18,55 @@ import { MemoryRouter } from 'react-router-dom'; import { mockColumnDiffPipelineVersionMockProps, pipelineVersionMockProps, -} from '../../mocks/PipelineVersion.mock'; +} from '../../../mocks/PipelineVersion.mock'; import PipelineVersion from './PipelineVersion.component'; const mockPush = jest.fn(); jest.mock( - '../../components/DataAssets/DataAssetsVersionHeader/DataAssetsVersionHeader', + '../../DataAssets/DataAssetsVersionHeader/DataAssetsVersionHeader', () => jest.fn().mockImplementation(() =>
DataAssetsVersionHeader
) ); -jest.mock('../../components/TabsLabel/TabsLabel.component', () => +jest.mock('../../common/TabsLabel/TabsLabel.component', () => jest.fn().mockImplementation(({ name }) =>
{name}
) ); -jest.mock('../../components/Tag/TagsContainerV2/TagsContainerV2', () => +jest.mock('../../Tag/TagsContainerV2/TagsContainerV2', () => jest.fn().mockImplementation(() =>
TagsContainerV2
) ); -jest.mock( - '../../components/common/RichTextEditor/RichTextEditorPreviewer', - () => - jest - .fn() - .mockImplementation(({ markdown }) => ( -
{markdown}
- )) +jest.mock('../../common/RichTextEditor/RichTextEditorPreviewer', () => + jest + .fn() + .mockImplementation(({ markdown }) => ( +
{markdown}
+ )) ); -jest.mock('../../components/Tag/TagsViewer/TagsViewer', () => +jest.mock('../../Tag/TagsViewer/TagsViewer', () => jest.fn().mockImplementation(() =>
TagsViewer
) ); -jest.mock( - '../../components/common/CustomPropertyTable/CustomPropertyTable', - () => ({ - CustomPropertyTable: jest - .fn() - .mockImplementation(() =>
CustomPropertyTable
), - }) -); +jest.mock('../../common/CustomPropertyTable/CustomPropertyTable', () => ({ + CustomPropertyTable: jest + .fn() + .mockImplementation(() =>
CustomPropertyTable
), +})); -jest.mock('../../components/common/EntityDescription/DescriptionV1', () => +jest.mock('../../common/EntityDescription/DescriptionV1', () => jest.fn().mockImplementation(() =>
DescriptionV1
) ); -jest.mock('../../components/common/ErrorWithPlaceholder/ErrorPlaceHolder', () => +jest.mock('../../common/ErrorWithPlaceholder/ErrorPlaceHolder', () => jest.fn().mockImplementation(() =>
ErrorPlaceHolder
) ); -jest.mock( - '../../components/Entity/EntityVersionTimeLine/EntityVersionTimeLine', - () => jest.fn().mockImplementation(() =>
EntityVersionTimeLine
) +jest.mock('../../Entity/EntityVersionTimeLine/EntityVersionTimeLine', () => + jest.fn().mockImplementation(() =>
EntityVersionTimeLine
) ); -jest.mock('../../components/Loader/Loader', () => +jest.mock('../../common/Loader/Loader', () => jest.fn().mockImplementation(() =>
Loader
) ); diff --git a/openmetadata-ui/src/main/resources/ui/src/components/TasksDAGView/TaskNode/TaskNode.test.tsx b/openmetadata-ui/src/main/resources/ui/src/components/Pipeline/TasksDAGView/TaskNode/TaskNode.test.tsx similarity index 100% rename from openmetadata-ui/src/main/resources/ui/src/components/TasksDAGView/TaskNode/TaskNode.test.tsx rename to openmetadata-ui/src/main/resources/ui/src/components/Pipeline/TasksDAGView/TaskNode/TaskNode.test.tsx diff --git a/openmetadata-ui/src/main/resources/ui/src/components/TasksDAGView/TaskNode/TaskNode.tsx b/openmetadata-ui/src/main/resources/ui/src/components/Pipeline/TasksDAGView/TaskNode/TaskNode.tsx similarity index 97% rename from openmetadata-ui/src/main/resources/ui/src/components/TasksDAGView/TaskNode/TaskNode.tsx rename to openmetadata-ui/src/main/resources/ui/src/components/Pipeline/TasksDAGView/TaskNode/TaskNode.tsx index bfb0764f2013..7cad9c199c32 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/TasksDAGView/TaskNode/TaskNode.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/components/Pipeline/TasksDAGView/TaskNode/TaskNode.tsx @@ -15,7 +15,7 @@ import { Space } from 'antd'; import classNames from 'classnames'; import React, { CSSProperties, Fragment } from 'react'; import { Handle, HandleType, NodeProps, Position } from 'reactflow'; -import { EntityLineageNodeType } from '../../../enums/entity.enum'; +import { EntityLineageNodeType } from '../../../../enums/entity.enum'; import './task-node.style.less'; const handleStyles = { diff --git a/openmetadata-ui/src/main/resources/ui/src/components/TasksDAGView/TaskNode/task-node.style.less b/openmetadata-ui/src/main/resources/ui/src/components/Pipeline/TasksDAGView/TaskNode/task-node.style.less similarity index 93% rename from openmetadata-ui/src/main/resources/ui/src/components/TasksDAGView/TaskNode/task-node.style.less rename to openmetadata-ui/src/main/resources/ui/src/components/Pipeline/TasksDAGView/TaskNode/task-node.style.less index 1e556fb7d95e..c58586338fc5 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/TasksDAGView/TaskNode/task-node.style.less +++ b/openmetadata-ui/src/main/resources/ui/src/components/Pipeline/TasksDAGView/TaskNode/task-node.style.less @@ -10,7 +10,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -@import (reference) url('../../../styles/variables.less'); +@import (reference) url('../../../../styles/variables.less'); .custom-node-label { border-radius: 50%; diff --git a/openmetadata-ui/src/main/resources/ui/src/components/TasksDAGView/TasksDAGView.test.tsx b/openmetadata-ui/src/main/resources/ui/src/components/Pipeline/TasksDAGView/TasksDAGView.test.tsx similarity index 97% rename from openmetadata-ui/src/main/resources/ui/src/components/TasksDAGView/TasksDAGView.test.tsx rename to openmetadata-ui/src/main/resources/ui/src/components/Pipeline/TasksDAGView/TasksDAGView.test.tsx index 14ad6df4cbb5..5316a0352e22 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/TasksDAGView/TasksDAGView.test.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/components/Pipeline/TasksDAGView/TasksDAGView.test.tsx @@ -62,7 +62,7 @@ const TasksDAGViewProps = { tasks, }; -jest.mock('../../utils/EntityLineageUtils', () => ({ +jest.mock('../../../utils/EntityLineageUtils', () => ({ dragHandle: jest.fn(), getLayoutedElements: jest.fn().mockImplementation(() => ({ node: mockNodes, diff --git a/openmetadata-ui/src/main/resources/ui/src/components/TasksDAGView/TasksDAGView.tsx b/openmetadata-ui/src/main/resources/ui/src/components/Pipeline/TasksDAGView/TasksDAGView.tsx similarity index 88% rename from openmetadata-ui/src/main/resources/ui/src/components/TasksDAGView/TasksDAGView.tsx rename to openmetadata-ui/src/main/resources/ui/src/components/Pipeline/TasksDAGView/TasksDAGView.tsx index 3c98842e872f..ad24d0dfce37 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/TasksDAGView/TasksDAGView.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/components/Pipeline/TasksDAGView/TasksDAGView.tsx @@ -23,13 +23,13 @@ import ReactFlow, { import { MAX_ZOOM_VALUE, MIN_ZOOM_VALUE, -} from '../../constants/Lineage.constants'; -import { EntityLineageNodeType } from '../../enums/entity.enum'; -import { PipelineStatus, Task } from '../../generated/entity/data/pipeline'; -import { replaceSpaceWith_ } from '../../utils/CommonUtils'; -import { getLayoutedElements, onLoad } from '../../utils/EntityLineageUtils'; -import { getEntityName } from '../../utils/EntityUtils'; -import { getTaskExecStatus } from '../../utils/PipelineDetailsUtils'; +} from '../../../constants/Lineage.constants'; +import { EntityLineageNodeType } from '../../../enums/entity.enum'; +import { PipelineStatus, Task } from '../../../generated/entity/data/pipeline'; +import { replaceSpaceWith_ } from '../../../utils/CommonUtils'; +import { getLayoutedElements, onLoad } from '../../../utils/EntityLineageUtils'; +import { getEntityName } from '../../../utils/EntityUtils'; +import { getTaskExecStatus } from '../../../utils/PipelineDetailsUtils'; import TaskNode from './TaskNode/TaskNode'; import './tasks-dag-view.style.less'; diff --git a/openmetadata-ui/src/main/resources/ui/src/components/TasksDAGView/tasks-dag-view.style.less b/openmetadata-ui/src/main/resources/ui/src/components/Pipeline/TasksDAGView/tasks-dag-view.style.less similarity index 100% rename from openmetadata-ui/src/main/resources/ui/src/components/TasksDAGView/tasks-dag-view.style.less rename to openmetadata-ui/src/main/resources/ui/src/components/Pipeline/TasksDAGView/tasks-dag-view.style.less diff --git a/openmetadata-ui/src/main/resources/ui/src/components/SearchDropdown/SearchDropdown.tsx b/openmetadata-ui/src/main/resources/ui/src/components/SearchDropdown/SearchDropdown.tsx index 070fd10fcbf9..3f761a00dc82 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/SearchDropdown/SearchDropdown.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/components/SearchDropdown/SearchDropdown.tsx @@ -43,7 +43,7 @@ import { getSelectedOptionLabelString, } from '../../utils/AdvancedSearchUtils'; import searchClassBase from '../../utils/SearchClassBase'; -import Loader from '../Loader/Loader'; +import Loader from '../common/Loader/Loader'; import './search-dropdown.less'; import { SearchDropdownOption, diff --git a/openmetadata-ui/src/main/resources/ui/src/components/SearchIndexVersion/SearchIndexVersion.interface.ts b/openmetadata-ui/src/main/resources/ui/src/components/SearchIndexVersion/SearchIndexVersion.interface.ts index 4b5630903132..7add32be6fc9 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/SearchIndexVersion/SearchIndexVersion.interface.ts +++ b/openmetadata-ui/src/main/resources/ui/src/components/SearchIndexVersion/SearchIndexVersion.interface.ts @@ -10,7 +10,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -import { OperationPermission } from '../../components/PermissionProvider/PermissionProvider.interface'; +import { OperationPermission } from '../../context/PermissionProvider/PermissionProvider.interface'; import { SearchIndex } from '../../generated/entity/data/searchIndex'; import { EntityHistory } from '../../generated/type/entityHistory'; import { TagLabel } from '../../generated/type/tagLabel'; diff --git a/openmetadata-ui/src/main/resources/ui/src/components/SearchIndexVersion/SearchIndexVersion.tsx b/openmetadata-ui/src/main/resources/ui/src/components/SearchIndexVersion/SearchIndexVersion.tsx index 1921514f01c9..fb2545e78383 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/SearchIndexVersion/SearchIndexVersion.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/components/SearchIndexVersion/SearchIndexVersion.tsx @@ -21,10 +21,7 @@ import { CustomPropertyTable } from '../../components/common/CustomPropertyTable import DescriptionV1 from '../../components/common/EntityDescription/DescriptionV1'; import DataAssetsVersionHeader from '../../components/DataAssets/DataAssetsVersionHeader/DataAssetsVersionHeader'; import EntityVersionTimeLine from '../../components/Entity/EntityVersionTimeLine/EntityVersionTimeLine'; -import Loader from '../../components/Loader/Loader'; -import TabsLabel from '../../components/TabsLabel/TabsLabel.component'; import TagsContainerV2 from '../../components/Tag/TagsContainerV2/TagsContainerV2'; -import VersionTable from '../../components/VersionTable/VersionTable.component'; import { FQN_SEPARATOR_CHAR } from '../../constants/char.constants'; import { getVersionPathWithTab } from '../../constants/constants'; import { EntityField } from '../../constants/Feeds.constants'; @@ -38,7 +35,10 @@ import { getEntityVersionTags, } from '../../utils/EntityVersionUtils'; import { getUpdatedSearchIndexFields } from '../../utils/SearchIndexVersionUtils'; -import DataProductsContainer from '../DataProductsContainer/DataProductsContainer.component'; +import Loader from '../common/Loader/Loader'; +import TabsLabel from '../common/TabsLabel/TabsLabel.component'; +import DataProductsContainer from '../DataProducts/DataProductsContainer/DataProductsContainer.component'; +import VersionTable from '../Entity/VersionTable/VersionTable.component'; import { SearchIndexVersionProps } from './SearchIndexVersion.interface'; const SearchIndexVersion: React.FC = ({ diff --git a/openmetadata-ui/src/main/resources/ui/src/components/SearchedData/SearchedData.tsx b/openmetadata-ui/src/main/resources/ui/src/components/SearchedData/SearchedData.tsx index 2a331b5d7b13..e9352a1f21af 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/SearchedData/SearchedData.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/components/SearchedData/SearchedData.tsx @@ -22,8 +22,8 @@ import { ELASTICSEARCH_ERROR_PLACEHOLDER_TYPE } from '../../enums/common.enum'; import { pluralize } from '../../utils/CommonUtils'; import { highlightEntityNameAndDescription } from '../../utils/EntityUtils'; import ErrorPlaceHolderES from '../common/ErrorWithPlaceholder/ErrorPlaceHolderES'; +import Loader from '../common/Loader/Loader'; import ExploreSearchCard from '../ExploreV1/ExploreSearchCard/ExploreSearchCard'; -import Loader from '../Loader/Loader'; import { SearchedDataProps } from './SearchedData.interface'; const ASSETS_NAME = [ diff --git a/openmetadata-ui/src/main/resources/ui/src/components/Alerts/AlertsDetails/AlertDetails.component.tsx b/openmetadata-ui/src/main/resources/ui/src/components/Settings/Alerts/AlertsDetails/AlertDetails.component.tsx similarity index 86% rename from openmetadata-ui/src/main/resources/ui/src/components/Alerts/AlertsDetails/AlertDetails.component.tsx rename to openmetadata-ui/src/main/resources/ui/src/components/Settings/Alerts/AlertsDetails/AlertDetails.component.tsx index 12654f39f8dd..ba32d5a93449 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/Alerts/AlertsDetails/AlertDetails.component.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/components/Settings/Alerts/AlertsDetails/AlertDetails.component.tsx @@ -16,21 +16,21 @@ import { isArray } from 'lodash'; import React, { Fragment } from 'react'; import { useTranslation } from 'react-i18next'; import { Link } from 'react-router-dom'; -import { ReactComponent as IconEdit } from '../../../assets/svg/edit-new.svg'; -import { ReactComponent as IconDelete } from '../../../assets/svg/ic-delete.svg'; +import { ReactComponent as IconEdit } from '../../../../assets/svg/edit-new.svg'; +import { ReactComponent as IconDelete } from '../../../../assets/svg/ic-delete.svg'; import { Effect, EventSubscription, -} from '../../../generated/events/eventSubscription'; +} from '../../../../generated/events/eventSubscription'; import { EDIT_LINK_PATH, getDisplayNameForEntities, getFunctionDisplayName, -} from '../../../utils/Alerts/AlertsUtil'; -import TitleBreadcrumb from '../../common/TitleBreadcrumb/TitleBreadcrumb.component'; -import { TitleBreadcrumbProps } from '../../common/TitleBreadcrumb/TitleBreadcrumb.interface'; -import PageHeader from '../../PageHeader/PageHeader.component'; -import { HeaderProps } from '../../PageHeader/PageHeader.interface'; +} from '../../../../utils/Alerts/AlertsUtil'; +import TitleBreadcrumb from '../../../common/TitleBreadcrumb/TitleBreadcrumb.component'; +import { TitleBreadcrumbProps } from '../../../common/TitleBreadcrumb/TitleBreadcrumb.interface'; +import PageHeader from '../../../PageHeader/PageHeader.component'; +import { HeaderProps } from '../../../PageHeader/PageHeader.interface'; interface AlertDetailsComponentProps { alerts: EventSubscription; diff --git a/openmetadata-ui/src/main/resources/ui/src/components/Alerts/AlertsDetails/AlertDetails.test.tsx b/openmetadata-ui/src/main/resources/ui/src/components/Settings/Alerts/AlertsDetails/AlertDetails.test.tsx similarity index 90% rename from openmetadata-ui/src/main/resources/ui/src/components/Alerts/AlertsDetails/AlertDetails.test.tsx rename to openmetadata-ui/src/main/resources/ui/src/components/Settings/Alerts/AlertsDetails/AlertDetails.test.tsx index 2e32b4d6170a..539104c73663 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/Alerts/AlertsDetails/AlertDetails.test.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/components/Settings/Alerts/AlertsDetails/AlertDetails.test.tsx @@ -19,12 +19,12 @@ import { AlertType, Destination, Effect, -} from '../../../generated/events/eventSubscription'; -import { TitleBreadcrumbProps } from '../../common/TitleBreadcrumb/TitleBreadcrumb.interface'; -import { HeaderProps } from '../../PageHeader/PageHeader.interface'; +} from '../../../../generated/events/eventSubscription'; +import { TitleBreadcrumbProps } from '../../../common/TitleBreadcrumb/TitleBreadcrumb.interface'; +import { HeaderProps } from '../../../PageHeader/PageHeader.interface'; import { AlertDetailsComponent } from './AlertDetails.component'; -jest.mock('../../../utils/Alerts/AlertsUtil', () => ({ +jest.mock('../../../../utils/Alerts/AlertsUtil', () => ({ EDIT_LINK_PATH: 'Edit Alert Link', getDisplayNameForEntities: jest.fn().mockImplementation((entity) => entity), getFunctionDisplayName: jest @@ -32,11 +32,11 @@ jest.mock('../../../utils/Alerts/AlertsUtil', () => ({ .mockImplementation((filterFQN) => filterFQN), })); -jest.mock('../../common/TitleBreadcrumb/TitleBreadcrumb.component', () => +jest.mock('../../../common/TitleBreadcrumb/TitleBreadcrumb.component', () => jest.fn().mockReturnValue(TitleBreadcrumb) ); -jest.mock('../../PageHeader/PageHeader.component', () => +jest.mock('../../../PageHeader/PageHeader.component', () => jest.fn().mockReturnValue(PageHeader) ); diff --git a/openmetadata-ui/src/main/resources/ui/src/components/Applications/AppDetails/AppDetails.component.tsx b/openmetadata-ui/src/main/resources/ui/src/components/Settings/Applications/AppDetails/AppDetails.component.tsx similarity index 89% rename from openmetadata-ui/src/main/resources/ui/src/components/Applications/AppDetails/AppDetails.component.tsx rename to openmetadata-ui/src/main/resources/ui/src/components/Settings/Applications/AppDetails/AppDetails.component.tsx index 5415ede6af6f..5bbd24549a54 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/Applications/AppDetails/AppDetails.component.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/components/Settings/Applications/AppDetails/AppDetails.component.tsx @@ -36,23 +36,20 @@ import { noop } from 'lodash'; import React, { useCallback, useEffect, useMemo, useState } from 'react'; import { useTranslation } from 'react-i18next'; import { useHistory } from 'react-router-dom'; -import { ReactComponent as IconExternalLink } from '../../../assets/svg/external-links.svg'; -import { ReactComponent as DeleteIcon } from '../../../assets/svg/ic-delete.svg'; -import { ReactComponent as IconRestore } from '../../../assets/svg/ic-restore.svg'; -import { ReactComponent as IconDropdown } from '../../../assets/svg/menu.svg'; -import Loader from '../../../components/Loader/Loader'; -import PageLayoutV1 from '../../../components/PageLayoutV1/PageLayoutV1'; -import TabsLabel from '../../../components/TabsLabel/TabsLabel.component'; -import { APP_UI_SCHEMA } from '../../../constants/Applications.constant'; -import { DE_ACTIVE_COLOR } from '../../../constants/constants'; -import { GlobalSettingOptions } from '../../../constants/GlobalSettings.constants'; -import { ServiceCategory } from '../../../enums/service.enum'; +import { ReactComponent as IconExternalLink } from '../../../../assets/svg/external-links.svg'; +import { ReactComponent as DeleteIcon } from '../../../../assets/svg/ic-delete.svg'; +import { ReactComponent as IconRestore } from '../../../../assets/svg/ic-restore.svg'; +import { ReactComponent as IconDropdown } from '../../../../assets/svg/menu.svg'; +import { APP_UI_SCHEMA } from '../../../../constants/Applications.constant'; +import { DE_ACTIVE_COLOR } from '../../../../constants/constants'; +import { GlobalSettingOptions } from '../../../../constants/GlobalSettings.constants'; +import { ServiceCategory } from '../../../../enums/service.enum'; import { App, ScheduleTimeline, -} from '../../../generated/entity/applications/app'; -import { Include } from '../../../generated/type/include'; -import { useFqn } from '../../../hooks/useFqn'; +} from '../../../../generated/entity/applications/app'; +import { Include } from '../../../../generated/type/include'; +import { useFqn } from '../../../../hooks/useFqn'; import { configureApp, deployApp, @@ -61,15 +58,18 @@ import { restoreApp, triggerOnDemandApp, uninstallApp, -} from '../../../rest/applicationAPI'; -import { getRelativeTime } from '../../../utils/date-time/DateTimeUtils'; -import { getEntityName } from '../../../utils/EntityUtils'; -import { formatFormDataForSubmit } from '../../../utils/JSONSchemaFormUtils'; -import { getSettingPath } from '../../../utils/RouterUtils'; -import { showErrorToast, showSuccessToast } from '../../../utils/ToastUtils'; -import FormBuilder from '../../common/FormBuilder/FormBuilder'; -import { ManageButtonItemLabel } from '../../common/ManageButtonContentItem/ManageButtonContentItem.component'; -import ConfirmationModal from '../../Modals/ConfirmationModal/ConfirmationModal'; +} from '../../../../rest/applicationAPI'; +import { getRelativeTime } from '../../../../utils/date-time/DateTimeUtils'; +import { getEntityName } from '../../../../utils/EntityUtils'; +import { formatFormDataForSubmit } from '../../../../utils/JSONSchemaFormUtils'; +import { getSettingPath } from '../../../../utils/RouterUtils'; +import { showErrorToast, showSuccessToast } from '../../../../utils/ToastUtils'; +import FormBuilder from '../../../common/FormBuilder/FormBuilder'; +import Loader from '../../../common/Loader/Loader'; +import { ManageButtonItemLabel } from '../../../common/ManageButtonContentItem/ManageButtonContentItem.component'; +import TabsLabel from '../../../common/TabsLabel/TabsLabel.component'; +import ConfirmationModal from '../../../Modals/ConfirmationModal/ConfirmationModal'; +import PageLayoutV1 from '../../../PageLayoutV1/PageLayoutV1'; import AppLogo from '../AppLogo/AppLogo.component'; import AppRunsHistory from '../AppRunsHistory/AppRunsHistory.component'; import AppSchedule from '../AppSchedule/AppSchedule.component'; diff --git a/openmetadata-ui/src/main/resources/ui/src/components/Applications/AppDetails/AppDetails.interface.ts b/openmetadata-ui/src/main/resources/ui/src/components/Settings/Applications/AppDetails/AppDetails.interface.ts similarity index 88% rename from openmetadata-ui/src/main/resources/ui/src/components/Applications/AppDetails/AppDetails.interface.ts rename to openmetadata-ui/src/main/resources/ui/src/components/Settings/Applications/AppDetails/AppDetails.interface.ts index 8cd01f56b5f0..6b082a53e9e0 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/Applications/AppDetails/AppDetails.interface.ts +++ b/openmetadata-ui/src/main/resources/ui/src/components/Settings/Applications/AppDetails/AppDetails.interface.ts @@ -11,7 +11,7 @@ * limitations under the License. */ -import { PipelineStatus } from '../../../generated/entity/services/ingestionPipelines/ingestionPipeline'; +import { PipelineStatus } from '../../../../generated/entity/services/ingestionPipelines/ingestionPipeline'; export interface DataInsightLatestRun { data_insight_task: string; diff --git a/openmetadata-ui/src/main/resources/ui/src/components/Applications/AppDetails/AppDetails.test.tsx b/openmetadata-ui/src/main/resources/ui/src/components/Settings/Applications/AppDetails/AppDetails.test.tsx similarity index 87% rename from openmetadata-ui/src/main/resources/ui/src/components/Applications/AppDetails/AppDetails.test.tsx rename to openmetadata-ui/src/main/resources/ui/src/components/Settings/Applications/AppDetails/AppDetails.test.tsx index 5b5b6a2fa71d..5a4a35b2d5ab 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/Applications/AppDetails/AppDetails.test.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/components/Settings/Applications/AppDetails/AppDetails.test.tsx @@ -18,23 +18,23 @@ import { } from '@testing-library/react'; import userEvent from '@testing-library/user-event'; import React from 'react'; -import { GlobalSettingOptions } from '../../../constants/GlobalSettings.constants'; -import { mockApplicationData } from '../../../mocks/rests/applicationAPI.mock'; +import { GlobalSettingOptions } from '../../../../constants/GlobalSettings.constants'; +import { mockApplicationData } from '../../../../mocks/rests/applicationAPI.mock'; import AppDetails from './AppDetails.component'; -jest.mock('../../../components/Loader/Loader', () => +jest.mock('../../../common/Loader/Loader', () => jest.fn().mockReturnValue(
Loader
) ); -jest.mock('../../../components/PageLayoutV1/PageLayoutV1', () => +jest.mock('../../../PageLayoutV1/PageLayoutV1', () => jest.fn().mockImplementation(({ children }) =>
{children}
) ); -jest.mock('../../../components/TabsLabel/TabsLabel.component', () => +jest.mock('../../../common/TabsLabel/TabsLabel.component', () => jest.fn().mockImplementation(({ name }) => {name}) ); -jest.mock('../../../hooks/useFqn', () => ({ +jest.mock('../../../../hooks/useFqn', () => ({ useFqn: jest.fn().mockReturnValue({ fqn: 'mockFQN' }), })); @@ -49,7 +49,7 @@ const mockPush = jest.fn(); const mockPatchApplication = jest.fn().mockReturnValue(mockApplicationData); const mockGetApplicationByName = jest.fn().mockReturnValue(mockApplicationData); -jest.mock('../../../rest/applicationAPI', () => ({ +jest.mock('../../../../rest/applicationAPI', () => ({ configureApp: mockConfigureApp, deployApp: jest.fn().mockImplementation(() => mockDeployApp()), getApplicationByName: jest @@ -65,28 +65,28 @@ jest.mock('../../../rest/applicationAPI', () => ({ .mockImplementation((...args) => mockUninstallApp(...args)), })); -jest.mock('../../../utils/date-time/DateTimeUtils', () => ({ +jest.mock('../../../../utils/date-time/DateTimeUtils', () => ({ getRelativeTime: jest.fn().mockReturnValue('getRelativeTime'), })); -jest.mock('../../../utils/EntityUtils', () => ({ +jest.mock('../../../../utils/EntityUtils', () => ({ getEntityName: jest.fn(), })); -jest.mock('../../../utils/JSONSchemaFormUtils', () => ({ +jest.mock('../../../../utils/JSONSchemaFormUtils', () => ({ formatFormDataForSubmit: jest.fn(), })); -jest.mock('../../../utils/RouterUtils', () => ({ +jest.mock('../../../../utils/RouterUtils', () => ({ getSettingPath: jest.fn().mockImplementation((path) => path), })); -jest.mock('../../../utils/ToastUtils', () => ({ +jest.mock('../../../../utils/ToastUtils', () => ({ showErrorToast: jest.fn().mockImplementation(() => mockShowErrorToast()), showSuccessToast: jest.fn().mockImplementation(() => mockShowSuccessToast()), })); -jest.mock('../../common/FormBuilder/FormBuilder', () => +jest.mock('../../../common/FormBuilder/FormBuilder', () => jest .fn() .mockImplementation(({ onSubmit }) => ( @@ -95,7 +95,7 @@ jest.mock('../../common/FormBuilder/FormBuilder', () => ); jest.mock( - '../../common/ManageButtonContentItem/ManageButtonContentItem.component', + '../../../common/ManageButtonContentItem/ManageButtonContentItem.component', () => ({ ManageButtonItemLabel: jest .fn() @@ -103,7 +103,7 @@ jest.mock( }) ); -jest.mock('../../Modals/ConfirmationModal/ConfirmationModal', () => +jest.mock('../../../Modals/ConfirmationModal/ConfirmationModal', () => jest.fn().mockImplementation(({ visible, onConfirm, onCancel }) => ( <> {visible ? 'Confirmation Modal is open' : 'Confirmation Modal is close'} diff --git a/openmetadata-ui/src/main/resources/ui/src/components/Applications/AppDetails/ApplicationSchemaClassBase.ts b/openmetadata-ui/src/main/resources/ui/src/components/Settings/Applications/AppDetails/ApplicationSchemaClassBase.ts similarity index 92% rename from openmetadata-ui/src/main/resources/ui/src/components/Applications/AppDetails/ApplicationSchemaClassBase.ts rename to openmetadata-ui/src/main/resources/ui/src/components/Settings/Applications/AppDetails/ApplicationSchemaClassBase.ts index 1d07e4c0d4d1..fbd8e469682b 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/Applications/AppDetails/ApplicationSchemaClassBase.ts +++ b/openmetadata-ui/src/main/resources/ui/src/components/Settings/Applications/AppDetails/ApplicationSchemaClassBase.ts @@ -13,7 +13,7 @@ class ApplicationSchemaClassBase { public importSchema(fqn: string) { - return import(`../../../utils/ApplicationSchemas/${fqn}.json`); + return import(`../../../../utils/ApplicationSchemas/${fqn}.json`); } } diff --git a/openmetadata-ui/src/main/resources/ui/src/components/Applications/AppDetails/app-details.less b/openmetadata-ui/src/main/resources/ui/src/components/Settings/Applications/AppDetails/app-details.less similarity index 97% rename from openmetadata-ui/src/main/resources/ui/src/components/Applications/AppDetails/app-details.less rename to openmetadata-ui/src/main/resources/ui/src/components/Settings/Applications/AppDetails/app-details.less index 45b2fa4ea850..ba559e3e7f06 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/Applications/AppDetails/app-details.less +++ b/openmetadata-ui/src/main/resources/ui/src/components/Settings/Applications/AppDetails/app-details.less @@ -10,7 +10,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -@import url('../../../styles/variables.less'); +@import url('../../../../styles/variables.less'); .app-details-page-tabs { .ant-tabs-nav { diff --git a/openmetadata-ui/src/main/resources/ui/src/components/Applications/AppInstallVerifyCard/AppInstallVerifyCard.component.tsx b/openmetadata-ui/src/main/resources/ui/src/components/Settings/Applications/AppInstallVerifyCard/AppInstallVerifyCard.component.tsx similarity index 90% rename from openmetadata-ui/src/main/resources/ui/src/components/Applications/AppInstallVerifyCard/AppInstallVerifyCard.component.tsx rename to openmetadata-ui/src/main/resources/ui/src/components/Settings/Applications/AppInstallVerifyCard/AppInstallVerifyCard.component.tsx index ae6077214a0f..1f89ee31b574 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/Applications/AppInstallVerifyCard/AppInstallVerifyCard.component.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/components/Settings/Applications/AppInstallVerifyCard/AppInstallVerifyCard.component.tsx @@ -26,13 +26,13 @@ import { } from 'antd'; import React from 'react'; import { useTranslation } from 'react-i18next'; -import { LIGHT_GREEN_COLOR } from '../../../constants/constants'; -import { Transi18next } from '../../../utils/CommonUtils'; -import { getRelativeTime } from '../../../utils/date-time/DateTimeUtils'; -import { getEntityName } from '../../../utils/EntityUtils'; -import { useAuthContext } from '../../Auth/AuthProviders/AuthProvider'; -import BrandImage from '../../common/BrandImage/BrandImage'; -import UserPopOverCard from '../../common/PopOverCard/UserPopOverCard'; +import { LIGHT_GREEN_COLOR } from '../../../../constants/constants'; +import { Transi18next } from '../../../../utils/CommonUtils'; +import { getRelativeTime } from '../../../../utils/date-time/DateTimeUtils'; +import { getEntityName } from '../../../../utils/EntityUtils'; +import { useAuthContext } from '../../../Auth/AuthProviders/AuthProvider'; +import BrandImage from '../../../common/BrandImage/BrandImage'; +import UserPopOverCard from '../../../common/PopOverCard/UserPopOverCard'; import AppLogo from '../AppLogo/AppLogo.component'; import './app-install-verify-card.less'; import { AppInstallVerifyCardProps } from './AppInstallVerifyCard.interface'; diff --git a/openmetadata-ui/src/main/resources/ui/src/components/Applications/AppInstallVerifyCard/AppInstallVerifyCard.interface.ts b/openmetadata-ui/src/main/resources/ui/src/components/Settings/Applications/AppInstallVerifyCard/AppInstallVerifyCard.interface.ts similarity index 85% rename from openmetadata-ui/src/main/resources/ui/src/components/Applications/AppInstallVerifyCard/AppInstallVerifyCard.interface.ts rename to openmetadata-ui/src/main/resources/ui/src/components/Settings/Applications/AppInstallVerifyCard/AppInstallVerifyCard.interface.ts index 08f1d8b92b7b..02380f742163 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/Applications/AppInstallVerifyCard/AppInstallVerifyCard.interface.ts +++ b/openmetadata-ui/src/main/resources/ui/src/components/Settings/Applications/AppInstallVerifyCard/AppInstallVerifyCard.interface.ts @@ -10,7 +10,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -import { AppMarketPlaceDefinition } from '../../../generated/entity/applications/marketplace/appMarketPlaceDefinition'; +import { AppMarketPlaceDefinition } from '../../../../generated/entity/applications/marketplace/appMarketPlaceDefinition'; export interface AppInstallVerifyCardProps { appData: AppMarketPlaceDefinition; diff --git a/openmetadata-ui/src/main/resources/ui/src/components/Applications/AppInstallVerifyCard/AppInstallVerifyCard.test.tsx b/openmetadata-ui/src/main/resources/ui/src/components/Settings/Applications/AppInstallVerifyCard/AppInstallVerifyCard.test.tsx similarity index 86% rename from openmetadata-ui/src/main/resources/ui/src/components/Applications/AppInstallVerifyCard/AppInstallVerifyCard.test.tsx rename to openmetadata-ui/src/main/resources/ui/src/components/Settings/Applications/AppInstallVerifyCard/AppInstallVerifyCard.test.tsx index daef7a01aed1..333751baf135 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/Applications/AppInstallVerifyCard/AppInstallVerifyCard.test.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/components/Settings/Applications/AppInstallVerifyCard/AppInstallVerifyCard.test.tsx @@ -13,29 +13,29 @@ import { render, screen } from '@testing-library/react'; import userEvent from '@testing-library/user-event'; import React from 'react'; -import { mockApplicationData } from '../../../mocks/rests/applicationAPI.mock'; +import { mockApplicationData } from '../../../../mocks/rests/applicationAPI.mock'; import { mockUserData } from '../../Users/mocks/User.mocks'; import AppInstallVerifyCard from './AppInstallVerifyCard.component'; -jest.mock('../../../utils/date-time/DateTimeUtils', () => ({ +jest.mock('../../../../utils/date-time/DateTimeUtils', () => ({ getRelativeTime: jest.fn().mockReturnValue('getRelativeTime'), })); -jest.mock('../../../utils/EntityUtils', () => ({ +jest.mock('../../../../utils/EntityUtils', () => ({ getEntityName: jest.fn(), })); -jest.mock('../../Auth/AuthProviders/AuthProvider', () => ({ +jest.mock('../../../Auth/AuthProviders/AuthProvider', () => ({ useAuthContext: jest.fn(() => ({ currentUser: mockUserData, })), })); -jest.mock('../../common/BrandImage/BrandImage', () => +jest.mock('../../../common/BrandImage/BrandImage', () => jest.fn().mockReturnValue(
BrandImage
) ); -jest.mock('../../common/PopOverCard/UserPopOverCard', () => { +jest.mock('../../../common/PopOverCard/UserPopOverCard', () => { return jest.fn().mockImplementation(() => <>UserPopOverCard); }); diff --git a/openmetadata-ui/src/main/resources/ui/src/components/Applications/AppInstallVerifyCard/app-install-verify-card.less b/openmetadata-ui/src/main/resources/ui/src/components/Settings/Applications/AppInstallVerifyCard/app-install-verify-card.less similarity index 100% rename from openmetadata-ui/src/main/resources/ui/src/components/Applications/AppInstallVerifyCard/app-install-verify-card.less rename to openmetadata-ui/src/main/resources/ui/src/components/Settings/Applications/AppInstallVerifyCard/app-install-verify-card.less diff --git a/openmetadata-ui/src/main/resources/ui/src/components/Applications/AppLogo/AppLogo.component.tsx b/openmetadata-ui/src/main/resources/ui/src/components/Settings/Applications/AppLogo/AppLogo.component.tsx similarity index 94% rename from openmetadata-ui/src/main/resources/ui/src/components/Applications/AppLogo/AppLogo.component.tsx rename to openmetadata-ui/src/main/resources/ui/src/components/Settings/Applications/AppLogo/AppLogo.component.tsx index 6ddafbb8e08f..17e950e243fb 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/Applications/AppLogo/AppLogo.component.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/components/Settings/Applications/AppLogo/AppLogo.component.tsx @@ -24,7 +24,7 @@ const AppLogo = ({ useEffect(() => { if (!logo) { - import(`../../../assets/svg/${appName}.svg`).then((data) => { + import(`../../../../assets/svg/${appName}.svg`).then((data) => { const Icon = data.ReactComponent as React.ComponentType< JSX.IntrinsicElements['svg'] >; diff --git a/openmetadata-ui/src/main/resources/ui/src/components/Applications/AppLogsViewer/AppLogsViewer.component.tsx b/openmetadata-ui/src/main/resources/ui/src/components/Settings/Applications/AppLogsViewer/AppLogsViewer.component.tsx similarity index 93% rename from openmetadata-ui/src/main/resources/ui/src/components/Applications/AppLogsViewer/AppLogsViewer.component.tsx rename to openmetadata-ui/src/main/resources/ui/src/components/Settings/Applications/AppLogsViewer/AppLogsViewer.component.tsx index 5e7f72169a70..7878a7b8090d 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/Applications/AppLogsViewer/AppLogsViewer.component.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/components/Settings/Applications/AppLogsViewer/AppLogsViewer.component.tsx @@ -16,10 +16,10 @@ import { isNil } from 'lodash'; import React, { useCallback } from 'react'; import { useTranslation } from 'react-i18next'; import { LazyLog } from 'react-lazylog'; -import { ReactComponent as IconSuccessBadge } from '../../../assets/svg/success-badge.svg'; -import { formatDateTimeWithTimezone } from '../../../utils/date-time/DateTimeUtils'; -import { formatJsonString } from '../../../utils/StringsUtils'; -import CopyToClipboardButton from '../../CopyToClipboardButton/CopyToClipboardButton'; +import { ReactComponent as IconSuccessBadge } from '../../../../assets/svg/success-badge.svg'; +import { formatDateTimeWithTimezone } from '../../../../utils/date-time/DateTimeUtils'; +import { formatJsonString } from '../../../../utils/StringsUtils'; +import CopyToClipboardButton from '../../../common/CopyToClipboardButton/CopyToClipboardButton'; import { AppLogsViewerProps, JobStats } from './AppLogsViewer.interface'; const AppLogsViewer = ({ data }: AppLogsViewerProps) => { diff --git a/openmetadata-ui/src/main/resources/ui/src/components/Applications/AppLogsViewer/AppLogsViewer.interface.ts b/openmetadata-ui/src/main/resources/ui/src/components/Settings/Applications/AppLogsViewer/AppLogsViewer.interface.ts similarity index 90% rename from openmetadata-ui/src/main/resources/ui/src/components/Applications/AppLogsViewer/AppLogsViewer.interface.ts rename to openmetadata-ui/src/main/resources/ui/src/components/Settings/Applications/AppLogsViewer/AppLogsViewer.interface.ts index e9f3509aa361..715262b6a0f0 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/Applications/AppLogsViewer/AppLogsViewer.interface.ts +++ b/openmetadata-ui/src/main/resources/ui/src/components/Settings/Applications/AppLogsViewer/AppLogsViewer.interface.ts @@ -11,7 +11,7 @@ * limitations under the License. */ -import { AppRunRecord } from '../../../generated/entity/applications/appRunRecord'; +import { AppRunRecord } from '../../../../generated/entity/applications/appRunRecord'; export interface AppLogsViewerProps { data: AppRunRecord; diff --git a/openmetadata-ui/src/main/resources/ui/src/components/Applications/AppLogsViewer/AppLogsViewer.test.tsx b/openmetadata-ui/src/main/resources/ui/src/components/Settings/Applications/AppLogsViewer/AppLogsViewer.test.tsx similarity index 92% rename from openmetadata-ui/src/main/resources/ui/src/components/Applications/AppLogsViewer/AppLogsViewer.test.tsx rename to openmetadata-ui/src/main/resources/ui/src/components/Settings/Applications/AppLogsViewer/AppLogsViewer.test.tsx index b73debec30a6..74619d8da2b1 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/Applications/AppLogsViewer/AppLogsViewer.test.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/components/Settings/Applications/AppLogsViewer/AppLogsViewer.test.tsx @@ -17,20 +17,20 @@ import { RunType, ScheduleTimeline, Status, -} from '../../../generated/entity/applications/appRunRecord'; +} from '../../../../generated/entity/applications/appRunRecord'; import AppLogsViewer from './AppLogsViewer.component'; -jest.mock('../../../utils/date-time/DateTimeUtils', () => ({ +jest.mock('../../../../utils/date-time/DateTimeUtils', () => ({ formatDateTimeWithTimezone: jest .fn() .mockReturnValue('formatDateTimeWithTimezone'), })); -jest.mock('../../../utils/StringsUtils', () => ({ +jest.mock('../../../../utils/StringsUtils', () => ({ formatJsonString: jest.fn().mockReturnValue('logs'), })); -jest.mock('../../CopyToClipboardButton/CopyToClipboardButton', () => +jest.mock('../../../common/CopyToClipboardButton/CopyToClipboardButton', () => jest.fn().mockReturnValue(<>CopyToClipboardButton) ); diff --git a/openmetadata-ui/src/main/resources/ui/src/components/Applications/AppRunsHistory/AppRunsHistory.component.tsx b/openmetadata-ui/src/main/resources/ui/src/components/Settings/Applications/AppRunsHistory/AppRunsHistory.component.tsx similarity index 86% rename from openmetadata-ui/src/main/resources/ui/src/components/Applications/AppRunsHistory/AppRunsHistory.component.tsx rename to openmetadata-ui/src/main/resources/ui/src/components/Settings/Applications/AppRunsHistory/AppRunsHistory.component.tsx index f389522c152d..0b9a07bad5a7 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/Applications/AppRunsHistory/AppRunsHistory.component.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/components/Settings/Applications/AppRunsHistory/AppRunsHistory.component.tsx @@ -24,34 +24,34 @@ import React, { } from 'react'; import { useTranslation } from 'react-i18next'; import { useHistory } from 'react-router-dom'; -import { NO_DATA_PLACEHOLDER } from '../../../constants/constants'; -import { GlobalSettingOptions } from '../../../constants/GlobalSettings.constants'; -import { AppType } from '../../../generated/entity/applications/app'; -import { Status } from '../../../generated/entity/applications/appRunRecord'; +import { NO_DATA_PLACEHOLDER } from '../../../../constants/constants'; +import { GlobalSettingOptions } from '../../../../constants/GlobalSettings.constants'; +import { AppType } from '../../../../generated/entity/applications/app'; +import { Status } from '../../../../generated/entity/applications/appRunRecord'; import { PipelineState, PipelineStatus, -} from '../../../generated/entity/services/ingestionPipelines/ingestionPipeline'; -import { Paging } from '../../../generated/type/paging'; -import { usePaging } from '../../../hooks/paging/usePaging'; -import { useFqn } from '../../../hooks/useFqn'; -import { getApplicationRuns } from '../../../rest/applicationAPI'; +} from '../../../../generated/entity/services/ingestionPipelines/ingestionPipeline'; +import { Paging } from '../../../../generated/type/paging'; +import { usePaging } from '../../../../hooks/paging/usePaging'; +import { useFqn } from '../../../../hooks/useFqn'; +import { getApplicationRuns } from '../../../../rest/applicationAPI'; import { getStatusFromPipelineState, getStatusTypeForApplication, -} from '../../../utils/ApplicationUtils'; +} from '../../../../utils/ApplicationUtils'; import { formatDateTime, getEpochMillisForPastDays, -} from '../../../utils/date-time/DateTimeUtils'; -import { getLogsViewerPath } from '../../../utils/RouterUtils'; -import { showErrorToast } from '../../../utils/ToastUtils'; -import ErrorPlaceHolder from '../../common/ErrorWithPlaceholder/ErrorPlaceHolder'; -import NextPrevious from '../../common/NextPrevious/NextPrevious'; -import { PagingHandlerParams } from '../../common/NextPrevious/NextPrevious.interface'; -import StatusBadge from '../../common/StatusBadge/StatusBadge.component'; -import { StatusType } from '../../common/StatusBadge/StatusBadge.interface'; -import Table from '../../common/Table/Table'; +} from '../../../../utils/date-time/DateTimeUtils'; +import { getLogsViewerPath } from '../../../../utils/RouterUtils'; +import { showErrorToast } from '../../../../utils/ToastUtils'; +import ErrorPlaceHolder from '../../../common/ErrorWithPlaceholder/ErrorPlaceHolder'; +import NextPrevious from '../../../common/NextPrevious/NextPrevious'; +import { PagingHandlerParams } from '../../../common/NextPrevious/NextPrevious.interface'; +import StatusBadge from '../../../common/StatusBadge/StatusBadge.component'; +import { StatusType } from '../../../common/StatusBadge/StatusBadge.interface'; +import Table from '../../../common/Table/Table'; import AppLogsViewer from '../AppLogsViewer/AppLogsViewer.component'; import { AppRunRecordWithId, diff --git a/openmetadata-ui/src/main/resources/ui/src/components/Applications/AppRunsHistory/AppRunsHistory.interface.ts b/openmetadata-ui/src/main/resources/ui/src/components/Settings/Applications/AppRunsHistory/AppRunsHistory.interface.ts similarity index 84% rename from openmetadata-ui/src/main/resources/ui/src/components/Applications/AppRunsHistory/AppRunsHistory.interface.ts rename to openmetadata-ui/src/main/resources/ui/src/components/Settings/Applications/AppRunsHistory/AppRunsHistory.interface.ts index f7382e3f0b67..9b31944fb758 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/Applications/AppRunsHistory/AppRunsHistory.interface.ts +++ b/openmetadata-ui/src/main/resources/ui/src/components/Settings/Applications/AppRunsHistory/AppRunsHistory.interface.ts @@ -11,8 +11,8 @@ * limitations under the License. */ -import { App } from '../../../generated/entity/applications/app'; -import { AppRunRecord } from '../../../generated/entity/applications/appRunRecord'; +import { App } from '../../../../generated/entity/applications/app'; +import { AppRunRecord } from '../../../../generated/entity/applications/appRunRecord'; export interface AppRunRecordWithId extends AppRunRecord { id: string; diff --git a/openmetadata-ui/src/main/resources/ui/src/components/Applications/AppRunsHistory/AppRunsHistory.test.tsx b/openmetadata-ui/src/main/resources/ui/src/components/Settings/Applications/AppRunsHistory/AppRunsHistory.test.tsx similarity index 88% rename from openmetadata-ui/src/main/resources/ui/src/components/Applications/AppRunsHistory/AppRunsHistory.test.tsx rename to openmetadata-ui/src/main/resources/ui/src/components/Settings/Applications/AppRunsHistory/AppRunsHistory.test.tsx index 9c42f59a295b..38532a46f695 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/Applications/AppRunsHistory/AppRunsHistory.test.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/components/Settings/Applications/AppRunsHistory/AppRunsHistory.test.tsx @@ -19,9 +19,9 @@ import { import userEvent from '@testing-library/user-event'; import { Table as AntdTable } from 'antd'; import React from 'react'; -import { NO_DATA_PLACEHOLDER } from '../../../constants/constants'; -import { AppType } from '../../../generated/entity/applications/app'; -import { mockApplicationData } from '../../../mocks/rests/applicationAPI.mock'; +import { NO_DATA_PLACEHOLDER } from '../../../../constants/constants'; +import { AppType } from '../../../../generated/entity/applications/app'; +import { mockApplicationData } from '../../../../mocks/rests/applicationAPI.mock'; import AppRunsHistory from './AppRunsHistory.component'; const mockHandlePagingChange = jest.fn(); @@ -37,7 +37,7 @@ const mockGetApplicationRuns = jest.fn().mockReturnValue({ const mockShowErrorToast = jest.fn(); const mockPush = jest.fn(); -jest.mock('../../../hooks/paging/usePaging', () => ({ +jest.mock('../../../../hooks/paging/usePaging', () => ({ usePaging: jest.fn().mockReturnValue({ currentPage: 8, paging: {}, @@ -55,41 +55,41 @@ jest.mock('../../../hooks/paging/usePaging', () => ({ }), })); -jest.mock('../../../hooks/useFqn', () => ({ +jest.mock('../../../../hooks/useFqn', () => ({ useFqn: jest.fn().mockReturnValue({ fqn: 'mockFQN' }), })); -jest.mock('../../../rest/applicationAPI', () => ({ +jest.mock('../../../../rest/applicationAPI', () => ({ getApplicationRuns: jest .fn() .mockImplementation((...args) => mockGetApplicationRuns(...args)), })); -jest.mock('../../../utils/ApplicationUtils', () => ({ +jest.mock('../../../../utils/ApplicationUtils', () => ({ getStatusFromPipelineState: jest.fn(), getStatusTypeForApplication: jest.fn(), })); -jest.mock('../../../utils/RouterUtils', () => ({ +jest.mock('../../../../utils/RouterUtils', () => ({ getLogsViewerPath: jest.fn().mockReturnValue('logs viewer path'), })); -jest.mock('../../../utils/ToastUtils', () => ({ +jest.mock('../../../../utils/ToastUtils', () => ({ showErrorToast: jest .fn() .mockImplementation((...args) => mockShowErrorToast(...args)), })); -jest.mock('../../../utils/date-time/DateTimeUtils', () => ({ +jest.mock('../../../../utils/date-time/DateTimeUtils', () => ({ formatDateTime: jest.fn().mockReturnValue('formatDateTime'), getEpochMillisForPastDays: jest.fn().mockReturnValue('startDay'), })); -jest.mock('../../common/ErrorWithPlaceholder/ErrorPlaceHolder', () => +jest.mock('../../../common/ErrorWithPlaceholder/ErrorPlaceHolder', () => jest.fn().mockReturnValue(
ErrorPlaceHolder
) ); -jest.mock('../../common/NextPrevious/NextPrevious', () => +jest.mock('../../../common/NextPrevious/NextPrevious', () => jest.fn().mockImplementation(({ pagingHandler }) => ( // passing currentPage value in pagingHandler - - - )) +jest.mock( + '../../../DataQuality/AddDataQualityTest/components/TestSuiteScheduler', + () => + jest.fn().mockImplementation(({ onSubmit, onCancel }) => ( +
+ TestSuiteScheduler + + +
+ )) ); -jest.mock('../../Loader/Loader', () => { +jest.mock('../../../common/Loader/Loader', () => { return jest.fn().mockImplementation(() =>

Loader

); }); diff --git a/openmetadata-ui/src/main/resources/ui/src/components/Applications/AppSchedule/AppScheduleProps.interface.ts b/openmetadata-ui/src/main/resources/ui/src/components/Settings/Applications/AppSchedule/AppScheduleProps.interface.ts similarity index 91% rename from openmetadata-ui/src/main/resources/ui/src/components/Applications/AppSchedule/AppScheduleProps.interface.ts rename to openmetadata-ui/src/main/resources/ui/src/components/Settings/Applications/AppSchedule/AppScheduleProps.interface.ts index fa1901f4a844..5fc394ecf3aa 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/Applications/AppSchedule/AppScheduleProps.interface.ts +++ b/openmetadata-ui/src/main/resources/ui/src/components/Settings/Applications/AppSchedule/AppScheduleProps.interface.ts @@ -10,7 +10,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -import { App } from '../../../generated/entity/applications/app'; +import { App } from '../../../../generated/entity/applications/app'; export interface AppScheduleProps { appData: App; diff --git a/openmetadata-ui/src/main/resources/ui/src/components/Applications/ApplicationCard/ApplicationCard.component.tsx b/openmetadata-ui/src/main/resources/ui/src/components/Settings/Applications/ApplicationCard/ApplicationCard.component.tsx similarity index 96% rename from openmetadata-ui/src/main/resources/ui/src/components/Applications/ApplicationCard/ApplicationCard.component.tsx rename to openmetadata-ui/src/main/resources/ui/src/components/Settings/Applications/ApplicationCard/ApplicationCard.component.tsx index 4fc2bf258896..942cc8916d61 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/Applications/ApplicationCard/ApplicationCard.component.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/components/Settings/Applications/ApplicationCard/ApplicationCard.component.tsx @@ -16,7 +16,7 @@ import classNames from 'classnames'; import { kebabCase } from 'lodash'; import React from 'react'; import { useTranslation } from 'react-i18next'; -import RichTextEditorPreviewer from '../../../components/common/RichTextEditor/RichTextEditorPreviewer'; +import RichTextEditorPreviewer from '../../../common/RichTextEditor/RichTextEditorPreviewer'; import AppLogo from '../AppLogo/AppLogo.component'; import { ApplicationCardProps } from './ApplicationCard.interface'; diff --git a/openmetadata-ui/src/main/resources/ui/src/components/Applications/ApplicationCard/ApplicationCard.interface.ts b/openmetadata-ui/src/main/resources/ui/src/components/Settings/Applications/ApplicationCard/ApplicationCard.interface.ts similarity index 100% rename from openmetadata-ui/src/main/resources/ui/src/components/Applications/ApplicationCard/ApplicationCard.interface.ts rename to openmetadata-ui/src/main/resources/ui/src/components/Settings/Applications/ApplicationCard/ApplicationCard.interface.ts diff --git a/openmetadata-ui/src/main/resources/ui/src/components/Applications/ApplicationCard/ApplicationCard.test.tsx b/openmetadata-ui/src/main/resources/ui/src/components/Settings/Applications/ApplicationCard/ApplicationCard.test.tsx similarity index 100% rename from openmetadata-ui/src/main/resources/ui/src/components/Applications/ApplicationCard/ApplicationCard.test.tsx rename to openmetadata-ui/src/main/resources/ui/src/components/Settings/Applications/ApplicationCard/ApplicationCard.test.tsx diff --git a/openmetadata-ui/src/main/resources/ui/src/components/Applications/MarketPlaceAppDetails/MarketPlaceAppDetails.component.tsx b/openmetadata-ui/src/main/resources/ui/src/components/Settings/Applications/MarketPlaceAppDetails/MarketPlaceAppDetails.component.tsx similarity index 86% rename from openmetadata-ui/src/main/resources/ui/src/components/Applications/MarketPlaceAppDetails/MarketPlaceAppDetails.component.tsx rename to openmetadata-ui/src/main/resources/ui/src/components/Settings/Applications/MarketPlaceAppDetails/MarketPlaceAppDetails.component.tsx index 4f018cc071a6..804f3ccb0c9d 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/Applications/MarketPlaceAppDetails/MarketPlaceAppDetails.component.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/components/Settings/Applications/MarketPlaceAppDetails/MarketPlaceAppDetails.component.tsx @@ -17,19 +17,19 @@ import { uniqueId } from 'lodash'; import React, { useCallback, useEffect, useMemo, useState } from 'react'; import { useTranslation } from 'react-i18next'; import { useHistory } from 'react-router-dom'; -import { ReactComponent as CheckMarkIcon } from '../../../assets/svg/ic-cloud-checkmark.svg'; -import RichTextEditorPreviewer from '../../../components/common/RichTextEditor/RichTextEditorPreviewer'; -import Loader from '../../../components/Loader/Loader'; -import PageLayoutV1 from '../../../components/PageLayoutV1/PageLayoutV1'; -import { ROUTES } from '../../../constants/constants'; -import { AppMarketPlaceDefinition } from '../../../generated/entity/applications/marketplace/appMarketPlaceDefinition'; -import { Include } from '../../../generated/type/include'; -import { useFqn } from '../../../hooks/useFqn'; -import { getApplicationByName } from '../../../rest/applicationAPI'; -import { getMarketPlaceApplicationByFqn } from '../../../rest/applicationMarketPlaceAPI'; -import { getEntityName } from '../../../utils/EntityUtils'; -import { getAppInstallPath } from '../../../utils/RouterUtils'; -import { showErrorToast } from '../../../utils/ToastUtils'; +import { ReactComponent as CheckMarkIcon } from '../../../../assets/svg/ic-cloud-checkmark.svg'; +import { ROUTES } from '../../../../constants/constants'; +import { AppMarketPlaceDefinition } from '../../../../generated/entity/applications/marketplace/appMarketPlaceDefinition'; +import { Include } from '../../../../generated/type/include'; +import { useFqn } from '../../../../hooks/useFqn'; +import { getApplicationByName } from '../../../../rest/applicationAPI'; +import { getMarketPlaceApplicationByFqn } from '../../../../rest/applicationMarketPlaceAPI'; +import { getEntityName } from '../../../../utils/EntityUtils'; +import { getAppInstallPath } from '../../../../utils/RouterUtils'; +import { showErrorToast } from '../../../../utils/ToastUtils'; +import Loader from '../../../common/Loader/Loader'; +import RichTextEditorPreviewer from '../../../common/RichTextEditor/RichTextEditorPreviewer'; +import PageLayoutV1 from '../../../PageLayoutV1/PageLayoutV1'; import AppLogo from '../AppLogo/AppLogo.component'; import './market-place-app-details.less'; @@ -45,7 +45,7 @@ const MarketPlaceAppDetails = () => { const loadScreenshot = async (screenshotName: string) => { try { const imageModule = await import( - `../../../assets/img/appScreenshots/${screenshotName}` + `../../../../assets/img/appScreenshots/${screenshotName}` ); const imageSrc = imageModule.default; diff --git a/openmetadata-ui/src/main/resources/ui/src/components/Applications/MarketPlaceAppDetails/MarketPlaceAppDetails.interface.ts b/openmetadata-ui/src/main/resources/ui/src/components/Settings/Applications/MarketPlaceAppDetails/MarketPlaceAppDetails.interface.ts similarity index 100% rename from openmetadata-ui/src/main/resources/ui/src/components/Applications/MarketPlaceAppDetails/MarketPlaceAppDetails.interface.ts rename to openmetadata-ui/src/main/resources/ui/src/components/Settings/Applications/MarketPlaceAppDetails/MarketPlaceAppDetails.interface.ts diff --git a/openmetadata-ui/src/main/resources/ui/src/components/Applications/MarketPlaceAppDetails/MarketPlaceAppDetails.test.tsx b/openmetadata-ui/src/main/resources/ui/src/components/Settings/Applications/MarketPlaceAppDetails/MarketPlaceAppDetails.test.tsx similarity index 86% rename from openmetadata-ui/src/main/resources/ui/src/components/Applications/MarketPlaceAppDetails/MarketPlaceAppDetails.test.tsx rename to openmetadata-ui/src/main/resources/ui/src/components/Settings/Applications/MarketPlaceAppDetails/MarketPlaceAppDetails.test.tsx index f70296c5e35c..516e4846cca9 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/Applications/MarketPlaceAppDetails/MarketPlaceAppDetails.test.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/components/Settings/Applications/MarketPlaceAppDetails/MarketPlaceAppDetails.test.tsx @@ -18,8 +18,8 @@ import { import userEvent from '@testing-library/user-event'; import React from 'react'; // import { ROUTES } from '../../../constants/constants'; -import { ROUTES } from '../../../constants/constants'; -import { mockApplicationData } from '../../../mocks/rests/applicationAPI.mock'; +import { ROUTES } from '../../../../constants/constants'; +import { mockApplicationData } from '../../../../mocks/rests/applicationAPI.mock'; import MarketPlaceAppDetails from './MarketPlaceAppDetails.component'; const mockPush = jest.fn(); @@ -40,16 +40,15 @@ jest.mock('react-router-dom', () => ({ })), })); -jest.mock( - '../../../components/common/RichTextEditor/RichTextEditorPreviewer', - () => jest.fn().mockReturnValue(<>RichTextEditorPreviewer) +jest.mock('../../../common/RichTextEditor/RichTextEditorPreviewer', () => + jest.fn().mockReturnValue(<>RichTextEditorPreviewer) ); -jest.mock('../../../components/Loader/Loader', () => +jest.mock('../../../common/Loader/Loader', () => jest.fn().mockReturnValue(
Loader
) ); -jest.mock('../../../components/PageLayoutV1/PageLayoutV1', () => +jest.mock('../../../PageLayoutV1/PageLayoutV1', () => jest.fn().mockImplementation(({ leftPanel, children }) => (
{leftPanel} @@ -58,17 +57,17 @@ jest.mock('../../../components/PageLayoutV1/PageLayoutV1', () => )) ); -jest.mock('../../../hooks/useFqn', () => ({ +jest.mock('../../../../hooks/useFqn', () => ({ useFqn: jest.fn().mockReturnValue({ fqn: 'mockFQN' }), })); -jest.mock('../../../rest/applicationAPI', () => ({ +jest.mock('../../../../rest/applicationAPI', () => ({ getApplicationByName: jest .fn() .mockImplementation(() => mockGetApplicationByName()), })); -jest.mock('../../../rest/applicationMarketPlaceAPI', () => ({ +jest.mock('../../../../rest/applicationMarketPlaceAPI', () => ({ getMarketPlaceApplicationByFqn: jest .fn() .mockImplementation((...args) => @@ -76,15 +75,15 @@ jest.mock('../../../rest/applicationMarketPlaceAPI', () => ({ ), })); -jest.mock('../../../utils/EntityUtils', () => ({ +jest.mock('../../../../utils/EntityUtils', () => ({ getEntityName: jest.fn(), })); -jest.mock('../../../utils/RouterUtils', () => ({ +jest.mock('../../../../utils/RouterUtils', () => ({ getAppInstallPath: jest.fn().mockReturnValue('app install path'), })); -jest.mock('../../../utils/ToastUtils', () => ({ +jest.mock('../../../../utils/ToastUtils', () => ({ showErrorToast: jest .fn() .mockImplementation((...args) => mockShowErrorToast(...args)), diff --git a/openmetadata-ui/src/main/resources/ui/src/components/Applications/MarketPlaceAppDetails/market-place-app-details.less b/openmetadata-ui/src/main/resources/ui/src/components/Settings/Applications/MarketPlaceAppDetails/market-place-app-details.less similarity index 95% rename from openmetadata-ui/src/main/resources/ui/src/components/Applications/MarketPlaceAppDetails/market-place-app-details.less rename to openmetadata-ui/src/main/resources/ui/src/components/Settings/Applications/MarketPlaceAppDetails/market-place-app-details.less index ece713e860aa..db87e5e9bd2a 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/Applications/MarketPlaceAppDetails/market-place-app-details.less +++ b/openmetadata-ui/src/main/resources/ui/src/components/Settings/Applications/MarketPlaceAppDetails/market-place-app-details.less @@ -10,7 +10,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -@import url('../../../styles/variables.less'); +@import url('../../../../styles/variables.less'); .marketplace-app-details-page-tabs { .ant-tabs-nav { diff --git a/openmetadata-ui/src/main/resources/ui/src/components/BotDetails/AuthMechanism.tsx b/openmetadata-ui/src/main/resources/ui/src/components/Settings/Bot/BotDetails/AuthMechanism.tsx similarity index 90% rename from openmetadata-ui/src/main/resources/ui/src/components/BotDetails/AuthMechanism.tsx rename to openmetadata-ui/src/main/resources/ui/src/components/Settings/Bot/BotDetails/AuthMechanism.tsx index c5628ac0b440..36e699e09d34 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/BotDetails/AuthMechanism.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/components/Settings/Bot/BotDetails/AuthMechanism.tsx @@ -15,11 +15,11 @@ import Icon from '@ant-design/icons/lib/components/Icon'; import { Button, Divider, Input, Space, Typography } from 'antd'; import { t } from 'i18next'; import React, { FC, useMemo } from 'react'; -import { ReactComponent as IconError } from '../../assets/svg/error.svg'; -import { PersonalAccessToken } from '../../generated/auth/personalAccessToken'; -import { AuthenticationMechanism } from '../../generated/entity/teams/user'; -import { getTokenExpiry } from '../../utils/BotsUtils'; -import CopyToClipboardButton from '../CopyToClipboardButton/CopyToClipboardButton'; +import { ReactComponent as IconError } from '../../../../assets/svg/error.svg'; +import { PersonalAccessToken } from '../../../../generated/auth/personalAccessToken'; +import { AuthenticationMechanism } from '../../../../generated/entity/teams/user'; +import { getTokenExpiry } from '../../../../utils/BotsUtils'; +import CopyToClipboardButton from '../../../common/CopyToClipboardButton/CopyToClipboardButton'; import './auth-mechanism.less'; interface Props { diff --git a/openmetadata-ui/src/main/resources/ui/src/components/BotDetails/AuthMechanismForm.tsx b/openmetadata-ui/src/main/resources/ui/src/components/Settings/Bot/BotDetails/AuthMechanismForm.tsx similarity index 95% rename from openmetadata-ui/src/main/resources/ui/src/components/BotDetails/AuthMechanismForm.tsx rename to openmetadata-ui/src/main/resources/ui/src/components/Settings/Bot/BotDetails/AuthMechanismForm.tsx index 64e141212303..ebc5bffe3f15 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/BotDetails/AuthMechanismForm.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/components/Settings/Bot/BotDetails/AuthMechanismForm.tsx @@ -18,14 +18,14 @@ import { useTranslation } from 'react-i18next'; import { PersonalAccessToken, TokenType, -} from '../../generated/auth/personalAccessToken'; +} from '../../../../generated/auth/personalAccessToken'; import { AuthenticationMechanism, AuthType, JWTTokenExpiry, -} from '../../generated/entity/teams/user'; -import { getJWTTokenExpiryOptions } from '../../utils/BotsUtils'; -import Loader from '../Loader/Loader'; +} from '../../../../generated/entity/teams/user'; +import { getJWTTokenExpiryOptions } from '../../../../utils/BotsUtils'; +import Loader from '../../../common/Loader/Loader'; const { Option } = Select; diff --git a/openmetadata-ui/src/main/resources/ui/src/components/BotDetails/BotDetails.component.tsx b/openmetadata-ui/src/main/resources/ui/src/components/Settings/Bot/BotDetails/BotDetails.component.tsx similarity index 87% rename from openmetadata-ui/src/main/resources/ui/src/components/BotDetails/BotDetails.component.tsx rename to openmetadata-ui/src/main/resources/ui/src/components/Settings/Bot/BotDetails/BotDetails.component.tsx index b95a6b1241a3..048ebb6af3ce 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/BotDetails/BotDetails.component.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/components/Settings/Bot/BotDetails/BotDetails.component.tsx @@ -17,24 +17,24 @@ import { AxiosError } from 'axios'; import { toLower } from 'lodash'; import React, { FC, useEffect, useMemo, useState } from 'react'; import { useTranslation } from 'react-i18next'; -import { ReactComponent as EditIcon } from '../../assets/svg/edit-new.svg'; -import PageLayoutV1 from '../../components/PageLayoutV1/PageLayoutV1'; -import { TERM_ADMIN } from '../../constants/constants'; -import { GlobalSettingOptions } from '../../constants/GlobalSettings.constants'; -import { Role } from '../../generated/entity/teams/role'; -import { getRoles } from '../../rest/userAPI'; -import { getEntityName } from '../../utils/EntityUtils'; -import { getSettingPath } from '../../utils/RouterUtils'; -import { showErrorToast } from '../../utils/ToastUtils'; -import Description from '../common/EntityDescription/Description'; -import InheritedRolesCard from '../common/InheritedRolesCard/InheritedRolesCard.component'; -import RolesCard from '../common/RolesCard/RolesCard.component'; -import TitleBreadcrumb from '../common/TitleBreadcrumb/TitleBreadcrumb.component'; +import { ReactComponent as EditIcon } from '../../../../assets/svg/edit-new.svg'; +import { TERM_ADMIN } from '../../../../constants/constants'; +import { GlobalSettingOptions } from '../../../../constants/GlobalSettings.constants'; +import { Role } from '../../../../generated/entity/teams/role'; +import { getRoles } from '../../../../rest/userAPI'; +import { getEntityName } from '../../../../utils/EntityUtils'; +import { getSettingPath } from '../../../../utils/RouterUtils'; +import { showErrorToast } from '../../../../utils/ToastUtils'; +import Description from '../../../common/EntityDescription/Description'; +import InheritedRolesCard from '../../../common/InheritedRolesCard/InheritedRolesCard.component'; +import RolesCard from '../../../common/RolesCard/RolesCard.component'; +import TitleBreadcrumb from '../../../common/TitleBreadcrumb/TitleBreadcrumb.component'; +import PageLayoutV1 from '../../../PageLayoutV1/PageLayoutV1'; import './bot-details.less'; import { BotsDetailProps } from './BotDetails.interfaces'; -import { ReactComponent as IconBotProfile } from '../../assets/svg/bot-profile.svg'; -import AccessTokenCard from '../AccessTokenCard/AccessTokenCard.component'; +import { ReactComponent as IconBotProfile } from '../../../../assets/svg/bot-profile.svg'; +import AccessTokenCard from '../../Users/AccessTokenCard/AccessTokenCard.component'; const BotDetails: FC = ({ botData, diff --git a/openmetadata-ui/src/main/resources/ui/src/components/BotDetails/BotDetails.interfaces.ts b/openmetadata-ui/src/main/resources/ui/src/components/Settings/Bot/BotDetails/BotDetails.interfaces.ts similarity index 82% rename from openmetadata-ui/src/main/resources/ui/src/components/BotDetails/BotDetails.interfaces.ts rename to openmetadata-ui/src/main/resources/ui/src/components/Settings/Bot/BotDetails/BotDetails.interfaces.ts index 75e83b9306cc..be30f73c97e3 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/BotDetails/BotDetails.interfaces.ts +++ b/openmetadata-ui/src/main/resources/ui/src/components/Settings/Bot/BotDetails/BotDetails.interfaces.ts @@ -12,9 +12,9 @@ */ import { HTMLAttributes } from 'react'; -import { Bot } from '../../generated/entity/bot'; -import { User } from '../../generated/entity/teams/user'; -import { OperationPermission } from '../PermissionProvider/PermissionProvider.interface'; +import { OperationPermission } from '../../../../context/PermissionProvider/PermissionProvider.interface'; +import { Bot } from '../../../../generated/entity/bot'; +import { User } from '../../../../generated/entity/teams/user'; export interface BotsDetailProps extends HTMLAttributes { botUserData: User; diff --git a/openmetadata-ui/src/main/resources/ui/src/components/BotDetails/BotDetails.test.tsx b/openmetadata-ui/src/main/resources/ui/src/components/Settings/Bot/BotDetails/BotDetails.test.tsx similarity index 93% rename from openmetadata-ui/src/main/resources/ui/src/components/BotDetails/BotDetails.test.tsx rename to openmetadata-ui/src/main/resources/ui/src/components/Settings/Bot/BotDetails/BotDetails.test.tsx index 8291cd57c2d1..45d65b700c38 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/BotDetails/BotDetails.test.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/components/Settings/Bot/BotDetails/BotDetails.test.tsx @@ -21,8 +21,8 @@ import { } from '@testing-library/react'; import React from 'react'; import { MemoryRouter } from 'react-router-dom'; -import { getAuthMechanismForBotUser } from '../../rest/userAPI'; -import { OperationPermission } from '../PermissionProvider/PermissionProvider.interface'; +import { OperationPermission } from '../../../../context/PermissionProvider/PermissionProvider.interface'; +import { getAuthMechanismForBotUser } from '../../../../rest/userAPI'; import BotDetails from './BotDetails.component'; const revokeTokenHandler = jest.fn(); @@ -96,11 +96,11 @@ const mockProp = { updateUserDetails, }; -jest.mock('../../utils/PermissionsUtils', () => ({ +jest.mock('../../../../utils/PermissionsUtils', () => ({ checkPermission: jest.fn().mockReturnValue(true), })); -jest.mock('../../rest/userAPI', () => { +jest.mock('../../../../rest/userAPI', () => { return { createUserWithPut: jest .fn() @@ -111,7 +111,7 @@ jest.mock('../../rest/userAPI', () => { }; }); -jest.mock('../common/EntityDescription/Description', () => { +jest.mock('../../../common/EntityDescription/Description', () => { return jest.fn().mockReturnValue(

Description Component

); }); @@ -123,7 +123,7 @@ jest.mock('./AuthMechanismForm', () => ) ); -jest.mock('../PageLayoutV1/PageLayoutV1', () => +jest.mock('../../../PageLayoutV1/PageLayoutV1', () => jest .fn() .mockImplementation(({ children, leftPanel, rightPanel, header }) => ( diff --git a/openmetadata-ui/src/main/resources/ui/src/components/BotDetails/auth-mechanism.less b/openmetadata-ui/src/main/resources/ui/src/components/Settings/Bot/BotDetails/auth-mechanism.less similarity index 100% rename from openmetadata-ui/src/main/resources/ui/src/components/BotDetails/auth-mechanism.less rename to openmetadata-ui/src/main/resources/ui/src/components/Settings/Bot/BotDetails/auth-mechanism.less diff --git a/openmetadata-ui/src/main/resources/ui/src/components/BotDetails/bot-details.less b/openmetadata-ui/src/main/resources/ui/src/components/Settings/Bot/BotDetails/bot-details.less similarity index 100% rename from openmetadata-ui/src/main/resources/ui/src/components/BotDetails/bot-details.less rename to openmetadata-ui/src/main/resources/ui/src/components/Settings/Bot/BotDetails/bot-details.less diff --git a/openmetadata-ui/src/main/resources/ui/src/components/BotListV1/BotListV1.component.tsx b/openmetadata-ui/src/main/resources/ui/src/components/Settings/Bot/BotListV1/BotListV1.component.tsx similarity index 81% rename from openmetadata-ui/src/main/resources/ui/src/components/BotListV1/BotListV1.component.tsx rename to openmetadata-ui/src/main/resources/ui/src/components/Settings/Bot/BotListV1/BotListV1.component.tsx index 24b8076f8070..3b454549a3fe 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/BotListV1/BotListV1.component.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/components/Settings/Bot/BotListV1/BotListV1.component.tsx @@ -19,33 +19,33 @@ import { isEmpty, lowerCase } from 'lodash'; import React, { useCallback, useEffect, useMemo, useState } from 'react'; import { useTranslation } from 'react-i18next'; import { Link } from 'react-router-dom'; -import { ReactComponent as IconDelete } from '../../assets/svg/ic-delete.svg'; -import FilterTablePlaceHolder from '../../components/common/ErrorWithPlaceholder/FilterTablePlaceHolder'; -import Table from '../../components/common/Table/Table'; -import { getBotsPath } from '../../constants/constants'; -import { BOTS_DOCS } from '../../constants/docs.constants'; -import { GlobalSettingsMenuCategory } from '../../constants/GlobalSettings.constants'; -import { PAGE_HEADERS } from '../../constants/PageHeaders.constant'; -import { ERROR_PLACEHOLDER_TYPE } from '../../enums/common.enum'; -import { EntityType } from '../../enums/entity.enum'; -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 { usePaging } from '../../hooks/paging/usePaging'; -import { getBots } from '../../rest/botsAPI'; -import { getEntityName } from '../../utils/EntityUtils'; -import { getSettingPageEntityBreadCrumb } from '../../utils/GlobalSettingsUtils'; -import { showErrorToast } from '../../utils/ToastUtils'; -import DeleteWidgetModal from '../common/DeleteWidget/DeleteWidgetModal'; -import ErrorPlaceHolder from '../common/ErrorWithPlaceholder/ErrorPlaceHolder'; -import NextPrevious from '../common/NextPrevious/NextPrevious'; -import { PagingHandlerParams } from '../common/NextPrevious/NextPrevious.interface'; -import RichTextEditorPreviewer from '../common/RichTextEditor/RichTextEditorPreviewer'; -import Searchbar from '../common/SearchBarComponent/SearchBar.component'; -import TitleBreadcrumb from '../common/TitleBreadcrumb/TitleBreadcrumb.component'; -import { TitleBreadcrumbProps } from '../common/TitleBreadcrumb/TitleBreadcrumb.interface'; -import PageHeader from '../PageHeader/PageHeader.component'; +import { ReactComponent as IconDelete } from '../../../../assets/svg/ic-delete.svg'; +import { getBotsPath } from '../../../../constants/constants'; +import { BOTS_DOCS } from '../../../../constants/docs.constants'; +import { GlobalSettingsMenuCategory } from '../../../../constants/GlobalSettings.constants'; +import { PAGE_HEADERS } from '../../../../constants/PageHeaders.constant'; +import { ERROR_PLACEHOLDER_TYPE } from '../../../../enums/common.enum'; +import { EntityType } from '../../../../enums/entity.enum'; +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 { usePaging } from '../../../../hooks/paging/usePaging'; +import { getBots } from '../../../../rest/botsAPI'; +import { getEntityName } from '../../../../utils/EntityUtils'; +import { getSettingPageEntityBreadCrumb } from '../../../../utils/GlobalSettingsUtils'; +import { showErrorToast } from '../../../../utils/ToastUtils'; +import DeleteWidgetModal from '../../../common/DeleteWidget/DeleteWidgetModal'; +import ErrorPlaceHolder from '../../../common/ErrorWithPlaceholder/ErrorPlaceHolder'; +import FilterTablePlaceHolder from '../../../common/ErrorWithPlaceholder/FilterTablePlaceHolder'; +import NextPrevious from '../../../common/NextPrevious/NextPrevious'; +import { PagingHandlerParams } from '../../../common/NextPrevious/NextPrevious.interface'; +import RichTextEditorPreviewer from '../../../common/RichTextEditor/RichTextEditorPreviewer'; +import Searchbar from '../../../common/SearchBarComponent/SearchBar.component'; +import Table from '../../../common/Table/Table'; +import TitleBreadcrumb from '../../../common/TitleBreadcrumb/TitleBreadcrumb.component'; +import { TitleBreadcrumbProps } from '../../../common/TitleBreadcrumb/TitleBreadcrumb.interface'; +import PageHeader from '../../../PageHeader/PageHeader.component'; import { BotListV1Props } from './BotListV1.interfaces'; const BotListV1 = ({ diff --git a/openmetadata-ui/src/main/resources/ui/src/components/BotListV1/BotListV1.interfaces.ts b/openmetadata-ui/src/main/resources/ui/src/components/Settings/Bot/BotListV1/BotListV1.interfaces.ts similarity index 100% rename from openmetadata-ui/src/main/resources/ui/src/components/BotListV1/BotListV1.interfaces.ts rename to openmetadata-ui/src/main/resources/ui/src/components/Settings/Bot/BotListV1/BotListV1.interfaces.ts diff --git a/openmetadata-ui/src/main/resources/ui/src/components/CustomEntityDetail/AddCustomProperty/AddCustomProperty.test.tsx b/openmetadata-ui/src/main/resources/ui/src/components/Settings/CustomProperty/AddCustomProperty/AddCustomProperty.test.tsx similarity index 92% rename from openmetadata-ui/src/main/resources/ui/src/components/CustomEntityDetail/AddCustomProperty/AddCustomProperty.test.tsx rename to openmetadata-ui/src/main/resources/ui/src/components/Settings/CustomProperty/AddCustomProperty/AddCustomProperty.test.tsx index 537229a2a551..08a9dfe5a05f 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/CustomEntityDetail/AddCustomProperty/AddCustomProperty.test.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/components/Settings/CustomProperty/AddCustomProperty/AddCustomProperty.test.tsx @@ -185,11 +185,7 @@ jest.mock('react-router-dom', () => ({ }), })); -jest.mock('../../../components/MyData/LeftSidebar/LeftSidebar.component', () => - jest.fn().mockReturnValue(

Sidebar

) -); - -jest.mock('../../../rest/metadataTypeAPI', () => ({ +jest.mock('../../../../rest/metadataTypeAPI', () => ({ addPropertyToEntity: jest .fn() .mockImplementation(() => Promise.resolve(mockPropertyTypes[0])), @@ -201,21 +197,20 @@ jest.mock('../../../rest/metadataTypeAPI', () => ({ .mockImplementation(() => Promise.resolve({ data: mockPropertyTypes })), })); -jest.mock('../../../utils/CommonUtils', () => ({ +jest.mock('../../../../utils/CommonUtils', () => ({ errorMsg: jest.fn(), requiredField: jest.fn(), })); -jest.mock('../../../utils/ToastUtils', () => ({ +jest.mock('../../../../utils/ToastUtils', () => ({ showErrorToast: jest.fn(), })); -jest.mock( - '../../../components/common/TitleBreadcrumb/TitleBreadcrumb.component', - () => jest.fn().mockImplementation(() =>
BreadCrumb.component
) +jest.mock('../../../common/TitleBreadcrumb/TitleBreadcrumb.component', () => + jest.fn().mockImplementation(() =>
BreadCrumb.component
) ); -jest.mock('../../../components/common/ResizablePanels/ResizablePanels', () => +jest.mock('../../../common/ResizablePanels/ResizablePanels', () => jest.fn().mockImplementation(({ firstPanel, secondPanel }) => ( <>
{firstPanel.children}
@@ -224,7 +219,7 @@ jest.mock('../../../components/common/ResizablePanels/ResizablePanels', () => )) ); -jest.mock('../../../components/common/ServiceDocPanel/ServiceDocPanel', () => +jest.mock('../../../common/ServiceDocPanel/ServiceDocPanel', () => jest.fn().mockImplementation(() =>
ServiceDocPanel.component
) ); diff --git a/openmetadata-ui/src/main/resources/ui/src/components/CustomEntityDetail/AddCustomProperty/AddCustomProperty.tsx b/openmetadata-ui/src/main/resources/ui/src/components/Settings/CustomProperty/AddCustomProperty/AddCustomProperty.tsx similarity index 84% rename from openmetadata-ui/src/main/resources/ui/src/components/CustomEntityDetail/AddCustomProperty/AddCustomProperty.tsx rename to openmetadata-ui/src/main/resources/ui/src/components/Settings/CustomProperty/AddCustomProperty/AddCustomProperty.tsx index 6c08ee1cbaca..ef7f9f7bba6d 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/CustomEntityDetail/AddCustomProperty/AddCustomProperty.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/components/Settings/CustomProperty/AddCustomProperty/AddCustomProperty.tsx @@ -23,29 +23,36 @@ import React, { useState, } from 'react'; import { useHistory, useParams } from 'react-router-dom'; -import { SUPPORTED_FIELD_TYPES } from '../../../constants/constants'; -import { GlobalSettingsMenuCategory } from '../../../constants/GlobalSettings.constants'; -import { CUSTOM_PROPERTY_NAME_REGEX } from '../../../constants/regex.constants'; +import { SUPPORTED_FIELD_TYPES } from '../../../../constants/constants'; +import { GlobalSettingsMenuCategory } from '../../../../constants/GlobalSettings.constants'; +import { CUSTOM_PROPERTY_NAME_REGEX } from '../../../../constants/regex.constants'; import { CUSTOM_PROPERTY_CATEGORY, OPEN_METADATA, -} from '../../../constants/service-guide.constant'; -import { EntityType } from '../../../enums/entity.enum'; -import { ServiceCategory } from '../../../enums/service.enum'; -import { Category, CustomProperty, Type } from '../../../generated/entity/type'; -import { FieldProp, FieldTypes } from '../../../interface/FormUtils.interface'; +} from '../../../../constants/service-guide.constant'; +import { EntityType } from '../../../../enums/entity.enum'; +import { ServiceCategory } from '../../../../enums/service.enum'; +import { + Category, + CustomProperty, + Type, +} from '../../../../generated/entity/type'; +import { + FieldProp, + FieldTypes, +} from '../../../../interface/FormUtils.interface'; import { addPropertyToEntity, getTypeByFQN, getTypeListByCategory, -} from '../../../rest/metadataTypeAPI'; -import { generateFormFields } from '../../../utils/formUtils'; -import { getSettingOptionByEntityType } from '../../../utils/GlobalSettingsUtils'; -import { getSettingPath } from '../../../utils/RouterUtils'; -import { showErrorToast } from '../../../utils/ToastUtils'; -import ResizablePanels from '../../common/ResizablePanels/ResizablePanels'; -import ServiceDocPanel from '../../common/ServiceDocPanel/ServiceDocPanel'; -import TitleBreadcrumb from '../../common/TitleBreadcrumb/TitleBreadcrumb.component'; +} from '../../../../rest/metadataTypeAPI'; +import { generateFormFields } from '../../../../utils/formUtils'; +import { getSettingOptionByEntityType } from '../../../../utils/GlobalSettingsUtils'; +import { getSettingPath } from '../../../../utils/RouterUtils'; +import { showErrorToast } from '../../../../utils/ToastUtils'; +import ResizablePanels from '../../../common/ResizablePanels/ResizablePanels'; +import ServiceDocPanel from '../../../common/ServiceDocPanel/ServiceDocPanel'; +import TitleBreadcrumb from '../../../common/TitleBreadcrumb/TitleBreadcrumb.component'; const AddCustomProperty = () => { const { entityType } = useParams<{ entityType: EntityType }>(); diff --git a/openmetadata-ui/src/main/resources/ui/src/components/CustomEntityDetail/CustomPropertyTable.interface.ts b/openmetadata-ui/src/main/resources/ui/src/components/Settings/CustomProperty/CustomPropertyTable.interface.ts similarity index 92% rename from openmetadata-ui/src/main/resources/ui/src/components/CustomEntityDetail/CustomPropertyTable.interface.ts rename to openmetadata-ui/src/main/resources/ui/src/components/Settings/CustomProperty/CustomPropertyTable.interface.ts index 475630150491..ec5c5d1c4a46 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/CustomEntityDetail/CustomPropertyTable.interface.ts +++ b/openmetadata-ui/src/main/resources/ui/src/components/Settings/CustomProperty/CustomPropertyTable.interface.ts @@ -11,7 +11,7 @@ * limitations under the License. */ -import { CustomProperty, Type } from '../../generated/entity/type'; +import { CustomProperty, Type } from '../../../generated/entity/type'; export interface CustomPropertyTableProp { hasAccess: boolean; diff --git a/openmetadata-ui/src/main/resources/ui/src/components/CustomEntityDetail/CustomPropertyTable.test.tsx b/openmetadata-ui/src/main/resources/ui/src/components/Settings/CustomProperty/CustomPropertyTable.test.tsx similarity index 95% rename from openmetadata-ui/src/main/resources/ui/src/components/CustomEntityDetail/CustomPropertyTable.test.tsx rename to openmetadata-ui/src/main/resources/ui/src/components/Settings/CustomProperty/CustomPropertyTable.test.tsx index 809bdfb3fb21..af99a66dbf39 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/CustomEntityDetail/CustomPropertyTable.test.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/components/Settings/CustomProperty/CustomPropertyTable.test.tsx @@ -21,15 +21,12 @@ import { import React from 'react'; import { CustomPropertyTable } from './CustomPropertyTable'; -jest.mock('../common/RichTextEditor/RichTextEditorPreviewer', () => { +jest.mock('../../common/RichTextEditor/RichTextEditorPreviewer', () => { return jest.fn().mockReturnValue(

RichTextEditorPreview

); }); -jest.mock( - '../../components/common/ErrorWithPlaceholder/ErrorPlaceHolder', - () => { - return jest.fn().mockReturnValue(

ErrorPlaceHolder

); - } -); +jest.mock('../../common/ErrorWithPlaceholder/ErrorPlaceHolder', () => { + return jest.fn().mockReturnValue(

ErrorPlaceHolder

); +}); const mockUpdateEntityType = jest.fn(); const mockProperties = [ diff --git a/openmetadata-ui/src/main/resources/ui/src/components/CustomEntityDetail/CustomPropertyTable.tsx b/openmetadata-ui/src/main/resources/ui/src/components/Settings/CustomProperty/CustomPropertyTable.tsx similarity index 86% rename from openmetadata-ui/src/main/resources/ui/src/components/CustomEntityDetail/CustomPropertyTable.tsx rename to openmetadata-ui/src/main/resources/ui/src/components/Settings/CustomProperty/CustomPropertyTable.tsx index a6de843e627e..9ba61c4971a0 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/CustomEntityDetail/CustomPropertyTable.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/components/Settings/CustomProperty/CustomPropertyTable.tsx @@ -15,18 +15,18 @@ import { ColumnsType } from 'antd/lib/table'; import { isEmpty } from 'lodash'; import React, { FC, Fragment, useEffect, useMemo, useState } from 'react'; import { useTranslation } from 'react-i18next'; -import { ReactComponent as IconEdit } from '../../assets/svg/edit-new.svg'; -import { ReactComponent as IconDelete } from '../../assets/svg/ic-delete.svg'; -import ErrorPlaceHolder from '../../components/common/ErrorWithPlaceholder/ErrorPlaceHolder'; -import Table from '../../components/common/Table/Table'; -import { ADD_CUSTOM_PROPERTIES_DOCS } from '../../constants/docs.constants'; -import { NO_PERMISSION_FOR_ACTION } from '../../constants/HelperTextUtil'; -import { ERROR_PLACEHOLDER_TYPE, OPERATION } from '../../enums/common.enum'; -import { CustomProperty } from '../../generated/entity/type'; -import { columnSorter, getEntityName } from '../../utils/EntityUtils'; -import RichTextEditorPreviewer from '../common/RichTextEditor/RichTextEditorPreviewer'; -import ConfirmationModal from '../Modals/ConfirmationModal/ConfirmationModal'; -import { ModalWithMarkdownEditor } from '../Modals/ModalWithMarkdownEditor/ModalWithMarkdownEditor'; +import { ReactComponent as IconEdit } from '../../../assets/svg/edit-new.svg'; +import { ReactComponent as IconDelete } from '../../../assets/svg/ic-delete.svg'; +import { ADD_CUSTOM_PROPERTIES_DOCS } from '../../../constants/docs.constants'; +import { NO_PERMISSION_FOR_ACTION } from '../../../constants/HelperTextUtil'; +import { ERROR_PLACEHOLDER_TYPE, OPERATION } from '../../../enums/common.enum'; +import { CustomProperty } from '../../../generated/entity/type'; +import { columnSorter, getEntityName } from '../../../utils/EntityUtils'; +import ErrorPlaceHolder from '../../common/ErrorWithPlaceholder/ErrorPlaceHolder'; +import RichTextEditorPreviewer from '../../common/RichTextEditor/RichTextEditorPreviewer'; +import Table from '../../common/Table/Table'; +import ConfirmationModal from '../../Modals/ConfirmationModal/ConfirmationModal'; +import { ModalWithMarkdownEditor } from '../../Modals/ModalWithMarkdownEditor/ModalWithMarkdownEditor'; import { CustomPropertyTableProp } from './CustomPropertyTable.interface'; export const CustomPropertyTable: FC = ({ diff --git a/openmetadata-ui/src/main/resources/ui/src/components/EmailConfigForm/EmailConfigForm.component.tsx b/openmetadata-ui/src/main/resources/ui/src/components/Settings/Email/EmailConfigForm/EmailConfigForm.component.tsx similarity index 94% rename from openmetadata-ui/src/main/resources/ui/src/components/EmailConfigForm/EmailConfigForm.component.tsx rename to openmetadata-ui/src/main/resources/ui/src/components/Settings/Email/EmailConfigForm/EmailConfigForm.component.tsx index da8ec3be0cd3..db7a457c7422 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/EmailConfigForm/EmailConfigForm.component.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/components/Settings/Email/EmailConfigForm/EmailConfigForm.component.tsx @@ -14,9 +14,9 @@ import { Button, Col, Form, Input, Row, Select, Switch } from 'antd'; import React, { FocusEvent } from 'react'; import { useTranslation } from 'react-i18next'; -import { VALIDATION_MESSAGES } from '../../constants/constants'; -import { TRANSPORTATION_STRATEGY_OPTIONS } from '../../constants/EmailConfig.constants'; -import { SMTPSettings } from '../../generated/email/smtpSettings'; +import { VALIDATION_MESSAGES } from '../../../../constants/constants'; +import { TRANSPORTATION_STRATEGY_OPTIONS } from '../../../../constants/EmailConfig.constants'; +import { SMTPSettings } from '../../../../generated/email/smtpSettings'; interface EmailConfigFormProps { emailConfigValues?: SMTPSettings; diff --git a/openmetadata-ui/src/main/resources/ui/src/components/TestEmail/TestEmail.component.tsx b/openmetadata-ui/src/main/resources/ui/src/components/Settings/Email/TestEmail/TestEmail.component.tsx similarity index 90% rename from openmetadata-ui/src/main/resources/ui/src/components/TestEmail/TestEmail.component.tsx rename to openmetadata-ui/src/main/resources/ui/src/components/Settings/Email/TestEmail/TestEmail.component.tsx index 734ef8eb4697..823103022a1a 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/TestEmail/TestEmail.component.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/components/Settings/Email/TestEmail/TestEmail.component.tsx @@ -14,9 +14,9 @@ import { Form, FormProps, Input, Modal } from 'antd'; import { AxiosError } from 'axios'; import React from 'react'; import { useTranslation } from 'react-i18next'; -import { VALIDATION_MESSAGES } from '../../constants/constants'; -import { testEmailConnection } from '../../rest/settingConfigAPI'; -import { showErrorToast, showSuccessToast } from '../../utils/ToastUtils'; +import { VALIDATION_MESSAGES } from '../../../../constants/constants'; +import { testEmailConnection } from '../../../../rest/settingConfigAPI'; +import { showErrorToast, showSuccessToast } from '../../../../utils/ToastUtils'; interface TesEmailProps { onCancel: () => void; diff --git a/openmetadata-ui/src/main/resources/ui/src/components/TestEmail/TestEmail.test.tsx b/openmetadata-ui/src/main/resources/ui/src/components/Settings/Email/TestEmail/TestEmail.test.tsx similarity index 94% rename from openmetadata-ui/src/main/resources/ui/src/components/TestEmail/TestEmail.test.tsx rename to openmetadata-ui/src/main/resources/ui/src/components/Settings/Email/TestEmail/TestEmail.test.tsx index 765110b6a72f..2135cf5a265c 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/TestEmail/TestEmail.test.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/components/Settings/Email/TestEmail/TestEmail.test.tsx @@ -13,14 +13,14 @@ import { act, fireEvent, render, screen } from '@testing-library/react'; import React from 'react'; -import { testEmailConnection } from '../../rest/settingConfigAPI'; +import { testEmailConnection } from '../../../../rest/settingConfigAPI'; import TestEmail from './TestEmail.component'; -jest.mock('../../rest/settingConfigAPI', () => ({ +jest.mock('../../../../rest/settingConfigAPI', () => ({ testEmailConnection: jest.fn().mockImplementation(() => Promise.resolve()), })); -jest.mock('../../utils/ToastUtils', () => ({ +jest.mock('../../../../utils/ToastUtils', () => ({ showErrorToast: jest.fn(), showSuccessToast: jest.fn(), })); diff --git a/openmetadata-ui/src/main/resources/ui/src/components/AddIngestion/AddIngestion.component.tsx b/openmetadata-ui/src/main/resources/ui/src/components/Settings/Services/AddIngestion/AddIngestion.component.tsx similarity index 90% rename from openmetadata-ui/src/main/resources/ui/src/components/AddIngestion/AddIngestion.component.tsx rename to openmetadata-ui/src/main/resources/ui/src/components/Settings/Services/AddIngestion/AddIngestion.component.tsx index 23960f7599ba..4073d6049e01 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/AddIngestion/AddIngestion.component.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/components/Settings/Services/AddIngestion/AddIngestion.component.tsx @@ -15,24 +15,23 @@ import { Form, Input, Typography } from 'antd'; import { isEmpty, isUndefined, omit, trim } from 'lodash'; import React, { useMemo, useState } from 'react'; import { useTranslation } from 'react-i18next'; -import IngestionWorkflowForm from '../../components/IngestionWorkflowForm/IngestionWorkflowForm'; -import { STEPS_FOR_ADD_INGESTION } from '../../constants/Ingestions.constant'; -import { LOADING_STATE } from '../../enums/common.enum'; -import { FormSubmitType } from '../../enums/form.enum'; +import { STEPS_FOR_ADD_INGESTION } from '../../../../constants/Ingestions.constant'; +import { LOADING_STATE } from '../../../../enums/common.enum'; +import { FormSubmitType } from '../../../../enums/form.enum'; import { CreateIngestionPipeline, LogLevels, PipelineType, -} from '../../generated/api/services/ingestionPipelines/createIngestionPipeline'; -import { IngestionPipeline } from '../../generated/entity/services/ingestionPipelines/ingestionPipeline'; - -import { IngestionWorkflowData } from '../../interface/service.interface'; -import { getIngestionFrequency } from '../../utils/CommonUtils'; -import { getIngestionName } from '../../utils/ServiceUtils'; -import { useAuthContext } from '../Auth/AuthProviders/AuthProvider'; -import SuccessScreen from '../common/SuccessScreen/SuccessScreen'; -import IngestionStepper from '../IngestionStepper/IngestionStepper.component'; -import DeployIngestionLoaderModal from '../Modals/DeployIngestionLoaderModal/DeployIngestionLoaderModal'; +} from '../../../../generated/api/services/ingestionPipelines/createIngestionPipeline'; +import { IngestionPipeline } from '../../../../generated/entity/services/ingestionPipelines/ingestionPipeline'; +import { IngestionWorkflowData } from '../../../../interface/service.interface'; +import { getIngestionFrequency } from '../../../../utils/CommonUtils'; +import { getIngestionName } from '../../../../utils/ServiceUtils'; +import { useAuthContext } from '../../../Auth/AuthProviders/AuthProvider'; +import SuccessScreen from '../../../common/SuccessScreen/SuccessScreen'; +import DeployIngestionLoaderModal from '../../../Modals/DeployIngestionLoaderModal/DeployIngestionLoaderModal'; +import IngestionStepper from '../Ingestion/IngestionStepper/IngestionStepper.component'; +import IngestionWorkflowForm from '../Ingestion/IngestionWorkflowForm/IngestionWorkflowForm'; import { AddIngestionProps, WorkflowExtraConfig, diff --git a/openmetadata-ui/src/main/resources/ui/src/components/AddIngestion/AddIngestion.test.tsx b/openmetadata-ui/src/main/resources/ui/src/components/Settings/Services/AddIngestion/AddIngestion.test.tsx similarity index 81% rename from openmetadata-ui/src/main/resources/ui/src/components/AddIngestion/AddIngestion.test.tsx rename to openmetadata-ui/src/main/resources/ui/src/components/Settings/Services/AddIngestion/AddIngestion.test.tsx index ea47ef257aaa..a4c6230fa7d0 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/AddIngestion/AddIngestion.test.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/components/Settings/Services/AddIngestion/AddIngestion.test.tsx @@ -13,9 +13,9 @@ import { findByTestId, findByText, render } from '@testing-library/react'; import React from 'react'; -import { FormSubmitType } from '../../enums/form.enum'; -import { ServiceCategory } from '../../enums/service.enum'; -import { PipelineType } from '../../generated/entity/services/ingestionPipelines/ingestionPipeline'; +import { FormSubmitType } from '../../../../enums/form.enum'; +import { ServiceCategory } from '../../../../enums/service.enum'; +import { PipelineType } from '../../../../generated/entity/services/ingestionPipelines/ingestionPipeline'; import AddIngestion from './AddIngestion.component'; import { AddIngestionProps } from './IngestionWorkflow.interface'; @@ -45,18 +45,13 @@ jest.mock('@rjsf/core', () => ({ Form: jest.fn().mockImplementation(() =>
RJSF_Form.component
), })); -jest.mock('../IngestionStepper/IngestionStepper.component', () => { +jest.mock('../Ingestion/IngestionStepper/IngestionStepper.component', () => { return jest.fn().mockImplementation(() =>
IngestionStepper
); }); -jest.mock( - '../../components/IngestionWorkflowForm/IngestionWorkflowForm', - () => { - return jest - .fn() - .mockImplementation(() =>
Ingestion workflow form
); - } -); +jest.mock('../Ingestion/IngestionWorkflowForm/IngestionWorkflowForm', () => { + return jest.fn().mockImplementation(() =>
Ingestion workflow form
); +}); describe('Test AddIngestion component', () => { it('AddIngestion component should render', async () => { diff --git a/openmetadata-ui/src/main/resources/ui/src/components/AddIngestion/IngestionWorkflow.interface.ts b/openmetadata-ui/src/main/resources/ui/src/components/Settings/Services/AddIngestion/IngestionWorkflow.interface.ts similarity index 86% rename from openmetadata-ui/src/main/resources/ui/src/components/AddIngestion/IngestionWorkflow.interface.ts rename to openmetadata-ui/src/main/resources/ui/src/components/Settings/Services/AddIngestion/IngestionWorkflow.interface.ts index 51f33d770bb5..150abac95dff 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/AddIngestion/IngestionWorkflow.interface.ts +++ b/openmetadata-ui/src/main/resources/ui/src/components/Settings/Services/AddIngestion/IngestionWorkflow.interface.ts @@ -13,13 +13,13 @@ import { LoadingState, ServicesUpdateRequest } from 'Models'; import { ReactNode } from 'react'; -import { FormSubmitType } from '../../enums/form.enum'; -import { ServiceCategory } from '../../enums/service.enum'; -import { CreateIngestionPipeline } from '../../generated/api/services/ingestionPipelines/createIngestionPipeline'; +import { FormSubmitType } from '../../../../enums/form.enum'; +import { ServiceCategory } from '../../../../enums/service.enum'; +import { CreateIngestionPipeline } from '../../../../generated/api/services/ingestionPipelines/createIngestionPipeline'; import { IngestionPipeline, PipelineType, -} from '../../generated/entity/services/ingestionPipelines/ingestionPipeline'; +} from '../../../../generated/entity/services/ingestionPipelines/ingestionPipeline'; export interface AddIngestionProps { activeIngestionStep: number; diff --git a/openmetadata-ui/src/main/resources/ui/src/components/AddIngestion/Steps/ScheduleInterval.test.tsx b/openmetadata-ui/src/main/resources/ui/src/components/Settings/Services/AddIngestion/Steps/ScheduleInterval.test.tsx similarity index 96% rename from openmetadata-ui/src/main/resources/ui/src/components/AddIngestion/Steps/ScheduleInterval.test.tsx rename to openmetadata-ui/src/main/resources/ui/src/components/Settings/Services/AddIngestion/Steps/ScheduleInterval.test.tsx index 6621fc0cce93..79fbf5aff878 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/AddIngestion/Steps/ScheduleInterval.test.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/components/Settings/Services/AddIngestion/Steps/ScheduleInterval.test.tsx @@ -16,7 +16,7 @@ import React from 'react'; import { ScheduleIntervalProps } from '../IngestionWorkflow.interface'; import ScheduleInterval from './ScheduleInterval'; -jest.mock('../../common/CronEditor/CronEditor', () => { +jest.mock('../../../../common/CronEditor/CronEditor', () => { return jest.fn().mockImplementation(() =>
CronEditor.component
); }); diff --git a/openmetadata-ui/src/main/resources/ui/src/components/AddIngestion/Steps/ScheduleInterval.tsx b/openmetadata-ui/src/main/resources/ui/src/components/Settings/Services/AddIngestion/Steps/ScheduleInterval.tsx similarity index 94% rename from openmetadata-ui/src/main/resources/ui/src/components/AddIngestion/Steps/ScheduleInterval.tsx rename to openmetadata-ui/src/main/resources/ui/src/components/Settings/Services/AddIngestion/Steps/ScheduleInterval.tsx index a6738cbe347a..03d72678beba 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/AddIngestion/Steps/ScheduleInterval.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/components/Settings/Services/AddIngestion/Steps/ScheduleInterval.tsx @@ -15,8 +15,8 @@ import { CheckOutlined } from '@ant-design/icons'; import { Button, Col, Form } from 'antd'; import React from 'react'; import { useTranslation } from 'react-i18next'; -import { LOADING_STATE } from '../../../enums/common.enum'; -import CronEditor from '../../common/CronEditor/CronEditor'; +import { LOADING_STATE } from '../../../../../enums/common.enum'; +import CronEditor from '../../../../common/CronEditor/CronEditor'; import { ScheduleIntervalProps } from '../IngestionWorkflow.interface'; const ScheduleInterval = ({ diff --git a/openmetadata-ui/src/main/resources/ui/src/components/AddService/AddService.component.tsx b/openmetadata-ui/src/main/resources/ui/src/components/Settings/Services/AddService/AddService.component.tsx similarity index 87% rename from openmetadata-ui/src/main/resources/ui/src/components/AddService/AddService.component.tsx rename to openmetadata-ui/src/main/resources/ui/src/components/Settings/Services/AddService/AddService.component.tsx index bcc4a2a37200..ed675f3a633f 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/AddService/AddService.component.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/components/Settings/Services/AddService/AddService.component.tsx @@ -18,33 +18,36 @@ import { capitalize, isEmpty, isUndefined } from 'lodash'; import { LoadingState } from 'Models'; import React, { useEffect, useState } from 'react'; import { useHistory } from 'react-router-dom'; -import ResizablePanels from '../../components/common/ResizablePanels/ResizablePanels'; -import { HTTP_STATUS_CODE } from '../../constants/Auth.constants'; -import { getServiceDetailsPath } from '../../constants/constants'; -import { GlobalSettingsMenuCategory } from '../../constants/GlobalSettings.constants'; +import { HTTP_STATUS_CODE } from '../../../../constants/Auth.constants'; +import { getServiceDetailsPath } from '../../../../constants/constants'; +import { GlobalSettingsMenuCategory } from '../../../../constants/GlobalSettings.constants'; import { SERVICE_DEFAULT_ERROR_MAP, STEPS_FOR_ADD_SERVICE, -} from '../../constants/Services.constant'; -import { FormSubmitType } from '../../enums/form.enum'; -import { ServiceCategory } from '../../enums/service.enum'; -import { PipelineType } from '../../generated/entity/services/ingestionPipelines/ingestionPipeline'; -import { useAirflowStatus } from '../../hooks/useAirflowStatus'; -import { ConfigData } from '../../interface/service.interface'; -import { getServiceLogo } from '../../utils/CommonUtils'; -import { getAddServicePath, getSettingPath } from '../../utils/RouterUtils'; +} from '../../../../constants/Services.constant'; +import { FormSubmitType } from '../../../../enums/form.enum'; +import { ServiceCategory } from '../../../../enums/service.enum'; +import { PipelineType } from '../../../../generated/entity/services/ingestionPipelines/ingestionPipeline'; +import { useAirflowStatus } from '../../../../hooks/useAirflowStatus'; +import { ConfigData } from '../../../../interface/service.interface'; +import { getServiceLogo } from '../../../../utils/CommonUtils'; +import { + getAddServicePath, + getSettingPath, +} from '../../../../utils/RouterUtils'; import { getServiceCreatedLabel, getServiceRouteFromServiceType, getServiceType, -} from '../../utils/ServiceUtils'; -import { showErrorToast } from '../../utils/ToastUtils'; +} from '../../../../utils/ServiceUtils'; +import { showErrorToast } from '../../../../utils/ToastUtils'; +import { useAuthContext } from '../../../Auth/AuthProviders/AuthProvider'; +import ResizablePanels from '../../../common/ResizablePanels/ResizablePanels'; +import ServiceDocPanel from '../../../common/ServiceDocPanel/ServiceDocPanel'; +import SuccessScreen from '../../../common/SuccessScreen/SuccessScreen'; +import TitleBreadcrumb from '../../../common/TitleBreadcrumb/TitleBreadcrumb.component'; import AddIngestion from '../AddIngestion/AddIngestion.component'; -import { useAuthContext } from '../Auth/AuthProviders/AuthProvider'; -import ServiceDocPanel from '../common/ServiceDocPanel/ServiceDocPanel'; -import SuccessScreen from '../common/SuccessScreen/SuccessScreen'; -import TitleBreadcrumb from '../common/TitleBreadcrumb/TitleBreadcrumb.component'; -import IngestionStepper from '../IngestionStepper/IngestionStepper.component'; +import IngestionStepper from '../Ingestion/IngestionStepper/IngestionStepper.component'; import ConnectionConfigForm from '../ServiceConfig/ConnectionConfigForm'; import { AddServiceProps, ServiceConfig } from './AddService.interface'; import ConfigureService from './Steps/ConfigureService'; diff --git a/openmetadata-ui/src/main/resources/ui/src/components/AddService/AddService.interface.ts b/openmetadata-ui/src/main/resources/ui/src/components/Settings/Services/AddService/AddService.interface.ts similarity index 77% rename from openmetadata-ui/src/main/resources/ui/src/components/AddService/AddService.interface.ts rename to openmetadata-ui/src/main/resources/ui/src/components/Settings/Services/AddService/AddService.interface.ts index 508568a659e5..cd2c08b4514b 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/AddService/AddService.interface.ts +++ b/openmetadata-ui/src/main/resources/ui/src/components/Settings/Services/AddService/AddService.interface.ts @@ -11,10 +11,10 @@ * limitations under the License. */ -import { ServiceCategory } from '../../enums/service.enum'; -import { CreateIngestionPipeline } from '../../generated/api/services/ingestionPipelines/createIngestionPipeline'; -import { DataObj } from '../../interface/service.interface'; -import { TitleBreadcrumbProps } from '../common/TitleBreadcrumb/TitleBreadcrumb.interface'; +import { ServiceCategory } from '../../../../enums/service.enum'; +import { CreateIngestionPipeline } from '../../../../generated/api/services/ingestionPipelines/createIngestionPipeline'; +import { DataObj } from '../../../../interface/service.interface'; +import { TitleBreadcrumbProps } from '../../../common/TitleBreadcrumb/TitleBreadcrumb.interface'; export interface AddServiceProps { serviceCategory: ServiceCategory; diff --git a/openmetadata-ui/src/main/resources/ui/src/components/AddService/AddService.test.tsx b/openmetadata-ui/src/main/resources/ui/src/components/Settings/Services/AddService/AddService.test.tsx similarity index 84% rename from openmetadata-ui/src/main/resources/ui/src/components/AddService/AddService.test.tsx rename to openmetadata-ui/src/main/resources/ui/src/components/Settings/Services/AddService/AddService.test.tsx index b98bc50305d2..b80d1f8cd96c 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/AddService/AddService.test.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/components/Settings/Services/AddService/AddService.test.tsx @@ -13,7 +13,7 @@ import { findByTestId, render } from '@testing-library/react'; import React from 'react'; -import { ServiceCategory } from '../../enums/service.enum'; +import { ServiceCategory } from '../../../../enums/service.enum'; import AddService from './AddService.component'; jest.mock('react-router-dom', () => ({ @@ -24,23 +24,24 @@ jest.mock('../AddIngestion/AddIngestion.component', () => () => ( <>AddIngestion )); -jest.mock('../common/TitleBreadcrumb/TitleBreadcrumb.component', () => () => ( - <>TitleBreadcrumb.component -)); +jest.mock( + '../../../common/TitleBreadcrumb/TitleBreadcrumb.component', + () => () => <>TitleBreadcrumb.component +); jest.mock('../ServiceConfig/ConnectionConfigForm', () => () => ( <>ConnectionConfigForm )); -jest.mock('../IngestionStepper/IngestionStepper.component', () => { +jest.mock('../Ingestion/IngestionStepper/IngestionStepper.component', () => { return jest.fn().mockImplementation(() =>
IngestionStepper
); }); -jest.mock('../common/ServiceDocPanel/ServiceDocPanel', () => { +jest.mock('../../../common/ServiceDocPanel/ServiceDocPanel', () => { return jest.fn().mockReturnValue(
ServiceDocPanel
); }); -jest.mock('../../components/common/ResizablePanels/ResizablePanels', () => +jest.mock('../../..//common/ResizablePanels/ResizablePanels', () => jest.fn().mockImplementation(({ firstPanel, secondPanel }) => ( <>
{firstPanel.children}
diff --git a/openmetadata-ui/src/main/resources/ui/src/components/AddService/Steps/ConfigureService.test.tsx b/openmetadata-ui/src/main/resources/ui/src/components/Settings/Services/AddService/Steps/ConfigureService.test.tsx similarity index 100% rename from openmetadata-ui/src/main/resources/ui/src/components/AddService/Steps/ConfigureService.test.tsx rename to openmetadata-ui/src/main/resources/ui/src/components/Settings/Services/AddService/Steps/ConfigureService.test.tsx diff --git a/openmetadata-ui/src/main/resources/ui/src/components/AddService/Steps/ConfigureService.tsx b/openmetadata-ui/src/main/resources/ui/src/components/Settings/Services/AddService/Steps/ConfigureService.tsx similarity index 90% rename from openmetadata-ui/src/main/resources/ui/src/components/AddService/Steps/ConfigureService.tsx rename to openmetadata-ui/src/main/resources/ui/src/components/Settings/Services/AddService/Steps/ConfigureService.tsx index 03943de3e7ea..880efe9c1099 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/AddService/Steps/ConfigureService.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/components/Settings/Services/AddService/Steps/ConfigureService.tsx @@ -14,9 +14,12 @@ import { Button, Form, FormProps, Space } from 'antd'; import { t } from 'i18next'; import React from 'react'; -import { ENTITY_NAME_REGEX } from '../../../constants/regex.constants'; -import { FieldProp, FieldTypes } from '../../../interface/FormUtils.interface'; -import { generateFormFields } from '../../../utils/formUtils'; +import { ENTITY_NAME_REGEX } from '../../../../../constants/regex.constants'; +import { + FieldProp, + FieldTypes, +} from '../../../../../interface/FormUtils.interface'; +import { generateFormFields } from '../../../../../utils/formUtils'; import { ConfigureServiceProps } from './Steps.interface'; const ConfigureService = ({ diff --git a/openmetadata-ui/src/main/resources/ui/src/components/AddService/Steps/SelectServiceType.test.tsx b/openmetadata-ui/src/main/resources/ui/src/components/Settings/Services/AddService/Steps/SelectServiceType.test.tsx similarity index 96% rename from openmetadata-ui/src/main/resources/ui/src/components/AddService/Steps/SelectServiceType.test.tsx rename to openmetadata-ui/src/main/resources/ui/src/components/Settings/Services/AddService/Steps/SelectServiceType.test.tsx index f391c3b78647..59c798cb6f89 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/AddService/Steps/SelectServiceType.test.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/components/Settings/Services/AddService/Steps/SelectServiceType.test.tsx @@ -13,7 +13,7 @@ import { findByTestId, render } from '@testing-library/react'; import React from 'react'; -import { ServiceCategory } from '../../../enums/service.enum'; +import { ServiceCategory } from '../../../../../enums/service.enum'; import SelectServiceType from './SelectServiceType'; import { SelectServiceTypeProps } from './Steps.interface'; diff --git a/openmetadata-ui/src/main/resources/ui/src/components/AddService/Steps/SelectServiceType.tsx b/openmetadata-ui/src/main/resources/ui/src/components/Settings/Services/AddService/Steps/SelectServiceType.tsx similarity index 86% rename from openmetadata-ui/src/main/resources/ui/src/components/AddService/Steps/SelectServiceType.tsx rename to openmetadata-ui/src/main/resources/ui/src/components/Settings/Services/AddService/Steps/SelectServiceType.tsx index 797fc5a3e7d6..67148b2f1659 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/AddService/Steps/SelectServiceType.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/components/Settings/Services/AddService/Steps/SelectServiceType.tsx @@ -17,21 +17,21 @@ import classNames from 'classnames'; import { startCase } from 'lodash'; import React, { useEffect, useMemo, useState } from 'react'; import { useTranslation } from 'react-i18next'; -import { ReactComponent as IconCheckboxPrimary } from '../../../assets/svg/checkbox-primary.svg'; -import { PRIMERY_COLOR } from '../../../constants/constants'; +import { ReactComponent as IconCheckboxPrimary } from '../../../../../assets/svg/checkbox-primary.svg'; +import { PRIMERY_COLOR } from '../../../../../constants/constants'; import { BETA_SERVICES, excludedService, SERVICE_CATEGORY_OPTIONS, -} from '../../../constants/Services.constant'; -import { ServiceCategory } from '../../../enums/service.enum'; -import { DatabaseServiceType } from '../../../generated/entity/data/database'; -import { MetadataServiceType } from '../../../generated/entity/services/metadataService'; -import { MlModelServiceType } from '../../../generated/entity/services/mlmodelService'; -import { PipelineServiceType } from '../../../generated/entity/services/pipelineService'; -import { errorMsg, getServiceLogo } from '../../../utils/CommonUtils'; -import ServiceUtilClassBase from '../../../utils/ServiceUtilClassBase'; -import Searchbar from '../../common/SearchBarComponent/SearchBar.component'; +} from '../../../../../constants/Services.constant'; +import { ServiceCategory } from '../../../../../enums/service.enum'; +import { DatabaseServiceType } from '../../../../../generated/entity/data/database'; +import { MetadataServiceType } from '../../../../../generated/entity/services/metadataService'; +import { MlModelServiceType } from '../../../../../generated/entity/services/mlmodelService'; +import { PipelineServiceType } from '../../../../../generated/entity/services/pipelineService'; +import { errorMsg, getServiceLogo } from '../../../../../utils/CommonUtils'; +import ServiceUtilClassBase from '../../../../../utils/ServiceUtilClassBase'; +import Searchbar from '../../../../common/SearchBarComponent/SearchBar.component'; import './select-service-type.less'; import { SelectServiceTypeProps } from './Steps.interface'; diff --git a/openmetadata-ui/src/main/resources/ui/src/components/AddService/Steps/Steps.interface.ts b/openmetadata-ui/src/main/resources/ui/src/components/Settings/Services/AddService/Steps/Steps.interface.ts similarity index 96% rename from openmetadata-ui/src/main/resources/ui/src/components/AddService/Steps/Steps.interface.ts rename to openmetadata-ui/src/main/resources/ui/src/components/Settings/Services/AddService/Steps/Steps.interface.ts index 9f5c3e0e919e..d2a64de36b49 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/AddService/Steps/Steps.interface.ts +++ b/openmetadata-ui/src/main/resources/ui/src/components/Settings/Services/AddService/Steps/Steps.interface.ts @@ -12,7 +12,7 @@ */ import { DynamicFormFieldType } from 'Models'; -import { ServiceCategory } from '../../../enums/service.enum'; +import { ServiceCategory } from '../../../../../enums/service.enum'; import { ServiceConfig } from '../AddService.interface'; export type SelectServiceTypeProps = { diff --git a/openmetadata-ui/src/main/resources/ui/src/components/AddService/Steps/select-service-type.less b/openmetadata-ui/src/main/resources/ui/src/components/Settings/Services/AddService/Steps/select-service-type.less similarity index 93% rename from openmetadata-ui/src/main/resources/ui/src/components/AddService/Steps/select-service-type.less rename to openmetadata-ui/src/main/resources/ui/src/components/Settings/Services/AddService/Steps/select-service-type.less index 7082e768a7ec..b9a8cfc85aed 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/AddService/Steps/select-service-type.less +++ b/openmetadata-ui/src/main/resources/ui/src/components/Settings/Services/AddService/Steps/select-service-type.less @@ -10,7 +10,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -@import (reference) url('../../../styles/antd-master.less'); +@import (reference) url('../../../../../styles/antd-master.less'); .service-list-container { display: flex; diff --git a/openmetadata-ui/src/main/resources/ui/src/components/Ingestion/AddIngestionButton.component.tsx b/openmetadata-ui/src/main/resources/ui/src/components/Settings/Services/Ingestion/AddIngestionButton.component.tsx similarity index 89% rename from openmetadata-ui/src/main/resources/ui/src/components/Ingestion/AddIngestionButton.component.tsx rename to openmetadata-ui/src/main/resources/ui/src/components/Settings/Services/Ingestion/AddIngestionButton.component.tsx index 5fe596ed834d..0f193feb56d6 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/Ingestion/AddIngestionButton.component.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/components/Settings/Services/Ingestion/AddIngestionButton.component.tsx @@ -15,16 +15,16 @@ import { Button, Dropdown, Space } from 'antd'; import classNames from 'classnames'; import React, { useCallback, useMemo } from 'react'; import { useHistory } from 'react-router-dom'; -import { ReactComponent as DropdownIcon } from '../../assets/svg/drop-down.svg'; -import { MetadataServiceType } from '../../generated/api/services/createMetadataService'; -import { PipelineType } from '../../generated/entity/services/ingestionPipelines/ingestionPipeline'; +import { ReactComponent as DropdownIcon } from '../../../../assets/svg/drop-down.svg'; +import { MetadataServiceType } from '../../../../generated/api/services/createMetadataService'; +import { PipelineType } from '../../../../generated/entity/services/ingestionPipelines/ingestionPipeline'; import { getIngestionButtonText, getIngestionTypes, getMenuItems, getSupportedPipelineTypes, -} from '../../utils/IngestionUtils'; -import { getAddIngestionPath } from '../../utils/RouterUtils'; +} from '../../../../utils/IngestionUtils'; +import { getAddIngestionPath } from '../../../../utils/RouterUtils'; import { AddIngestionButtonProps } from './AddIngestionButton.interface'; function AddIngestionButton({ diff --git a/openmetadata-ui/src/main/resources/ui/src/components/Ingestion/AddIngestionButton.interface.ts b/openmetadata-ui/src/main/resources/ui/src/components/Settings/Services/Ingestion/AddIngestionButton.interface.ts similarity index 65% rename from openmetadata-ui/src/main/resources/ui/src/components/Ingestion/AddIngestionButton.interface.ts rename to openmetadata-ui/src/main/resources/ui/src/components/Settings/Services/Ingestion/AddIngestionButton.interface.ts index bc94c2eff469..828e0d16210c 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/Ingestion/AddIngestionButton.interface.ts +++ b/openmetadata-ui/src/main/resources/ui/src/components/Settings/Services/Ingestion/AddIngestionButton.interface.ts @@ -11,11 +11,11 @@ * limitations under the License. */ -import { ServiceCategory } from '../../enums/service.enum'; -import { PipelineType } from '../../generated/api/services/ingestionPipelines/createIngestionPipeline'; -import { IngestionPipeline } from '../../generated/entity/services/ingestionPipelines/ingestionPipeline'; -import { ServicesType } from '../../interface/service.interface'; -import { OperationPermission } from '../PermissionProvider/PermissionProvider.interface'; +import { OperationPermission } from '../../../../context/PermissionProvider/PermissionProvider.interface'; +import { ServiceCategory } from '../../../../enums/service.enum'; +import { PipelineType } from '../../../../generated/api/services/ingestionPipelines/createIngestionPipeline'; +import { IngestionPipeline } from '../../../../generated/entity/services/ingestionPipelines/ingestionPipeline'; +import { ServicesType } from '../../../../interface/service.interface'; export interface AddIngestionButtonProps { serviceDetails: ServicesType; diff --git a/openmetadata-ui/src/main/resources/ui/src/components/Ingestion/Ingestion.component.tsx b/openmetadata-ui/src/main/resources/ui/src/components/Settings/Services/Ingestion/Ingestion.component.tsx similarity index 90% rename from openmetadata-ui/src/main/resources/ui/src/components/Ingestion/Ingestion.component.tsx rename to openmetadata-ui/src/main/resources/ui/src/components/Settings/Services/Ingestion/Ingestion.component.tsx index 651aff05bfaf..1f0a2514100f 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/Ingestion/Ingestion.component.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/components/Settings/Services/Ingestion/Ingestion.component.tsx @@ -17,19 +17,19 @@ import classNames from 'classnames'; import { isEmpty, isUndefined, lowerCase } from 'lodash'; import React, { useCallback, useEffect, useMemo, useState } from 'react'; import { useTranslation } from 'react-i18next'; -import ErrorPlaceHolderIngestion from '../../components/common/ErrorWithPlaceholder/ErrorPlaceHolderIngestion'; -import { DISABLED } from '../../constants/constants'; -import { IngestionPipeline } from '../../generated/entity/services/ingestionPipelines/ingestionPipeline'; -import { useAirflowStatus } from '../../hooks/useAirflowStatus'; -import { showErrorToast } from '../../utils/ToastUtils'; -import Searchbar from '../common/SearchBarComponent/SearchBar.component'; -import EntityDeleteModal from '../Modals/EntityDeleteModal/EntityDeleteModal'; -import { usePermissionProvider } from '../PermissionProvider/PermissionProvider'; +import { DISABLED } from '../../../../constants/constants'; +import { usePermissionProvider } from '../../../../context/PermissionProvider/PermissionProvider'; import { IngestionServicePermission, ResourceEntity, -} from '../PermissionProvider/PermissionProvider.interface'; -import ButtonSkeleton from '../Skeleton/CommonSkeletons/ControlElements/ControlElements.component'; +} from '../../../../context/PermissionProvider/PermissionProvider.interface'; +import { IngestionPipeline } from '../../../../generated/entity/services/ingestionPipelines/ingestionPipeline'; +import { useAirflowStatus } from '../../../../hooks/useAirflowStatus'; +import { showErrorToast } from '../../../../utils/ToastUtils'; +import ErrorPlaceHolderIngestion from '../../../common/ErrorWithPlaceholder/ErrorPlaceHolderIngestion'; +import Searchbar from '../../../common/SearchBarComponent/SearchBar.component'; +import ButtonSkeleton from '../../../common/Skeleton/CommonSkeletons/ControlElements/ControlElements.component'; +import EntityDeleteModal from '../../../Modals/EntityDeleteModal/EntityDeleteModal'; import AddIngestionButton from './AddIngestionButton.component'; import { IngestionProps, SelectedRowDetails } from './ingestion.interface'; import IngestionListTable from './IngestionListTable.component'; diff --git a/openmetadata-ui/src/main/resources/ui/src/components/Ingestion/Ingestion.mock.ts b/openmetadata-ui/src/main/resources/ui/src/components/Settings/Services/Ingestion/Ingestion.mock.ts similarity index 98% rename from openmetadata-ui/src/main/resources/ui/src/components/Ingestion/Ingestion.mock.ts rename to openmetadata-ui/src/main/resources/ui/src/components/Settings/Services/Ingestion/Ingestion.mock.ts index 78fa2d8be49b..44a42661341d 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/Ingestion/Ingestion.mock.ts +++ b/openmetadata-ui/src/main/resources/ui/src/components/Settings/Services/Ingestion/Ingestion.mock.ts @@ -11,7 +11,7 @@ * limitations under the License. */ -import { ServicesType } from '../../interface/service.interface'; +import { ServicesType } from '../../../../interface/service.interface'; export const mockIngestionWorkFlow = { data: { diff --git a/openmetadata-ui/src/main/resources/ui/src/components/Ingestion/Ingestion.test.tsx b/openmetadata-ui/src/main/resources/ui/src/components/Settings/Services/Ingestion/Ingestion.test.tsx similarity index 94% rename from openmetadata-ui/src/main/resources/ui/src/components/Ingestion/Ingestion.test.tsx rename to openmetadata-ui/src/main/resources/ui/src/components/Settings/Services/Ingestion/Ingestion.test.tsx index d2ab088ccc46..710f56499ed8 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/Ingestion/Ingestion.test.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/components/Settings/Services/Ingestion/Ingestion.test.tsx @@ -22,10 +22,10 @@ import { } from '@testing-library/react'; import React from 'react'; import { MemoryRouter } from 'react-router'; -import { ServiceCategory } from '../../enums/service.enum'; -import { IngestionPipeline } from '../../generated/entity/services/ingestionPipelines/ingestionPipeline'; -import { useAirflowStatus } from '../../hooks/useAirflowStatus'; -import { OperationPermission } from '../PermissionProvider/PermissionProvider.interface'; +import { OperationPermission } from '../../../../context/PermissionProvider/PermissionProvider.interface'; +import { ServiceCategory } from '../../../../enums/service.enum'; +import { IngestionPipeline } from '../../../../generated/entity/services/ingestionPipelines/ingestionPipeline'; +import { useAirflowStatus } from '../../../../hooks/useAirflowStatus'; import Ingestion from './Ingestion.component'; import { mockIngestionWorkFlow, mockService } from './Ingestion.mock'; @@ -69,16 +69,16 @@ const mockTriggerIngestion = jest .fn() .mockImplementation(() => Promise.resolve()); -jest.mock('../common/SearchBarComponent/SearchBar.component', () => { +jest.mock('../../../common/SearchBarComponent/SearchBar.component', () => { return jest.fn().mockImplementation(() =>
Searchbar
); }); -jest.mock('../Modals/EntityDeleteModal/EntityDeleteModal', () => { +jest.mock('../../../Modals/EntityDeleteModal/EntityDeleteModal', () => { return jest.fn().mockImplementation(() =>
EntityDeleteModal
); }); jest.mock( - '../Modals/KillIngestionPipelineModal/KillIngestionPipelineModal', + '../../../Modals/KillIngestionPipelineModal/KillIngestionPipelineModal', () => { return jest.fn().mockImplementation(() =>
KillIngestionModal
); } @@ -91,11 +91,11 @@ jest.mock('./IngestionRecentRun/IngestionRecentRuns.component', () => ({ })); jest.mock( - '../Skeleton/CommonSkeletons/ControlElements/ControlElements.component', + '../../../common/Skeleton/CommonSkeletons/ControlElements/ControlElements.component', () => jest.fn().mockImplementation(() =>
ButtonSkeleton
) ); -jest.mock('../../components/PermissionProvider/PermissionProvider', () => ({ +jest.mock('../../../../context/PermissionProvider/PermissionProvider', () => ({ usePermissionProvider: jest.fn().mockReturnValue({ getEntityPermissionByFqn: jest.fn().mockReturnValue({ Create: true, @@ -109,7 +109,7 @@ jest.mock('../../components/PermissionProvider/PermissionProvider', () => ({ }), })); -jest.mock('../../hooks/useAirflowStatus', () => ({ +jest.mock('../../../../hooks/useAirflowStatus', () => ({ useAirflowStatus: jest.fn(() => { return { isFetchingStatus: false, diff --git a/openmetadata-ui/src/main/resources/ui/src/components/Ingestion/IngestionListTable.component.tsx b/openmetadata-ui/src/main/resources/ui/src/components/Settings/Services/Ingestion/IngestionListTable.component.tsx similarity index 88% rename from openmetadata-ui/src/main/resources/ui/src/components/Ingestion/IngestionListTable.component.tsx rename to openmetadata-ui/src/main/resources/ui/src/components/Settings/Services/Ingestion/IngestionListTable.component.tsx index 7e6bf7d9d997..c5e2c702347d 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/Ingestion/IngestionListTable.component.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/components/Settings/Services/Ingestion/IngestionListTable.component.tsx @@ -16,16 +16,16 @@ import { ColumnsType } from 'antd/lib/table'; import cronstrue from 'cronstrue'; import React, { useCallback, useEffect, useMemo } from 'react'; import { useTranslation } from 'react-i18next'; -import Table from '../../components/common/Table/Table'; -import { DISABLED, NO_DATA_PLACEHOLDER } from '../../constants/constants'; -import { IngestionPipeline } from '../../generated/entity/services/ingestionPipelines/ingestionPipeline'; -import { usePaging } from '../../hooks/paging/usePaging'; -import { useAirflowStatus } from '../../hooks/useAirflowStatus'; -import { getEntityName } from '../../utils/EntityUtils'; -import { getErrorPlaceHolder } from '../../utils/IngestionUtils'; -import NextPrevious from '../common/NextPrevious/NextPrevious'; -import { PagingHandlerParams } from '../common/NextPrevious/NextPrevious.interface'; -import ButtonSkeleton from '../Skeleton/CommonSkeletons/ControlElements/ControlElements.component'; +import { DISABLED, NO_DATA_PLACEHOLDER } from '../../../../constants/constants'; +import { IngestionPipeline } from '../../../../generated/entity/services/ingestionPipelines/ingestionPipeline'; +import { usePaging } from '../../../../hooks/paging/usePaging'; +import { useAirflowStatus } from '../../../../hooks/useAirflowStatus'; +import { getEntityName } from '../../../../utils/EntityUtils'; +import { getErrorPlaceHolder } from '../../../../utils/IngestionUtils'; +import NextPrevious from '../../../common/NextPrevious/NextPrevious'; +import { PagingHandlerParams } from '../../../common/NextPrevious/NextPrevious.interface'; +import ButtonSkeleton from '../../../common/Skeleton/CommonSkeletons/ControlElements/ControlElements.component'; +import Table from '../../../common/Table/Table'; import { IngestionListTableProps } from './IngestionListTable.interface'; import { IngestionRecentRuns } from './IngestionRecentRun/IngestionRecentRuns.component'; import PipelineActions from './PipelineActions.component'; diff --git a/openmetadata-ui/src/main/resources/ui/src/components/Ingestion/IngestionListTable.interface.ts b/openmetadata-ui/src/main/resources/ui/src/components/Settings/Services/Ingestion/IngestionListTable.interface.ts similarity index 78% rename from openmetadata-ui/src/main/resources/ui/src/components/Ingestion/IngestionListTable.interface.ts rename to openmetadata-ui/src/main/resources/ui/src/components/Settings/Services/Ingestion/IngestionListTable.interface.ts index bea40a7b3b8e..4147d1b4acd9 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/Ingestion/IngestionListTable.interface.ts +++ b/openmetadata-ui/src/main/resources/ui/src/components/Settings/Services/Ingestion/IngestionListTable.interface.ts @@ -11,14 +11,14 @@ * limitations under the License. */ -import { ServiceCategory } from '../../enums/service.enum'; -import { PipelineType } from '../../generated/api/services/ingestionPipelines/createIngestionPipeline'; -import { IngestionPipeline } from '../../generated/entity/services/ingestionPipelines/ingestionPipeline'; -import { Paging } from '../../generated/type/paging'; import { IngestionServicePermission, OperationPermission, -} from '../PermissionProvider/PermissionProvider.interface'; +} from '../../../../context/PermissionProvider/PermissionProvider.interface'; +import { ServiceCategory } from '../../../../enums/service.enum'; +import { PipelineType } from '../../../../generated/api/services/ingestionPipelines/createIngestionPipeline'; +import { IngestionPipeline } from '../../../../generated/entity/services/ingestionPipelines/ingestionPipeline'; +import { Paging } from '../../../../generated/type/paging'; import { SelectedRowDetails } from './ingestion.interface'; export interface IngestionListTableProps { diff --git a/openmetadata-ui/src/main/resources/ui/src/components/Ingestion/IngestionListTable.test.tsx b/openmetadata-ui/src/main/resources/ui/src/components/Settings/Services/Ingestion/IngestionListTable.test.tsx similarity index 90% rename from openmetadata-ui/src/main/resources/ui/src/components/Ingestion/IngestionListTable.test.tsx rename to openmetadata-ui/src/main/resources/ui/src/components/Settings/Services/Ingestion/IngestionListTable.test.tsx index dd4f9cce5ade..066927c85495 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/Ingestion/IngestionListTable.test.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/components/Settings/Services/Ingestion/IngestionListTable.test.tsx @@ -13,20 +13,20 @@ import { render, screen } from '@testing-library/react'; import React from 'react'; -import { NO_DATA_PLACEHOLDER } from '../../constants/constants'; -import { useAirflowStatus } from '../../hooks/useAirflowStatus'; -import { mockIngestionListTableProps } from '../../mocks/IngestionListTable.mock'; +import { NO_DATA_PLACEHOLDER } from '../../../../constants/constants'; +import { useAirflowStatus } from '../../../../hooks/useAirflowStatus'; +import { mockIngestionListTableProps } from '../../../../mocks/IngestionListTable.mock'; import IngestionListTable from './IngestionListTable.component'; -jest.mock('../../components/common/NextPrevious/NextPrevious', () => +jest.mock('../../../common/NextPrevious/NextPrevious', () => jest.fn().mockImplementation(() =>
nextPrevious
) ); -jest.mock('../../components/Loader/Loader', () => +jest.mock('../../../common/Loader/Loader', () => jest.fn().mockImplementation(() =>
loader
) ); jest.mock( - '../Skeleton/CommonSkeletons/ControlElements/ControlElements.component', + '../../../common/Skeleton/CommonSkeletons/ControlElements/ControlElements.component', () => jest.fn().mockImplementation(() =>
ButtonSkeleton
) ); @@ -39,7 +39,7 @@ jest.mock('./IngestionRecentRun/IngestionRecentRuns.component', () => ({ .mockImplementation(() =>
ingestionRecentRuns
), })); -jest.mock('../../hooks/useAirflowStatus', () => ({ +jest.mock('../../../../hooks/useAirflowStatus', () => ({ useAirflowStatus: jest.fn(() => { return { isFetchingStatus: false, diff --git a/openmetadata-ui/src/main/resources/ui/src/components/Ingestion/IngestionPipelineList/IngestinoPipelineList.test.tsx b/openmetadata-ui/src/main/resources/ui/src/components/Settings/Services/Ingestion/IngestionPipelineList/IngestinoPipelineList.test.tsx similarity index 79% rename from openmetadata-ui/src/main/resources/ui/src/components/Ingestion/IngestionPipelineList/IngestinoPipelineList.test.tsx rename to openmetadata-ui/src/main/resources/ui/src/components/Settings/Services/Ingestion/IngestionPipelineList/IngestinoPipelineList.test.tsx index 38e7e98f4d6e..a26a85b7ff47 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/Ingestion/IngestionPipelineList/IngestinoPipelineList.test.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/components/Settings/Services/Ingestion/IngestionPipelineList/IngestinoPipelineList.test.tsx @@ -12,30 +12,32 @@ */ import { render, screen } from '@testing-library/react'; import React from 'react'; -import { ServiceCategory } from '../../../enums/service.enum'; -import { useAirflowStatus } from '../../../hooks/useAirflowStatus'; +import { ServiceCategory } from '../../../../../enums/service.enum'; +import { useAirflowStatus } from '../../../../../hooks/useAirflowStatus'; import { IngestionPipelineList } from './IngestionPipelineList.component'; const mockGetIngestinoPipelines = jest.fn(); const mockBulkDeployPipelines = jest.fn(); -jest.mock('../../common/ErrorWithPlaceholder/ErrorPlaceHolderIngestion', () => { - return jest.fn().mockImplementation(() =>

Airflow not available

); -}); +jest.mock( + '../../../../common/ErrorWithPlaceholder/ErrorPlaceHolderIngestion', + () => { + return jest.fn().mockImplementation(() =>

Airflow not available

); + } +); -jest.mock('../../../hooks/useAirflowStatus', () => ({ - ...jest.requireActual('../../../hooks/useAirflowStatus'), +jest.mock('../../../../../hooks/useAirflowStatus', () => ({ useAirflowStatus: jest.fn().mockImplementation(() => ({ isAirflowAvailable: false, isFetchingStatus: true, })), })); -jest.mock('../../../components/Loader/Loader', () => { +jest.mock('../../../../common/Loader/Loader', () => { return jest.fn().mockReturnValue(
Loader
); }); -jest.mock('../../../rest/ingestionPipelineAPI', () => ({ +jest.mock('../../../../../rest/ingestionPipelineAPI', () => ({ deployIngestionPipelineById: mockBulkDeployPipelines, getIngestionPipelines: mockGetIngestinoPipelines, })); diff --git a/openmetadata-ui/src/main/resources/ui/src/components/Ingestion/IngestionPipelineList/IngestionPipelineList.component.tsx b/openmetadata-ui/src/main/resources/ui/src/components/Settings/Services/Ingestion/IngestionPipelineList/IngestionPipelineList.component.tsx similarity index 85% rename from openmetadata-ui/src/main/resources/ui/src/components/Ingestion/IngestionPipelineList/IngestionPipelineList.component.tsx rename to openmetadata-ui/src/main/resources/ui/src/components/Settings/Services/Ingestion/IngestionPipelineList/IngestionPipelineList.component.tsx index 7ffc2067defa..3132672503b9 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/Ingestion/IngestionPipelineList/IngestionPipelineList.component.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/components/Settings/Services/Ingestion/IngestionPipelineList/IngestionPipelineList.component.tsx @@ -17,29 +17,32 @@ import cronstrue from 'cronstrue'; import { isNil, map, startCase } from 'lodash'; import React, { useEffect, useMemo, useState } from 'react'; import { useTranslation } from 'react-i18next'; -import { ServiceCategory } from '../../../enums/service.enum'; +import { ServiceCategory } from '../../../../../enums/service.enum'; import { IngestionPipeline, PipelineType, -} from '../../../generated/entity/services/ingestionPipelines/ingestionPipeline'; -import { Paging } from '../../../generated/type/paging'; -import { usePaging } from '../../../hooks/paging/usePaging'; -import { useAirflowStatus } from '../../../hooks/useAirflowStatus'; +} from '../../../../../generated/entity/services/ingestionPipelines/ingestionPipeline'; +import { Paging } from '../../../../../generated/type/paging'; +import { usePaging } from '../../../../../hooks/paging/usePaging'; +import { useAirflowStatus } from '../../../../../hooks/useAirflowStatus'; import { deployIngestionPipelineById, getIngestionPipelines, -} from '../../../rest/ingestionPipelineAPI'; -import { getEntityName } from '../../../utils/EntityUtils'; -import { getEntityTypeFromServiceCategory } from '../../../utils/ServiceUtils'; -import { FilterIcon } from '../../../utils/TableUtils'; -import { showErrorToast, showSuccessToast } from '../../../utils/ToastUtils'; -import ErrorPlaceHolder from '../../common/ErrorWithPlaceholder/ErrorPlaceHolder'; -import ErrorPlaceHolderIngestion from '../../common/ErrorWithPlaceholder/ErrorPlaceHolderIngestion'; -import NextPrevious from '../../common/NextPrevious/NextPrevious'; -import { PagingHandlerParams } from '../../common/NextPrevious/NextPrevious.interface'; -import Table from '../../common/Table/Table'; -import Loader from '../../Loader/Loader'; -import { ColumnFilter } from '../../Table/ColumnFilter/ColumnFilter.component'; +} from '../../../../../rest/ingestionPipelineAPI'; +import { getEntityName } from '../../../../../utils/EntityUtils'; +import { getEntityTypeFromServiceCategory } from '../../../../../utils/ServiceUtils'; +import { FilterIcon } from '../../../../../utils/TableUtils'; +import { + showErrorToast, + showSuccessToast, +} from '../../../../../utils/ToastUtils'; +import ErrorPlaceHolder from '../../../../common/ErrorWithPlaceholder/ErrorPlaceHolder'; +import ErrorPlaceHolderIngestion from '../../../../common/ErrorWithPlaceholder/ErrorPlaceHolderIngestion'; +import Loader from '../../../../common/Loader/Loader'; +import NextPrevious from '../../../../common/NextPrevious/NextPrevious'; +import { PagingHandlerParams } from '../../../../common/NextPrevious/NextPrevious.interface'; +import Table from '../../../../common/Table/Table'; +import { ColumnFilter } from '../../../../Database/ColumnFilter/ColumnFilter.component'; import { IngestionRecentRuns } from '../IngestionRecentRun/IngestionRecentRuns.component'; export const IngestionPipelineList = ({ diff --git a/openmetadata-ui/src/main/resources/ui/src/components/Ingestion/IngestionRecentRun/IngestionRecentRun.test.tsx b/openmetadata-ui/src/main/resources/ui/src/components/Settings/Services/Ingestion/IngestionRecentRun/IngestionRecentRun.test.tsx similarity index 97% rename from openmetadata-ui/src/main/resources/ui/src/components/Ingestion/IngestionRecentRun/IngestionRecentRun.test.tsx rename to openmetadata-ui/src/main/resources/ui/src/components/Settings/Services/Ingestion/IngestionRecentRun/IngestionRecentRun.test.tsx index eca346783e47..627cb62ea15c 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/Ingestion/IngestionRecentRun/IngestionRecentRun.test.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/components/Settings/Services/Ingestion/IngestionRecentRun/IngestionRecentRun.test.tsx @@ -19,9 +19,9 @@ import { screen, } from '@testing-library/react'; import React from 'react'; -import { IngestionPipeline } from '../../../generated/entity/services/ingestionPipelines/ingestionPipeline'; -import { getRunHistoryForPipeline } from '../../../rest/ingestionPipelineAPI'; -import ConnectionStepCard from '../../common/TestConnection/ConnectionStepCard/ConnectionStepCard'; +import { IngestionPipeline } from '../../../../../generated/entity/services/ingestionPipelines/ingestionPipeline'; +import { getRunHistoryForPipeline } from '../../../../../rest/ingestionPipelineAPI'; +import ConnectionStepCard from '../../../../common/TestConnection/ConnectionStepCard/ConnectionStepCard'; import { IngestionRecentRuns } from './IngestionRecentRuns.component'; const failure = { @@ -77,13 +77,13 @@ const executionRuns = [ ]; jest.mock( - '../../common/TestConnection/ConnectionStepCard/ConnectionStepCard', + '../../../../common/TestConnection/ConnectionStepCard/ConnectionStepCard', () => { return jest.fn().mockImplementation(() =>

testConnectionStepCard

); } ); -jest.mock('../../../rest/ingestionPipelineAPI', () => ({ +jest.mock('../../../../../rest/ingestionPipelineAPI', () => ({ getRunHistoryForPipeline: jest.fn().mockImplementation(() => Promise.resolve({ data: [ diff --git a/openmetadata-ui/src/main/resources/ui/src/components/Ingestion/IngestionRecentRun/IngestionRecentRuns.component.tsx b/openmetadata-ui/src/main/resources/ui/src/components/Settings/Services/Ingestion/IngestionRecentRun/IngestionRecentRuns.component.tsx similarity index 92% rename from openmetadata-ui/src/main/resources/ui/src/components/Ingestion/IngestionRecentRun/IngestionRecentRuns.component.tsx rename to openmetadata-ui/src/main/resources/ui/src/components/Settings/Services/Ingestion/IngestionRecentRun/IngestionRecentRuns.component.tsx index 7822da4dc471..c1c0a136a5c7 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/Ingestion/IngestionRecentRun/IngestionRecentRuns.component.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/components/Settings/Services/Ingestion/IngestionRecentRun/IngestionRecentRuns.component.tsx @@ -24,21 +24,21 @@ import React, { useState, } from 'react'; import { useTranslation } from 'react-i18next'; -import { NO_DATA } from '../../../constants/constants'; -import { PIPELINE_INGESTION_RUN_STATUS } from '../../../constants/pipeline.constants'; +import { NO_DATA } from '../../../../../constants/constants'; +import { PIPELINE_INGESTION_RUN_STATUS } from '../../../../../constants/pipeline.constants'; import { IngestionPipeline, PipelineStatus, StepSummary, -} from '../../../generated/entity/services/ingestionPipelines/ingestionPipeline'; -import { getRunHistoryForPipeline } from '../../../rest/ingestionPipelineAPI'; +} from '../../../../../generated/entity/services/ingestionPipelines/ingestionPipeline'; +import { getRunHistoryForPipeline } from '../../../../../rest/ingestionPipelineAPI'; import { formatDateTime, getCurrentMillis, getEpochMillisForPastDays, -} from '../../../utils/date-time/DateTimeUtils'; -import Table from '../../common/Table/Table'; -import ConnectionStepCard from '../../common/TestConnection/ConnectionStepCard/ConnectionStepCard'; +} from '../../../../../utils/date-time/DateTimeUtils'; +import Table from '../../../../common/Table/Table'; +import ConnectionStepCard from '../../../../common/TestConnection/ConnectionStepCard/ConnectionStepCard'; import './ingestion-recent-run.style.less'; interface Props { diff --git a/openmetadata-ui/src/main/resources/ui/src/components/Ingestion/IngestionRecentRun/ingestion-recent-run.style.less b/openmetadata-ui/src/main/resources/ui/src/components/Settings/Services/Ingestion/IngestionRecentRun/ingestion-recent-run.style.less similarity index 100% rename from openmetadata-ui/src/main/resources/ui/src/components/Ingestion/IngestionRecentRun/ingestion-recent-run.style.less rename to openmetadata-ui/src/main/resources/ui/src/components/Settings/Services/Ingestion/IngestionRecentRun/ingestion-recent-run.style.less diff --git a/openmetadata-ui/src/main/resources/ui/src/components/IngestionStepper/IngestionStepper.component.tsx b/openmetadata-ui/src/main/resources/ui/src/components/Settings/Services/Ingestion/IngestionStepper/IngestionStepper.component.tsx similarity index 100% rename from openmetadata-ui/src/main/resources/ui/src/components/IngestionStepper/IngestionStepper.component.tsx rename to openmetadata-ui/src/main/resources/ui/src/components/Settings/Services/Ingestion/IngestionStepper/IngestionStepper.component.tsx diff --git a/openmetadata-ui/src/main/resources/ui/src/components/IngestionStepper/IngestionStepper.test.tsx b/openmetadata-ui/src/main/resources/ui/src/components/Settings/Services/Ingestion/IngestionStepper/IngestionStepper.test.tsx similarity index 100% rename from openmetadata-ui/src/main/resources/ui/src/components/IngestionStepper/IngestionStepper.test.tsx rename to openmetadata-ui/src/main/resources/ui/src/components/Settings/Services/Ingestion/IngestionStepper/IngestionStepper.test.tsx diff --git a/openmetadata-ui/src/main/resources/ui/src/components/IngestionStepper/ingestion-stepper.style.less b/openmetadata-ui/src/main/resources/ui/src/components/Settings/Services/Ingestion/IngestionStepper/ingestion-stepper.style.less similarity index 100% rename from openmetadata-ui/src/main/resources/ui/src/components/IngestionStepper/ingestion-stepper.style.less rename to openmetadata-ui/src/main/resources/ui/src/components/Settings/Services/Ingestion/IngestionStepper/ingestion-stepper.style.less diff --git a/openmetadata-ui/src/main/resources/ui/src/components/IngestionWorkflowForm/IngestionWorkflowForm.tsx b/openmetadata-ui/src/main/resources/ui/src/components/Settings/Services/Ingestion/IngestionWorkflowForm/IngestionWorkflowForm.tsx similarity index 82% rename from openmetadata-ui/src/main/resources/ui/src/components/IngestionWorkflowForm/IngestionWorkflowForm.tsx rename to openmetadata-ui/src/main/resources/ui/src/components/Settings/Services/Ingestion/IngestionWorkflowForm/IngestionWorkflowForm.tsx index 3187c89309fc..a6bf8f8f298f 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/IngestionWorkflowForm/IngestionWorkflowForm.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/components/Settings/Services/Ingestion/IngestionWorkflowForm/IngestionWorkflowForm.tsx @@ -18,24 +18,24 @@ import classNames from 'classnames'; import { isUndefined, omit, omitBy } from 'lodash'; import React, { FC, useMemo, useState } from 'react'; import { useTranslation } from 'react-i18next'; -import BooleanFieldTemplate from '../../components/JSONSchemaTemplate/BooleanFieldTemplate'; -import DescriptionFieldTemplate from '../../components/JSONSchemaTemplate/DescriptionFieldTemplate'; -import { FieldErrorTemplate } from '../../components/JSONSchemaTemplate/FieldErrorTemplate/FieldErrorTemplate'; -import { ObjectFieldTemplate } from '../../components/JSONSchemaTemplate/ObjectFieldTemplate'; -import WorkflowArrayFieldTemplate from '../../components/JSONSchemaTemplate/WorkflowArrayFieldTemplate'; import { INGESTION_ELASTIC_SEARCH_WORKFLOW_UI_SCHEMA, INGESTION_WORKFLOW_NAME_UI_SCHEMA, INGESTION_WORKFLOW_UI_SCHEMA, -} from '../../constants/Services.constant'; -import { FormSubmitType } from '../../enums/form.enum'; -import { PipelineType } from '../../generated/api/services/ingestionPipelines/createIngestionPipeline'; +} from '../../../../../constants/Services.constant'; +import { FormSubmitType } from '../../../../../enums/form.enum'; +import { PipelineType } from '../../../../../generated/api/services/ingestionPipelines/createIngestionPipeline'; import { IngestionWorkflowData, IngestionWorkflowFormProps, -} from '../../interface/service.interface'; -import { transformErrors } from '../../utils/formUtils'; -import { getSchemaByWorkflowType } from '../../utils/IngestionWorkflowUtils'; +} from '../../../../../interface/service.interface'; +import { transformErrors } from '../../../../../utils/formUtils'; +import { getSchemaByWorkflowType } from '../../../../../utils/IngestionWorkflowUtils'; +import BooleanFieldTemplate from '../../../../common/Form/JSONSchema/JSONSchemaTemplate/BooleanFieldTemplate'; +import DescriptionFieldTemplate from '../../../../common/Form/JSONSchema/JSONSchemaTemplate/DescriptionFieldTemplate'; +import { FieldErrorTemplate } from '../../../../common/Form/JSONSchema/JSONSchemaTemplate/FieldErrorTemplate/FieldErrorTemplate'; +import { ObjectFieldTemplate } from '../../../../common/Form/JSONSchema/JSONSchemaTemplate/ObjectFieldTemplate'; +import WorkflowArrayFieldTemplate from '../../../../common/Form/JSONSchema/JSONSchemaTemplate/WorkflowArrayFieldTemplate'; const IngestionWorkflowForm: FC = ({ pipeLineType, diff --git a/openmetadata-ui/src/main/resources/ui/src/components/Ingestion/PipelineActions.component.tsx b/openmetadata-ui/src/main/resources/ui/src/components/Settings/Services/Ingestion/PipelineActions.component.tsx similarity index 94% rename from openmetadata-ui/src/main/resources/ui/src/components/Ingestion/PipelineActions.component.tsx rename to openmetadata-ui/src/main/resources/ui/src/components/Settings/Services/Ingestion/PipelineActions.component.tsx index 373d1aeeaee6..e998eb08ce15 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/Ingestion/PipelineActions.component.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/components/Settings/Services/Ingestion/PipelineActions.component.tsx @@ -16,15 +16,15 @@ import { AxiosError } from 'axios'; import React, { useState } from 'react'; import { useTranslation } from 'react-i18next'; import { Link, useHistory } from 'react-router-dom'; -import Loader from '../../components/Loader/Loader'; -import KillIngestionModal from '../../components/Modals/KillIngestionPipelineModal/KillIngestionPipelineModal'; -import { IngestionPipeline } from '../../generated/entity/services/ingestionPipelines/ingestionPipeline'; -import { getLoadingStatus } from '../../utils/CommonUtils'; +import { IngestionPipeline } from '../../../../generated/entity/services/ingestionPipelines/ingestionPipeline'; +import { getLoadingStatus } from '../../../../utils/CommonUtils'; import { getEditIngestionPath, getLogsViewerPath, -} from '../../utils/RouterUtils'; -import { showErrorToast, showSuccessToast } from '../../utils/ToastUtils'; +} from '../../../../utils/RouterUtils'; +import { showErrorToast, showSuccessToast } from '../../../../utils/ToastUtils'; +import Loader from '../../../common/Loader/Loader'; +import KillIngestionModal from '../../../Modals/KillIngestionPipelineModal/KillIngestionPipelineModal'; import { PipelineActionsProps } from './PipelineActions.interface'; function PipelineActions({ diff --git a/openmetadata-ui/src/main/resources/ui/src/components/Ingestion/PipelineActions.interface.ts b/openmetadata-ui/src/main/resources/ui/src/components/Settings/Services/Ingestion/PipelineActions.interface.ts similarity index 81% rename from openmetadata-ui/src/main/resources/ui/src/components/Ingestion/PipelineActions.interface.ts rename to openmetadata-ui/src/main/resources/ui/src/components/Settings/Services/Ingestion/PipelineActions.interface.ts index a980536733ec..92d5997a3677 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/Ingestion/PipelineActions.interface.ts +++ b/openmetadata-ui/src/main/resources/ui/src/components/Settings/Services/Ingestion/PipelineActions.interface.ts @@ -11,9 +11,9 @@ * limitations under the License. */ -import { ServiceCategory } from '../../enums/service.enum'; -import { IngestionPipeline } from '../../generated/entity/services/ingestionPipelines/ingestionPipeline'; -import { IngestionServicePermission } from '../PermissionProvider/PermissionProvider.interface'; +import { IngestionServicePermission } from '../../../../context/PermissionProvider/PermissionProvider.interface'; +import { ServiceCategory } from '../../../../enums/service.enum'; +import { IngestionPipeline } from '../../../../generated/entity/services/ingestionPipelines/ingestionPipeline'; import { SelectedRowDetails } from './ingestion.interface'; export interface PipelineActionsProps { diff --git a/openmetadata-ui/src/main/resources/ui/src/components/Ingestion/ingestion.interface.ts b/openmetadata-ui/src/main/resources/ui/src/components/Settings/Services/Ingestion/ingestion.interface.ts similarity index 78% rename from openmetadata-ui/src/main/resources/ui/src/components/Ingestion/ingestion.interface.ts rename to openmetadata-ui/src/main/resources/ui/src/components/Settings/Services/Ingestion/ingestion.interface.ts index e42f4321eb0a..a2c953f53829 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/Ingestion/ingestion.interface.ts +++ b/openmetadata-ui/src/main/resources/ui/src/components/Settings/Services/Ingestion/ingestion.interface.ts @@ -11,12 +11,12 @@ * limitations under the License. */ -import { ServiceCategory } from '../../enums/service.enum'; -import { PipelineType } from '../../generated/api/services/ingestionPipelines/createIngestionPipeline'; -import { IngestionPipeline } from '../../generated/entity/services/ingestionPipelines/ingestionPipeline'; -import { Paging } from '../../generated/type/paging'; -import { ServicesType } from '../../interface/service.interface'; -import { OperationPermission } from '../PermissionProvider/PermissionProvider.interface'; +import { OperationPermission } from '../../../../context/PermissionProvider/PermissionProvider.interface'; +import { ServiceCategory } from '../../../../enums/service.enum'; +import { PipelineType } from '../../../../generated/api/services/ingestionPipelines/createIngestionPipeline'; +import { IngestionPipeline } from '../../../../generated/entity/services/ingestionPipelines/ingestionPipeline'; +import { Paging } from '../../../../generated/type/paging'; +import { ServicesType } from '../../../../interface/service.interface'; export interface ConnectorConfig { username: string; diff --git a/openmetadata-ui/src/main/resources/ui/src/components/ServiceConfig/ConnectionConfigForm.tsx b/openmetadata-ui/src/main/resources/ui/src/components/Settings/Services/ServiceConfig/ConnectionConfigForm.tsx similarity index 73% rename from openmetadata-ui/src/main/resources/ui/src/components/ServiceConfig/ConnectionConfigForm.tsx rename to openmetadata-ui/src/main/resources/ui/src/components/Settings/Services/ServiceConfig/ConnectionConfigForm.tsx index ac66339466d1..d335ca09b5a5 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/ServiceConfig/ConnectionConfigForm.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/components/Settings/Services/ServiceConfig/ConnectionConfigForm.tsx @@ -23,30 +23,33 @@ import React, { useRef, useState, } from 'react'; -import AirflowMessageBanner from '../../components/common/AirflowMessageBanner/AirflowMessageBanner'; -import { ServiceCategory } from '../../enums/service.enum'; -import { MetadataServiceType } from '../../generated/api/services/createMetadataService'; -import { MlModelServiceType } from '../../generated/api/services/createMlModelService'; -import { StorageServiceType } from '../../generated/entity/data/container'; -import { DashboardServiceType } from '../../generated/entity/services/dashboardService'; -import { DatabaseServiceType } from '../../generated/entity/services/databaseService'; -import { MessagingServiceType } from '../../generated/entity/services/messagingService'; -import { PipelineServiceType } from '../../generated/entity/services/pipelineService'; -import { SearchServiceType } from '../../generated/entity/services/searchService'; -import { useAirflowStatus } from '../../hooks/useAirflowStatus'; -import { ConfigData, ServicesType } from '../../interface/service.interface'; -import { getPipelineServiceHostIp } from '../../rest/ingestionPipelineAPI'; -import { getDashboardConfig } from '../../utils/DashboardServiceUtils'; -import { getDatabaseConfig } from '../../utils/DatabaseServiceUtils'; -import { formatFormDataForSubmit } from '../../utils/JSONSchemaFormUtils'; -import { getMessagingConfig } from '../../utils/MessagingServiceUtils'; -import { getMetadataConfig } from '../../utils/MetadataServiceUtils'; -import { getMlmodelConfig } from '../../utils/MlmodelServiceUtils'; -import { getPipelineConfig } from '../../utils/PipelineServiceUtils'; -import { getSearchServiceConfig } from '../../utils/SearchServiceUtils'; -import serviceUtilClassBase from '../../utils/ServiceUtilClassBase'; -import FormBuilder from '../common/FormBuilder/FormBuilder'; -import TestConnection from '../common/TestConnection/TestConnection'; +import { ServiceCategory } from '../../../../enums/service.enum'; +import { MetadataServiceType } from '../../../../generated/api/services/createMetadataService'; +import { MlModelServiceType } from '../../../../generated/api/services/createMlModelService'; +import { StorageServiceType } from '../../../../generated/entity/data/container'; +import { DashboardServiceType } from '../../../../generated/entity/services/dashboardService'; +import { DatabaseServiceType } from '../../../../generated/entity/services/databaseService'; +import { MessagingServiceType } from '../../../../generated/entity/services/messagingService'; +import { PipelineServiceType } from '../../../../generated/entity/services/pipelineService'; +import { SearchServiceType } from '../../../../generated/entity/services/searchService'; +import { useAirflowStatus } from '../../../../hooks/useAirflowStatus'; +import { + ConfigData, + ServicesType, +} from '../../../../interface/service.interface'; +import { getPipelineServiceHostIp } from '../../../../rest/ingestionPipelineAPI'; +import { getDashboardConfig } from '../../../../utils/DashboardServiceUtils'; +import { getDatabaseConfig } from '../../../../utils/DatabaseServiceUtils'; +import { formatFormDataForSubmit } from '../../../../utils/JSONSchemaFormUtils'; +import { getMessagingConfig } from '../../../../utils/MessagingServiceUtils'; +import { getMetadataConfig } from '../../../../utils/MetadataServiceUtils'; +import { getMlmodelConfig } from '../../../../utils/MlmodelServiceUtils'; +import { getPipelineConfig } from '../../../../utils/PipelineServiceUtils'; +import { getSearchServiceConfig } from '../../../../utils/SearchServiceUtils'; +import serviceUtilClassBase from '../../../../utils/ServiceUtilClassBase'; +import AirflowMessageBanner from '../../../common/AirflowMessageBanner/AirflowMessageBanner'; +import FormBuilder from '../../../common/FormBuilder/FormBuilder'; +import TestConnection from '../../../common/TestConnection/TestConnection'; interface Props { data?: ServicesType; diff --git a/openmetadata-ui/src/main/resources/ui/src/components/ServiceConfig/ServiceConfig.tsx b/openmetadata-ui/src/main/resources/ui/src/components/Settings/Services/ServiceConfig/ServiceConfig.tsx similarity index 82% rename from openmetadata-ui/src/main/resources/ui/src/components/ServiceConfig/ServiceConfig.tsx rename to openmetadata-ui/src/main/resources/ui/src/components/Settings/Services/ServiceConfig/ServiceConfig.tsx index f4a802b5e311..a87af0e483be 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/ServiceConfig/ServiceConfig.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/components/Settings/Services/ServiceConfig/ServiceConfig.tsx @@ -15,13 +15,13 @@ import { IChangeEvent } from '@rjsf/core'; import { LoadingState, ServicesData } from 'Models'; import React, { useState } from 'react'; import { useHistory } from 'react-router-dom'; -import { ServiceCategory } from '../../enums/service.enum'; -import { DashboardService } from '../../generated/entity/services/dashboardService'; -import { DatabaseService } from '../../generated/entity/services/databaseService'; -import { MessagingService } from '../../generated/entity/services/messagingService'; -import { PipelineService } from '../../generated/entity/services/pipelineService'; -import { ConfigData } from '../../interface/service.interface'; -import { getPathByServiceFQN } from '../../utils/RouterUtils'; +import { ServiceCategory } from '../../../../enums/service.enum'; +import { DashboardService } from '../../../../generated/entity/services/dashboardService'; +import { DatabaseService } from '../../../../generated/entity/services/databaseService'; +import { MessagingService } from '../../../../generated/entity/services/messagingService'; +import { PipelineService } from '../../../../generated/entity/services/pipelineService'; +import { ConfigData } from '../../../../interface/service.interface'; +import { getPathByServiceFQN } from '../../../../utils/RouterUtils'; import ConnectionConfigForm from './ConnectionConfigForm'; interface ServiceConfigProps { diff --git a/openmetadata-ui/src/main/resources/ui/src/components/ServiceConnectionDetails/ServiceConnectionDetails.component.tsx b/openmetadata-ui/src/main/resources/ui/src/components/Settings/Services/ServiceConnectionDetails/ServiceConnectionDetails.component.tsx similarity index 83% rename from openmetadata-ui/src/main/resources/ui/src/components/ServiceConnectionDetails/ServiceConnectionDetails.component.tsx rename to openmetadata-ui/src/main/resources/ui/src/components/Settings/Services/ServiceConnectionDetails/ServiceConnectionDetails.component.tsx index d7d1c1c23df9..ac2c9f6ec1cb 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/ServiceConnectionDetails/ServiceConnectionDetails.component.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/components/Settings/Services/ServiceConnectionDetails/ServiceConnectionDetails.component.tsx @@ -20,25 +20,28 @@ import { Card, Col, Row, Space, Tooltip } from 'antd'; import Input from 'antd/lib/input/Input'; import { get, isEmpty, isNull, isObject } from 'lodash'; import React, { ReactNode, useEffect, useState } from 'react'; -import { DEF_UI_SCHEMA, JWT_CONFIG } from '../../constants/Services.constant'; -import { EntityType } from '../../enums/entity.enum'; -import { DashboardServiceType } from '../../generated/entity/services/dashboardService'; -import { DatabaseServiceType } from '../../generated/entity/services/databaseService'; -import { MessagingServiceType } from '../../generated/entity/services/messagingService'; -import { MetadataServiceType } from '../../generated/entity/services/metadataService'; -import { MlModelServiceType } from '../../generated/entity/services/mlmodelService'; -import { PipelineServiceType } from '../../generated/entity/services/pipelineService'; -import { SearchServiceType } from '../../generated/entity/services/searchService'; -import { StorageServiceType } from '../../generated/entity/services/storageService'; -import { ConfigData } from '../../interface/service.interface'; -import { getDashboardConfig } from '../../utils/DashboardServiceUtils'; -import { getDatabaseConfig } from '../../utils/DatabaseServiceUtils'; -import { getMessagingConfig } from '../../utils/MessagingServiceUtils'; -import { getMetadataConfig } from '../../utils/MetadataServiceUtils'; -import { getMlmodelConfig } from '../../utils/MlmodelServiceUtils'; -import { getPipelineConfig } from '../../utils/PipelineServiceUtils'; -import { getSearchServiceConfig } from '../../utils/SearchServiceUtils'; -import serviceUtilClassBase from '../../utils/ServiceUtilClassBase'; +import { + DEF_UI_SCHEMA, + JWT_CONFIG, +} from '../../../../constants/Services.constant'; +import { EntityType } from '../../../../enums/entity.enum'; +import { DashboardServiceType } from '../../../../generated/entity/services/dashboardService'; +import { DatabaseServiceType } from '../../../../generated/entity/services/databaseService'; +import { MessagingServiceType } from '../../../../generated/entity/services/messagingService'; +import { MetadataServiceType } from '../../../../generated/entity/services/metadataService'; +import { MlModelServiceType } from '../../../../generated/entity/services/mlmodelService'; +import { PipelineServiceType } from '../../../../generated/entity/services/pipelineService'; +import { SearchServiceType } from '../../../../generated/entity/services/searchService'; +import { StorageServiceType } from '../../../../generated/entity/services/storageService'; +import { ConfigData } from '../../../../interface/service.interface'; +import { getDashboardConfig } from '../../../../utils/DashboardServiceUtils'; +import { getDatabaseConfig } from '../../../../utils/DatabaseServiceUtils'; +import { getMessagingConfig } from '../../../../utils/MessagingServiceUtils'; +import { getMetadataConfig } from '../../../../utils/MetadataServiceUtils'; +import { getMlmodelConfig } from '../../../../utils/MlmodelServiceUtils'; +import { getPipelineConfig } from '../../../../utils/PipelineServiceUtils'; +import { getSearchServiceConfig } from '../../../../utils/SearchServiceUtils'; +import serviceUtilClassBase from '../../../../utils/ServiceUtilClassBase'; type ServiceConnectionDetailsProps = { connectionDetails: ConfigData; diff --git a/openmetadata-ui/src/main/resources/ui/src/components/Services/Services.tsx b/openmetadata-ui/src/main/resources/ui/src/components/Settings/Services/Services.tsx similarity index 86% rename from openmetadata-ui/src/main/resources/ui/src/components/Services/Services.tsx rename to openmetadata-ui/src/main/resources/ui/src/components/Settings/Services/Services.tsx index 33a31a80e062..3319aeeebf29 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/Services/Services.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/components/Settings/Services/Services.tsx @@ -19,50 +19,50 @@ import { isEmpty, map, startCase } from 'lodash'; import React, { useCallback, useEffect, useMemo, useState } from 'react'; import { useTranslation } from 'react-i18next'; import { Link, useHistory } from 'react-router-dom'; -import { OwnerLabel } from '../../components/common/OwnerLabel/OwnerLabel.component'; -import RichTextEditorPreviewer from '../../components/common/RichTextEditor/RichTextEditorPreviewer'; -import { ListView } from '../../components/ListView/ListView.component'; -import { ColumnFilter } from '../../components/Table/ColumnFilter/ColumnFilter.component'; import { DISABLED, getServiceDetailsPath, pagingObject, -} from '../../constants/constants'; -import { CONNECTORS_DOCS } from '../../constants/docs.constants'; -import { NO_PERMISSION_FOR_ACTION } from '../../constants/HelperTextUtil'; -import { PAGE_HEADERS } from '../../constants/PageHeaders.constant'; +} from '../../../constants/constants'; +import { CONNECTORS_DOCS } from '../../../constants/docs.constants'; +import { NO_PERMISSION_FOR_ACTION } from '../../../constants/HelperTextUtil'; +import { PAGE_HEADERS } from '../../../constants/PageHeaders.constant'; import { OPEN_METADATA, servicesDisplayName, -} from '../../constants/Services.constant'; -import { ERROR_PLACEHOLDER_TYPE } from '../../enums/common.enum'; -import { SearchIndex } from '../../enums/search.enum'; -import { ServiceCategory } from '../../enums/service.enum'; -import { Operation } from '../../generated/entity/policies/policy'; -import { EntityReference } from '../../generated/entity/type'; -import { Include } from '../../generated/type/include'; -import { usePaging } from '../../hooks/paging/usePaging'; -import { useAirflowStatus } from '../../hooks/useAirflowStatus'; -import { DatabaseServiceSearchSource } from '../../interface/search.interface'; -import { ServicesType } from '../../interface/service.interface'; -import { getServices, searchService } from '../../rest/serviceAPI'; -import { getServiceLogo } from '../../utils/CommonUtils'; -import { getEntityName } from '../../utils/EntityUtils'; -import { checkPermission } from '../../utils/PermissionsUtils'; -import { getAddServicePath } from '../../utils/RouterUtils'; +} from '../../../constants/Services.constant'; +import { usePermissionProvider } from '../../../context/PermissionProvider/PermissionProvider'; +import { ERROR_PLACEHOLDER_TYPE } from '../../../enums/common.enum'; +import { SearchIndex } from '../../../enums/search.enum'; +import { ServiceCategory } from '../../../enums/service.enum'; +import { Operation } from '../../../generated/entity/policies/policy'; +import { EntityReference } from '../../../generated/entity/type'; +import { Include } from '../../../generated/type/include'; +import { usePaging } from '../../../hooks/paging/usePaging'; +import { useAirflowStatus } from '../../../hooks/useAirflowStatus'; +import { DatabaseServiceSearchSource } from '../../../interface/search.interface'; +import { ServicesType } from '../../../interface/service.interface'; +import { getServices, searchService } from '../../../rest/serviceAPI'; +import { getServiceLogo } from '../../../utils/CommonUtils'; +import { getEntityName } from '../../../utils/EntityUtils'; +import { checkPermission } from '../../../utils/PermissionsUtils'; +import { getAddServicePath } from '../../../utils/RouterUtils'; import { getOptionalFields, getResourceEntityFromServiceCategory, getServiceTypesFromServiceCategory, -} from '../../utils/ServiceUtils'; -import { FilterIcon } from '../../utils/TableUtils'; -import { showErrorToast } from '../../utils/ToastUtils'; -import ErrorPlaceHolder from '../common/ErrorWithPlaceholder/ErrorPlaceHolder'; -import NextPrevious from '../common/NextPrevious/NextPrevious'; -import { PagingHandlerParams } from '../common/NextPrevious/NextPrevious.interface'; -import PageHeader from '../PageHeader/PageHeader.component'; -import { usePermissionProvider } from '../PermissionProvider/PermissionProvider'; -import ButtonSkeleton from '../Skeleton/CommonSkeletons/ControlElements/ControlElements.component'; +} from '../../../utils/ServiceUtils'; +import { FilterIcon } from '../../../utils/TableUtils'; +import { showErrorToast } from '../../../utils/ToastUtils'; +import ErrorPlaceHolder from '../../common/ErrorWithPlaceholder/ErrorPlaceHolder'; +import { ListView } from '../../common/ListView/ListView.component'; +import NextPrevious from '../../common/NextPrevious/NextPrevious'; +import { PagingHandlerParams } from '../../common/NextPrevious/NextPrevious.interface'; +import { OwnerLabel } from '../../common/OwnerLabel/OwnerLabel.component'; +import RichTextEditorPreviewer from '../../common/RichTextEditor/RichTextEditorPreviewer'; +import ButtonSkeleton from '../../common/Skeleton/CommonSkeletons/ControlElements/ControlElements.component'; +import { ColumnFilter } from '../../Database/ColumnFilter/ColumnFilter.component'; +import PageHeader from '../../PageHeader/PageHeader.component'; interface ServicesProps { serviceName: ServiceCategory; diff --git a/openmetadata-ui/src/main/resources/ui/src/components/Setting/SettingItemCard/SettingItemCard.component.tsx b/openmetadata-ui/src/main/resources/ui/src/components/Settings/SettingItemCard/SettingItemCard.component.tsx similarity index 100% rename from openmetadata-ui/src/main/resources/ui/src/components/Setting/SettingItemCard/SettingItemCard.component.tsx rename to openmetadata-ui/src/main/resources/ui/src/components/Settings/SettingItemCard/SettingItemCard.component.tsx diff --git a/openmetadata-ui/src/main/resources/ui/src/components/Setting/SettingItemCard/SettingsItemCard.test.tsx b/openmetadata-ui/src/main/resources/ui/src/components/Settings/SettingItemCard/SettingsItemCard.test.tsx similarity index 100% rename from openmetadata-ui/src/main/resources/ui/src/components/Setting/SettingItemCard/SettingsItemCard.test.tsx rename to openmetadata-ui/src/main/resources/ui/src/components/Settings/SettingItemCard/SettingsItemCard.test.tsx diff --git a/openmetadata-ui/src/main/resources/ui/src/components/Setting/SettingItemCard/setting-item-card.style.less b/openmetadata-ui/src/main/resources/ui/src/components/Settings/SettingItemCard/setting-item-card.style.less similarity index 100% rename from openmetadata-ui/src/main/resources/ui/src/components/Setting/SettingItemCard/setting-item-card.style.less rename to openmetadata-ui/src/main/resources/ui/src/components/Settings/SettingItemCard/setting-item-card.style.less diff --git a/openmetadata-ui/src/main/resources/ui/src/components/Team/TeamDetails/RolesAndPoliciesList.tsx b/openmetadata-ui/src/main/resources/ui/src/components/Settings/Team/TeamDetails/RolesAndPoliciesList.tsx similarity index 87% rename from openmetadata-ui/src/main/resources/ui/src/components/Team/TeamDetails/RolesAndPoliciesList.tsx rename to openmetadata-ui/src/main/resources/ui/src/components/Settings/Team/TeamDetails/RolesAndPoliciesList.tsx index 5b8fadeb9552..df70b9317c58 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/Team/TeamDetails/RolesAndPoliciesList.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/components/Settings/Team/TeamDetails/RolesAndPoliciesList.tsx @@ -17,16 +17,16 @@ import Table, { ColumnsType } from 'antd/lib/table'; import React, { useMemo } from 'react'; import { useTranslation } from 'react-i18next'; import { Link } from 'react-router-dom'; -import { ReactComponent as IconRemove } from '../../../assets/svg/ic-remove.svg'; -import { NO_PERMISSION_FOR_ACTION } from '../../../constants/HelperTextUtil'; -import { EntityType } from '../../../enums/entity.enum'; -import { EntityReference } from '../../../generated/type/entityReference'; -import { getEntityName } from '../../../utils/EntityUtils'; +import { ReactComponent as IconRemove } from '../../../../assets/svg/ic-remove.svg'; +import { NO_PERMISSION_FOR_ACTION } from '../../../../constants/HelperTextUtil'; +import { EntityType } from '../../../../enums/entity.enum'; +import { EntityReference } from '../../../../generated/type/entityReference'; +import { getEntityName } from '../../../../utils/EntityUtils'; import { getPolicyWithFqnPath, getRoleWithFqnPath, -} from '../../../utils/RouterUtils'; -import RichTextEditorPreviewer from '../../common/RichTextEditor/RichTextEditorPreviewer'; +} from '../../../../utils/RouterUtils'; +import RichTextEditorPreviewer from '../../../common/RichTextEditor/RichTextEditorPreviewer'; const ListEntities = ({ list, diff --git a/openmetadata-ui/src/main/resources/ui/src/components/Team/TeamDetails/TeamDetailsV1.interface.ts b/openmetadata-ui/src/main/resources/ui/src/components/Settings/Team/TeamDetails/TeamDetailsV1.interface.ts similarity index 87% rename from openmetadata-ui/src/main/resources/ui/src/components/Team/TeamDetails/TeamDetailsV1.interface.ts rename to openmetadata-ui/src/main/resources/ui/src/components/Settings/Team/TeamDetails/TeamDetailsV1.interface.ts index 84607e6a6431..4ea43c1e1867 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/Team/TeamDetails/TeamDetailsV1.interface.ts +++ b/openmetadata-ui/src/main/resources/ui/src/components/Settings/Team/TeamDetails/TeamDetailsV1.interface.ts @@ -13,14 +13,14 @@ import { Operation } from 'fast-json-patch'; import { FormErrorData } from 'Models'; -import { ERROR_PLACEHOLDER_TYPE } from '../../../enums/common.enum'; -import { EntityType } from '../../../enums/entity.enum'; -import { UserType } from '../../../enums/user.enum'; -import { Team } from '../../../generated/entity/teams/team'; -import { User } from '../../../generated/entity/teams/user'; -import { EntityReference } from '../../../generated/entity/type'; -import { Paging } from '../../../generated/type/paging'; -import { OperationPermission } from '../../PermissionProvider/PermissionProvider.interface'; +import { OperationPermission } from '../../../../context/PermissionProvider/PermissionProvider.interface'; +import { ERROR_PLACEHOLDER_TYPE } from '../../../../enums/common.enum'; +import { EntityType } from '../../../../enums/entity.enum'; +import { UserType } from '../../../../enums/user.enum'; +import { Team } from '../../../../generated/entity/teams/team'; +import { User } from '../../../../generated/entity/teams/user'; +import { EntityReference } from '../../../../generated/entity/type'; +import { Paging } from '../../../../generated/type/paging'; export type TeamDeleteType = { team: Team | undefined; diff --git a/openmetadata-ui/src/main/resources/ui/src/components/Team/TeamDetails/TeamDetailsV1.tsx b/openmetadata-ui/src/main/resources/ui/src/components/Settings/Team/TeamDetails/TeamDetailsV1.tsx similarity index 90% rename from openmetadata-ui/src/main/resources/ui/src/components/Team/TeamDetails/TeamDetailsV1.tsx rename to openmetadata-ui/src/main/resources/ui/src/components/Settings/Team/TeamDetails/TeamDetailsV1.tsx index f470386680b9..b63c8331530c 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/Team/TeamDetails/TeamDetailsV1.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/components/Settings/Team/TeamDetails/TeamDetailsV1.tsx @@ -35,74 +35,74 @@ import Qs from 'qs'; import React, { useCallback, useEffect, useMemo, useState } from 'react'; import { useTranslation } from 'react-i18next'; import { useHistory, useLocation } from 'react-router-dom'; -import { ReactComponent as AddPlaceHolderIcon } from '../../../assets/svg/add-placeholder.svg'; -import { ReactComponent as EditIcon } from '../../../assets/svg/edit-new.svg'; -import { ReactComponent as ExportIcon } from '../../../assets/svg/ic-export.svg'; -import { ReactComponent as ImportIcon } from '../../../assets/svg/ic-import.svg'; -import { ReactComponent as IconRestore } from '../../../assets/svg/ic-restore.svg'; -import { ReactComponent as IconOpenLock } from '../../../assets/svg/open-lock.svg'; -import { ReactComponent as IconTeams } from '../../../assets/svg/teams.svg'; -import { ManageButtonItemLabel } from '../../../components/common/ManageButtonContentItem/ManageButtonContentItem.component'; -import { useEntityExportModalProvider } from '../../../components/Entity/EntityExportModalProvider/EntityExportModalProvider.component'; -import EntitySummaryPanel from '../../../components/Explore/EntitySummaryPanel/EntitySummaryPanel.component'; -import AssetsTabs from '../../../components/Glossary/GlossaryTerms/tabs/AssetsTabs.component'; -import { AssetsOfEntity } from '../../../components/Glossary/GlossaryTerms/tabs/AssetsTabs.interface'; +import { ReactComponent as AddPlaceHolderIcon } from '../../../../assets/svg/add-placeholder.svg'; +import { ReactComponent as EditIcon } from '../../../../assets/svg/edit-new.svg'; +import { ReactComponent as ExportIcon } from '../../../../assets/svg/ic-export.svg'; +import { ReactComponent as ImportIcon } from '../../../../assets/svg/ic-import.svg'; +import { ReactComponent as IconRestore } from '../../../../assets/svg/ic-restore.svg'; +import { ReactComponent as IconOpenLock } from '../../../../assets/svg/open-lock.svg'; +import { ReactComponent as IconTeams } from '../../../../assets/svg/teams.svg'; import { DE_ACTIVE_COLOR, ICON_DIMENSION, ROUTES, -} from '../../../constants/constants'; +} from '../../../../constants/constants'; import { GLOSSARIES_DOCS, ROLE_DOCS, TEAMS_DOCS, -} from '../../../constants/docs.constants'; +} from '../../../../constants/docs.constants'; import { GlobalSettingOptions, GlobalSettingsMenuCategory, -} from '../../../constants/GlobalSettings.constants'; -import { DROPDOWN_ICON_SIZE_PROPS } from '../../../constants/ManageButton.constants'; -import { ERROR_PLACEHOLDER_TYPE } from '../../../enums/common.enum'; -import { EntityAction, EntityType } from '../../../enums/entity.enum'; -import { SearchIndex } from '../../../enums/search.enum'; -import { OwnerType } from '../../../enums/user.enum'; -import { Operation } from '../../../generated/entity/policies/policy'; -import { Team, TeamType } from '../../../generated/entity/teams/team'; +} from '../../../../constants/GlobalSettings.constants'; +import { DROPDOWN_ICON_SIZE_PROPS } from '../../../../constants/ManageButton.constants'; +import { usePermissionProvider } from '../../../../context/PermissionProvider/PermissionProvider'; +import { ResourceEntity } from '../../../../context/PermissionProvider/PermissionProvider.interface'; +import { ERROR_PLACEHOLDER_TYPE } from '../../../../enums/common.enum'; +import { EntityAction, EntityType } from '../../../../enums/entity.enum'; +import { SearchIndex } from '../../../../enums/search.enum'; +import { OwnerType } from '../../../../enums/user.enum'; +import { Operation } from '../../../../generated/entity/policies/policy'; +import { Team, TeamType } from '../../../../generated/entity/teams/team'; import { EntityReference as UserTeams, User, -} from '../../../generated/entity/teams/user'; -import { EntityReference } from '../../../generated/type/entityReference'; -import { useAuth } from '../../../hooks/authHooks'; -import AddAttributeModal from '../../../pages/RolesPage/AddAttributeModal/AddAttributeModal'; -import { ImportType } from '../../../pages/TeamsPage/ImportTeamsPage/ImportTeamsPage.interface'; -import { getSuggestions } from '../../../rest/miscAPI'; -import { exportTeam, restoreTeam } from '../../../rest/teamsAPI'; -import { Transi18next } from '../../../utils/CommonUtils'; -import { getEntityName } from '../../../utils/EntityUtils'; -import { getSettingPageEntityBreadCrumb } from '../../../utils/GlobalSettingsUtils'; -import { checkPermission } from '../../../utils/PermissionsUtils'; +} from '../../../../generated/entity/teams/user'; +import { EntityReference } from '../../../../generated/type/entityReference'; +import { useAuth } from '../../../../hooks/authHooks'; +import AddAttributeModal from '../../../../pages/RolesPage/AddAttributeModal/AddAttributeModal'; +import { ImportType } from '../../../../pages/TeamsPage/ImportTeamsPage/ImportTeamsPage.interface'; +import { getSuggestions } from '../../../../rest/miscAPI'; +import { exportTeam, restoreTeam } from '../../../../rest/teamsAPI'; +import { Transi18next } from '../../../../utils/CommonUtils'; +import { getEntityName } from '../../../../utils/EntityUtils'; +import { getSettingPageEntityBreadCrumb } from '../../../../utils/GlobalSettingsUtils'; +import { checkPermission } from '../../../../utils/PermissionsUtils'; import { getSettingsPathWithFqn, getTeamsWithFqnPath, -} from '../../../utils/RouterUtils'; +} from '../../../../utils/RouterUtils'; import { filterChildTeams, getDeleteMessagePostFix, -} from '../../../utils/TeamUtils'; -import { showErrorToast, showSuccessToast } from '../../../utils/ToastUtils'; -import { useAuthContext } from '../../Auth/AuthProviders/AuthProvider'; -import Description from '../../common/EntityDescription/Description'; -import ManageButton from '../../common/EntityPageInfos/ManageButton/ManageButton'; -import ErrorPlaceHolder from '../../common/ErrorWithPlaceholder/ErrorPlaceHolder'; -import Searchbar from '../../common/SearchBarComponent/SearchBar.component'; -import TitleBreadcrumb from '../../common/TitleBreadcrumb/TitleBreadcrumb.component'; -import { TitleBreadcrumbProps } from '../../common/TitleBreadcrumb/TitleBreadcrumb.interface'; -import { EntityDetailsObjectInterface } from '../../Explore/ExplorePage.interface'; -import Loader from '../../Loader/Loader'; -import { usePermissionProvider } from '../../PermissionProvider/PermissionProvider'; -import { ResourceEntity } from '../../PermissionProvider/PermissionProvider.interface'; -import TabsLabel from '../../TabsLabel/TabsLabel.component'; +} from '../../../../utils/TeamUtils'; +import { showErrorToast, showSuccessToast } from '../../../../utils/ToastUtils'; +import { useAuthContext } from '../../../Auth/AuthProviders/AuthProvider'; +import Description from '../../../common/EntityDescription/Description'; +import ManageButton from '../../../common/EntityPageInfos/ManageButton/ManageButton'; +import ErrorPlaceHolder from '../../../common/ErrorWithPlaceholder/ErrorPlaceHolder'; +import Loader from '../../../common/Loader/Loader'; +import { ManageButtonItemLabel } from '../../../common/ManageButtonContentItem/ManageButtonContentItem.component'; +import Searchbar from '../../../common/SearchBarComponent/SearchBar.component'; +import TabsLabel from '../../../common/TabsLabel/TabsLabel.component'; +import TitleBreadcrumb from '../../../common/TitleBreadcrumb/TitleBreadcrumb.component'; +import { TitleBreadcrumbProps } from '../../../common/TitleBreadcrumb/TitleBreadcrumb.interface'; +import { useEntityExportModalProvider } from '../../../Entity/EntityExportModalProvider/EntityExportModalProvider.component'; +import EntitySummaryPanel from '../../../Explore/EntitySummaryPanel/EntitySummaryPanel.component'; +import { EntityDetailsObjectInterface } from '../../../Explore/ExplorePage.interface'; +import AssetsTabs from '../../../Glossary/GlossaryTerms/tabs/AssetsTabs.component'; +import { AssetsOfEntity } from '../../../Glossary/GlossaryTerms/tabs/AssetsTabs.interface'; import ListEntities from './RolesAndPoliciesList'; import { TeamsPageTab } from './team.interface'; import { diff --git a/openmetadata-ui/src/main/resources/ui/src/components/Team/TeamDetails/TeamDetailsV1.utils.tsx b/openmetadata-ui/src/main/resources/ui/src/components/Settings/Team/TeamDetails/TeamDetailsV1.utils.tsx similarity index 96% rename from openmetadata-ui/src/main/resources/ui/src/components/Team/TeamDetails/TeamDetailsV1.utils.tsx rename to openmetadata-ui/src/main/resources/ui/src/components/Settings/Team/TeamDetails/TeamDetailsV1.utils.tsx index cfc764dbcea7..cfb8ccf31edb 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/Team/TeamDetails/TeamDetailsV1.utils.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/components/Settings/Team/TeamDetails/TeamDetailsV1.utils.tsx @@ -12,7 +12,7 @@ */ import { t } from 'i18next'; -import { Team } from '../../../generated/entity/teams/team'; +import { Team } from '../../../../generated/entity/teams/team'; import { TeamsPageTab } from './team.interface'; export const getTabs = ( diff --git a/openmetadata-ui/src/main/resources/ui/src/components/Team/TeamDetails/TeamHierarchy.test.tsx b/openmetadata-ui/src/main/resources/ui/src/components/Settings/Team/TeamDetails/TeamHierarchy.test.tsx similarity index 91% rename from openmetadata-ui/src/main/resources/ui/src/components/Team/TeamDetails/TeamHierarchy.test.tsx rename to openmetadata-ui/src/main/resources/ui/src/components/Settings/Team/TeamDetails/TeamHierarchy.test.tsx index fa41a84e4aca..3a95b6f17f27 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/Team/TeamDetails/TeamHierarchy.test.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/components/Settings/Team/TeamDetails/TeamHierarchy.test.tsx @@ -14,7 +14,10 @@ import { act, fireEvent, render, screen } from '@testing-library/react'; import React from 'react'; import { MemoryRouter } from 'react-router-dom'; -import { MOCK_CURRENT_TEAM, MOCK_TABLE_DATA } from '../../../mocks/Teams.mock'; +import { + MOCK_CURRENT_TEAM, + MOCK_TABLE_DATA, +} from '../../../../mocks/Teams.mock'; import { TeamHierarchyProps } from './team.interface'; import TeamHierarchy from './TeamHierarchy'; @@ -34,11 +37,11 @@ jest.mock('react-router-dom', () => ({ .mockImplementation(({ children }) => {children}), })); -jest.mock('../../../utils/TeamUtils', () => ({ +jest.mock('../../../../utils/TeamUtils', () => ({ getMovedTeamData: jest.fn().mockReturnValue([]), })); -jest.mock('../../../rest/teamsAPI', () => ({ +jest.mock('../../../../rest/teamsAPI', () => ({ updateTeam: jest .fn() .mockImplementation(() => Promise.resolve(MOCK_CURRENT_TEAM)), @@ -47,15 +50,15 @@ jest.mock('../../../rest/teamsAPI', () => ({ .mockImplementation(() => Promise.resolve(MOCK_CURRENT_TEAM)), })); -jest.mock('../../../utils/EntityUtils', () => ({ +jest.mock('../../../../utils/EntityUtils', () => ({ getEntityName: jest.fn().mockReturnValue('entityName'), })); -jest.mock('../../../utils/RouterUtils', () => ({ +jest.mock('../../../../utils/RouterUtils', () => ({ getTeamsWithFqnPath: jest.fn().mockReturnValue([]), })); -jest.mock('../../../utils/ToastUtils', () => ({ +jest.mock('../../../../utils/ToastUtils', () => ({ showErrorToast: jest.fn().mockImplementation(() => mockShowErrorToast), })); diff --git a/openmetadata-ui/src/main/resources/ui/src/components/Team/TeamDetails/TeamHierarchy.tsx b/openmetadata-ui/src/main/resources/ui/src/components/Settings/Team/TeamDetails/TeamHierarchy.tsx similarity index 85% rename from openmetadata-ui/src/main/resources/ui/src/components/Team/TeamDetails/TeamHierarchy.tsx rename to openmetadata-ui/src/main/resources/ui/src/components/Settings/Team/TeamDetails/TeamHierarchy.tsx index 09bdc0b83103..b137ee8a38b3 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/Team/TeamDetails/TeamHierarchy.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/components/Settings/Team/TeamDetails/TeamHierarchy.tsx @@ -21,25 +21,25 @@ import { DndProvider } from 'react-dnd'; import { HTML5Backend } from 'react-dnd-html5-backend'; import { useTranslation } from 'react-i18next'; import { Link } from 'react-router-dom'; -import FilterTablePlaceHolder from '../../../components/common/ErrorWithPlaceholder/FilterTablePlaceHolder'; -import Table from '../../../components/common/Table/Table'; import { DESCRIPTION_LENGTH, NO_DATA_PLACEHOLDER, -} from '../../../constants/constants'; -import { TABLE_CONSTANTS } from '../../../constants/Teams.constants'; -import { TeamType } from '../../../generated/api/teams/createTeam'; -import { Team } from '../../../generated/entity/teams/team'; -import { Include } from '../../../generated/type/include'; -import { getTeamByName, updateTeam } from '../../../rest/teamsAPI'; -import { Transi18next } from '../../../utils/CommonUtils'; -import { getEntityName } from '../../../utils/EntityUtils'; -import { getTeamsWithFqnPath } from '../../../utils/RouterUtils'; -import { getTableExpandableConfig } from '../../../utils/TableUtils'; -import { getMovedTeamData } from '../../../utils/TeamUtils'; -import { showErrorToast, showSuccessToast } from '../../../utils/ToastUtils'; -import RichTextEditorPreviewer from '../../common/RichTextEditor/RichTextEditorPreviewer'; -import { DraggableBodyRowProps } from '../../Draggable/DraggableBodyRowProps.interface'; +} from '../../../../constants/constants'; +import { TABLE_CONSTANTS } from '../../../../constants/Teams.constants'; +import { TeamType } from '../../../../generated/api/teams/createTeam'; +import { Team } from '../../../../generated/entity/teams/team'; +import { Include } from '../../../../generated/type/include'; +import { getTeamByName, updateTeam } from '../../../../rest/teamsAPI'; +import { Transi18next } from '../../../../utils/CommonUtils'; +import { getEntityName } from '../../../../utils/EntityUtils'; +import { getTeamsWithFqnPath } from '../../../../utils/RouterUtils'; +import { getTableExpandableConfig } from '../../../../utils/TableUtils'; +import { getMovedTeamData } from '../../../../utils/TeamUtils'; +import { showErrorToast, showSuccessToast } from '../../../../utils/ToastUtils'; +import { DraggableBodyRowProps } from '../../../common/Draggable/DraggableBodyRowProps.interface'; +import FilterTablePlaceHolder from '../../../common/ErrorWithPlaceholder/FilterTablePlaceHolder'; +import RichTextEditorPreviewer from '../../../common/RichTextEditor/RichTextEditorPreviewer'; +import Table from '../../../common/Table/Table'; import { MovedTeamProps, TeamHierarchyProps } from './team.interface'; import './teams.less'; diff --git a/openmetadata-ui/src/main/resources/ui/src/components/Team/TeamDetails/TeamsHeaderSection/TeamsHeadingLabel.component.tsx b/openmetadata-ui/src/main/resources/ui/src/components/Settings/Team/TeamDetails/TeamsHeaderSection/TeamsHeadingLabel.component.tsx similarity index 93% rename from openmetadata-ui/src/main/resources/ui/src/components/Team/TeamDetails/TeamsHeaderSection/TeamsHeadingLabel.component.tsx rename to openmetadata-ui/src/main/resources/ui/src/components/Settings/Team/TeamDetails/TeamsHeaderSection/TeamsHeadingLabel.component.tsx index 4a5027ecda86..08dd1467cb0d 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/Team/TeamDetails/TeamsHeaderSection/TeamsHeadingLabel.component.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/components/Settings/Team/TeamDetails/TeamsHeaderSection/TeamsHeadingLabel.component.tsx @@ -18,11 +18,11 @@ import Icon, { import { Button, Col, Input, Space, Tooltip, Typography } from 'antd'; import React, { useEffect, useMemo, useState } from 'react'; import { useTranslation } from 'react-i18next'; -import { ReactComponent as EditIcon } from '../../../../assets/svg/edit-new.svg'; -import { Team } from '../../../../generated/entity/teams/team'; -import { useAuth } from '../../../../hooks/authHooks'; -import { hasEditAccess } from '../../../../utils/CommonUtils'; -import { useAuthContext } from '../../../Auth/AuthProviders/AuthProvider'; +import { ReactComponent as EditIcon } from '../../../../../assets/svg/edit-new.svg'; +import { Team } from '../../../../../generated/entity/teams/team'; +import { useAuth } from '../../../../../hooks/authHooks'; +import { hasEditAccess } from '../../../../../utils/CommonUtils'; +import { useAuthContext } from '../../../../Auth/AuthProviders/AuthProvider'; import { TeamsHeadingLabelProps } from '../team.interface'; const TeamsHeadingLabel = ({ diff --git a/openmetadata-ui/src/main/resources/ui/src/components/Team/TeamDetails/TeamsHeaderSection/TeamsHeadingLabel.test.tsx b/openmetadata-ui/src/main/resources/ui/src/components/Settings/Team/TeamDetails/TeamsHeaderSection/TeamsHeadingLabel.test.tsx similarity index 92% rename from openmetadata-ui/src/main/resources/ui/src/components/Team/TeamDetails/TeamsHeaderSection/TeamsHeadingLabel.test.tsx rename to openmetadata-ui/src/main/resources/ui/src/components/Settings/Team/TeamDetails/TeamsHeaderSection/TeamsHeadingLabel.test.tsx index a6773cc90b58..6af0edd62f30 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/Team/TeamDetails/TeamsHeaderSection/TeamsHeadingLabel.test.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/components/Settings/Team/TeamDetails/TeamsHeaderSection/TeamsHeadingLabel.test.tsx @@ -13,16 +13,16 @@ import { act, fireEvent, render, screen } from '@testing-library/react'; import userEvent from '@testing-library/user-event'; import React from 'react'; -import { TeamType } from '../../../../generated/entity/teams/team'; -import { useAuth } from '../../../../hooks/authHooks'; -import { ENTITY_PERMISSIONS } from '../../../../mocks/Permissions.mock'; +import { TeamType } from '../../../../../generated/entity/teams/team'; +import { useAuth } from '../../../../../hooks/authHooks'; +import { ENTITY_PERMISSIONS } from '../../../../../mocks/Permissions.mock'; import TeamsHeadingLabel from './TeamsHeadingLabel.component'; -jest.mock('../../../../hooks/authHooks', () => ({ +jest.mock('../../../../../hooks/authHooks', () => ({ useAuth: jest.fn().mockReturnValue({ isAdminUser: true }), })); -jest.mock('../../../Auth/AuthProviders/AuthProvider', () => ({ +jest.mock('../../../../Auth/AuthProviders/AuthProvider', () => ({ useAuthContext: jest.fn().mockReturnValue({ currentUser: { userId: 'test-user' }, }), diff --git a/openmetadata-ui/src/main/resources/ui/src/components/Team/TeamDetails/TeamsHeaderSection/TeamsInfo.component.tsx b/openmetadata-ui/src/main/resources/ui/src/components/Settings/Team/TeamDetails/TeamsHeaderSection/TeamsInfo.component.tsx similarity index 91% rename from openmetadata-ui/src/main/resources/ui/src/components/Team/TeamDetails/TeamsHeaderSection/TeamsInfo.component.tsx rename to openmetadata-ui/src/main/resources/ui/src/components/Settings/Team/TeamDetails/TeamsHeaderSection/TeamsInfo.component.tsx index c1969f480551..0ad2b185628b 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/Team/TeamDetails/TeamsHeaderSection/TeamsInfo.component.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/components/Settings/Team/TeamDetails/TeamsHeaderSection/TeamsInfo.component.tsx @@ -17,17 +17,17 @@ import classNames from 'classnames'; import { isEmpty, last } from 'lodash'; import React, { useCallback, useMemo, useState } from 'react'; import { useTranslation } from 'react-i18next'; -import { ReactComponent as EditIcon } from '../../../../assets/svg/edit-new.svg'; -import { NO_DATA_PLACEHOLDER } from '../../../../constants/constants'; -import { EMAIL_REG_EX } from '../../../../constants/regex.constants'; -import { EntityType } from '../../../../enums/entity.enum'; -import { Team, TeamType } from '../../../../generated/entity/teams/team'; -import { EntityReference } from '../../../../generated/entity/type'; -import { useAuth } from '../../../../hooks/authHooks'; -import { useAuthContext } from '../../../Auth/AuthProviders/AuthProvider'; -import { DomainLabel } from '../../../common/DomainLabel/DomainLabel.component'; -import { OwnerLabel } from '../../../common/OwnerLabel/OwnerLabel.component'; -import TeamTypeSelect from '../../../common/TeamTypeSelect/TeamTypeSelect.component'; +import { ReactComponent as EditIcon } from '../../../../../assets/svg/edit-new.svg'; +import { NO_DATA_PLACEHOLDER } from '../../../../../constants/constants'; +import { EMAIL_REG_EX } from '../../../../../constants/regex.constants'; +import { EntityType } from '../../../../../enums/entity.enum'; +import { Team, TeamType } from '../../../../../generated/entity/teams/team'; +import { EntityReference } from '../../../../../generated/entity/type'; +import { useAuth } from '../../../../../hooks/authHooks'; +import { useAuthContext } from '../../../../Auth/AuthProviders/AuthProvider'; +import { DomainLabel } from '../../../../common/DomainLabel/DomainLabel.component'; +import { OwnerLabel } from '../../../../common/OwnerLabel/OwnerLabel.component'; +import TeamTypeSelect from '../../../../common/TeamTypeSelect/TeamTypeSelect.component'; import { SubscriptionWebhook, TeamsInfoProps } from '../team.interface'; import TeamsSubscription from './TeamsSubscription.component'; diff --git a/openmetadata-ui/src/main/resources/ui/src/components/Team/TeamDetails/TeamsHeaderSection/TeamsInfo.test.tsx b/openmetadata-ui/src/main/resources/ui/src/components/Settings/Team/TeamDetails/TeamsHeaderSection/TeamsInfo.test.tsx similarity index 88% rename from openmetadata-ui/src/main/resources/ui/src/components/Team/TeamDetails/TeamsHeaderSection/TeamsInfo.test.tsx rename to openmetadata-ui/src/main/resources/ui/src/components/Settings/Team/TeamDetails/TeamsHeaderSection/TeamsInfo.test.tsx index 95e799f8ed0d..e1e76cd2a863 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/Team/TeamDetails/TeamsHeaderSection/TeamsInfo.test.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/components/Settings/Team/TeamDetails/TeamsHeaderSection/TeamsInfo.test.tsx @@ -12,9 +12,9 @@ */ import { act, fireEvent, render, screen } from '@testing-library/react'; import React from 'react'; -import { TeamType } from '../../../../generated/entity/teams/team'; -import { useAuth } from '../../../../hooks/authHooks'; -import { ENTITY_PERMISSIONS } from '../../../../mocks/Permissions.mock'; +import { TeamType } from '../../../../../generated/entity/teams/team'; +import { useAuth } from '../../../../../hooks/authHooks'; +import { ENTITY_PERMISSIONS } from '../../../../../mocks/Permissions.mock'; import TeamsInfo from './TeamsInfo.component'; const mockTeam = { @@ -46,15 +46,15 @@ const mockTeam = { version: 1, }; -jest.mock('../../../../hooks/authHooks', () => ({ +jest.mock('../../../../../hooks/authHooks', () => ({ useAuth: jest.fn().mockReturnValue({ isAdminUser: true }), })); -jest.mock('../../../common/OwnerLabel/OwnerLabel.component', () => ({ +jest.mock('../../../../common/OwnerLabel/OwnerLabel.component', () => ({ OwnerLabel: jest.fn().mockImplementation(() =>
OwnerLabel
), })); -jest.mock('../../../common/DomainLabel/DomainLabel.component', () => ({ +jest.mock('../../../../common/DomainLabel/DomainLabel.component', () => ({ DomainLabel: jest.fn().mockImplementation(() =>
DomainLabel
), })); @@ -63,12 +63,12 @@ jest.mock('./TeamsSubscription.component', () => ({ default: jest.fn().mockImplementation(() =>
TeamsSubscription
), })); -jest.mock('../../../common/TeamTypeSelect/TeamTypeSelect.component', () => ({ +jest.mock('../../../../common/TeamTypeSelect/TeamTypeSelect.component', () => ({ __esModule: true, default: jest.fn().mockImplementation(() =>
TeamTypeSelect
), })); -jest.mock('../../../Auth/AuthProviders/AuthProvider', () => ({ +jest.mock('../../../../Auth/AuthProviders/AuthProvider', () => ({ useAuthContext: jest.fn().mockReturnValue({ currentUser: { id: 'test-user' }, }), diff --git a/openmetadata-ui/src/main/resources/ui/src/components/Team/TeamDetails/TeamsHeaderSection/TeamsSubscription.component.tsx b/openmetadata-ui/src/main/resources/ui/src/components/Settings/Team/TeamDetails/TeamsHeaderSection/TeamsSubscription.component.tsx similarity index 95% rename from openmetadata-ui/src/main/resources/ui/src/components/Team/TeamDetails/TeamsHeaderSection/TeamsSubscription.component.tsx rename to openmetadata-ui/src/main/resources/ui/src/components/Settings/Team/TeamDetails/TeamsHeaderSection/TeamsSubscription.component.tsx index 045fa42a3b6f..6437e266bb6b 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/Team/TeamDetails/TeamsHeaderSection/TeamsSubscription.component.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/components/Settings/Team/TeamDetails/TeamsHeaderSection/TeamsSubscription.component.tsx @@ -15,18 +15,18 @@ import { useForm } from 'antd/lib/form/Form'; import { isEmpty } from 'lodash'; import React, { useCallback, useEffect, useMemo, useState } from 'react'; import { useTranslation } from 'react-i18next'; -import { ReactComponent as EditIcon } from '../../../../assets/svg/edit-new.svg'; +import { ReactComponent as EditIcon } from '../../../../../assets/svg/edit-new.svg'; import { DE_ACTIVE_COLOR, ICON_DIMENSION, NO_DATA_PLACEHOLDER, -} from '../../../../constants/constants'; +} from '../../../../../constants/constants'; import { SUBSCRIPTION_WEBHOOK, SUBSCRIPTION_WEBHOOK_OPTIONS, -} from '../../../../constants/Teams.constants'; -import { Webhook } from '../../../../generated/type/profile'; -import { getWebhookIcon } from '../../../../utils/TeamUtils'; +} from '../../../../../constants/Teams.constants'; +import { Webhook } from '../../../../../generated/type/profile'; +import { getWebhookIcon } from '../../../../../utils/TeamUtils'; import { SubscriptionWebhook, TeamsSubscriptionProps } from '../team.interface'; const TeamsSubscription = ({ diff --git a/openmetadata-ui/src/main/resources/ui/src/components/Team/TeamDetails/TeamsHeaderSection/TeamsSubscription.test.tsx b/openmetadata-ui/src/main/resources/ui/src/components/Settings/Team/TeamDetails/TeamsHeaderSection/TeamsSubscription.test.tsx similarity index 100% rename from openmetadata-ui/src/main/resources/ui/src/components/Team/TeamDetails/TeamsHeaderSection/TeamsSubscription.test.tsx rename to openmetadata-ui/src/main/resources/ui/src/components/Settings/Team/TeamDetails/TeamsHeaderSection/TeamsSubscription.test.tsx diff --git a/openmetadata-ui/src/main/resources/ui/src/components/Team/TeamDetails/UserTab/UserTab.component.tsx b/openmetadata-ui/src/main/resources/ui/src/components/Settings/Team/TeamDetails/UserTab/UserTab.component.tsx similarity index 82% rename from openmetadata-ui/src/main/resources/ui/src/components/Team/TeamDetails/UserTab/UserTab.component.tsx rename to openmetadata-ui/src/main/resources/ui/src/components/Settings/Team/TeamDetails/UserTab/UserTab.component.tsx index ccfc725a5428..6802d0fa8e3f 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/Team/TeamDetails/UserTab/UserTab.component.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/components/Settings/Team/TeamDetails/UserTab/UserTab.component.tsx @@ -19,44 +19,44 @@ import QueryString from 'qs'; import React, { useCallback, useEffect, useMemo, useState } from 'react'; import { useTranslation } from 'react-i18next'; import { useHistory } from 'react-router-dom'; -import { ReactComponent as ExportIcon } from '../../../../assets/svg/ic-export.svg'; -import { ReactComponent as ImportIcon } from '../../../../assets/svg/ic-import.svg'; -import { ReactComponent as IconRemove } from '../../../../assets/svg/ic-remove.svg'; -import ErrorPlaceHolder from '../../../../components/common/ErrorWithPlaceholder/ErrorPlaceHolder'; -import FilterTablePlaceHolder from '../../../../components/common/ErrorWithPlaceholder/FilterTablePlaceHolder'; -import { ManageButtonItemLabel } from '../../../../components/common/ManageButtonContentItem/ManageButtonContentItem.component'; -import Table from '../../../../components/common/Table/Table'; -import { UserSelectableList } from '../../../../components/common/UserSelectableList/UserSelectableList.component'; -import { useEntityExportModalProvider } from '../../../../components/Entity/EntityExportModalProvider/EntityExportModalProvider.component'; +import { ReactComponent as ExportIcon } from '../../../../../assets/svg/ic-export.svg'; +import { ReactComponent as ImportIcon } from '../../../../../assets/svg/ic-import.svg'; +import { ReactComponent as IconRemove } from '../../../../../assets/svg/ic-remove.svg'; import { INITIAL_PAGING_VALUE, PAGE_SIZE_MEDIUM, -} from '../../../../constants/constants'; +} from '../../../../../constants/constants'; import { GlobalSettingOptions, GlobalSettingsMenuCategory, -} from '../../../../constants/GlobalSettings.constants'; -import { ERROR_PLACEHOLDER_TYPE } from '../../../../enums/common.enum'; -import { EntityAction, EntityType } from '../../../../enums/entity.enum'; -import { SearchIndex } from '../../../../enums/search.enum'; -import { User } from '../../../../generated/entity/teams/user'; -import { EntityReference } from '../../../../generated/entity/type'; -import { Paging } from '../../../../generated/type/paging'; -import { usePaging } from '../../../../hooks/paging/usePaging'; -import { SearchResponse } from '../../../../interface/search.interface'; -import { ImportType } from '../../../../pages/TeamsPage/ImportTeamsPage/ImportTeamsPage.interface'; -import { searchData } from '../../../../rest/miscAPI'; -import { exportUserOfTeam } from '../../../../rest/teamsAPI'; -import { getUsers } from '../../../../rest/userAPI'; -import { formatUsersResponse } from '../../../../utils/APIUtils'; -import { getEntityName } from '../../../../utils/EntityUtils'; -import { getSettingsPathWithFqn } from '../../../../utils/RouterUtils'; -import { getDecodedFqn } from '../../../../utils/StringsUtils'; -import { commonUserDetailColumns } from '../../../../utils/Users.util'; -import ManageButton from '../../../common/EntityPageInfos/ManageButton/ManageButton'; -import NextPrevious from '../../../common/NextPrevious/NextPrevious'; -import { PagingHandlerParams } from '../../../common/NextPrevious/NextPrevious.interface'; -import Searchbar from '../../../common/SearchBarComponent/SearchBar.component'; +} from '../../../../../constants/GlobalSettings.constants'; +import { ERROR_PLACEHOLDER_TYPE } from '../../../../../enums/common.enum'; +import { EntityAction, EntityType } from '../../../../../enums/entity.enum'; +import { SearchIndex } from '../../../../../enums/search.enum'; +import { User } from '../../../../../generated/entity/teams/user'; +import { EntityReference } from '../../../../../generated/entity/type'; +import { Paging } from '../../../../../generated/type/paging'; +import { usePaging } from '../../../../../hooks/paging/usePaging'; +import { SearchResponse } from '../../../../../interface/search.interface'; +import { ImportType } from '../../../../../pages/TeamsPage/ImportTeamsPage/ImportTeamsPage.interface'; +import { searchData } from '../../../../../rest/miscAPI'; +import { exportUserOfTeam } from '../../../../../rest/teamsAPI'; +import { getUsers } from '../../../../../rest/userAPI'; +import { formatUsersResponse } from '../../../../../utils/APIUtils'; +import { getEntityName } from '../../../../../utils/EntityUtils'; +import { getSettingsPathWithFqn } from '../../../../../utils/RouterUtils'; +import { getDecodedFqn } from '../../../../../utils/StringsUtils'; +import { commonUserDetailColumns } from '../../../../../utils/Users.util'; +import ManageButton from '../../../../common/EntityPageInfos/ManageButton/ManageButton'; +import ErrorPlaceHolder from '../../../../common/ErrorWithPlaceholder/ErrorPlaceHolder'; +import FilterTablePlaceHolder from '../../../../common/ErrorWithPlaceholder/FilterTablePlaceHolder'; +import { ManageButtonItemLabel } from '../../../../common/ManageButtonContentItem/ManageButtonContentItem.component'; +import NextPrevious from '../../../../common/NextPrevious/NextPrevious'; +import { PagingHandlerParams } from '../../../../common/NextPrevious/NextPrevious.interface'; +import Searchbar from '../../../../common/SearchBarComponent/SearchBar.component'; +import Table from '../../../../common/Table/Table'; +import { UserSelectableList } from '../../../../common/UserSelectableList/UserSelectableList.component'; +import { useEntityExportModalProvider } from '../../../../Entity/EntityExportModalProvider/EntityExportModalProvider.component'; import { UserTabProps } from './UserTab.interface'; export const UserTab = ({ diff --git a/openmetadata-ui/src/main/resources/ui/src/components/Team/TeamDetails/UserTab/UserTab.interface.ts b/openmetadata-ui/src/main/resources/ui/src/components/Settings/Team/TeamDetails/UserTab/UserTab.interface.ts similarity index 79% rename from openmetadata-ui/src/main/resources/ui/src/components/Team/TeamDetails/UserTab/UserTab.interface.ts rename to openmetadata-ui/src/main/resources/ui/src/components/Settings/Team/TeamDetails/UserTab/UserTab.interface.ts index 9e96a4762148..211fafd46aa4 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/Team/TeamDetails/UserTab/UserTab.interface.ts +++ b/openmetadata-ui/src/main/resources/ui/src/components/Settings/Team/TeamDetails/UserTab/UserTab.interface.ts @@ -10,9 +10,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -import { OperationPermission } from '../../../../components/PermissionProvider/PermissionProvider.interface'; -import { Team } from '../../../../generated/entity/teams/team'; -import { EntityReference } from '../../../../generated/type/entityReference'; +import { OperationPermission } from '../../../../../context/PermissionProvider/PermissionProvider.interface'; +import { Team } from '../../../../../generated/entity/teams/team'; +import { EntityReference } from '../../../../../generated/type/entityReference'; export interface UserTabProps { permission: OperationPermission; diff --git a/openmetadata-ui/src/main/resources/ui/src/components/Team/TeamDetails/UserTab/UserTab.test.tsx b/openmetadata-ui/src/main/resources/ui/src/components/Settings/Team/TeamDetails/UserTab/UserTab.test.tsx similarity index 77% rename from openmetadata-ui/src/main/resources/ui/src/components/Team/TeamDetails/UserTab/UserTab.test.tsx rename to openmetadata-ui/src/main/resources/ui/src/components/Settings/Team/TeamDetails/UserTab/UserTab.test.tsx index d4dc60d6fc36..1191a1ed945d 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/Team/TeamDetails/UserTab/UserTab.test.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/components/Settings/Team/TeamDetails/UserTab/UserTab.test.tsx @@ -13,10 +13,10 @@ import { render, screen } from '@testing-library/react'; import React from 'react'; import { BrowserRouter } from 'react-router-dom'; -import { OperationPermission } from '../../../../components/PermissionProvider/PermissionProvider.interface'; -import { Team } from '../../../../generated/entity/teams/team'; -import { MOCK_MARKETING_TEAM } from '../../../../mocks/Teams.mock'; -import { getUsers } from '../../../../rest/userAPI'; +import { OperationPermission } from '../../../../../context/PermissionProvider/PermissionProvider.interface'; +import { Team } from '../../../../../generated/entity/teams/team'; +import { MOCK_MARKETING_TEAM } from '../../../../../mocks/Teams.mock'; +import { getUsers } from '../../../../../rest/userAPI'; import { UserTab } from './UserTab.component'; import { UserTabProps } from './UserTab.interface'; @@ -30,32 +30,23 @@ const props: UserTabProps = { onAddUser: jest.fn(), onRemoveUser: mockOnRemoveUser, }; -jest.mock( - '../../../../components/common/ErrorWithPlaceholder/ErrorPlaceHolder', - () => { - return jest.fn().mockImplementation(() =>
ErrorPlaceHolder
); - } -); -jest.mock('../../../../components/common/NextPrevious/NextPrevious', () => { +jest.mock('../../../../common/ErrorWithPlaceholder/ErrorPlaceHolder', () => { + return jest.fn().mockImplementation(() =>
ErrorPlaceHolder
); +}); +jest.mock('../../../../common/NextPrevious/NextPrevious', () => { return jest.fn().mockImplementation(() =>
NextPrevious
); }); -jest.mock( - '../../../../components/common/SearchBarComponent/SearchBar.component', - () => { - return jest.fn().mockImplementation(() =>
Searchbar
); - } -); -jest.mock('../../../../components/Loader/Loader', () => { - return jest.fn().mockImplementation(() =>
Loader
); +jest.mock('../../../../common/SearchBarComponent/SearchBar.component', () => { + return jest.fn().mockImplementation(() =>
Searchbar
); }); jest.mock( - '../../../../components/common/EntityPageInfos/ManageButton/ManageButton', + '../../../../common/EntityPageInfos/ManageButton/ManageButton', () => { return jest.fn().mockImplementation(() =>
ManageButton
); } ); jest.mock( - '../../../../components/common/UserSelectableList/UserSelectableList.component', + '../../../../common/UserSelectableList/UserSelectableList.component', () => ({ UserSelectableList: jest .fn() @@ -65,11 +56,11 @@ jest.mock( }) ); -jest.mock('../../../../utils/Users.util', () => ({ +jest.mock('../../../../../utils/Users.util', () => ({ commonUserDetailColumns: jest.fn().mockImplementation(() => []), })); -jest.mock('../../../../rest/userAPI', () => ({ +jest.mock('../../../../../rest/userAPI', () => ({ getUsers: jest.fn().mockResolvedValue({ data: [{ id: 'test', name: 'testing' }], paging: { total: 10 }, diff --git a/openmetadata-ui/src/main/resources/ui/src/components/Team/TeamDetails/team.interface.ts b/openmetadata-ui/src/main/resources/ui/src/components/Settings/Team/TeamDetails/team.interface.ts similarity index 90% rename from openmetadata-ui/src/main/resources/ui/src/components/Team/TeamDetails/team.interface.ts rename to openmetadata-ui/src/main/resources/ui/src/components/Settings/Team/TeamDetails/team.interface.ts index 931ef9f05436..229f7ff0cdec 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/Team/TeamDetails/team.interface.ts +++ b/openmetadata-ui/src/main/resources/ui/src/components/Settings/Team/TeamDetails/team.interface.ts @@ -11,8 +11,11 @@ * limitations under the License. */ -import { MessagingProvider, Team } from '../../../generated/entity/teams/team'; -import { OperationPermission } from '../../PermissionProvider/PermissionProvider.interface'; +import { OperationPermission } from '../../../../context/PermissionProvider/PermissionProvider.interface'; +import { + MessagingProvider, + Team, +} from '../../../../generated/entity/teams/team'; export interface TeamHierarchyProps { currentTeam?: Team; diff --git a/openmetadata-ui/src/main/resources/ui/src/components/Team/TeamDetails/teams.less b/openmetadata-ui/src/main/resources/ui/src/components/Settings/Team/TeamDetails/teams.less similarity index 98% rename from openmetadata-ui/src/main/resources/ui/src/components/Team/TeamDetails/teams.less rename to openmetadata-ui/src/main/resources/ui/src/components/Settings/Team/TeamDetails/teams.less index 408809318cee..2199cf4ae40b 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/Team/TeamDetails/teams.less +++ b/openmetadata-ui/src/main/resources/ui/src/components/Settings/Team/TeamDetails/teams.less @@ -11,7 +11,7 @@ * limitations under the License. */ -@import url('../../../styles/variables.less'); +@import url('../../../../styles/variables.less'); .team-list-container { padding: 20px 0; diff --git a/openmetadata-ui/src/main/resources/ui/src/components/Team/TeamImportResult/TeamImportResult.component.tsx b/openmetadata-ui/src/main/resources/ui/src/components/Settings/Team/TeamImportResult/TeamImportResult.component.tsx similarity index 94% rename from openmetadata-ui/src/main/resources/ui/src/components/Team/TeamImportResult/TeamImportResult.component.tsx rename to openmetadata-ui/src/main/resources/ui/src/components/Settings/Team/TeamImportResult/TeamImportResult.component.tsx index f93b058c3035..065c56715d82 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/Team/TeamImportResult/TeamImportResult.component.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/components/Settings/Team/TeamImportResult/TeamImportResult.component.tsx @@ -15,11 +15,11 @@ import { ColumnsType } from 'antd/lib/table'; import React, { useEffect, useMemo, useState } from 'react'; import { useTranslation } from 'react-i18next'; import { usePapaParse } from 'react-papaparse'; -import { ReactComponent as FailBadgeIcon } from '../../../assets/svg/fail-badge.svg'; -import { ReactComponent as SuccessBadgeIcon } from '../../../assets/svg/success-badge.svg'; -import Table from '../../../components/common/Table/Table'; -import { Status } from '../../../generated/type/csvImportResult'; -import { parseCSV } from '../../../utils/EntityImport/EntityImportUtils'; +import { ReactComponent as FailBadgeIcon } from '../../../../assets/svg/fail-badge.svg'; +import { ReactComponent as SuccessBadgeIcon } from '../../../../assets/svg/success-badge.svg'; +import { Status } from '../../../../generated/type/csvImportResult'; +import { parseCSV } from '../../../../utils/EntityImport/EntityImportUtils'; +import Table from '../../../common/Table/Table'; import { TeamCSVRecord, TeamImportResultProps, diff --git a/openmetadata-ui/src/main/resources/ui/src/components/Team/TeamImportResult/TeamImportResult.interface.ts b/openmetadata-ui/src/main/resources/ui/src/components/Settings/Team/TeamImportResult/TeamImportResult.interface.ts similarity index 92% rename from openmetadata-ui/src/main/resources/ui/src/components/Team/TeamImportResult/TeamImportResult.interface.ts rename to openmetadata-ui/src/main/resources/ui/src/components/Settings/Team/TeamImportResult/TeamImportResult.interface.ts index 7f6b624060ec..be4120950247 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/Team/TeamImportResult/TeamImportResult.interface.ts +++ b/openmetadata-ui/src/main/resources/ui/src/components/Settings/Team/TeamImportResult/TeamImportResult.interface.ts @@ -10,7 +10,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -import { CSVImportResult } from '../../../generated/type/csvImportResult'; +import { CSVImportResult } from '../../../../generated/type/csvImportResult'; export interface TeamImportResultProps { csvImportResult: CSVImportResult; diff --git a/openmetadata-ui/src/main/resources/ui/src/components/Team/TeamImportResult/TeamImportResult.test.tsx b/openmetadata-ui/src/main/resources/ui/src/components/Settings/Team/TeamImportResult/TeamImportResult.test.tsx similarity index 96% rename from openmetadata-ui/src/main/resources/ui/src/components/Team/TeamImportResult/TeamImportResult.test.tsx rename to openmetadata-ui/src/main/resources/ui/src/components/Settings/Team/TeamImportResult/TeamImportResult.test.tsx index 947fad923537..975966fd82f4 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/Team/TeamImportResult/TeamImportResult.test.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/components/Settings/Team/TeamImportResult/TeamImportResult.test.tsx @@ -12,7 +12,7 @@ */ import { findAllByRole, render, screen } from '@testing-library/react'; import React from 'react'; -import { CSVImportResult } from '../../../generated/type/csvImportResult'; +import { CSVImportResult } from '../../../../generated/type/csvImportResult'; import { TeamImportResult } from './TeamImportResult.component'; const mockCsvImportResult = { dryRun: true, diff --git a/openmetadata-ui/src/main/resources/ui/src/components/TeamsSelectable/TeamsSelectable.interface.ts b/openmetadata-ui/src/main/resources/ui/src/components/Settings/Team/TeamsSelectable/TeamsSelectable.interface.ts similarity index 92% rename from openmetadata-ui/src/main/resources/ui/src/components/TeamsSelectable/TeamsSelectable.interface.ts rename to openmetadata-ui/src/main/resources/ui/src/components/Settings/Team/TeamsSelectable/TeamsSelectable.interface.ts index fea4122a9c71..e247a0a9f9f9 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/TeamsSelectable/TeamsSelectable.interface.ts +++ b/openmetadata-ui/src/main/resources/ui/src/components/Settings/Team/TeamsSelectable/TeamsSelectable.interface.ts @@ -1,4 +1,4 @@ -import { EntityReference } from '../../generated/entity/type'; +import { EntityReference } from '../../../../generated/entity/type'; /* * Copyright 2023 Collate. diff --git a/openmetadata-ui/src/main/resources/ui/src/components/TeamsSelectable/TeamsSelectable.test.tsx b/openmetadata-ui/src/main/resources/ui/src/components/Settings/Team/TeamsSelectable/TeamsSelectable.test.tsx similarity index 95% rename from openmetadata-ui/src/main/resources/ui/src/components/TeamsSelectable/TeamsSelectable.test.tsx rename to openmetadata-ui/src/main/resources/ui/src/components/Settings/Team/TeamsSelectable/TeamsSelectable.test.tsx index ecda56a066bd..af54b7adfae3 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/TeamsSelectable/TeamsSelectable.test.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/components/Settings/Team/TeamsSelectable/TeamsSelectable.test.tsx @@ -30,7 +30,7 @@ jest.mock('antd', () => ({ )), })); -jest.mock('../../rest/teamsAPI', () => ({ +jest.mock('../../../../rest/teamsAPI', () => ({ getTeamsHierarchy: jest.fn().mockImplementation(() => Promise.resolve({ data: [], @@ -38,7 +38,7 @@ jest.mock('../../rest/teamsAPI', () => ({ ), })); -jest.mock('../../utils/EntityUtils', () => ({ +jest.mock('../../../../utils/EntityUtils', () => ({ getEntityName: jest.fn().mockImplementation(() => 'entityName'), })); diff --git a/openmetadata-ui/src/main/resources/ui/src/components/TeamsSelectable/TeamsSelectable.tsx b/openmetadata-ui/src/main/resources/ui/src/components/Settings/Team/TeamsSelectable/TeamsSelectable.tsx similarity index 91% rename from openmetadata-ui/src/main/resources/ui/src/components/TeamsSelectable/TeamsSelectable.tsx rename to openmetadata-ui/src/main/resources/ui/src/components/Settings/Team/TeamsSelectable/TeamsSelectable.tsx index 2c8198ee3118..951a598782cd 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/TeamsSelectable/TeamsSelectable.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/components/Settings/Team/TeamsSelectable/TeamsSelectable.tsx @@ -15,11 +15,11 @@ import { Alert, TreeSelect } from 'antd'; import { BaseOptionType } from 'antd/lib/select'; import { t } from 'i18next'; import React, { useEffect, useMemo, useState } from 'react'; -import { TeamHierarchy } from '../../generated/entity/teams/teamHierarchy'; -import { EntityReference } from '../../generated/entity/type'; -import { getTeamsHierarchy } from '../../rest/teamsAPI'; -import { getEntityName } from '../../utils/EntityUtils'; -import { showErrorToast } from '../../utils/ToastUtils'; +import { TeamHierarchy } from '../../../../generated/entity/teams/teamHierarchy'; +import { EntityReference } from '../../../../generated/entity/type'; +import { getTeamsHierarchy } from '../../../../rest/teamsAPI'; +import { getEntityName } from '../../../../utils/EntityUtils'; +import { showErrorToast } from '../../../../utils/ToastUtils'; import { TeamsSelectableProps } from './TeamsSelectable.interface'; const TeamsSelectable = ({ diff --git a/openmetadata-ui/src/main/resources/ui/src/components/Team/UserImportResult/UserImportResult.component.tsx b/openmetadata-ui/src/main/resources/ui/src/components/Settings/Team/UserImportResult/UserImportResult.component.tsx similarity index 94% rename from openmetadata-ui/src/main/resources/ui/src/components/Team/UserImportResult/UserImportResult.component.tsx rename to openmetadata-ui/src/main/resources/ui/src/components/Settings/Team/UserImportResult/UserImportResult.component.tsx index 06e5238d03f8..046bb0f7f2ae 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/Team/UserImportResult/UserImportResult.component.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/components/Settings/Team/UserImportResult/UserImportResult.component.tsx @@ -15,11 +15,11 @@ import { ColumnsType } from 'antd/lib/table'; import React, { useEffect, useMemo, useState } from 'react'; import { useTranslation } from 'react-i18next'; import { usePapaParse } from 'react-papaparse'; -import { ReactComponent as FailBadgeIcon } from '../../../assets/svg/fail-badge.svg'; -import { ReactComponent as SuccessBadgeIcon } from '../../../assets/svg/success-badge.svg'; -import Table from '../../../components/common/Table/Table'; -import { Status } from '../../../generated/type/csvImportResult'; -import { parseCSV } from '../../../utils/EntityImport/EntityImportUtils'; +import { ReactComponent as FailBadgeIcon } from '../../../../assets/svg/fail-badge.svg'; +import { ReactComponent as SuccessBadgeIcon } from '../../../../assets/svg/success-badge.svg'; +import { Status } from '../../../../generated/type/csvImportResult'; +import { parseCSV } from '../../../../utils/EntityImport/EntityImportUtils'; +import Table from '../../../common/Table/Table'; import { UserCSVRecord, UserImportResultProps, diff --git a/openmetadata-ui/src/main/resources/ui/src/components/Team/UserImportResult/UserImportResult.interface.ts b/openmetadata-ui/src/main/resources/ui/src/components/Settings/Team/UserImportResult/UserImportResult.interface.ts similarity index 92% rename from openmetadata-ui/src/main/resources/ui/src/components/Team/UserImportResult/UserImportResult.interface.ts rename to openmetadata-ui/src/main/resources/ui/src/components/Settings/Team/UserImportResult/UserImportResult.interface.ts index bdbe621146d5..6c217e849804 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/Team/UserImportResult/UserImportResult.interface.ts +++ b/openmetadata-ui/src/main/resources/ui/src/components/Settings/Team/UserImportResult/UserImportResult.interface.ts @@ -10,7 +10,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -import { CSVImportResult } from '../../../generated/type/csvImportResult'; +import { CSVImportResult } from '../../../../generated/type/csvImportResult'; export interface UserImportResultProps { csvImportResult: CSVImportResult; diff --git a/openmetadata-ui/src/main/resources/ui/src/components/Team/UserImportResult/UserImportResult.test.tsx b/openmetadata-ui/src/main/resources/ui/src/components/Settings/Team/UserImportResult/UserImportResult.test.tsx similarity index 96% rename from openmetadata-ui/src/main/resources/ui/src/components/Team/UserImportResult/UserImportResult.test.tsx rename to openmetadata-ui/src/main/resources/ui/src/components/Settings/Team/UserImportResult/UserImportResult.test.tsx index 154ef193c964..4b6af381fea5 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/Team/UserImportResult/UserImportResult.test.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/components/Settings/Team/UserImportResult/UserImportResult.test.tsx @@ -12,7 +12,7 @@ */ import { findAllByRole, render, screen } from '@testing-library/react'; import React from 'react'; -import { CSVImportResult } from '../../../generated/type/csvImportResult'; +import { CSVImportResult } from '../../../../generated/type/csvImportResult'; import { UserImportResult } from './UserImportResult.component'; const mockCsvImportResult = { diff --git a/openmetadata-ui/src/main/resources/ui/src/components/AccessTokenCard/AccessTokenCard.component.tsx b/openmetadata-ui/src/main/resources/ui/src/components/Settings/Users/AccessTokenCard/AccessTokenCard.component.tsx similarity index 93% rename from openmetadata-ui/src/main/resources/ui/src/components/AccessTokenCard/AccessTokenCard.component.tsx rename to openmetadata-ui/src/main/resources/ui/src/components/Settings/Users/AccessTokenCard/AccessTokenCard.component.tsx index 3a1795cc3201..effa41151247 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/AccessTokenCard/AccessTokenCard.component.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/components/Settings/Users/AccessTokenCard/AccessTokenCard.component.tsx @@ -19,24 +19,24 @@ import React, { FC, useCallback, useEffect, useMemo, useState } from 'react'; import { PersonalAccessToken, TokenType, -} from '../../generated/auth/personalAccessToken'; +} from '../../../../generated/auth/personalAccessToken'; import { AuthenticationMechanism, AuthType, -} from '../../generated/entity/teams/user'; -import { createBotWithPut } from '../../rest/botsAPI'; +} from '../../../../generated/entity/teams/user'; +import { createBotWithPut } from '../../../../rest/botsAPI'; import { createUserWithPut, getAuthMechanismForBotUser, getUserAccessToken, revokeAccessToken, updateUserAccessToken, -} from '../../rest/userAPI'; -import { showErrorToast } from '../../utils/ToastUtils'; -import AuthMechanism from '../BotDetails/AuthMechanism'; -import AuthMechanismForm from '../BotDetails/AuthMechanismForm'; -import Loader from '../Loader/Loader'; -import ConfirmationModal from '../Modals/ConfirmationModal/ConfirmationModal'; +} from '../../../../rest/userAPI'; +import { showErrorToast } from '../../../../utils/ToastUtils'; +import Loader from '../../../common/Loader/Loader'; +import ConfirmationModal from '../../../Modals/ConfirmationModal/ConfirmationModal'; +import AuthMechanism from '../../Bot/BotDetails/AuthMechanism'; +import AuthMechanismForm from '../../Bot/BotDetails/AuthMechanismForm'; import { MockProps } from './AccessTokenCard.interfaces'; const AccessTokenCard: FC = ({ diff --git a/openmetadata-ui/src/main/resources/ui/src/components/AccessTokenCard/AccessTokenCard.interfaces.ts b/openmetadata-ui/src/main/resources/ui/src/components/Settings/Users/AccessTokenCard/AccessTokenCard.interfaces.ts similarity index 85% rename from openmetadata-ui/src/main/resources/ui/src/components/AccessTokenCard/AccessTokenCard.interfaces.ts rename to openmetadata-ui/src/main/resources/ui/src/components/Settings/Users/AccessTokenCard/AccessTokenCard.interfaces.ts index c2a9975f8d07..12d38700a677 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/AccessTokenCard/AccessTokenCard.interfaces.ts +++ b/openmetadata-ui/src/main/resources/ui/src/components/Settings/Users/AccessTokenCard/AccessTokenCard.interfaces.ts @@ -11,8 +11,8 @@ * limitations under the License. */ -import { Bot } from '../../generated/entity/bot'; -import { User } from '../../generated/entity/teams/user'; +import { Bot } from '../../../../generated/entity/bot'; +import { User } from '../../../../generated/entity/teams/user'; export type MockProps = { isBot: boolean; diff --git a/openmetadata-ui/src/main/resources/ui/src/components/AccessTokenCard/AccessTokenCard.test.tsx b/openmetadata-ui/src/main/resources/ui/src/components/Settings/Users/AccessTokenCard/AccessTokenCard.test.tsx similarity index 91% rename from openmetadata-ui/src/main/resources/ui/src/components/AccessTokenCard/AccessTokenCard.test.tsx rename to openmetadata-ui/src/main/resources/ui/src/components/Settings/Users/AccessTokenCard/AccessTokenCard.test.tsx index d3c009e2d44e..77c225bfb16b 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/AccessTokenCard/AccessTokenCard.test.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/components/Settings/Users/AccessTokenCard/AccessTokenCard.test.tsx @@ -13,11 +13,11 @@ import '@testing-library/jest-dom/extend-expect'; import { act, fireEvent, render, screen } from '@testing-library/react'; import React from 'react'; -import { revokeAccessToken } from '../../rest/userAPI'; -import { mockAccessData } from '../Users/mocks/User.mocks'; +import { revokeAccessToken } from '../../../../rest/userAPI'; +import { mockAccessData } from '../mocks/User.mocks'; import AccessTokenCard from './AccessTokenCard.component'; -jest.mock('../BotDetails/AuthMechanism', () => { +jest.mock('../../Bot/BotDetails/AuthMechanism', () => { return jest.fn().mockImplementation(({ onTokenRevoke }) => (

AuthMechanism{' '} @@ -28,11 +28,11 @@ jest.mock('../BotDetails/AuthMechanism', () => { )); }); -jest.mock('../BotDetails/AuthMechanismForm', () => { +jest.mock('../../Bot/BotDetails/AuthMechanismForm', () => { return jest.fn().mockReturnValue(

AuthMechanismForm

); }); -jest.mock('../Modals/ConfirmationModal/ConfirmationModal', () => { +jest.mock('../../../Modals/ConfirmationModal/ConfirmationModal', () => { return jest.fn().mockImplementation(({ onConfirm, onCancel, visible }) => visible ? (
@@ -49,7 +49,7 @@ jest.mock('../Modals/ConfirmationModal/ConfirmationModal', () => { ); }); -jest.mock('../../rest/userAPI', () => { +jest.mock('../../../../rest/userAPI', () => { return { getUserAccessToken: jest .fn() diff --git a/openmetadata-ui/src/main/resources/ui/src/components/Users/ChangePasswordForm.test.tsx b/openmetadata-ui/src/main/resources/ui/src/components/Settings/Users/ChangePasswordForm.test.tsx similarity index 100% rename from openmetadata-ui/src/main/resources/ui/src/components/Users/ChangePasswordForm.test.tsx rename to openmetadata-ui/src/main/resources/ui/src/components/Settings/Users/ChangePasswordForm.test.tsx diff --git a/openmetadata-ui/src/main/resources/ui/src/components/Users/ChangePasswordForm.tsx b/openmetadata-ui/src/main/resources/ui/src/components/Settings/Users/ChangePasswordForm.tsx similarity index 94% rename from openmetadata-ui/src/main/resources/ui/src/components/Users/ChangePasswordForm.tsx rename to openmetadata-ui/src/main/resources/ui/src/components/Settings/Users/ChangePasswordForm.tsx index 0f66127755bf..6d0bfc269a5b 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/Users/ChangePasswordForm.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/components/Settings/Users/ChangePasswordForm.tsx @@ -14,9 +14,9 @@ import { Form, Input, Modal } from 'antd'; import React from 'react'; import { useTranslation } from 'react-i18next'; -import { VALIDATION_MESSAGES } from '../../constants/constants'; -import { passwordRegex } from '../../constants/regex.constants'; -import { ChangePasswordRequest } from '../../generated/auth/changePasswordRequest'; +import { VALIDATION_MESSAGES } from '../../../constants/constants'; +import { passwordRegex } from '../../../constants/regex.constants'; +import { ChangePasswordRequest } from '../../../generated/auth/changePasswordRequest'; type ChangePasswordForm = { visible: boolean; diff --git a/openmetadata-ui/src/main/resources/ui/src/components/CreateUser/CreateUser.component.tsx b/openmetadata-ui/src/main/resources/ui/src/components/Settings/Users/CreateUser/CreateUser.component.tsx similarity index 90% rename from openmetadata-ui/src/main/resources/ui/src/components/CreateUser/CreateUser.component.tsx rename to openmetadata-ui/src/main/resources/ui/src/components/Settings/Users/CreateUser/CreateUser.component.tsx index 0d55af22a938..cc644aa71739 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/CreateUser/CreateUser.component.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/components/Settings/Users/CreateUser/CreateUser.component.tsx @@ -26,27 +26,30 @@ import { AxiosError } from 'axios'; import { compact, isEmpty, map, trim } from 'lodash'; import React, { useEffect, useMemo, useState } from 'react'; import { useTranslation } from 'react-i18next'; -import { ReactComponent as IconSync } from '../../assets/svg/ic-sync.svg'; -import { VALIDATION_MESSAGES } from '../../constants/constants'; -import { EMAIL_REG_EX, passwordRegex } from '../../constants/regex.constants'; -import { CreatePasswordGenerator } from '../../enums/user.enum'; +import { ReactComponent as IconSync } from '../../../../assets/svg/ic-sync.svg'; +import { VALIDATION_MESSAGES } from '../../../../constants/constants'; +import { + EMAIL_REG_EX, + passwordRegex, +} from '../../../../constants/regex.constants'; +import { CreatePasswordGenerator } from '../../../../enums/user.enum'; import { AuthType, CreatePasswordType, CreateUser as CreateUserSchema, -} from '../../generated/api/teams/createUser'; -import { EntityReference } from '../../generated/entity/type'; -import { AuthProvider } from '../../generated/settings/settings'; -import { checkEmailInUse, generateRandomPwd } from '../../rest/auth-API'; -import { getJWTTokenExpiryOptions } from '../../utils/BotsUtils'; -import { handleSearchFilterOption } from '../../utils/CommonUtils'; -import { getEntityName } from '../../utils/EntityUtils'; -import { showErrorToast } from '../../utils/ToastUtils'; -import { useAuthContext } from '../Auth/AuthProviders/AuthProvider'; -import RichTextEditor from '../common/RichTextEditor/RichTextEditor'; -import CopyToClipboardButton from '../CopyToClipboardButton/CopyToClipboardButton'; -import Loader from '../Loader/Loader'; -import TeamsSelectable from '../TeamsSelectable/TeamsSelectable'; +} from '../../../../generated/api/teams/createUser'; +import { EntityReference } from '../../../../generated/entity/type'; +import { AuthProvider } from '../../../../generated/settings/settings'; +import { checkEmailInUse, generateRandomPwd } from '../../../../rest/auth-API'; +import { getJWTTokenExpiryOptions } from '../../../../utils/BotsUtils'; +import { handleSearchFilterOption } from '../../../../utils/CommonUtils'; +import { getEntityName } from '../../../../utils/EntityUtils'; +import { showErrorToast } from '../../../../utils/ToastUtils'; +import { useAuthContext } from '../../../Auth/AuthProviders/AuthProvider'; +import CopyToClipboardButton from '../../../common/CopyToClipboardButton/CopyToClipboardButton'; +import Loader from '../../../common/Loader/Loader'; +import RichTextEditor from '../../../common/RichTextEditor/RichTextEditor'; +import TeamsSelectable from '../../Team/TeamsSelectable/TeamsSelectable'; import { CreateUserProps } from './CreateUser.interface'; const { Option } = Select; diff --git a/openmetadata-ui/src/main/resources/ui/src/components/CreateUser/CreateUser.interface.ts b/openmetadata-ui/src/main/resources/ui/src/components/Settings/Users/CreateUser/CreateUser.interface.ts similarity index 84% rename from openmetadata-ui/src/main/resources/ui/src/components/CreateUser/CreateUser.interface.ts rename to openmetadata-ui/src/main/resources/ui/src/components/Settings/Users/CreateUser/CreateUser.interface.ts index b70481200bf6..ea4b4088020a 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/CreateUser/CreateUser.interface.ts +++ b/openmetadata-ui/src/main/resources/ui/src/components/Settings/Users/CreateUser/CreateUser.interface.ts @@ -11,8 +11,8 @@ * limitations under the License. */ -import { CreateUser } from '../../generated/api/teams/createUser'; -import { Role } from '../../generated/entity/teams/role'; +import { CreateUser } from '../../../../generated/api/teams/createUser'; +import { Role } from '../../../../generated/entity/teams/role'; export interface CreateUserProps { isLoading?: boolean; diff --git a/openmetadata-ui/src/main/resources/ui/src/components/CreateUser/CreateUser.test.tsx b/openmetadata-ui/src/main/resources/ui/src/components/Settings/Users/CreateUser/CreateUser.test.tsx similarity index 94% rename from openmetadata-ui/src/main/resources/ui/src/components/CreateUser/CreateUser.test.tsx rename to openmetadata-ui/src/main/resources/ui/src/components/Settings/Users/CreateUser/CreateUser.test.tsx index 3585ec3f8f58..a82622e5fcd2 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/CreateUser/CreateUser.test.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/components/Settings/Users/CreateUser/CreateUser.test.tsx @@ -17,11 +17,11 @@ import { MemoryRouter } from 'react-router-dom'; import CreateUser from './CreateUser.component'; import { CreateUserProps } from './CreateUser.interface'; -jest.mock('../TeamsSelectable/TeamsSelectable', () => { +jest.mock('../../Team/TeamsSelectable/TeamsSelectable', () => { return jest.fn().mockReturnValue(

TeamsSelectable component

); }); -jest.mock('../common/RichTextEditor/RichTextEditor', () => { +jest.mock('../../../common/RichTextEditor/RichTextEditor', () => { return forwardRef( jest.fn().mockImplementation(({ initialValue }, ref) => { return
{initialValue}MarkdownWithPreview component
; diff --git a/openmetadata-ui/src/main/resources/ui/src/components/Users/UserProfileIcon/UserProfileIcon.component.tsx b/openmetadata-ui/src/main/resources/ui/src/components/Settings/Users/UserProfileIcon/UserProfileIcon.component.tsx similarity index 94% rename from openmetadata-ui/src/main/resources/ui/src/components/Users/UserProfileIcon/UserProfileIcon.component.tsx rename to openmetadata-ui/src/main/resources/ui/src/components/Settings/Users/UserProfileIcon/UserProfileIcon.component.tsx index a174aabd59b1..e4b457d92487 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/Users/UserProfileIcon/UserProfileIcon.component.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/components/Settings/Users/UserProfileIcon/UserProfileIcon.component.tsx @@ -23,7 +23,7 @@ import React, { } from 'react'; import { useTranslation } from 'react-i18next'; import { Link } from 'react-router-dom'; -import { ReactComponent as DropDownIcon } from '../../../assets/svg/drop-down.svg'; +import { ReactComponent as DropDownIcon } from '../../../../assets/svg/drop-down.svg'; import { getTeamAndUserDetailsPath, getUserPath, @@ -31,17 +31,17 @@ import { NO_DATA_PLACEHOLDER, TERM_ADMIN, TERM_USER, -} from '../../../constants/constants'; -import { EntityReference } from '../../../generated/entity/type'; -import { getEntityName } from '../../../utils/EntityUtils'; -import i18n from '../../../utils/i18next/LocalUtil'; +} from '../../../../constants/constants'; +import { useApplicationConfigContext } from '../../../../context/ApplicationConfigProvider/ApplicationConfigProvider'; +import { EntityReference } from '../../../../generated/entity/type'; +import { getEntityName } from '../../../../utils/EntityUtils'; +import i18n from '../../../../utils/i18next/LocalUtil'; import { getImageWithResolutionAndFallback, ImageQuality, -} from '../../../utils/ProfilerUtils'; -import { useApplicationConfigContext } from '../../ApplicationConfigProvider/ApplicationConfigProvider'; -import { useAuthContext } from '../../Auth/AuthProviders/AuthProvider'; -import Avatar from '../../common/AvatarComponent/Avatar'; +} from '../../../../utils/ProfilerUtils'; +import { useAuthContext } from '../../../Auth/AuthProviders/AuthProvider'; +import Avatar from '../../../common/AvatarComponent/Avatar'; import './user-profile-icon.less'; type ListMenuItemProps = { diff --git a/openmetadata-ui/src/main/resources/ui/src/components/Users/UserProfileIcon/UserProfileIcon.test.tsx b/openmetadata-ui/src/main/resources/ui/src/components/Settings/Users/UserProfileIcon/UserProfileIcon.test.tsx similarity index 86% rename from openmetadata-ui/src/main/resources/ui/src/components/Users/UserProfileIcon/UserProfileIcon.test.tsx rename to openmetadata-ui/src/main/resources/ui/src/components/Settings/Users/UserProfileIcon/UserProfileIcon.test.tsx index c8e5e278046f..99b4797f87d7 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/Users/UserProfileIcon/UserProfileIcon.test.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/components/Settings/Users/UserProfileIcon/UserProfileIcon.test.tsx @@ -13,34 +13,37 @@ import { act, fireEvent, render, screen } from '@testing-library/react'; import userEvent from '@testing-library/user-event'; import React from 'react'; -import { getImageWithResolutionAndFallback } from '../../../utils/ProfilerUtils'; -import { useApplicationConfigContext } from '../../ApplicationConfigProvider/ApplicationConfigProvider'; -import { useAuthContext } from '../../Auth/AuthProviders/AuthProvider'; +import { useApplicationConfigContext } from '../../../../context/ApplicationConfigProvider/ApplicationConfigProvider'; +import { getImageWithResolutionAndFallback } from '../../../../utils/ProfilerUtils'; +import { useAuthContext } from '../../../Auth/AuthProviders/AuthProvider'; import { mockPersonaData, mockUserData } from '../mocks/User.mocks'; import { UserProfileIcon } from './UserProfileIcon.component'; const mockLogout = jest.fn(); const mockUpdateSelectedPersona = jest.fn(); -jest.mock('../../ApplicationConfigProvider/ApplicationConfigProvider', () => ({ - useApplicationConfigContext: jest.fn().mockImplementation(() => ({ - selectedPersona: {}, - updateSelectedPersona: mockUpdateSelectedPersona, - })), -})); +jest.mock( + '../../../../context/ApplicationConfigProvider/ApplicationConfigProvider', + () => ({ + useApplicationConfigContext: jest.fn().mockImplementation(() => ({ + selectedPersona: {}, + updateSelectedPersona: mockUpdateSelectedPersona, + })), + }) +); -jest.mock('../../../utils/EntityUtils', () => ({ +jest.mock('../../../../utils/EntityUtils', () => ({ getEntityName: jest.fn().mockReturnValue('Test User'), })); -jest.mock('../../../utils/ProfilerUtils', () => ({ +jest.mock('../../../../utils/ProfilerUtils', () => ({ getImageWithResolutionAndFallback: jest .fn() .mockImplementation(() => 'valid-image-url'), ImageQuality: jest.fn().mockReturnValue('6x'), })); -jest.mock('../../common/AvatarComponent/Avatar', () => +jest.mock('../../../common/AvatarComponent/Avatar', () => jest.fn().mockReturnValue(
Avatar
) ); @@ -52,7 +55,7 @@ jest.mock('react-router-dom', () => ({ )), })); -jest.mock('../../Auth/AuthProviders/AuthProvider', () => ({ +jest.mock('../../../Auth/AuthProviders/AuthProvider', () => ({ useAuthContext: jest.fn(() => ({ currentUser: mockUserData, })), diff --git a/openmetadata-ui/src/main/resources/ui/src/components/Users/UserProfileIcon/user-profile-icon.less b/openmetadata-ui/src/main/resources/ui/src/components/Settings/Users/UserProfileIcon/user-profile-icon.less similarity index 100% rename from openmetadata-ui/src/main/resources/ui/src/components/Users/UserProfileIcon/user-profile-icon.less rename to openmetadata-ui/src/main/resources/ui/src/components/Settings/Users/UserProfileIcon/user-profile-icon.less diff --git a/openmetadata-ui/src/main/resources/ui/src/components/Users/Users.component.test.tsx b/openmetadata-ui/src/main/resources/ui/src/components/Settings/Users/Users.component.test.tsx similarity index 81% rename from openmetadata-ui/src/main/resources/ui/src/components/Users/Users.component.test.tsx rename to openmetadata-ui/src/main/resources/ui/src/components/Settings/Users/Users.component.test.tsx index 52beca237e8b..1a75203a747d 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/Users/Users.component.test.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/components/Settings/Users/Users.component.test.tsx @@ -22,14 +22,9 @@ import { import userEvent from '@testing-library/user-event'; import React, { ReactNode } from 'react'; import { MemoryRouter } from 'react-router-dom'; -import { AuthProvider } from '../../generated/settings/settings'; -import { useAuthContext } from '../Auth/AuthProviders/AuthProvider'; -import { - mockAccessData, - mockTeamsData, - mockUserData, - mockUserRole, -} from './mocks/User.mocks'; +import { AuthProvider } from '../../../generated/settings/settings'; +import { useAuthContext } from '../../Auth/AuthProviders/AuthProvider'; +import { mockAccessData, mockUserData, mockUserRole } from './mocks/User.mocks'; import Users from './Users.component'; import { UserPageTabs } from './Users.interface'; @@ -43,14 +38,10 @@ jest.mock('react-router-dom', () => ({ useParams: jest.fn().mockImplementation(() => mockParams), })); -jest.mock('../../rest/rolesAPIV1', () => ({ +jest.mock('../../../rest/rolesAPIV1', () => ({ getRoles: jest.fn().mockImplementation(() => Promise.resolve(mockUserRole)), })); -jest.mock('../common/ProfilePicture/ProfilePicture', () => { - return jest.fn().mockReturnValue(

ProfilePicture

); -}); - jest.mock( './UsersProfile/UserProfileDetails/UserProfileDetails.component', () => { @@ -58,10 +49,6 @@ jest.mock( } ); -jest.mock('./UsersProfile/UserProfileImage/UserProfileImage.component', () => { - return jest.fn().mockReturnValue(
UserProfileImage
); -}); - jest.mock( './UsersProfile/UserProfileInheritedRoles/UserProfileInheritedRoles.component', () => { @@ -77,19 +64,15 @@ jest.mock('./UsersProfile/UserProfileTeams/UserProfileTeams.component', () => { return jest.fn().mockReturnValue(
UserProfileTeams
); }); -jest.mock('../../components/SearchedData/SearchedData', () => { - return jest.fn().mockReturnValue(

SearchedData

); -}); - jest.mock( - '../../components/Explore/EntitySummaryPanel/EntitySummaryPanel.component', + '../../Explore/EntitySummaryPanel/EntitySummaryPanel.component', () => { return jest.fn().mockReturnValue(

EntitySummaryPanel

); } ); jest.mock( - '../Persona/PersonaSelectableList/PersonaSelectableList.component', + '../../MyData/Persona/PersonaSelectableList/PersonaSelectableList.component', () => ({ PersonaSelectableList: jest .fn() @@ -97,26 +80,26 @@ jest.mock( }) ); -jest.mock('../Glossary/GlossaryTerms/tabs/AssetsTabs.component', () => { +jest.mock('../../Glossary/GlossaryTerms/tabs/AssetsTabs.component', () => { return jest.fn().mockReturnValue(

AssetsTabs

); }); jest.mock( - '../../components/ActivityFeed/ActivityFeedProvider/ActivityFeedProvider', + '../../ActivityFeed/ActivityFeedProvider/ActivityFeedProvider', () => { return jest.fn().mockImplementation(({ children }) => <>{children}); } ); jest.mock( - '../../components/ActivityFeed/ActivityFeedTab/ActivityFeedTab.component', + '../../ActivityFeed/ActivityFeedTab/ActivityFeedTab.component', () => ({ ActivityFeedTab: jest .fn() .mockImplementation(() => <>ActivityFeedTabTest), }) ); -jest.mock('../Auth/AuthProviders/AuthProvider', () => ({ +jest.mock('../../Auth/AuthProviders/AuthProvider', () => ({ useAuthContext: jest.fn(() => ({ authConfig: { provider: AuthProvider.Basic, @@ -127,11 +110,7 @@ jest.mock('../Auth/AuthProviders/AuthProvider', () => ({ })), })); -jest.mock('../../rest/teamsAPI', () => ({ - getTeams: jest.fn().mockImplementation(() => Promise.resolve(mockTeamsData)), -})); - -jest.mock('../PageLayoutV1/PageLayoutV1', () => +jest.mock('../../PageLayoutV1/PageLayoutV1', () => jest .fn() .mockImplementation( @@ -153,7 +132,7 @@ jest.mock('../PageLayoutV1/PageLayoutV1', () => ) ); -jest.mock('../common/EntityDescription/Description', () => { +jest.mock('../../common/EntityDescription/DescriptionV1', () => { return jest.fn().mockReturnValue(

Description

); }); const updateUserDetails = jest.fn(); @@ -167,11 +146,7 @@ const mockProp = { handlePaginate: jest.fn(), }; -jest.mock('../../rest/userAPI', () => ({ - checkValidImage: jest.fn().mockImplementation(() => Promise.resolve(true)), -})); - -jest.mock('../PageLayoutV1/PageLayoutV1', () => +jest.mock('../../PageLayoutV1/PageLayoutV1', () => jest.fn().mockImplementation(({ children, leftPanel, rightPanel }) => (
{leftPanel} diff --git a/openmetadata-ui/src/main/resources/ui/src/components/Users/Users.component.tsx b/openmetadata-ui/src/main/resources/ui/src/components/Settings/Users/Users.component.tsx similarity index 87% rename from openmetadata-ui/src/main/resources/ui/src/components/Users/Users.component.tsx rename to openmetadata-ui/src/main/resources/ui/src/components/Settings/Users/Users.component.tsx index 173d20dd421a..4dc4d39c5c9d 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/Users/Users.component.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/components/Settings/Users/Users.component.tsx @@ -17,32 +17,32 @@ import { isEmpty, noop } from 'lodash'; import React, { useCallback, useEffect, useMemo, useState } from 'react'; import { useTranslation } from 'react-i18next'; import { useHistory, useLocation, useParams } from 'react-router-dom'; -import { ReactComponent as PersonaIcon } from '../../assets/svg/ic-personas.svg'; -import ActivityFeedProvider from '../../components/ActivityFeed/ActivityFeedProvider/ActivityFeedProvider'; -import { ActivityFeedTab } from '../../components/ActivityFeed/ActivityFeedTab/ActivityFeedTab.component'; -import TabsLabel from '../../components/TabsLabel/TabsLabel.component'; -import { getUserPath, ROUTES } from '../../constants/constants'; -import { EntityType } from '../../enums/entity.enum'; -import { SearchIndex } from '../../enums/search.enum'; -import { EntityReference } from '../../generated/entity/type'; -import { useAuth } from '../../hooks/authHooks'; -import { useFqn } from '../../hooks/useFqn'; -import { searchData } from '../../rest/miscAPI'; -import { getEntityName } from '../../utils/EntityUtils'; -import { DEFAULT_ENTITY_PERMISSION } from '../../utils/PermissionsUtils'; -import AccessTokenCard from '../AccessTokenCard/AccessTokenCard.component'; -import { useAuthContext } from '../Auth/AuthProviders/AuthProvider'; -import Chip from '../common/Chip/Chip.component'; -import DescriptionV1 from '../common/EntityDescription/DescriptionV1'; -import EntitySummaryPanel from '../Explore/EntitySummaryPanel/EntitySummaryPanel.component'; -import { EntityDetailsObjectInterface } from '../Explore/ExplorePage.interface'; -import AssetsTabs from '../Glossary/GlossaryTerms/tabs/AssetsTabs.component'; +import { ReactComponent as PersonaIcon } from '../../../assets/svg/ic-personas.svg'; +import { getUserPath, ROUTES } from '../../../constants/constants'; +import { EntityType } from '../../../enums/entity.enum'; +import { SearchIndex } from '../../../enums/search.enum'; +import { EntityReference } from '../../../generated/entity/type'; +import { useAuth } from '../../../hooks/authHooks'; +import { useFqn } from '../../../hooks/useFqn'; +import { searchData } from '../../../rest/miscAPI'; +import { getEntityName } from '../../../utils/EntityUtils'; +import { DEFAULT_ENTITY_PERMISSION } from '../../../utils/PermissionsUtils'; +import ActivityFeedProvider from '../../ActivityFeed/ActivityFeedProvider/ActivityFeedProvider'; +import { ActivityFeedTab } from '../../ActivityFeed/ActivityFeedTab/ActivityFeedTab.component'; +import { useAuthContext } from '../../Auth/AuthProviders/AuthProvider'; +import Chip from '../../common/Chip/Chip.component'; +import DescriptionV1 from '../../common/EntityDescription/DescriptionV1'; +import TabsLabel from '../../common/TabsLabel/TabsLabel.component'; +import EntitySummaryPanel from '../../Explore/EntitySummaryPanel/EntitySummaryPanel.component'; +import { EntityDetailsObjectInterface } from '../../Explore/ExplorePage.interface'; +import AssetsTabs from '../../Glossary/GlossaryTerms/tabs/AssetsTabs.component'; import { AssetNoDataPlaceholderProps, AssetsOfEntity, -} from '../Glossary/GlossaryTerms/tabs/AssetsTabs.interface'; -import PageLayoutV1 from '../PageLayoutV1/PageLayoutV1'; -import { PersonaSelectableList } from '../Persona/PersonaSelectableList/PersonaSelectableList.component'; +} from '../../Glossary/GlossaryTerms/tabs/AssetsTabs.interface'; +import { PersonaSelectableList } from '../../MyData/Persona/PersonaSelectableList/PersonaSelectableList.component'; +import PageLayoutV1 from '../../PageLayoutV1/PageLayoutV1'; +import AccessTokenCard from './AccessTokenCard/AccessTokenCard.component'; import { Props, UserPageTabs } from './Users.interface'; import './users.less'; import UserProfileDetails from './UsersProfile/UserProfileDetails/UserProfileDetails.component'; diff --git a/openmetadata-ui/src/main/resources/ui/src/components/Users/Users.interface.ts b/openmetadata-ui/src/main/resources/ui/src/components/Settings/Users/Users.interface.ts similarity index 87% rename from openmetadata-ui/src/main/resources/ui/src/components/Users/Users.interface.ts rename to openmetadata-ui/src/main/resources/ui/src/components/Settings/Users/Users.interface.ts index 8ec6a13a8739..dfb3135f497e 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/Users/Users.interface.ts +++ b/openmetadata-ui/src/main/resources/ui/src/components/Settings/Users/Users.interface.ts @@ -11,8 +11,8 @@ * limitations under the License. */ -import { PersonalAccessToken } from '../../generated/auth/personalAccessToken'; -import { User } from '../../generated/entity/teams/user'; +import { PersonalAccessToken } from '../../../generated/auth/personalAccessToken'; +import { User } from '../../../generated/entity/teams/user'; export interface Props { userData: User; diff --git a/openmetadata-ui/src/main/resources/ui/src/components/Users/UsersProfile/UserProfileDetails/UserProfileDetails.component.tsx b/openmetadata-ui/src/main/resources/ui/src/components/Settings/Users/UsersProfile/UserProfileDetails/UserProfileDetails.component.tsx similarity index 87% rename from openmetadata-ui/src/main/resources/ui/src/components/Users/UsersProfile/UserProfileDetails/UserProfileDetails.component.tsx rename to openmetadata-ui/src/main/resources/ui/src/components/Settings/Users/UsersProfile/UserProfileDetails/UserProfileDetails.component.tsx index dd3ec77d7d9d..501b8cad3f49 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/Users/UsersProfile/UserProfileDetails/UserProfileDetails.component.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/components/Settings/Users/UsersProfile/UserProfileDetails/UserProfileDetails.component.tsx @@ -15,30 +15,33 @@ import { Button, Divider, Input, Space, Typography } from 'antd'; import { AxiosError } from 'axios'; import React, { useCallback, useMemo, useState } from 'react'; import { useTranslation } from 'react-i18next'; -import { ReactComponent as EditIcon } from '../../../../assets/svg/edit-new.svg'; -import InlineEdit from '../../../../components/InlineEdit/InlineEdit.component'; -import ChangePasswordForm from '../../../../components/Users/ChangePasswordForm'; +import { ReactComponent as EditIcon } from '../../../../../assets/svg/edit-new.svg'; import { DE_ACTIVE_COLOR, ICON_DIMENSION, NO_DATA_PLACEHOLDER, -} from '../../../../constants/constants'; -import { EntityType } from '../../../../enums/entity.enum'; +} from '../../../../../constants/constants'; +import { EntityType } from '../../../../../enums/entity.enum'; import { ChangePasswordRequest, RequestType, -} from '../../../../generated/auth/changePasswordRequest'; -import { EntityReference } from '../../../../generated/entity/type'; -import { AuthProvider } from '../../../../generated/settings/settings'; -import { useAuth } from '../../../../hooks/authHooks'; -import { useFqn } from '../../../../hooks/useFqn'; -import { changePassword } from '../../../../rest/auth-API'; -import { getEntityName } from '../../../../utils/EntityUtils'; -import { showErrorToast, showSuccessToast } from '../../../../utils/ToastUtils'; -import { useAuthContext } from '../../../Auth/AuthProviders/AuthProvider'; -import Chip from '../../../common/Chip/Chip.component'; -import { DomainLabel } from '../../../common/DomainLabel/DomainLabel.component'; -import { PersonaSelectableList } from '../../../Persona/PersonaSelectableList/PersonaSelectableList.component'; +} from '../../../../../generated/auth/changePasswordRequest'; +import { EntityReference } from '../../../../../generated/entity/type'; +import { AuthProvider } from '../../../../../generated/settings/settings'; +import { useAuth } from '../../../../../hooks/authHooks'; +import { useFqn } from '../../../../../hooks/useFqn'; +import { changePassword } from '../../../../../rest/auth-API'; +import { getEntityName } from '../../../../../utils/EntityUtils'; +import { + showErrorToast, + showSuccessToast, +} from '../../../../../utils/ToastUtils'; +import { useAuthContext } from '../../../../Auth/AuthProviders/AuthProvider'; +import Chip from '../../../../common/Chip/Chip.component'; +import { DomainLabel } from '../../../../common/DomainLabel/DomainLabel.component'; +import InlineEdit from '../../../../common/InlineEdit/InlineEdit.component'; +import { PersonaSelectableList } from '../../../../MyData/Persona/PersonaSelectableList/PersonaSelectableList.component'; +import ChangePasswordForm from '../../ChangePasswordForm'; import UserProfileImage from '../UserProfileImage/UserProfileImage.component'; import { UserProfileDetailsProps } from './UserProfileDetails.interface'; diff --git a/openmetadata-ui/src/main/resources/ui/src/components/Users/UsersProfile/UserProfileDetails/UserProfileDetails.interface.ts b/openmetadata-ui/src/main/resources/ui/src/components/Settings/Users/UsersProfile/UserProfileDetails/UserProfileDetails.interface.ts similarity index 91% rename from openmetadata-ui/src/main/resources/ui/src/components/Users/UsersProfile/UserProfileDetails/UserProfileDetails.interface.ts rename to openmetadata-ui/src/main/resources/ui/src/components/Settings/Users/UsersProfile/UserProfileDetails/UserProfileDetails.interface.ts index c79109e30e06..b4feb0ab2952 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/Users/UsersProfile/UserProfileDetails/UserProfileDetails.interface.ts +++ b/openmetadata-ui/src/main/resources/ui/src/components/Settings/Users/UsersProfile/UserProfileDetails/UserProfileDetails.interface.ts @@ -11,7 +11,7 @@ * limitations under the License. */ -import { User } from '../../../../generated/entity/teams/user'; +import { User } from '../../../../../generated/entity/teams/user'; export interface UserProfileDetailsProps { userData: User; diff --git a/openmetadata-ui/src/main/resources/ui/src/components/Users/UsersProfile/UserProfileDetails/UserProfileDetails.test.tsx b/openmetadata-ui/src/main/resources/ui/src/components/Settings/Users/UsersProfile/UserProfileDetails/UserProfileDetails.test.tsx similarity index 87% rename from openmetadata-ui/src/main/resources/ui/src/components/Users/UsersProfile/UserProfileDetails/UserProfileDetails.test.tsx rename to openmetadata-ui/src/main/resources/ui/src/components/Settings/Users/UsersProfile/UserProfileDetails/UserProfileDetails.test.tsx index 5827f574a1b9..bbeed1f34d42 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/Users/UsersProfile/UserProfileDetails/UserProfileDetails.test.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/components/Settings/Users/UsersProfile/UserProfileDetails/UserProfileDetails.test.tsx @@ -13,10 +13,10 @@ import { fireEvent, render, screen } from '@testing-library/react'; import React from 'react'; import { MemoryRouter } from 'react-router-dom'; -import { AuthProvider } from '../../../../generated/settings/settings'; -import { useAuth } from '../../../../hooks/authHooks'; -import { USER_DATA } from '../../../../mocks/User.mock'; -import { useAuthContext } from '../../../Auth/AuthProviders/AuthProvider'; +import { AuthProvider } from '../../../../../generated/settings/settings'; +import { useAuth } from '../../../../../hooks/authHooks'; +import { USER_DATA } from '../../../../../mocks/User.mock'; +import { useAuthContext } from '../../../../Auth/AuthProviders/AuthProvider'; import UserProfileDetails from './UserProfileDetails.component'; import { UserProfileDetailsProps } from './UserProfileDetails.interface'; @@ -34,7 +34,7 @@ jest.mock('react-router-dom', () => ({ useParams: jest.fn().mockImplementation(() => mockParams), })); -jest.mock('../../../Auth/AuthProviders/AuthProvider', () => ({ +jest.mock('../../../../Auth/AuthProviders/AuthProvider', () => ({ useAuthContext: jest.fn(() => ({ authConfig: { provider: AuthProvider.Basic, @@ -45,15 +45,15 @@ jest.mock('../../../Auth/AuthProviders/AuthProvider', () => ({ })), })); -jest.mock('../../../../hooks/authHooks', () => ({ +jest.mock('../../../../../hooks/authHooks', () => ({ useAuth: jest.fn().mockReturnValue({ isAdminUser: true }), })); -jest.mock('../../../../utils/EntityUtils', () => ({ +jest.mock('../../../../../utils/EntityUtils', () => ({ getEntityName: jest.fn().mockReturnValue('entityName'), })); -jest.mock('../../../../utils/ToastUtils', () => ({ +jest.mock('../../../../../utils/ToastUtils', () => ({ showErrorToast: jest.fn(), showSuccessToast: jest.fn(), })); @@ -62,16 +62,16 @@ jest.mock('../UserProfileImage/UserProfileImage.component', () => { return jest.fn().mockReturnValue(

ProfilePicture

); }); -jest.mock('../../../../components/InlineEdit/InlineEdit.component', () => { +jest.mock('../../../../common/InlineEdit/InlineEdit.component', () => { return jest.fn().mockReturnValue(

InlineEdit

); }); -jest.mock('../../../../components/Users/ChangePasswordForm', () => { +jest.mock('../../ChangePasswordForm', () => { return jest.fn().mockReturnValue(

ChangePasswordForm

); }); jest.mock( - '../../../Persona/PersonaSelectableList/PersonaSelectableList.component', + '../../../../MyData/Persona/PersonaSelectableList/PersonaSelectableList.component', () => ({ PersonaSelectableList: jest .fn() @@ -79,7 +79,7 @@ jest.mock( }) ); -jest.mock('../../../common/Chip/Chip.component', () => { +jest.mock('../../../../common/Chip/Chip.component', () => { return jest.fn().mockReturnValue(

Chip

); }); @@ -87,7 +87,7 @@ jest.mock('../UserProfileImage/UserProfileImage.component', () => { return jest.fn().mockReturnValue(

UserProfileImage

); }); -jest.mock('../../../../rest/auth-API', () => ({ +jest.mock('../../../../../rest/auth-API', () => ({ changePassword: jest.fn(), })); diff --git a/openmetadata-ui/src/main/resources/ui/src/components/Users/UsersProfile/UserProfileImage/UserProfileImage.component.tsx b/openmetadata-ui/src/main/resources/ui/src/components/Settings/Users/UsersProfile/UserProfileImage/UserProfileImage.component.tsx similarity index 93% rename from openmetadata-ui/src/main/resources/ui/src/components/Users/UsersProfile/UserProfileImage/UserProfileImage.component.tsx rename to openmetadata-ui/src/main/resources/ui/src/components/Settings/Users/UsersProfile/UserProfileImage/UserProfileImage.component.tsx index f64ad66cf2af..d31b3fcc3363 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/Users/UsersProfile/UserProfileImage/UserProfileImage.component.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/components/Settings/Users/UsersProfile/UserProfileImage/UserProfileImage.component.tsx @@ -13,11 +13,11 @@ import { Image } from 'antd'; import React, { useEffect, useMemo, useState } from 'react'; -import ProfilePicture from '../../../../components/common/ProfilePicture/ProfilePicture'; import { getImageWithResolutionAndFallback, ImageQuality, -} from '../../../../utils/ProfilerUtils'; +} from '../../../../../utils/ProfilerUtils'; +import ProfilePicture from '../../../../common/ProfilePicture/ProfilePicture'; import { UserProfileImageProps } from './UserProfileImage.interface'; const UserProfileImage = ({ userData }: UserProfileImageProps) => { diff --git a/openmetadata-ui/src/main/resources/ui/src/components/Users/UsersProfile/UserProfileImage/UserProfileImage.interface.ts b/openmetadata-ui/src/main/resources/ui/src/components/Settings/Users/UsersProfile/UserProfileImage/UserProfileImage.interface.ts similarity index 91% rename from openmetadata-ui/src/main/resources/ui/src/components/Users/UsersProfile/UserProfileImage/UserProfileImage.interface.ts rename to openmetadata-ui/src/main/resources/ui/src/components/Settings/Users/UsersProfile/UserProfileImage/UserProfileImage.interface.ts index 40b449c47fd5..3f5c0e0a2be8 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/Users/UsersProfile/UserProfileImage/UserProfileImage.interface.ts +++ b/openmetadata-ui/src/main/resources/ui/src/components/Settings/Users/UsersProfile/UserProfileImage/UserProfileImage.interface.ts @@ -11,7 +11,7 @@ * limitations under the License. */ -import { ImageList } from '../../../../generated/type/profile'; +import { ImageList } from '../../../../../generated/type/profile'; export interface UserProfileImageProps { userData: { diff --git a/openmetadata-ui/src/main/resources/ui/src/components/Users/UsersProfile/UserProfileImage/UserProfileImage.test.tsx b/openmetadata-ui/src/main/resources/ui/src/components/Settings/Users/UsersProfile/UserProfileImage/UserProfileImage.test.tsx similarity index 90% rename from openmetadata-ui/src/main/resources/ui/src/components/Users/UsersProfile/UserProfileImage/UserProfileImage.test.tsx rename to openmetadata-ui/src/main/resources/ui/src/components/Settings/Users/UsersProfile/UserProfileImage/UserProfileImage.test.tsx index 5ef192099a2a..9d9045cc778c 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/Users/UsersProfile/UserProfileImage/UserProfileImage.test.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/components/Settings/Users/UsersProfile/UserProfileImage/UserProfileImage.test.tsx @@ -13,7 +13,7 @@ import { act, render, screen } from '@testing-library/react'; import React from 'react'; -import { getImageWithResolutionAndFallback } from '../../../../utils/ProfilerUtils'; +import { getImageWithResolutionAndFallback } from '../../../../../utils/ProfilerUtils'; import { mockUserData } from '../../mocks/User.mocks'; import UserProfileImage from './UserProfileImage.component'; import { UserProfileImageProps } from './UserProfileImage.interface'; @@ -22,12 +22,12 @@ const mockPropsData: UserProfileImageProps = { userData: mockUserData, }; -jest.mock('../../../../utils/ProfilerUtils', () => ({ +jest.mock('../../../../../utils/ProfilerUtils', () => ({ getImageWithResolutionAndFallback: jest.fn().mockImplementation(undefined), ImageQuality: jest.fn().mockReturnValue('6x'), })); -jest.mock('../../../../components/common/ProfilePicture/ProfilePicture', () => { +jest.mock('../../../../common/ProfilePicture/ProfilePicture', () => { return jest.fn().mockReturnValue(

ProfilePicture

); }); diff --git a/openmetadata-ui/src/main/resources/ui/src/components/Users/UsersProfile/UserProfileInheritedRoles/UserProfileInheritedRoles.component.tsx b/openmetadata-ui/src/main/resources/ui/src/components/Settings/Users/UsersProfile/UserProfileInheritedRoles/UserProfileInheritedRoles.component.tsx similarity index 91% rename from openmetadata-ui/src/main/resources/ui/src/components/Users/UsersProfile/UserProfileInheritedRoles/UserProfileInheritedRoles.component.tsx rename to openmetadata-ui/src/main/resources/ui/src/components/Settings/Users/UsersProfile/UserProfileInheritedRoles/UserProfileInheritedRoles.component.tsx index 14f84b0279e4..dbe62b8539de 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/Users/UsersProfile/UserProfileInheritedRoles/UserProfileInheritedRoles.component.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/components/Settings/Users/UsersProfile/UserProfileInheritedRoles/UserProfileInheritedRoles.component.tsx @@ -14,8 +14,8 @@ import { Card, Typography } from 'antd'; import React from 'react'; import { useTranslation } from 'react-i18next'; -import { ReactComponent as UserIcons } from '../../../../assets/svg/user.svg'; -import Chip from '../../../../components/common/Chip/Chip.component'; +import { ReactComponent as UserIcons } from '../../../../../assets/svg/user.svg'; +import Chip from '../../../../common/Chip/Chip.component'; import { UserProfileInheritedRolesProps } from './UserProfileInheritedRoles.interface'; const UserProfileInheritedRoles = ({ diff --git a/openmetadata-ui/src/main/resources/ui/src/components/Users/UsersProfile/UserProfileInheritedRoles/UserProfileInheritedRoles.interface.ts b/openmetadata-ui/src/main/resources/ui/src/components/Settings/Users/UsersProfile/UserProfileInheritedRoles/UserProfileInheritedRoles.interface.ts similarity index 91% rename from openmetadata-ui/src/main/resources/ui/src/components/Users/UsersProfile/UserProfileInheritedRoles/UserProfileInheritedRoles.interface.ts rename to openmetadata-ui/src/main/resources/ui/src/components/Settings/Users/UsersProfile/UserProfileInheritedRoles/UserProfileInheritedRoles.interface.ts index 4313a18288f1..cc33c8078c85 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/Users/UsersProfile/UserProfileInheritedRoles/UserProfileInheritedRoles.interface.ts +++ b/openmetadata-ui/src/main/resources/ui/src/components/Settings/Users/UsersProfile/UserProfileInheritedRoles/UserProfileInheritedRoles.interface.ts @@ -11,7 +11,7 @@ * limitations under the License. */ -import { User } from '../../../../generated/entity/teams/user'; +import { User } from '../../../../../generated/entity/teams/user'; export interface UserProfileInheritedRolesProps { inheritedRoles: User['inheritedRoles']; diff --git a/openmetadata-ui/src/main/resources/ui/src/components/Users/UsersProfile/UserProfileInheritedRoles/UserProfileInheritedRoles.test.tsx b/openmetadata-ui/src/main/resources/ui/src/components/Settings/Users/UsersProfile/UserProfileInheritedRoles/UserProfileInheritedRoles.test.tsx similarity index 95% rename from openmetadata-ui/src/main/resources/ui/src/components/Users/UsersProfile/UserProfileInheritedRoles/UserProfileInheritedRoles.test.tsx rename to openmetadata-ui/src/main/resources/ui/src/components/Settings/Users/UsersProfile/UserProfileInheritedRoles/UserProfileInheritedRoles.test.tsx index 68c8c825d85e..3780c3f7cdc8 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/Users/UsersProfile/UserProfileInheritedRoles/UserProfileInheritedRoles.test.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/components/Settings/Users/UsersProfile/UserProfileInheritedRoles/UserProfileInheritedRoles.test.tsx @@ -20,7 +20,7 @@ const mockPropsData: UserProfileInheritedRolesProps = { inheritedRoles: [], }; -jest.mock('../../../common/Chip/Chip.component', () => { +jest.mock('../../../../common/Chip/Chip.component', () => { return jest.fn().mockReturnValue(

Chip

); }); diff --git a/openmetadata-ui/src/main/resources/ui/src/components/Users/UsersProfile/UserProfileRoles/UserProfileRoles.component.tsx b/openmetadata-ui/src/main/resources/ui/src/components/Settings/Users/UsersProfile/UserProfileRoles/UserProfileRoles.component.tsx similarity index 87% rename from openmetadata-ui/src/main/resources/ui/src/components/Users/UsersProfile/UserProfileRoles/UserProfileRoles.component.tsx rename to openmetadata-ui/src/main/resources/ui/src/components/Settings/Users/UsersProfile/UserProfileRoles/UserProfileRoles.component.tsx index 67256f5e0a7c..fa846b8abf35 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/Users/UsersProfile/UserProfileRoles/UserProfileRoles.component.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/components/Settings/Users/UsersProfile/UserProfileRoles/UserProfileRoles.component.tsx @@ -16,22 +16,22 @@ import { AxiosError } from 'axios'; import { isEmpty, toLower } from 'lodash'; import React, { useEffect, useMemo, useState } from 'react'; import { useTranslation } from 'react-i18next'; -import { ReactComponent as EditIcon } from '../../../../assets/svg/edit-new.svg'; -import { ReactComponent as UserIcons } from '../../../../assets/svg/user.svg'; -import Chip from '../../../../components/common/Chip/Chip.component'; -import InlineEdit from '../../../../components/InlineEdit/InlineEdit.component'; +import { ReactComponent as EditIcon } from '../../../../../assets/svg/edit-new.svg'; +import { ReactComponent as UserIcons } from '../../../../../assets/svg/user.svg'; import { DE_ACTIVE_COLOR, ICON_DIMENSION, PAGE_SIZE_LARGE, TERM_ADMIN, -} from '../../../../constants/constants'; -import { Role } from '../../../../generated/entity/teams/role'; -import { useAuth } from '../../../../hooks/authHooks'; -import { getRoles } from '../../../../rest/rolesAPIV1'; -import { handleSearchFilterOption } from '../../../../utils/CommonUtils'; -import { getEntityName } from '../../../../utils/EntityUtils'; -import { showErrorToast } from '../../../../utils/ToastUtils'; +} from '../../../../../constants/constants'; +import { Role } from '../../../../../generated/entity/teams/role'; +import { useAuth } from '../../../../../hooks/authHooks'; +import { getRoles } from '../../../../../rest/rolesAPIV1'; +import { handleSearchFilterOption } from '../../../../../utils/CommonUtils'; +import { getEntityName } from '../../../../../utils/EntityUtils'; +import { showErrorToast } from '../../../../../utils/ToastUtils'; +import Chip from '../../../../common/Chip/Chip.component'; +import InlineEdit from '../../../../common/InlineEdit/InlineEdit.component'; import { UserProfileRolesProps } from './UserProfileRoles.interface'; const UserProfileRoles = ({ diff --git a/openmetadata-ui/src/main/resources/ui/src/components/Users/UsersProfile/UserProfileRoles/UserProfileRoles.interface.ts b/openmetadata-ui/src/main/resources/ui/src/components/Settings/Users/UsersProfile/UserProfileRoles/UserProfileRoles.interface.ts similarity index 91% rename from openmetadata-ui/src/main/resources/ui/src/components/Users/UsersProfile/UserProfileRoles/UserProfileRoles.interface.ts rename to openmetadata-ui/src/main/resources/ui/src/components/Settings/Users/UsersProfile/UserProfileRoles/UserProfileRoles.interface.ts index 9d32da421318..c288aa62d195 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/Users/UsersProfile/UserProfileRoles/UserProfileRoles.interface.ts +++ b/openmetadata-ui/src/main/resources/ui/src/components/Settings/Users/UsersProfile/UserProfileRoles/UserProfileRoles.interface.ts @@ -10,7 +10,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -import { User } from '../../../../generated/entity/teams/user'; +import { User } from '../../../../../generated/entity/teams/user'; export interface UserProfileRolesProps { isUserAdmin?: boolean; diff --git a/openmetadata-ui/src/main/resources/ui/src/components/Users/UsersProfile/UserProfileRoles/UserProfileRoles.test.tsx b/openmetadata-ui/src/main/resources/ui/src/components/Settings/Users/UsersProfile/UserProfileRoles/UserProfileRoles.test.tsx similarity index 88% rename from openmetadata-ui/src/main/resources/ui/src/components/Users/UsersProfile/UserProfileRoles/UserProfileRoles.test.tsx rename to openmetadata-ui/src/main/resources/ui/src/components/Settings/Users/UsersProfile/UserProfileRoles/UserProfileRoles.test.tsx index 612c02b9b9b6..11db0b0e9314 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/Users/UsersProfile/UserProfileRoles/UserProfileRoles.test.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/components/Settings/Users/UsersProfile/UserProfileRoles/UserProfileRoles.test.tsx @@ -13,8 +13,8 @@ import { fireEvent, render, screen } from '@testing-library/react'; import React from 'react'; -import { useAuth } from '../../../../hooks/authHooks'; -import { getRoles } from '../../../../rest/rolesAPIV1'; +import { useAuth } from '../../../../../hooks/authHooks'; +import { getRoles } from '../../../../../rest/rolesAPIV1'; import { mockUserRole } from '../../mocks/User.mocks'; import UserProfileRoles from './UserProfileRoles.component'; import { UserProfileRolesProps } from './UserProfileRoles.interface'; @@ -24,27 +24,27 @@ const mockPropsData: UserProfileRolesProps = { updateUserDetails: jest.fn(), }; -jest.mock('../../../../hooks/authHooks', () => ({ +jest.mock('../../../../../hooks/authHooks', () => ({ useAuth: jest.fn().mockReturnValue({ isAdminUser: false }), })); -jest.mock('../../../../components/InlineEdit/InlineEdit.component', () => { +jest.mock('../../../../common/InlineEdit/InlineEdit.component', () => { return jest.fn().mockReturnValue(

InlineEdit

); }); -jest.mock('../../../common/Chip/Chip.component', () => { +jest.mock('../../../../common/Chip/Chip.component', () => { return jest.fn().mockReturnValue(

Chip

); }); -jest.mock('../../../../utils/EntityUtils', () => ({ +jest.mock('../../../../../utils/EntityUtils', () => ({ getEntityName: jest.fn().mockReturnValue('roleName'), })); -jest.mock('../../../../utils/ToastUtils', () => ({ +jest.mock('../../../../../utils/ToastUtils', () => ({ showErrorToast: jest.fn(), })); -jest.mock('../../../../rest/rolesAPIV1', () => ({ +jest.mock('../../../../../rest/rolesAPIV1', () => ({ getRoles: jest.fn().mockImplementation(() => Promise.resolve(mockUserRole)), })); diff --git a/openmetadata-ui/src/main/resources/ui/src/components/Users/UsersProfile/UserProfileTeams/UserProfileTeams.component.tsx b/openmetadata-ui/src/main/resources/ui/src/components/Settings/Users/UsersProfile/UserProfileTeams/UserProfileTeams.component.tsx similarity index 81% rename from openmetadata-ui/src/main/resources/ui/src/components/Users/UsersProfile/UserProfileTeams/UserProfileTeams.component.tsx rename to openmetadata-ui/src/main/resources/ui/src/components/Settings/Users/UsersProfile/UserProfileTeams/UserProfileTeams.component.tsx index 4d3dad757ae7..9172b9d37d70 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/Users/UsersProfile/UserProfileTeams/UserProfileTeams.component.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/components/Settings/Users/UsersProfile/UserProfileTeams/UserProfileTeams.component.tsx @@ -14,18 +14,18 @@ import { Card, Space, Typography } from 'antd'; import React, { useEffect, useMemo, useState } from 'react'; import { useTranslation } from 'react-i18next'; -import { ReactComponent as EditIcon } from '../../../../assets/svg/edit-new.svg'; -import { ReactComponent as IconTeamsGrey } from '../../../../assets/svg/teams-grey.svg'; -import Chip from '../../../../components/common/Chip/Chip.component'; -import InlineEdit from '../../../../components/InlineEdit/InlineEdit.component'; -import TeamsSelectable from '../../../../components/TeamsSelectable/TeamsSelectable'; +import { ReactComponent as EditIcon } from '../../../../../assets/svg/edit-new.svg'; +import { ReactComponent as IconTeamsGrey } from '../../../../../assets/svg/teams-grey.svg'; import { DE_ACTIVE_COLOR, ICON_DIMENSION, -} from '../../../../constants/constants'; -import { EntityReference } from '../../../../generated/entity/type'; -import { useAuth } from '../../../../hooks/authHooks'; -import { getNonDeletedTeams } from '../../../../utils/CommonUtils'; +} from '../../../../../constants/constants'; +import { EntityReference } from '../../../../../generated/entity/type'; +import { useAuth } from '../../../../../hooks/authHooks'; +import { getNonDeletedTeams } from '../../../../../utils/CommonUtils'; +import Chip from '../../../../common/Chip/Chip.component'; +import InlineEdit from '../../../../common/InlineEdit/InlineEdit.component'; +import TeamsSelectable from '../../../Team/TeamsSelectable/TeamsSelectable'; import { UserProfileTeamsProps } from './UserProfileTeams.interface'; const UserProfileTeams = ({ diff --git a/openmetadata-ui/src/main/resources/ui/src/components/Users/UsersProfile/UserProfileTeams/UserProfileTeams.interface.ts b/openmetadata-ui/src/main/resources/ui/src/components/Settings/Users/UsersProfile/UserProfileTeams/UserProfileTeams.interface.ts similarity index 91% rename from openmetadata-ui/src/main/resources/ui/src/components/Users/UsersProfile/UserProfileTeams/UserProfileTeams.interface.ts rename to openmetadata-ui/src/main/resources/ui/src/components/Settings/Users/UsersProfile/UserProfileTeams/UserProfileTeams.interface.ts index 1cd062d5b590..8161d6519404 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/Users/UsersProfile/UserProfileTeams/UserProfileTeams.interface.ts +++ b/openmetadata-ui/src/main/resources/ui/src/components/Settings/Users/UsersProfile/UserProfileTeams/UserProfileTeams.interface.ts @@ -10,7 +10,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -import { User } from '../../../../generated/entity/teams/user'; +import { User } from '../../../../../generated/entity/teams/user'; export interface UserProfileTeamsProps { teams: User['teams']; diff --git a/openmetadata-ui/src/main/resources/ui/src/components/Users/UsersProfile/UserProfileTeams/UserProfileTeams.test.tsx b/openmetadata-ui/src/main/resources/ui/src/components/Settings/Users/UsersProfile/UserProfileTeams/UserProfileTeams.test.tsx similarity index 85% rename from openmetadata-ui/src/main/resources/ui/src/components/Users/UsersProfile/UserProfileTeams/UserProfileTeams.test.tsx rename to openmetadata-ui/src/main/resources/ui/src/components/Settings/Users/UsersProfile/UserProfileTeams/UserProfileTeams.test.tsx index 251a53685049..701d1a60059d 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/Users/UsersProfile/UserProfileTeams/UserProfileTeams.test.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/components/Settings/Users/UsersProfile/UserProfileTeams/UserProfileTeams.test.tsx @@ -13,8 +13,8 @@ import { fireEvent, render, screen } from '@testing-library/react'; import React from 'react'; -import { useAuth } from '../../../../hooks/authHooks'; -import { USER_DATA, USER_TEAMS } from '../../../../mocks/User.mock'; +import { useAuth } from '../../../../../hooks/authHooks'; +import { USER_DATA, USER_TEAMS } from '../../../../../mocks/User.mock'; import UserProfileTeams from './UserProfileTeams.component'; import { UserProfileTeamsProps } from './UserProfileTeams.interface'; @@ -23,23 +23,23 @@ const mockPropsData: UserProfileTeamsProps = { updateUserDetails: jest.fn(), }; -jest.mock('../../../../hooks/authHooks', () => ({ +jest.mock('../../../../../hooks/authHooks', () => ({ useAuth: jest.fn().mockReturnValue({ isAdminUser: true }), })); -jest.mock('../../../../utils/CommonUtils', () => ({ +jest.mock('../../../../../utils/CommonUtils', () => ({ getNonDeletedTeams: jest.fn(), })); -jest.mock('../../../../components/InlineEdit/InlineEdit.component', () => { +jest.mock('../../../../common/InlineEdit/InlineEdit.component', () => { return jest.fn().mockReturnValue(

InlineEdit

); }); -jest.mock('../../../common/Chip/Chip.component', () => { +jest.mock('../../../../common/Chip/Chip.component', () => { return jest.fn().mockReturnValue(

Chip

); }); -jest.mock('../../../../components/TeamsSelectable/TeamsSelectable', () => { +jest.mock('../../../Team/TeamsSelectable/TeamsSelectable', () => { return jest.fn().mockReturnValue(

TeamsSelectable

); }); diff --git a/openmetadata-ui/src/main/resources/ui/src/components/Users/UsersTab/UsersTab.test.tsx b/openmetadata-ui/src/main/resources/ui/src/components/Settings/Users/UsersTab/UsersTab.test.tsx similarity index 95% rename from openmetadata-ui/src/main/resources/ui/src/components/Users/UsersTab/UsersTab.test.tsx rename to openmetadata-ui/src/main/resources/ui/src/components/Settings/Users/UsersTab/UsersTab.test.tsx index a1a015a459d3..44dceaf7bd4c 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/Users/UsersTab/UsersTab.test.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/components/Settings/Users/UsersTab/UsersTab.test.tsx @@ -14,19 +14,16 @@ import { act, fireEvent, render, screen } from '@testing-library/react'; import userEvent from '@testing-library/user-event'; import React from 'react'; import { MemoryRouter } from 'react-router-dom'; -import { getUserById } from '../../../rest/userAPI'; +import { getUserById } from '../../../../rest/userAPI'; import { mockUsersTabData } from '../mocks/User.mocks'; import { UsersTab } from './UsersTabs.component'; -jest.mock('../../../rest/userAPI', () => ({ +jest.mock('../../../../rest/userAPI', () => ({ getUserById: jest .fn() .mockImplementation(() => Promise.resolve(mockUsersTabData)), })); -jest.mock('../../common/PopOverCard/UserPopOverCard', () => - jest.fn().mockReturnValue('Aaron Johnson') -); jest.mock('react-router-dom', () => ({ Link: jest .fn() diff --git a/openmetadata-ui/src/main/resources/ui/src/components/Users/UsersTab/UsersTabs.component.tsx b/openmetadata-ui/src/main/resources/ui/src/components/Settings/Users/UsersTab/UsersTabs.component.tsx similarity index 88% rename from openmetadata-ui/src/main/resources/ui/src/components/Users/UsersTab/UsersTabs.component.tsx rename to openmetadata-ui/src/main/resources/ui/src/components/Settings/Users/UsersTab/UsersTabs.component.tsx index 10f0022bae78..b05dd748c991 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/Users/UsersTab/UsersTabs.component.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/components/Settings/Users/UsersTab/UsersTabs.component.tsx @@ -14,14 +14,14 @@ import { Button, Modal } from 'antd'; import { isNil } from 'lodash'; import React, { useCallback, useEffect, useMemo, useState } from 'react'; import { useTranslation } from 'react-i18next'; -import { ReactComponent as IconRemove } from '../../../assets/svg/ic-remove.svg'; -import { ERROR_PLACEHOLDER_TYPE } from '../../../enums/common.enum'; -import { User } from '../../../generated/entity/teams/user'; -import { EntityReference } from '../../../generated/entity/type'; -import { getUserById } from '../../../rest/userAPI'; -import { commonUserDetailColumns } from '../../../utils/Users.util'; -import ErrorPlaceHolder from '../../common/ErrorWithPlaceholder/ErrorPlaceHolder'; -import Table from '../../common/Table/Table'; +import { ReactComponent as IconRemove } from '../../../../assets/svg/ic-remove.svg'; +import { ERROR_PLACEHOLDER_TYPE } from '../../../../enums/common.enum'; +import { User } from '../../../../generated/entity/teams/user'; +import { EntityReference } from '../../../../generated/entity/type'; +import { getUserById } from '../../../../rest/userAPI'; +import { commonUserDetailColumns } from '../../../../utils/Users.util'; +import ErrorPlaceHolder from '../../../common/ErrorWithPlaceholder/ErrorPlaceHolder'; +import Table from '../../../common/Table/Table'; interface UsersTabProps { users: EntityReference[]; diff --git a/openmetadata-ui/src/main/resources/ui/src/components/Users/mocks/User.mocks.ts b/openmetadata-ui/src/main/resources/ui/src/components/Settings/Users/mocks/User.mocks.ts similarity index 99% rename from openmetadata-ui/src/main/resources/ui/src/components/Users/mocks/User.mocks.ts rename to openmetadata-ui/src/main/resources/ui/src/components/Settings/Users/mocks/User.mocks.ts index 9b98b85c3127..91064f0847a7 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/Users/mocks/User.mocks.ts +++ b/openmetadata-ui/src/main/resources/ui/src/components/Settings/Users/mocks/User.mocks.ts @@ -11,16 +11,16 @@ * limitations under the License. */ -import { SearchIndex } from '../../../enums/search.enum'; -import { TokenType } from '../../../generated/auth/personalAccessToken'; -import { DashboardServiceType } from '../../../generated/entity/data/dashboard'; +import { SearchIndex } from '../../../../enums/search.enum'; +import { TokenType } from '../../../../generated/auth/personalAccessToken'; +import { DashboardServiceType } from '../../../../generated/entity/data/dashboard'; import { DashboardSearchSource, PipelineSearchSource, TableSearchSource, TopicSearchSource, -} from '../../../interface/search.interface'; -import { SearchedDataProps } from '../../SearchedData/SearchedData.interface'; +} from '../../../../interface/search.interface'; +import { SearchedDataProps } from '../../../SearchedData/SearchedData.interface'; export const mockUserData = { id: 'd6764107-e8b4-4748-b256-c86fecc66064', diff --git a/openmetadata-ui/src/main/resources/ui/src/components/Users/users.less b/openmetadata-ui/src/main/resources/ui/src/components/Settings/Users/users.less similarity index 97% rename from openmetadata-ui/src/main/resources/ui/src/components/Users/users.less rename to openmetadata-ui/src/main/resources/ui/src/components/Settings/Users/users.less index 56e321a888ce..1ef9e8a0cc0a 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/Users/users.less +++ b/openmetadata-ui/src/main/resources/ui/src/components/Settings/Users/users.less @@ -11,7 +11,7 @@ * limitations under the License. */ -@import url('../../styles/variables.less'); +@import url('../../../styles/variables.less'); .roles-container { display: flex; diff --git a/openmetadata-ui/src/main/resources/ui/src/components/Tag/TagsContainerV2/TagsContainerV2.tsx b/openmetadata-ui/src/main/resources/ui/src/components/Tag/TagsContainerV2/TagsContainerV2.tsx index c036ad851c94..0223f5128d57 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/Tag/TagsContainerV2/TagsContainerV2.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/components/Tag/TagsContainerV2/TagsContainerV2.tsx @@ -21,7 +21,6 @@ import { useHistory } from 'react-router-dom'; import { ReactComponent as IconComments } from '../../../assets/svg/comment.svg'; import { ReactComponent as EditIcon } from '../../../assets/svg/edit-new.svg'; import { ReactComponent as IconRequest } from '../../../assets/svg/request-icon.svg'; -import { TableTagsProps } from '../../../components/TableTags/TableTags.interface'; import { DE_ACTIVE_COLOR } from '../../../constants/constants'; import { GLOSSARY_CONSTANT, @@ -38,7 +37,8 @@ import { getRequestTagsPath, getUpdateTagsPath, } from '../../../utils/TasksUtils'; -import { SelectOption } from '../../AsyncSelectList/AsyncSelectList.interface'; +import { SelectOption } from '../../common/AsyncSelectList/AsyncSelectList.interface'; +import { TableTagsProps } from '../../Database/TableTags/TableTags.interface'; import TagSelectForm from '../TagsSelectForm/TagsSelectForm.component'; import TagsV1 from '../TagsV1/TagsV1.component'; import TagsViewer from '../TagsViewer/TagsViewer'; diff --git a/openmetadata-ui/src/main/resources/ui/src/components/Tag/TagsSelectForm/TagsSelectForm.component.tsx b/openmetadata-ui/src/main/resources/ui/src/components/Tag/TagsSelectForm/TagsSelectForm.component.tsx index 96120daceff0..aa6969faf470 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/Tag/TagsSelectForm/TagsSelectForm.component.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/components/Tag/TagsSelectForm/TagsSelectForm.component.tsx @@ -14,7 +14,7 @@ import { CheckOutlined, CloseOutlined } from '@ant-design/icons'; import { Button, Col, Form, Row, Space } from 'antd'; import { useForm } from 'antd/lib/form/Form'; import React, { useState } from 'react'; -import AsyncSelectList from '../../../components/AsyncSelectList/AsyncSelectList'; +import AsyncSelectList from '../../common/AsyncSelectList/AsyncSelectList'; import './tag-select-fom.style.less'; import { TagsSelectFormProps } from './TagsSelectForm.interface'; diff --git a/openmetadata-ui/src/main/resources/ui/src/components/Tag/TagsSelectForm/TagsSelectForm.interface.ts b/openmetadata-ui/src/main/resources/ui/src/components/Tag/TagsSelectForm/TagsSelectForm.interface.ts index df1b78769738..59de832de300 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/Tag/TagsSelectForm/TagsSelectForm.interface.ts +++ b/openmetadata-ui/src/main/resources/ui/src/components/Tag/TagsSelectForm/TagsSelectForm.interface.ts @@ -12,9 +12,9 @@ */ import { DefaultOptionType } from 'antd/lib/select'; -import { SelectOption } from '../../../components/AsyncSelectList/AsyncSelectList.interface'; import { Paging } from '../../../generated/type/paging'; import { TagSource } from '../../../generated/type/tagLabel'; +import { SelectOption } from '../../common/AsyncSelectList/AsyncSelectList.interface'; export type TagsSelectFormProps = { placeholder: string; diff --git a/openmetadata-ui/src/main/resources/ui/src/components/TopicDetails/TopicDetails.component.tsx b/openmetadata-ui/src/main/resources/ui/src/components/Topic/TopicDetails/TopicDetails.component.tsx similarity index 84% rename from openmetadata-ui/src/main/resources/ui/src/components/TopicDetails/TopicDetails.component.tsx rename to openmetadata-ui/src/main/resources/ui/src/components/Topic/TopicDetails/TopicDetails.component.tsx index e48a94459ad6..5851a538514a 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/TopicDetails/TopicDetails.component.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/components/Topic/TopicDetails/TopicDetails.component.tsx @@ -17,46 +17,46 @@ import { EntityTags } from 'Models'; import React, { useCallback, useEffect, useMemo, useState } from 'react'; import { useTranslation } from 'react-i18next'; import { useHistory, useParams } from 'react-router-dom'; -import { useActivityFeedProvider } from '../../components/ActivityFeed/ActivityFeedProvider/ActivityFeedProvider'; -import { ActivityFeedTab } from '../../components/ActivityFeed/ActivityFeedTab/ActivityFeedTab.component'; -import { withActivityFeed } from '../../components/AppRouter/withActivityFeed'; -import DescriptionV1 from '../../components/common/EntityDescription/DescriptionV1'; -import ErrorPlaceHolder from '../../components/common/ErrorWithPlaceholder/ErrorPlaceHolder'; -import QueryViewer from '../../components/common/QueryViewer/QueryViewer.component'; -import { DataAssetsHeader } from '../../components/DataAssets/DataAssetsHeader/DataAssetsHeader.component'; -import { EntityName } from '../../components/Modals/EntityNameModal/EntityNameModal.interface'; -import PageLayoutV1 from '../../components/PageLayoutV1/PageLayoutV1'; -import SampleDataWithMessages from '../../components/SampleDataWithMessages/SampleDataWithMessages'; -import TabsLabel from '../../components/TabsLabel/TabsLabel.component'; -import { getTopicDetailsPath } from '../../constants/constants'; -import { FEED_COUNT_INITIAL_DATA } from '../../constants/entity.constants'; -import { ERROR_PLACEHOLDER_TYPE } from '../../enums/common.enum'; -import { EntityTabs, EntityType } from '../../enums/entity.enum'; -import { Tag } from '../../generated/entity/classification/tag'; -import { Topic } from '../../generated/entity/data/topic'; -import { DataProduct } from '../../generated/entity/domains/dataProduct'; -import { ThreadType } from '../../generated/entity/feed/thread'; -import { TagLabel } from '../../generated/type/schema'; -import { useFqn } from '../../hooks/useFqn'; -import { FeedCounts } from '../../interface/feed.interface'; -import { restoreTopic } from '../../rest/topicsAPI'; -import { getFeedCounts } from '../../utils/CommonUtils'; +import { getTopicDetailsPath } from '../../../constants/constants'; +import { FEED_COUNT_INITIAL_DATA } from '../../../constants/entity.constants'; +import LineageProvider from '../../../context/LineageProvider/LineageProvider'; +import { ERROR_PLACEHOLDER_TYPE } from '../../../enums/common.enum'; +import { EntityTabs, EntityType } from '../../../enums/entity.enum'; +import { Tag } from '../../../generated/entity/classification/tag'; +import { Topic } from '../../../generated/entity/data/topic'; +import { DataProduct } from '../../../generated/entity/domains/dataProduct'; +import { ThreadType } from '../../../generated/entity/feed/thread'; +import { TagLabel } from '../../../generated/type/schema'; +import { useFqn } from '../../../hooks/useFqn'; +import { FeedCounts } from '../../../interface/feed.interface'; +import { restoreTopic } from '../../../rest/topicsAPI'; +import { getFeedCounts } from '../../../utils/CommonUtils'; import { getEntityName, getEntityReferenceFromEntity, -} from '../../utils/EntityUtils'; -import { getTagsWithoutTier, getTierTags } from '../../utils/TableUtils'; -import { createTagObject, updateTierTag } from '../../utils/TagsUtils'; -import { showErrorToast, showSuccessToast } from '../../utils/ToastUtils'; -import ActivityThreadPanel from '../ActivityFeed/ActivityThreadPanel/ActivityThreadPanel'; -import { useAuthContext } from '../Auth/AuthProviders/AuthProvider'; -import { CustomPropertyTable } from '../common/CustomPropertyTable/CustomPropertyTable'; -import EntityRightPanel from '../Entity/EntityRightPanel/EntityRightPanel'; -import Lineage from '../Lineage/Lineage.component'; -import LineageProvider from '../LineageProvider/LineageProvider'; -import { SourceType } from '../SearchedData/SearchedData.interface'; +} from '../../../utils/EntityUtils'; +import { getTagsWithoutTier, getTierTags } from '../../../utils/TableUtils'; +import { createTagObject, updateTierTag } from '../../../utils/TagsUtils'; +import { showErrorToast, showSuccessToast } from '../../../utils/ToastUtils'; +import { useActivityFeedProvider } from '../../ActivityFeed/ActivityFeedProvider/ActivityFeedProvider'; +import { ActivityFeedTab } from '../../ActivityFeed/ActivityFeedTab/ActivityFeedTab.component'; +import ActivityThreadPanel from '../../ActivityFeed/ActivityThreadPanel/ActivityThreadPanel'; +import { withActivityFeed } from '../../AppRouter/withActivityFeed'; +import { useAuthContext } from '../../Auth/AuthProviders/AuthProvider'; +import { CustomPropertyTable } from '../../common/CustomPropertyTable/CustomPropertyTable'; +import DescriptionV1 from '../../common/EntityDescription/DescriptionV1'; +import ErrorPlaceHolder from '../../common/ErrorWithPlaceholder/ErrorPlaceHolder'; +import QueryViewer from '../../common/QueryViewer/QueryViewer.component'; +import TabsLabel from '../../common/TabsLabel/TabsLabel.component'; +import { DataAssetsHeader } from '../../DataAssets/DataAssetsHeader/DataAssetsHeader.component'; +import SampleDataWithMessages from '../../Database/SampleDataWithMessages/SampleDataWithMessages'; +import EntityRightPanel from '../../Entity/EntityRightPanel/EntityRightPanel'; +import Lineage from '../../Lineage/Lineage.component'; +import { EntityName } from '../../Modals/EntityNameModal/EntityNameModal.interface'; +import PageLayoutV1 from '../../PageLayoutV1/PageLayoutV1'; +import { SourceType } from '../../SearchedData/SearchedData.interface'; +import TopicSchemaFields from '../TopicSchema/TopicSchema'; import { TopicDetailsProps } from './TopicDetails.interface'; -import TopicSchemaFields from './TopicSchema/TopicSchema'; const TopicDetails: React.FC = ({ updateTopicDetailsState, diff --git a/openmetadata-ui/src/main/resources/ui/src/components/TopicDetails/TopicDetails.interface.ts b/openmetadata-ui/src/main/resources/ui/src/components/Topic/TopicDetails/TopicDetails.interface.ts similarity index 76% rename from openmetadata-ui/src/main/resources/ui/src/components/TopicDetails/TopicDetails.interface.ts rename to openmetadata-ui/src/main/resources/ui/src/components/Topic/TopicDetails/TopicDetails.interface.ts index d087b1f48101..00d6e55aef25 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/TopicDetails/TopicDetails.interface.ts +++ b/openmetadata-ui/src/main/resources/ui/src/components/Topic/TopicDetails/TopicDetails.interface.ts @@ -11,12 +11,12 @@ * limitations under the License. */ -import { DataAssetWithDomains } from '../../components/DataAssets/DataAssetsHeader/DataAssetsHeader.interface'; -import { OperationPermission } from '../../components/PermissionProvider/PermissionProvider.interface'; -import { QueryVote } from '../../components/TableQueries/TableQueries.interface'; -import { CreateThread } from '../../generated/api/feed/createThread'; -import { CleanupPolicy, Topic } from '../../generated/entity/data/topic'; -import { SchemaType } from '../../generated/type/schema'; +import { OperationPermission } from '../../../context/PermissionProvider/PermissionProvider.interface'; +import { CreateThread } from '../../../generated/api/feed/createThread'; +import { CleanupPolicy, Topic } from '../../../generated/entity/data/topic'; +import { SchemaType } from '../../../generated/type/schema'; +import { DataAssetWithDomains } from '../../DataAssets/DataAssetsHeader/DataAssetsHeader.interface'; +import { QueryVote } from '../../Database/TableQueries/TableQueries.interface'; export interface TopicDetailsProps { updateTopicDetailsState?: (data: DataAssetWithDomains) => void; diff --git a/openmetadata-ui/src/main/resources/ui/src/components/TopicDetails/TopicDetails.mock.ts b/openmetadata-ui/src/main/resources/ui/src/components/Topic/TopicDetails/TopicDetails.mock.ts similarity index 97% rename from openmetadata-ui/src/main/resources/ui/src/components/TopicDetails/TopicDetails.mock.ts rename to openmetadata-ui/src/main/resources/ui/src/components/Topic/TopicDetails/TopicDetails.mock.ts index ea4c665ea55d..2f64b3bc5c0a 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/TopicDetails/TopicDetails.mock.ts +++ b/openmetadata-ui/src/main/resources/ui/src/components/Topic/TopicDetails/TopicDetails.mock.ts @@ -11,8 +11,8 @@ * limitations under the License. */ -import { Topic } from '../../generated/entity/data/topic'; -import { nestedField } from './TopicSchema/TopicSchema.mock'; +import { Topic } from '../../../generated/entity/data/topic'; +import { nestedField } from '../TopicSchema/TopicSchema.mock'; /* eslint-disable max-len */ diff --git a/openmetadata-ui/src/main/resources/ui/src/components/TopicDetails/TopicDetails.test.tsx b/openmetadata-ui/src/main/resources/ui/src/components/Topic/TopicDetails/TopicDetails.test.tsx similarity index 98% rename from openmetadata-ui/src/main/resources/ui/src/components/TopicDetails/TopicDetails.test.tsx rename to openmetadata-ui/src/main/resources/ui/src/components/Topic/TopicDetails/TopicDetails.test.tsx index 35464135daef..74611f1efc65 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/TopicDetails/TopicDetails.test.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/components/Topic/TopicDetails/TopicDetails.test.tsx @@ -19,8 +19,8 @@ import { } from '@testing-library/react'; import React from 'react'; import { MemoryRouter } from 'react-router-dom'; -import { EntityTabs } from '../../enums/entity.enum'; -import { DEFAULT_ENTITY_PERMISSION } from '../../utils/PermissionsUtils'; +import { EntityTabs } from '../../../enums/entity.enum'; +import { DEFAULT_ENTITY_PERMISSION } from '../../../utils/PermissionsUtils'; import TopicDetails from './TopicDetails.component'; import { TopicDetailsProps } from './TopicDetails.interface'; import { TOPIC_DETAILS } from './TopicDetails.mock'; diff --git a/openmetadata-ui/src/main/resources/ui/src/components/TopicDetails/TopicSchema/TopicSchema.interface.tsx b/openmetadata-ui/src/main/resources/ui/src/components/Topic/TopicSchema/TopicSchema.interface.tsx similarity index 100% rename from openmetadata-ui/src/main/resources/ui/src/components/TopicDetails/TopicSchema/TopicSchema.interface.tsx rename to openmetadata-ui/src/main/resources/ui/src/components/Topic/TopicSchema/TopicSchema.interface.tsx diff --git a/openmetadata-ui/src/main/resources/ui/src/components/TopicDetails/TopicSchema/TopicSchema.mock.ts b/openmetadata-ui/src/main/resources/ui/src/components/Topic/TopicSchema/TopicSchema.mock.ts similarity index 100% rename from openmetadata-ui/src/main/resources/ui/src/components/TopicDetails/TopicSchema/TopicSchema.mock.ts rename to openmetadata-ui/src/main/resources/ui/src/components/Topic/TopicSchema/TopicSchema.mock.ts diff --git a/openmetadata-ui/src/main/resources/ui/src/components/TopicDetails/TopicSchema/TopicSchema.test.tsx b/openmetadata-ui/src/main/resources/ui/src/components/Topic/TopicSchema/TopicSchema.test.tsx similarity index 98% rename from openmetadata-ui/src/main/resources/ui/src/components/TopicDetails/TopicSchema/TopicSchema.test.tsx rename to openmetadata-ui/src/main/resources/ui/src/components/Topic/TopicSchema/TopicSchema.test.tsx index e7b26b283bcd..0b38cd20f646 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/TopicDetails/TopicSchema/TopicSchema.test.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/components/Topic/TopicSchema/TopicSchema.test.tsx @@ -23,7 +23,7 @@ import { import userEvent from '@testing-library/user-event'; import React from 'react'; import { Topic } from '../../../generated/entity/data/topic'; -import { MESSAGE_SCHEMA } from '../TopicDetails.mock'; +import { MESSAGE_SCHEMA } from '../TopicDetails/TopicDetails.mock'; import TopicSchema from './TopicSchema'; import { TopicSchemaFieldsProps } from './TopicSchema.interface'; diff --git a/openmetadata-ui/src/main/resources/ui/src/components/TopicDetails/TopicSchema/TopicSchema.tsx b/openmetadata-ui/src/main/resources/ui/src/components/Topic/TopicSchema/TopicSchema.tsx similarity index 93% rename from openmetadata-ui/src/main/resources/ui/src/components/TopicDetails/TopicSchema/TopicSchema.tsx rename to openmetadata-ui/src/main/resources/ui/src/components/Topic/TopicSchema/TopicSchema.tsx index 866808ec35ff..9e78ca6039ff 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/TopicDetails/TopicSchema/TopicSchema.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/components/Topic/TopicSchema/TopicSchema.tsx @@ -27,13 +27,6 @@ import { cloneDeep, groupBy, isEmpty, isUndefined, uniqBy } from 'lodash'; import { EntityTags, TagFilterOptions } from 'Models'; import React, { FC, useCallback, useEffect, useMemo, useState } from 'react'; import { useTranslation } from 'react-i18next'; -import ErrorPlaceHolder from '../../../components/common/ErrorWithPlaceholder/ErrorPlaceHolder'; -import RichTextEditorPreviewer from '../../../components/common/RichTextEditor/RichTextEditorPreviewer'; -import { ModalWithMarkdownEditor } from '../../../components/Modals/ModalWithMarkdownEditor/ModalWithMarkdownEditor'; -import { ColumnFilter } from '../../../components/Table/ColumnFilter/ColumnFilter.component'; -import TableDescription from '../../../components/TableDescription/TableDescription.component'; -import TableTags from '../../../components/TableTags/TableTags.component'; -import ToggleExpandButton from '../../../components/ToggleExpandButton/ToggleExpandButton'; import { TABLE_SCROLL_VALUE } from '../../../constants/Table.constants'; import { CSMode } from '../../../enums/codemirror.enum'; import { EntityType } from '../../../enums/entity.enum'; @@ -51,7 +44,14 @@ import { updateFieldDescription, updateFieldTags, } from '../../../utils/TableUtils'; -import SchemaEditor from '../../SchemaEditor/SchemaEditor'; +import ErrorPlaceHolder from '../../common/ErrorWithPlaceholder/ErrorPlaceHolder'; +import RichTextEditorPreviewer from '../../common/RichTextEditor/RichTextEditorPreviewer'; +import ToggleExpandButton from '../../common/ToggleExpandButton/ToggleExpandButton'; +import { ColumnFilter } from '../../Database/ColumnFilter/ColumnFilter.component'; +import SchemaEditor from '../../Database/SchemaEditor/SchemaEditor'; +import TableDescription from '../../Database/TableDescription/TableDescription.component'; +import TableTags from '../../Database/TableTags/TableTags.component'; +import { ModalWithMarkdownEditor } from '../../Modals/ModalWithMarkdownEditor/ModalWithMarkdownEditor'; import { SchemaViewType, TopicSchemaFieldsProps, diff --git a/openmetadata-ui/src/main/resources/ui/src/components/TopicVersion/TopicVersion.component.tsx b/openmetadata-ui/src/main/resources/ui/src/components/Topic/TopicVersion/TopicVersion.component.tsx similarity index 85% rename from openmetadata-ui/src/main/resources/ui/src/components/TopicVersion/TopicVersion.component.tsx rename to openmetadata-ui/src/main/resources/ui/src/components/Topic/TopicVersion/TopicVersion.component.tsx index 0186ace56435..ca614f9692a4 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/TopicVersion/TopicVersion.component.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/components/Topic/TopicVersion/TopicVersion.component.tsx @@ -17,27 +17,28 @@ import { isEmpty, noop } from 'lodash'; import React, { FC, useEffect, useMemo, useState } from 'react'; import { useTranslation } from 'react-i18next'; import { useHistory, useParams } from 'react-router-dom'; -import { CustomPropertyTable } from '../../components/common/CustomPropertyTable/CustomPropertyTable'; -import DescriptionV1 from '../../components/common/EntityDescription/DescriptionV1'; -import DataAssetsVersionHeader from '../../components/DataAssets/DataAssetsVersionHeader/DataAssetsVersionHeader'; -import EntityVersionTimeLine from '../../components/Entity/EntityVersionTimeLine/EntityVersionTimeLine'; -import Loader from '../../components/Loader/Loader'; -import TabsLabel from '../../components/TabsLabel/TabsLabel.component'; -import TagsContainerV2 from '../../components/Tag/TagsContainerV2/TagsContainerV2'; -import TopicSchemaFields from '../../components/TopicDetails/TopicSchema/TopicSchema'; -import { getVersionPathWithTab } from '../../constants/constants'; -import { EntityField } from '../../constants/Feeds.constants'; -import { EntityTabs, EntityType } from '../../enums/entity.enum'; -import { ChangeDescription } from '../../generated/entity/data/topic'; -import { TagSource } from '../../generated/type/tagLabel'; +import { getVersionPathWithTab } from '../../../constants/constants'; +import { EntityField } from '../../../constants/Feeds.constants'; +import { EntityTabs, EntityType } from '../../../enums/entity.enum'; +import { ChangeDescription } from '../../../generated/entity/data/topic'; +import { TagSource } from '../../../generated/type/tagLabel'; import { getCommonExtraInfoForVersionDetails, getEntityVersionByField, getEntityVersionTags, -} from '../../utils/EntityVersionUtils'; -import { stringToHTML } from '../../utils/StringsUtils'; -import { getUpdatedMessageSchema } from '../../utils/TopicVersionUtils'; -import DataProductsContainer from '../DataProductsContainer/DataProductsContainer.component'; +} from '../../../utils/EntityVersionUtils'; +import { stringToHTML } from '../../../utils/StringsUtils'; +import { getUpdatedMessageSchema } from '../../../utils/TopicVersionUtils'; +import { CustomPropertyTable } from '../../common/CustomPropertyTable/CustomPropertyTable'; +import DescriptionV1 from '../../common/EntityDescription/DescriptionV1'; +import Loader from '../../common/Loader/Loader'; +import TabsLabel from '../../common/TabsLabel/TabsLabel.component'; +import DataAssetsVersionHeader from '../../DataAssets/DataAssetsVersionHeader/DataAssetsVersionHeader'; +import DataProductsContainer from '../../DataProducts/DataProductsContainer/DataProductsContainer.component'; +import EntityVersionTimeLine from '../../Entity/EntityVersionTimeLine/EntityVersionTimeLine'; +import TagsContainerV2 from '../../Tag/TagsContainerV2/TagsContainerV2'; + +import TopicSchemaFields from '../TopicSchema/TopicSchema'; import { TopicVersionProp } from './TopicVersion.interface'; const TopicVersion: FC = ({ diff --git a/openmetadata-ui/src/main/resources/ui/src/components/TopicVersion/TopicVersion.interface.ts b/openmetadata-ui/src/main/resources/ui/src/components/Topic/TopicVersion/TopicVersion.interface.ts similarity index 75% rename from openmetadata-ui/src/main/resources/ui/src/components/TopicVersion/TopicVersion.interface.ts rename to openmetadata-ui/src/main/resources/ui/src/components/Topic/TopicVersion/TopicVersion.interface.ts index 8e6c6cb18f2e..c33ea960880e 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/TopicVersion/TopicVersion.interface.ts +++ b/openmetadata-ui/src/main/resources/ui/src/components/Topic/TopicVersion/TopicVersion.interface.ts @@ -11,11 +11,11 @@ * limitations under the License. */ -import { OperationPermission } from '../../components/PermissionProvider/PermissionProvider.interface'; -import { Topic } from '../../generated/entity/data/topic'; -import { EntityHistory } from '../../generated/type/entityHistory'; -import { TagLabel } from '../../generated/type/tagLabel'; -import { TitleBreadcrumbProps } from '../common/TitleBreadcrumb/TitleBreadcrumb.interface'; +import { OperationPermission } from '../../../context/PermissionProvider/PermissionProvider.interface'; +import { Topic } from '../../../generated/entity/data/topic'; +import { EntityHistory } from '../../../generated/type/entityHistory'; +import { TagLabel } from '../../../generated/type/tagLabel'; +import { TitleBreadcrumbProps } from '../../common/TitleBreadcrumb/TitleBreadcrumb.interface'; export interface TopicVersionProp { version: string; diff --git a/openmetadata-ui/src/main/resources/ui/src/components/TopicVersion/TopicVersion.test.tsx b/openmetadata-ui/src/main/resources/ui/src/components/Topic/TopicVersion/TopicVersion.test.tsx similarity index 97% rename from openmetadata-ui/src/main/resources/ui/src/components/TopicVersion/TopicVersion.test.tsx rename to openmetadata-ui/src/main/resources/ui/src/components/Topic/TopicVersion/TopicVersion.test.tsx index 92c4829228d4..b42fb45ca547 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/TopicVersion/TopicVersion.test.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/components/Topic/TopicVersion/TopicVersion.test.tsx @@ -14,8 +14,8 @@ import { act, render, screen } from '@testing-library/react'; import userEvent from '@testing-library/user-event'; import React from 'react'; -import { ENTITY_PERMISSIONS } from '../../mocks/Permissions.mock'; -import { topicVersionMockProps } from '../../mocks/TopicVersion.mock'; +import { ENTITY_PERMISSIONS } from '../../../mocks/Permissions.mock'; +import { topicVersionMockProps } from '../../../mocks/TopicVersion.mock'; import TopicVersion from './TopicVersion.component'; const mockPush = jest.fn(); diff --git a/openmetadata-ui/src/main/resources/ui/src/components/Chart/Chart.interface.ts b/openmetadata-ui/src/main/resources/ui/src/components/Visualisations/Chart/Chart.interface.ts similarity index 82% rename from openmetadata-ui/src/main/resources/ui/src/components/Chart/Chart.interface.ts rename to openmetadata-ui/src/main/resources/ui/src/components/Visualisations/Chart/Chart.interface.ts index e4b1e0f745ac..d15eae9665c5 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/Chart/Chart.interface.ts +++ b/openmetadata-ui/src/main/resources/ui/src/components/Visualisations/Chart/Chart.interface.ts @@ -11,8 +11,8 @@ * limitations under the License. */ -import { ColumnProfile } from '../../generated/entity/data/table'; -import { MetricChartType } from '../ProfilerDashboard/profilerDashboard.interface'; +import { ColumnProfile } from '../../../generated/entity/data/table'; +import { MetricChartType } from '../../Database/Profiler/ProfilerDashboard/profilerDashboard.interface'; export interface CustomBarChartProps { chartCollection: MetricChartType; diff --git a/openmetadata-ui/src/main/resources/ui/src/components/Chart/CustomBarChart.test.tsx b/openmetadata-ui/src/main/resources/ui/src/components/Visualisations/Chart/CustomBarChart.test.tsx similarity index 93% rename from openmetadata-ui/src/main/resources/ui/src/components/Chart/CustomBarChart.test.tsx rename to openmetadata-ui/src/main/resources/ui/src/components/Visualisations/Chart/CustomBarChart.test.tsx index 596b819fc665..4d97979a734a 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/Chart/CustomBarChart.test.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/components/Visualisations/Chart/CustomBarChart.test.tsx @@ -13,8 +13,8 @@ import { render, screen } from '@testing-library/react'; import React from 'react'; -import { INITIAL_OPERATION_METRIC_VALUE } from '../../constants/profiler.constant'; -import '../../test/unit/mocks/recharts.mock'; +import { INITIAL_OPERATION_METRIC_VALUE } from '../../../constants/profiler.constant'; +import '../../../test/unit/mocks/recharts.mock'; import { CustomBarChartProps } from './Chart.interface'; import CustomBarChart from './CustomBarChart'; diff --git a/openmetadata-ui/src/main/resources/ui/src/components/Chart/CustomBarChart.tsx b/openmetadata-ui/src/main/resources/ui/src/components/Visualisations/Chart/CustomBarChart.tsx similarity index 93% rename from openmetadata-ui/src/main/resources/ui/src/components/Chart/CustomBarChart.tsx rename to openmetadata-ui/src/main/resources/ui/src/components/Visualisations/Chart/CustomBarChart.tsx index dc76698e5744..eb592098187a 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/Chart/CustomBarChart.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/components/Visualisations/Chart/CustomBarChart.tsx @@ -24,13 +24,13 @@ import { XAxis, YAxis, } from 'recharts'; -import { GRAPH_BACKGROUND_COLOR } from '../../constants/constants'; +import { GRAPH_BACKGROUND_COLOR } from '../../../constants/constants'; import { axisTickFormatter, tooltipFormatter, updateActiveChartFilter, -} from '../../utils/ChartUtils'; -import ErrorPlaceHolder from '../common/ErrorWithPlaceholder/ErrorPlaceHolder'; +} from '../../../utils/ChartUtils'; +import ErrorPlaceHolder from '../../common/ErrorWithPlaceholder/ErrorPlaceHolder'; import { CustomBarChartProps } from './Chart.interface'; const CustomBarChart = ({ diff --git a/openmetadata-ui/src/main/resources/ui/src/components/Chart/DataDistributionHistogram.component.tsx b/openmetadata-ui/src/main/resources/ui/src/components/Visualisations/Chart/DataDistributionHistogram.component.tsx similarity index 89% rename from openmetadata-ui/src/main/resources/ui/src/components/Chart/DataDistributionHistogram.component.tsx rename to openmetadata-ui/src/main/resources/ui/src/components/Visualisations/Chart/DataDistributionHistogram.component.tsx index 2a4d5afde701..c9369eb39353 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/Chart/DataDistributionHistogram.component.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/components/Visualisations/Chart/DataDistributionHistogram.component.tsx @@ -25,12 +25,12 @@ import { XAxis, YAxis, } from 'recharts'; -import ErrorPlaceHolder from '../../components/common/ErrorWithPlaceholder/ErrorPlaceHolder'; -import { GRAPH_BACKGROUND_COLOR } from '../../constants/constants'; -import { DEFAULT_HISTOGRAM_DATA } from '../../constants/profiler.constant'; -import { HistogramClass } from '../../generated/entity/data/table'; -import { axisTickFormatter, tooltipFormatter } from '../../utils/ChartUtils'; -import { customFormatDateTime } from '../../utils/date-time/DateTimeUtils'; +import { GRAPH_BACKGROUND_COLOR } from '../../../constants/constants'; +import { DEFAULT_HISTOGRAM_DATA } from '../../../constants/profiler.constant'; +import { HistogramClass } from '../../../generated/entity/data/table'; +import { axisTickFormatter, tooltipFormatter } from '../../../utils/ChartUtils'; +import { customFormatDateTime } from '../../../utils/date-time/DateTimeUtils'; +import ErrorPlaceHolder from '../../common/ErrorWithPlaceholder/ErrorPlaceHolder'; import { DataDistributionHistogramProps } from './Chart.interface'; const DataDistributionHistogram = ({ diff --git a/openmetadata-ui/src/main/resources/ui/src/components/Chart/DataDistributionHistogram.test.tsx b/openmetadata-ui/src/main/resources/ui/src/components/Visualisations/Chart/DataDistributionHistogram.test.tsx similarity index 96% rename from openmetadata-ui/src/main/resources/ui/src/components/Chart/DataDistributionHistogram.test.tsx rename to openmetadata-ui/src/main/resources/ui/src/components/Visualisations/Chart/DataDistributionHistogram.test.tsx index 8c44ee2d00c2..b2d810bed38a 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/Chart/DataDistributionHistogram.test.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/components/Visualisations/Chart/DataDistributionHistogram.test.tsx @@ -96,12 +96,9 @@ const COLUMN_PROFILER = { median: 7344.0, }; -jest.mock( - '../../components/common/ErrorWithPlaceholder/ErrorPlaceHolder', - () => { - return jest.fn().mockReturnValue(
ErrorPlaceHolder
); - } -); +jest.mock('../../common/ErrorWithPlaceholder/ErrorPlaceHolder', () => { + return jest.fn().mockReturnValue(
ErrorPlaceHolder
); +}); describe('DataDistributionHistogram component test', () => { it('Component should render', async () => { diff --git a/openmetadata-ui/src/main/resources/ui/src/components/Chart/OperationDateBarChart.test.tsx b/openmetadata-ui/src/main/resources/ui/src/components/Visualisations/Chart/OperationDateBarChart.test.tsx similarity index 93% rename from openmetadata-ui/src/main/resources/ui/src/components/Chart/OperationDateBarChart.test.tsx rename to openmetadata-ui/src/main/resources/ui/src/components/Visualisations/Chart/OperationDateBarChart.test.tsx index b1105e0729dd..a5d40931d060 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/Chart/OperationDateBarChart.test.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/components/Visualisations/Chart/OperationDateBarChart.test.tsx @@ -13,8 +13,8 @@ import { render, screen } from '@testing-library/react'; import React from 'react'; -import { INITIAL_OPERATION_METRIC_VALUE } from '../../constants/profiler.constant'; -import '../../test/unit/mocks/recharts.mock'; +import { INITIAL_OPERATION_METRIC_VALUE } from '../../../constants/profiler.constant'; +import '../../../test/unit/mocks/recharts.mock'; import { CustomBarChartProps } from './Chart.interface'; import OperationDateBarChart from './OperationDateBarChart'; diff --git a/openmetadata-ui/src/main/resources/ui/src/components/Chart/OperationDateBarChart.tsx b/openmetadata-ui/src/main/resources/ui/src/components/Visualisations/Chart/OperationDateBarChart.tsx similarity index 91% rename from openmetadata-ui/src/main/resources/ui/src/components/Chart/OperationDateBarChart.tsx rename to openmetadata-ui/src/main/resources/ui/src/components/Visualisations/Chart/OperationDateBarChart.tsx index d70aaff2e9a9..c9f461a40731 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/Chart/OperationDateBarChart.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/components/Visualisations/Chart/OperationDateBarChart.tsx @@ -25,10 +25,10 @@ import { TooltipProps, XAxis, } from 'recharts'; -import { GRAPH_BACKGROUND_COLOR } from '../../constants/constants'; -import { updateActiveChartFilter } from '../../utils/ChartUtils'; -import { formatNumberWithComma } from '../../utils/CommonUtils'; -import ErrorPlaceHolder from '../common/ErrorWithPlaceholder/ErrorPlaceHolder'; +import { GRAPH_BACKGROUND_COLOR } from '../../../constants/constants'; +import { updateActiveChartFilter } from '../../../utils/ChartUtils'; +import { formatNumberWithComma } from '../../../utils/CommonUtils'; +import ErrorPlaceHolder from '../../common/ErrorWithPlaceholder/ErrorPlaceHolder'; import { CustomBarChartProps } from './Chart.interface'; const OperationDateBarChart = ({ diff --git a/openmetadata-ui/src/main/resources/ui/src/components/AsyncSelect/AsyncSelect.tsx b/openmetadata-ui/src/main/resources/ui/src/components/common/AsyncSelect/AsyncSelect.tsx similarity index 100% rename from openmetadata-ui/src/main/resources/ui/src/components/AsyncSelect/AsyncSelect.tsx rename to openmetadata-ui/src/main/resources/ui/src/components/common/AsyncSelect/AsyncSelect.tsx diff --git a/openmetadata-ui/src/main/resources/ui/src/components/AsyncSelectList/AsyncSelectList.interface.ts b/openmetadata-ui/src/main/resources/ui/src/components/common/AsyncSelectList/AsyncSelectList.interface.ts similarity index 85% rename from openmetadata-ui/src/main/resources/ui/src/components/AsyncSelectList/AsyncSelectList.interface.ts rename to openmetadata-ui/src/main/resources/ui/src/components/common/AsyncSelectList/AsyncSelectList.interface.ts index 405a5d0e0a78..91cd63f3946a 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/AsyncSelectList/AsyncSelectList.interface.ts +++ b/openmetadata-ui/src/main/resources/ui/src/components/common/AsyncSelectList/AsyncSelectList.interface.ts @@ -13,9 +13,9 @@ import { DefaultOptionType } from 'antd/lib/select'; import { PagingResponse } from 'Models'; -import { Tag } from '../../generated/entity/classification/tag'; -import { GlossaryTerm } from '../../generated/entity/data/glossaryTerm'; -import { TagSource } from '../../generated/type/tagLabel'; +import { Tag } from '../../../generated/entity/classification/tag'; +import { GlossaryTerm } from '../../../generated/entity/data/glossaryTerm'; +import { TagSource } from '../../../generated/type/tagLabel'; export type SelectOption = { label: string; diff --git a/openmetadata-ui/src/main/resources/ui/src/components/AsyncSelectList/AsyncSelectList.test.tsx b/openmetadata-ui/src/main/resources/ui/src/components/common/AsyncSelectList/AsyncSelectList.test.tsx similarity index 98% rename from openmetadata-ui/src/main/resources/ui/src/components/AsyncSelectList/AsyncSelectList.test.tsx rename to openmetadata-ui/src/main/resources/ui/src/components/common/AsyncSelectList/AsyncSelectList.test.tsx index 5f644803abb8..abd6996cef9e 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/AsyncSelectList/AsyncSelectList.test.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/components/common/AsyncSelectList/AsyncSelectList.test.tsx @@ -21,7 +21,7 @@ import { } from '@testing-library/react'; import userEvent from '@testing-library/user-event'; import React from 'react'; -import { ASYNC_SELECT_MOCK } from '../../mocks/AsyncSelect.mock'; +import { ASYNC_SELECT_MOCK } from '../../../mocks/AsyncSelect.mock'; import AsyncSelectList from './AsyncSelectList'; jest.mock('lodash', () => { diff --git a/openmetadata-ui/src/main/resources/ui/src/components/AsyncSelectList/AsyncSelectList.tsx b/openmetadata-ui/src/main/resources/ui/src/components/common/AsyncSelectList/AsyncSelectList.tsx similarity index 93% rename from openmetadata-ui/src/main/resources/ui/src/components/AsyncSelectList/AsyncSelectList.tsx rename to openmetadata-ui/src/main/resources/ui/src/components/common/AsyncSelectList/AsyncSelectList.tsx index d7cd8f556e41..61f1c7c4e61e 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/AsyncSelectList/AsyncSelectList.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/components/common/AsyncSelectList/AsyncSelectList.tsx @@ -24,16 +24,16 @@ import { debounce, isEmpty, isUndefined, pick } from 'lodash'; import { CustomTagProps } from 'rc-select/lib/BaseSelect'; import React, { FC, useCallback, useMemo, useRef, useState } from 'react'; import { useTranslation } from 'react-i18next'; -import Loader from '../../components/Loader/Loader'; -import { FQN_SEPARATOR_CHAR } from '../../constants/char.constants'; -import { TAG_START_WITH } from '../../constants/Tag.constants'; -import { LabelType } from '../../generated/entity/data/table'; -import { Paging } from '../../generated/type/paging'; -import { TagLabel } from '../../generated/type/tagLabel'; -import Fqn from '../../utils/Fqn'; -import { getTagDisplay, tagRender } from '../../utils/TagsUtils'; -import { showErrorToast } from '../../utils/ToastUtils'; -import TagsV1 from '../Tag/TagsV1/TagsV1.component'; +import { FQN_SEPARATOR_CHAR } from '../../../constants/char.constants'; +import { TAG_START_WITH } from '../../../constants/Tag.constants'; +import { LabelType } from '../../../generated/entity/data/table'; +import { Paging } from '../../../generated/type/paging'; +import { TagLabel } from '../../../generated/type/tagLabel'; +import Fqn from '../../../utils/Fqn'; +import { getTagDisplay, tagRender } from '../../../utils/TagsUtils'; +import { showErrorToast } from '../../../utils/ToastUtils'; +import TagsV1 from '../../Tag/TagsV1/TagsV1.component'; +import Loader from '../Loader/Loader'; import { AsyncSelectListProps, SelectOption, diff --git a/openmetadata-ui/src/main/resources/ui/src/components/common/BrandImage/BrandImage.tsx b/openmetadata-ui/src/main/resources/ui/src/components/common/BrandImage/BrandImage.tsx index 5f0f3d66db0a..1272493d6bdc 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/common/BrandImage/BrandImage.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/components/common/BrandImage/BrandImage.tsx @@ -11,7 +11,7 @@ * limitations under the License. */ import React, { FC, useMemo } from 'react'; -import { useApplicationConfigContext } from '../../../components/ApplicationConfigProvider/ApplicationConfigProvider'; +import { useApplicationConfigContext } from '../../../context/ApplicationConfigProvider/ApplicationConfigProvider'; import brandImageClassBase from '../../../utils/BrandImage/BrandImageClassBase'; interface BrandImageProps { diff --git a/openmetadata-ui/src/main/resources/ui/src/components/CopyToClipboardButton/CopyToClipboardButton.test.tsx b/openmetadata-ui/src/main/resources/ui/src/components/common/CopyToClipboardButton/CopyToClipboardButton.test.tsx similarity index 100% rename from openmetadata-ui/src/main/resources/ui/src/components/CopyToClipboardButton/CopyToClipboardButton.test.tsx rename to openmetadata-ui/src/main/resources/ui/src/components/common/CopyToClipboardButton/CopyToClipboardButton.test.tsx diff --git a/openmetadata-ui/src/main/resources/ui/src/components/CopyToClipboardButton/CopyToClipboardButton.tsx b/openmetadata-ui/src/main/resources/ui/src/components/common/CopyToClipboardButton/CopyToClipboardButton.tsx similarity index 92% rename from openmetadata-ui/src/main/resources/ui/src/components/CopyToClipboardButton/CopyToClipboardButton.tsx rename to openmetadata-ui/src/main/resources/ui/src/components/common/CopyToClipboardButton/CopyToClipboardButton.tsx index 830bd891ac16..0adda05a08c6 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/CopyToClipboardButton/CopyToClipboardButton.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/components/common/CopyToClipboardButton/CopyToClipboardButton.tsx @@ -14,8 +14,8 @@ import { Button, PopoverProps, Tooltip } from 'antd'; import React, { FunctionComponent } from 'react'; import { useTranslation } from 'react-i18next'; -import { ReactComponent as CopyIcon } from '../../assets/svg/icon-copy.svg'; -import { useClipboard } from '../../hooks/useClipBoard'; +import { ReactComponent as CopyIcon } from '../../../assets/svg/icon-copy.svg'; +import { useClipboard } from '../../../hooks/useClipBoard'; interface Props { copyText: string; diff --git a/openmetadata-ui/src/main/resources/ui/src/components/common/CustomPropertyTable/CustomPropertyTable.tsx b/openmetadata-ui/src/main/resources/ui/src/components/common/CustomPropertyTable/CustomPropertyTable.tsx index bf9b6d471cdd..2699338e4a69 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/common/CustomPropertyTable/CustomPropertyTable.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/components/common/CustomPropertyTable/CustomPropertyTable.tsx @@ -33,6 +33,11 @@ import { getTypeByFQN } from '../../../rest/metadataTypeAPI'; import { getEntityDetailLink, Transi18next } from '../../../utils/CommonUtils'; +import { usePermissionProvider } from '../../../context/PermissionProvider/PermissionProvider'; +import { + OperationPermission, + ResourceEntity, +} from '../../../context/PermissionProvider/PermissionProvider.interface'; import { columnSorter, getEntityName } from '../../../utils/EntityUtils'; import { getChangedEntityNewValue, @@ -40,11 +45,6 @@ import { getUpdatedExtensionDiffFields, } from '../../../utils/EntityVersionUtils'; import { showErrorToast } from '../../../utils/ToastUtils'; -import { usePermissionProvider } from '../../PermissionProvider/PermissionProvider'; -import { - OperationPermission, - ResourceEntity, -} from '../../PermissionProvider/PermissionProvider.interface'; import ErrorPlaceHolder from '../ErrorWithPlaceholder/ErrorPlaceHolder'; import Table from '../Table/Table'; import { diff --git a/openmetadata-ui/src/main/resources/ui/src/components/common/CustomPropertyTable/PropertyInput.tsx b/openmetadata-ui/src/main/resources/ui/src/components/common/CustomPropertyTable/PropertyInput.tsx index 66a0b816b386..40deb91e7a0a 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/common/CustomPropertyTable/PropertyInput.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/components/common/CustomPropertyTable/PropertyInput.tsx @@ -13,7 +13,7 @@ import { Input } from 'antd'; import React, { ChangeEvent, FC, useState } from 'react'; -import InlineEdit from '../../../components/InlineEdit/InlineEdit.component'; +import InlineEdit from '../InlineEdit/InlineEdit.component'; export interface PropertyInputProps { isLoading: boolean; diff --git a/openmetadata-ui/src/main/resources/ui/src/components/DatePickerMenu/DatePickerMenu.component.tsx b/openmetadata-ui/src/main/resources/ui/src/components/common/DatePickerMenu/DatePickerMenu.component.tsx similarity index 96% rename from openmetadata-ui/src/main/resources/ui/src/components/DatePickerMenu/DatePickerMenu.component.tsx rename to openmetadata-ui/src/main/resources/ui/src/components/common/DatePickerMenu/DatePickerMenu.component.tsx index 739c9d126a1a..e87ccc08329a 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/DatePickerMenu/DatePickerMenu.component.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/components/common/DatePickerMenu/DatePickerMenu.component.tsx @@ -20,19 +20,19 @@ import moment from 'moment'; import { MenuInfo } from 'rc-menu/lib/interface'; import React, { useMemo, useState } from 'react'; import { useTranslation } from 'react-i18next'; -import { ReactComponent as DropdownIcon } from '../../assets/svg/drop-down.svg'; +import { ReactComponent as DropdownIcon } from '../../../assets/svg/drop-down.svg'; import { DEFAULT_SELECTED_RANGE, PROFILER_FILTER_RANGE, -} from '../../constants/profiler.constant'; +} from '../../../constants/profiler.constant'; import { getCurrentMillis, getEpochMillisForPastDays, -} from '../../utils/date-time/DateTimeUtils'; +} from '../../../utils/date-time/DateTimeUtils'; import { getDaysCount, getTimestampLabel, -} from '../../utils/DatePickerMenuUtils'; +} from '../../../utils/DatePickerMenuUtils'; import './date-picker-menu.less'; interface DatePickerMenuProps { diff --git a/openmetadata-ui/src/main/resources/ui/src/components/DatePickerMenu/date-picker-menu.less b/openmetadata-ui/src/main/resources/ui/src/components/common/DatePickerMenu/date-picker-menu.less similarity index 100% rename from openmetadata-ui/src/main/resources/ui/src/components/DatePickerMenu/date-picker-menu.less rename to openmetadata-ui/src/main/resources/ui/src/components/common/DatePickerMenu/date-picker-menu.less diff --git a/openmetadata-ui/src/main/resources/ui/src/components/DocumentTitle/DocumentTitle.tsx b/openmetadata-ui/src/main/resources/ui/src/components/common/DocumentTitle/DocumentTitle.tsx similarity index 100% rename from openmetadata-ui/src/main/resources/ui/src/components/DocumentTitle/DocumentTitle.tsx rename to openmetadata-ui/src/main/resources/ui/src/components/common/DocumentTitle/DocumentTitle.tsx diff --git a/openmetadata-ui/src/main/resources/ui/src/components/common/DomainLabel/DomainLabel.component.tsx b/openmetadata-ui/src/main/resources/ui/src/components/common/DomainLabel/DomainLabel.component.tsx index 3f7fd6a0277a..d6f27aefa2c4 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/common/DomainLabel/DomainLabel.component.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/components/common/DomainLabel/DomainLabel.component.tsx @@ -19,7 +19,6 @@ import React, { useCallback, useEffect, useMemo, useState } from 'react'; import { useTranslation } from 'react-i18next'; import { Link } from 'react-router-dom'; import { ReactComponent as DomainIcon } from '../../../assets/svg/ic-domain.svg'; -import { AssetsUnion } from '../../../components/Assets/AssetsSelectionModal/AssetSelectionModal.interface'; import { DE_ACTIVE_COLOR } from '../../../constants/constants'; import { EntityReference } from '../../../generated/entity/type'; import { @@ -29,6 +28,7 @@ import { import { getEntityName } from '../../../utils/EntityUtils'; import { getDomainPath } from '../../../utils/RouterUtils'; import { showErrorToast } from '../../../utils/ToastUtils'; +import { AssetsUnion } from '../../DataAssets/AssetsSelectionModal/AssetSelectionModal.interface'; import { DataAssetWithDomains } from '../../DataAssets/DataAssetsHeader/DataAssetsHeader.interface'; import DomainSelectableList from '../DomainSelectableList/DomainSelectableList.component'; import { DomainLabelProps } from './DomainLabel.interface'; diff --git a/openmetadata-ui/src/main/resources/ui/src/components/Draggable/DraggableBodyRow.tsx b/openmetadata-ui/src/main/resources/ui/src/components/common/Draggable/DraggableBodyRow.tsx similarity index 96% rename from openmetadata-ui/src/main/resources/ui/src/components/Draggable/DraggableBodyRow.tsx rename to openmetadata-ui/src/main/resources/ui/src/components/common/Draggable/DraggableBodyRow.tsx index f19b05db65af..ba1f1467d4f2 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/Draggable/DraggableBodyRow.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/components/common/Draggable/DraggableBodyRow.tsx @@ -15,7 +15,7 @@ import classNames from 'classnames'; import { isUndefined } from 'lodash'; import React, { useEffect, useRef } from 'react'; import { useDrag, useDrop } from 'react-dnd'; -import { DRAGGABLE_BODY_ROW } from '../../constants/Teams.constants'; +import { DRAGGABLE_BODY_ROW } from '../../../constants/Teams.constants'; import { DragCollectProps, DraggableBodyRowProps, diff --git a/openmetadata-ui/src/main/resources/ui/src/components/Draggable/DraggableBodyRowProps.interface.ts b/openmetadata-ui/src/main/resources/ui/src/components/common/Draggable/DraggableBodyRowProps.interface.ts similarity index 88% rename from openmetadata-ui/src/main/resources/ui/src/components/Draggable/DraggableBodyRowProps.interface.ts rename to openmetadata-ui/src/main/resources/ui/src/components/common/Draggable/DraggableBodyRowProps.interface.ts index e14e6852fa62..3ee4ea198cb3 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/Draggable/DraggableBodyRowProps.interface.ts +++ b/openmetadata-ui/src/main/resources/ui/src/components/common/Draggable/DraggableBodyRowProps.interface.ts @@ -11,8 +11,8 @@ * limitations under the License. */ -import { GlossaryTerm } from '../../generated/entity/data/glossaryTerm'; -import { Team } from '../../generated/entity/teams/team'; +import { GlossaryTerm } from '../../../generated/entity/data/glossaryTerm'; +import { Team } from '../../../generated/entity/teams/team'; export type DraggableUnion = Team | GlossaryTerm; diff --git a/openmetadata-ui/src/main/resources/ui/src/components/common/EntityImport/EntityImport.component.tsx b/openmetadata-ui/src/main/resources/ui/src/components/common/EntityImport/EntityImport.component.tsx index 116252a47f28..498cbb3e0e68 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/common/EntityImport/EntityImport.component.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/components/common/EntityImport/EntityImport.component.tsx @@ -27,8 +27,6 @@ import React, { useMemo, useState } from 'react'; import { useTranslation } from 'react-i18next'; import { ReactComponent as ImportIcon } from '../../../assets/svg/ic-drag-drop.svg'; import { ReactComponent as SuccessBadgeIcon } from '../../../assets/svg/success-badge.svg'; -import Stepper from '../../../components/IngestionStepper/IngestionStepper.component'; -import Loader from '../../../components/Loader/Loader'; import { STEPS_FOR_IMPORT_ENTITY } from '../../../constants/entity.constants'; import { CSVImportResult, @@ -36,6 +34,8 @@ import { } from '../../../generated/type/csvImportResult'; import { Transi18next } from '../../../utils/CommonUtils'; import { showErrorToast } from '../../../utils/ToastUtils'; +import Stepper from '../../Settings/Services/Ingestion/IngestionStepper/IngestionStepper.component'; +import Loader from '../Loader/Loader'; import './entity-import.style.less'; import { EntityImportProps } from './EntityImport.interface'; import { ImportStatus } from './ImportStatus/ImportStatus.component'; diff --git a/openmetadata-ui/src/main/resources/ui/src/components/ErrorBoundary/ErrorBoundary.tsx b/openmetadata-ui/src/main/resources/ui/src/components/common/ErrorBoundary/ErrorBoundary.tsx similarity index 95% rename from openmetadata-ui/src/main/resources/ui/src/components/ErrorBoundary/ErrorBoundary.tsx rename to openmetadata-ui/src/main/resources/ui/src/components/common/ErrorBoundary/ErrorBoundary.tsx index 815d5621b9d9..427218b5f953 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/ErrorBoundary/ErrorBoundary.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/components/common/ErrorBoundary/ErrorBoundary.tsx @@ -14,7 +14,7 @@ import React from 'react'; import { ErrorBoundary as ErrorBoundaryWrapper } from 'react-error-boundary'; import { useHistory } from 'react-router-dom'; -import { ROUTES } from '../../constants/constants'; +import { ROUTES } from '../../../constants/constants'; import ErrorFallback from './ErrorFallback'; interface Props { diff --git a/openmetadata-ui/src/main/resources/ui/src/components/ErrorBoundary/ErrorFallback.tsx b/openmetadata-ui/src/main/resources/ui/src/components/common/ErrorBoundary/ErrorFallback.tsx similarity index 95% rename from openmetadata-ui/src/main/resources/ui/src/components/ErrorBoundary/ErrorFallback.tsx rename to openmetadata-ui/src/main/resources/ui/src/components/common/ErrorBoundary/ErrorFallback.tsx index 82cefcff0011..d29f6f20f94c 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/ErrorBoundary/ErrorFallback.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/components/common/ErrorBoundary/ErrorFallback.tsx @@ -15,7 +15,7 @@ import { Button, Result } from 'antd'; import { t } from 'i18next'; import React from 'react'; import { FallbackProps } from 'react-error-boundary'; -import { ERROR500 } from '../../constants/constants'; +import { ERROR500 } from '../../../constants/constants'; const ErrorFallback: React.FC = ({ error, diff --git a/openmetadata-ui/src/main/resources/ui/src/components/common/ErrorWithPlaceholder/ErrorPlaceHolderIngestion.tsx b/openmetadata-ui/src/main/resources/ui/src/components/common/ErrorWithPlaceholder/ErrorPlaceHolderIngestion.tsx index 39dd012eedf8..37d60ffa2c6f 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/common/ErrorWithPlaceholder/ErrorPlaceHolderIngestion.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/components/common/ErrorWithPlaceholder/ErrorPlaceHolderIngestion.tsx @@ -15,11 +15,11 @@ import { Card, Space, Typography } from 'antd'; import { t } from 'i18next'; import React from 'react'; import { ReactComponent as IconCollateSupport } from '../../../assets/svg/ic-collate-support.svg'; -import Loader from '../../../components/Loader/Loader'; import { AIRFLOW_DOCS } from '../../../constants/docs.constants'; import { PIPELINE_SERVICE_PLATFORM } from '../../../constants/Services.constant'; import { useAirflowStatus } from '../../../hooks/useAirflowStatus'; import AirflowMessageBanner from '../AirflowMessageBanner/AirflowMessageBanner'; +import Loader from '../Loader/Loader'; const ErrorPlaceHolderIngestion = () => { const { platform, isFetchingStatus } = useAirflowStatus(); diff --git a/openmetadata-ui/src/main/resources/ui/src/components/Form/Form.interface.ts b/openmetadata-ui/src/main/resources/ui/src/components/common/Form/Form.interface.ts similarity index 100% rename from openmetadata-ui/src/main/resources/ui/src/components/Form/Form.interface.ts rename to openmetadata-ui/src/main/resources/ui/src/components/common/Form/Form.interface.ts diff --git a/openmetadata-ui/src/main/resources/ui/src/components/Form/FormItemLabel.test.tsx b/openmetadata-ui/src/main/resources/ui/src/components/common/Form/FormItemLabel.test.tsx similarity index 100% rename from openmetadata-ui/src/main/resources/ui/src/components/Form/FormItemLabel.test.tsx rename to openmetadata-ui/src/main/resources/ui/src/components/common/Form/FormItemLabel.test.tsx diff --git a/openmetadata-ui/src/main/resources/ui/src/components/Form/FormItemLabel.tsx b/openmetadata-ui/src/main/resources/ui/src/components/common/Form/FormItemLabel.tsx similarity index 95% rename from openmetadata-ui/src/main/resources/ui/src/components/Form/FormItemLabel.tsx rename to openmetadata-ui/src/main/resources/ui/src/components/common/Form/FormItemLabel.tsx index e011b4b670e1..618b6d5cae72 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/Form/FormItemLabel.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/components/common/Form/FormItemLabel.tsx @@ -14,7 +14,7 @@ import { InfoCircleOutlined } from '@ant-design/icons'; import { Tooltip } from 'antd'; import React from 'react'; -import { GRAYED_OUT_COLOR } from '../../constants/constants'; +import { GRAYED_OUT_COLOR } from '../../../constants/constants'; import { FormItemLabelProps } from './Form.interface'; const FormItemLabel = ({ diff --git a/openmetadata-ui/src/main/resources/ui/src/components/JSONSchemaTemplate/ArrayFieldTemplate.tsx b/openmetadata-ui/src/main/resources/ui/src/components/common/Form/JSONSchema/JSONSchemaTemplate/ArrayFieldTemplate.tsx similarity index 96% rename from openmetadata-ui/src/main/resources/ui/src/components/JSONSchemaTemplate/ArrayFieldTemplate.tsx rename to openmetadata-ui/src/main/resources/ui/src/components/common/Form/JSONSchema/JSONSchemaTemplate/ArrayFieldTemplate.tsx index 62df9f60bb01..5de405c45724 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/JSONSchemaTemplate/ArrayFieldTemplate.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/components/common/Form/JSONSchema/JSONSchemaTemplate/ArrayFieldTemplate.tsx @@ -17,7 +17,7 @@ import { Button } from 'antd'; import classNames from 'classnames'; import { isUndefined } from 'lodash'; import React, { Fragment, FunctionComponent } from 'react'; -import { ReactComponent as DeleteIcon } from '../../assets/svg/ic-delete.svg'; +import { ReactComponent as DeleteIcon } from '../../../../../assets/svg/ic-delete.svg'; export const ArrayFieldTemplate: FunctionComponent = ( props: ArrayFieldTemplateProps diff --git a/openmetadata-ui/src/main/resources/ui/src/components/JSONSchemaTemplate/BooleanFieldTemplate.tsx b/openmetadata-ui/src/main/resources/ui/src/components/common/Form/JSONSchema/JSONSchemaTemplate/BooleanFieldTemplate.tsx similarity index 100% rename from openmetadata-ui/src/main/resources/ui/src/components/JSONSchemaTemplate/BooleanFieldTemplate.tsx rename to openmetadata-ui/src/main/resources/ui/src/components/common/Form/JSONSchema/JSONSchemaTemplate/BooleanFieldTemplate.tsx diff --git a/openmetadata-ui/src/main/resources/ui/src/components/JSONSchemaTemplate/DescriptionFieldTemplate.tsx b/openmetadata-ui/src/main/resources/ui/src/components/common/Form/JSONSchema/JSONSchemaTemplate/DescriptionFieldTemplate.tsx similarity index 100% rename from openmetadata-ui/src/main/resources/ui/src/components/JSONSchemaTemplate/DescriptionFieldTemplate.tsx rename to openmetadata-ui/src/main/resources/ui/src/components/common/Form/JSONSchema/JSONSchemaTemplate/DescriptionFieldTemplate.tsx diff --git a/openmetadata-ui/src/main/resources/ui/src/components/JSONSchemaTemplate/FieldErrorTemplate/FieldErrorTemplate.test.tsx b/openmetadata-ui/src/main/resources/ui/src/components/common/Form/JSONSchema/JSONSchemaTemplate/FieldErrorTemplate/FieldErrorTemplate.test.tsx similarity index 100% rename from openmetadata-ui/src/main/resources/ui/src/components/JSONSchemaTemplate/FieldErrorTemplate/FieldErrorTemplate.test.tsx rename to openmetadata-ui/src/main/resources/ui/src/components/common/Form/JSONSchema/JSONSchemaTemplate/FieldErrorTemplate/FieldErrorTemplate.test.tsx diff --git a/openmetadata-ui/src/main/resources/ui/src/components/JSONSchemaTemplate/FieldErrorTemplate/FieldErrorTemplate.tsx b/openmetadata-ui/src/main/resources/ui/src/components/common/Form/JSONSchema/JSONSchemaTemplate/FieldErrorTemplate/FieldErrorTemplate.tsx similarity index 100% rename from openmetadata-ui/src/main/resources/ui/src/components/JSONSchemaTemplate/FieldErrorTemplate/FieldErrorTemplate.tsx rename to openmetadata-ui/src/main/resources/ui/src/components/common/Form/JSONSchema/JSONSchemaTemplate/FieldErrorTemplate/FieldErrorTemplate.tsx diff --git a/openmetadata-ui/src/main/resources/ui/src/components/JSONSchemaTemplate/ObjectFieldTemplate.tsx b/openmetadata-ui/src/main/resources/ui/src/components/common/Form/JSONSchema/JSONSchemaTemplate/ObjectFieldTemplate.tsx similarity index 98% rename from openmetadata-ui/src/main/resources/ui/src/components/JSONSchemaTemplate/ObjectFieldTemplate.tsx rename to openmetadata-ui/src/main/resources/ui/src/components/common/Form/JSONSchema/JSONSchemaTemplate/ObjectFieldTemplate.tsx index 519326116f74..3cc716657fd2 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/JSONSchemaTemplate/ObjectFieldTemplate.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/components/common/Form/JSONSchema/JSONSchemaTemplate/ObjectFieldTemplate.tsx @@ -21,7 +21,7 @@ import classNames from 'classnames'; import { isEmpty, isUndefined } from 'lodash'; import React, { Fragment, FunctionComponent } from 'react'; import { useTranslation } from 'react-i18next'; -import { ADVANCED_PROPERTIES } from '../../constants/Services.constant'; +import { ADVANCED_PROPERTIES } from '../../../../../constants/Services.constant'; import './object-field-template.less'; const { Panel } = Collapse; diff --git a/openmetadata-ui/src/main/resources/ui/src/components/JSONSchemaTemplate/WorkflowArrayFieldTemplate.tsx b/openmetadata-ui/src/main/resources/ui/src/components/common/Form/JSONSchema/JSONSchemaTemplate/WorkflowArrayFieldTemplate.tsx similarity index 100% rename from openmetadata-ui/src/main/resources/ui/src/components/JSONSchemaTemplate/WorkflowArrayFieldTemplate.tsx rename to openmetadata-ui/src/main/resources/ui/src/components/common/Form/JSONSchema/JSONSchemaTemplate/WorkflowArrayFieldTemplate.tsx diff --git a/openmetadata-ui/src/main/resources/ui/src/components/JSONSchemaTemplate/object-field-template.less b/openmetadata-ui/src/main/resources/ui/src/components/common/Form/JSONSchema/JSONSchemaTemplate/object-field-template.less similarity index 100% rename from openmetadata-ui/src/main/resources/ui/src/components/JSONSchemaTemplate/object-field-template.less rename to openmetadata-ui/src/main/resources/ui/src/components/common/Form/JSONSchema/JSONSchemaTemplate/object-field-template.less diff --git a/openmetadata-ui/src/main/resources/ui/src/components/JsonSchemaWidgets/AsyncSelectWidget.tsx b/openmetadata-ui/src/main/resources/ui/src/components/common/Form/JSONSchema/JsonSchemaWidgets/AsyncSelectWidget.tsx similarity index 81% rename from openmetadata-ui/src/main/resources/ui/src/components/JsonSchemaWidgets/AsyncSelectWidget.tsx rename to openmetadata-ui/src/main/resources/ui/src/components/common/Form/JSONSchema/JsonSchemaWidgets/AsyncSelectWidget.tsx index 5034e81ee56f..5f8e5efc2045 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/JsonSchemaWidgets/AsyncSelectWidget.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/components/common/Form/JSONSchema/JsonSchemaWidgets/AsyncSelectWidget.tsx @@ -12,9 +12,9 @@ */ import { WidgetProps } from '@rjsf/utils'; import React from 'react'; -import { SearchIndex } from '../../enums/search.enum'; -import DataAssetAsyncSelectList from '../DataAssetAsyncSelectList/DataAssetAsyncSelectList'; -import { DataAssetOption } from '../DataAssetAsyncSelectList/DataAssetAsyncSelectList.interface'; +import { SearchIndex } from '../../../../../enums/search.enum'; +import DataAssetAsyncSelectList from '../../../../DataAssets/DataAssetAsyncSelectList/DataAssetAsyncSelectList'; +import { DataAssetOption } from '../../../../DataAssets/DataAssetAsyncSelectList/DataAssetAsyncSelectList.interface'; const AsyncSelectWidget = ({ onChange, schema, ...props }: WidgetProps) => { const handleChange = (value: DataAssetOption | DataAssetOption[]) => { diff --git a/openmetadata-ui/src/main/resources/ui/src/components/JsonSchemaWidgets/MultiSelectWidget.tsx b/openmetadata-ui/src/main/resources/ui/src/components/common/Form/JSONSchema/JsonSchemaWidgets/MultiSelectWidget.tsx similarity index 100% rename from openmetadata-ui/src/main/resources/ui/src/components/JsonSchemaWidgets/MultiSelectWidget.tsx rename to openmetadata-ui/src/main/resources/ui/src/components/common/Form/JSONSchema/JsonSchemaWidgets/MultiSelectWidget.tsx diff --git a/openmetadata-ui/src/main/resources/ui/src/components/JsonSchemaWidgets/PasswordWidget.tsx b/openmetadata-ui/src/main/resources/ui/src/components/common/Form/JSONSchema/JsonSchemaWidgets/PasswordWidget.tsx similarity index 100% rename from openmetadata-ui/src/main/resources/ui/src/components/JsonSchemaWidgets/PasswordWidget.tsx rename to openmetadata-ui/src/main/resources/ui/src/components/common/Form/JSONSchema/JsonSchemaWidgets/PasswordWidget.tsx diff --git a/openmetadata-ui/src/main/resources/ui/src/components/common/FormBuilder/FormBuilder.tsx b/openmetadata-ui/src/main/resources/ui/src/components/common/FormBuilder/FormBuilder.tsx index f504b1c61f9f..d2bf3d9f8316 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/common/FormBuilder/FormBuilder.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/components/common/FormBuilder/FormBuilder.tsx @@ -21,14 +21,14 @@ import { ServiceCategory } from '../../../enums/service.enum'; import { ConfigData } from '../../../interface/service.interface'; import { transformErrors } from '../../../utils/formUtils'; import { formatFormDataForRender } from '../../../utils/JSONSchemaFormUtils'; -import { ArrayFieldTemplate } from '../../JSONSchemaTemplate/ArrayFieldTemplate'; -import DescriptionFieldTemplate from '../../JSONSchemaTemplate/DescriptionFieldTemplate'; -import { FieldErrorTemplate } from '../../JSONSchemaTemplate/FieldErrorTemplate/FieldErrorTemplate'; -import { ObjectFieldTemplate } from '../../JSONSchemaTemplate/ObjectFieldTemplate'; -import AsyncSelectWidget from '../../JsonSchemaWidgets/AsyncSelectWidget'; -import MultiSelectWidget from '../../JsonSchemaWidgets/MultiSelectWidget'; -import PasswordWidget from '../../JsonSchemaWidgets/PasswordWidget'; -import Loader from '../../Loader/Loader'; +import { ArrayFieldTemplate } from '../Form/JSONSchema/JSONSchemaTemplate/ArrayFieldTemplate'; +import DescriptionFieldTemplate from '../Form/JSONSchema/JSONSchemaTemplate/DescriptionFieldTemplate'; +import { FieldErrorTemplate } from '../Form/JSONSchema/JSONSchemaTemplate/FieldErrorTemplate/FieldErrorTemplate'; +import { ObjectFieldTemplate } from '../Form/JSONSchema/JSONSchemaTemplate/ObjectFieldTemplate'; +import AsyncSelectWidget from '../Form/JSONSchema/JsonSchemaWidgets/AsyncSelectWidget'; +import MultiSelectWidget from '../Form/JSONSchema/JsonSchemaWidgets/MultiSelectWidget'; +import PasswordWidget from '../Form/JSONSchema/JsonSchemaWidgets/PasswordWidget'; +import Loader from '../Loader/Loader'; export interface Props extends FormProps { okText: string; diff --git a/openmetadata-ui/src/main/resources/ui/src/components/InlineEdit/InlineEdit.component.tsx b/openmetadata-ui/src/main/resources/ui/src/components/common/InlineEdit/InlineEdit.component.tsx similarity index 100% rename from openmetadata-ui/src/main/resources/ui/src/components/InlineEdit/InlineEdit.component.tsx rename to openmetadata-ui/src/main/resources/ui/src/components/common/InlineEdit/InlineEdit.component.tsx diff --git a/openmetadata-ui/src/main/resources/ui/src/components/InlineEdit/InlineEdit.interface.ts b/openmetadata-ui/src/main/resources/ui/src/components/common/InlineEdit/InlineEdit.interface.ts similarity index 100% rename from openmetadata-ui/src/main/resources/ui/src/components/InlineEdit/InlineEdit.interface.ts rename to openmetadata-ui/src/main/resources/ui/src/components/common/InlineEdit/InlineEdit.interface.ts diff --git a/openmetadata-ui/src/main/resources/ui/src/components/InlineEdit/InlineEdit.test.tsx b/openmetadata-ui/src/main/resources/ui/src/components/common/InlineEdit/InlineEdit.test.tsx similarity index 100% rename from openmetadata-ui/src/main/resources/ui/src/components/InlineEdit/InlineEdit.test.tsx rename to openmetadata-ui/src/main/resources/ui/src/components/common/InlineEdit/InlineEdit.test.tsx diff --git a/openmetadata-ui/src/main/resources/ui/src/components/ListView/ListView.component.tsx b/openmetadata-ui/src/main/resources/ui/src/components/common/ListView/ListView.component.tsx similarity index 91% rename from openmetadata-ui/src/main/resources/ui/src/components/ListView/ListView.component.tsx rename to openmetadata-ui/src/main/resources/ui/src/components/common/ListView/ListView.component.tsx index 7926213d9cf9..bb990765fd0c 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/ListView/ListView.component.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/components/common/ListView/ListView.component.tsx @@ -15,10 +15,10 @@ import { Col, Radio, Row, Space, Switch, Typography } from 'antd'; import { isEmpty, isUndefined } from 'lodash'; import React, { useMemo, useState } from 'react'; import { useTranslation } from 'react-i18next'; -import { ReactComponent as GridIcon } from '../../assets/svg/ic-grid.svg'; -import { ReactComponent as ListIcon } from '../../assets/svg/ic-list.svg'; -import Table from '../../components/common/Table/Table'; -import Searchbar from '../common/SearchBarComponent/SearchBar.component'; +import { ReactComponent as GridIcon } from '../../../assets/svg/ic-grid.svg'; +import { ReactComponent as ListIcon } from '../../../assets/svg/ic-list.svg'; +import Searchbar from '../SearchBarComponent/SearchBar.component'; +import Table from '../Table/Table'; import { ListViewOptions, ListViewProps } from './ListView.interface'; // eslint-disable-next-line @typescript-eslint/ban-types, @typescript-eslint/no-explicit-any diff --git a/openmetadata-ui/src/main/resources/ui/src/components/ListView/ListView.interface.ts b/openmetadata-ui/src/main/resources/ui/src/components/common/ListView/ListView.interface.ts similarity index 100% rename from openmetadata-ui/src/main/resources/ui/src/components/ListView/ListView.interface.ts rename to openmetadata-ui/src/main/resources/ui/src/components/common/ListView/ListView.interface.ts diff --git a/openmetadata-ui/src/main/resources/ui/src/components/ListView/ListView.test.tsx b/openmetadata-ui/src/main/resources/ui/src/components/common/ListView/ListView.test.tsx similarity index 100% rename from openmetadata-ui/src/main/resources/ui/src/components/ListView/ListView.test.tsx rename to openmetadata-ui/src/main/resources/ui/src/components/common/ListView/ListView.test.tsx diff --git a/openmetadata-ui/src/main/resources/ui/src/components/Loader/Loader.less b/openmetadata-ui/src/main/resources/ui/src/components/common/Loader/Loader.less similarity index 100% rename from openmetadata-ui/src/main/resources/ui/src/components/Loader/Loader.less rename to openmetadata-ui/src/main/resources/ui/src/components/common/Loader/Loader.less diff --git a/openmetadata-ui/src/main/resources/ui/src/components/Loader/Loader.test.tsx b/openmetadata-ui/src/main/resources/ui/src/components/common/Loader/Loader.test.tsx similarity index 100% rename from openmetadata-ui/src/main/resources/ui/src/components/Loader/Loader.test.tsx rename to openmetadata-ui/src/main/resources/ui/src/components/common/Loader/Loader.test.tsx diff --git a/openmetadata-ui/src/main/resources/ui/src/components/Loader/Loader.tsx b/openmetadata-ui/src/main/resources/ui/src/components/common/Loader/Loader.tsx similarity index 100% rename from openmetadata-ui/src/main/resources/ui/src/components/Loader/Loader.tsx rename to openmetadata-ui/src/main/resources/ui/src/components/common/Loader/Loader.tsx diff --git a/openmetadata-ui/src/main/resources/ui/src/components/LoginButton/LoginButton.tsx b/openmetadata-ui/src/main/resources/ui/src/components/common/LoginButton/LoginButton.tsx similarity index 100% rename from openmetadata-ui/src/main/resources/ui/src/components/LoginButton/LoginButton.tsx rename to openmetadata-ui/src/main/resources/ui/src/components/common/LoginButton/LoginButton.tsx diff --git a/openmetadata-ui/src/main/resources/ui/src/components/LoginButton/login-button.style.less b/openmetadata-ui/src/main/resources/ui/src/components/common/LoginButton/login-button.style.less similarity index 95% rename from openmetadata-ui/src/main/resources/ui/src/components/LoginButton/login-button.style.less rename to openmetadata-ui/src/main/resources/ui/src/components/common/LoginButton/login-button.style.less index 5a059fe4a008..6ef8ec896267 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/LoginButton/login-button.style.less +++ b/openmetadata-ui/src/main/resources/ui/src/components/common/LoginButton/login-button.style.less @@ -10,7 +10,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -@import (reference) url('../../styles/variables.less'); +@import (reference) url('../../../styles/variables.less'); .signin-button.ant-btn { display: flex; diff --git a/openmetadata-ui/src/main/resources/ui/src/components/common/PopOverCard/EntityPopOverCard.test.tsx b/openmetadata-ui/src/main/resources/ui/src/components/common/PopOverCard/EntityPopOverCard.test.tsx index 63009baae89e..90902aa8eddf 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/common/PopOverCard/EntityPopOverCard.test.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/components/common/PopOverCard/EntityPopOverCard.test.tsx @@ -13,10 +13,10 @@ import { act, render, screen } from '@testing-library/react'; import React from 'react'; +import { useApplicationConfigContext } from '../../../context/ApplicationConfigProvider/ApplicationConfigProvider'; import { EntityType } from '../../../enums/entity.enum'; import { MOCK_TAG_DATA, MOCK_TAG_ENCODED_FQN } from '../../../mocks/Tags.mock'; import { getTagByFqn } from '../../../rest/tagAPI'; -import { useApplicationConfigContext } from '../../ApplicationConfigProvider/ApplicationConfigProvider'; import EntityPopOverCard, { PopoverContent } from './EntityPopOverCard'; const updateCachedEntityData = jest.fn(); diff --git a/openmetadata-ui/src/main/resources/ui/src/components/common/PopOverCard/EntityPopOverCard.tsx b/openmetadata-ui/src/main/resources/ui/src/components/common/PopOverCard/EntityPopOverCard.tsx index e6cd0418863c..81a12f257837 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/common/PopOverCard/EntityPopOverCard.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/components/common/PopOverCard/EntityPopOverCard.tsx @@ -22,6 +22,7 @@ import React, { useState, } from 'react'; import { useTranslation } from 'react-i18next'; +import { useApplicationConfigContext } from '../../../context/ApplicationConfigProvider/ApplicationConfigProvider'; import { EntityType } from '../../../enums/entity.enum'; import { Table } from '../../../generated/entity/data/table'; import { Include } from '../../../generated/type/include'; @@ -47,11 +48,10 @@ import { getTestCaseByFqn } from '../../../rest/testAPI'; import { getTopicByFqn } from '../../../rest/topicsAPI'; import { getEntityName } from '../../../utils/EntityUtils'; import { getDecodedFqn } from '../../../utils/StringsUtils'; -import { useApplicationConfigContext } from '../../ApplicationConfigProvider/ApplicationConfigProvider'; import { EntityUnion } from '../../Explore/ExplorePage.interface'; import ExploreSearchCard from '../../ExploreV1/ExploreSearchCard/ExploreSearchCard'; -import Loader from '../../Loader/Loader'; import { SearchedDataProps } from '../../SearchedData/SearchedData.interface'; +import Loader from '../Loader/Loader'; import './popover-card.less'; interface Props extends HTMLAttributes { diff --git a/openmetadata-ui/src/main/resources/ui/src/components/common/PopOverCard/UserPopOverCard.tsx b/openmetadata-ui/src/main/resources/ui/src/components/common/PopOverCard/UserPopOverCard.tsx index 1dc2da74202a..b45737083666 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/common/PopOverCard/UserPopOverCard.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/components/common/PopOverCard/UserPopOverCard.tsx @@ -31,14 +31,14 @@ import { getUserPath, TERM_ADMIN, } from '../../../constants/constants'; +import { useApplicationConfigContext } from '../../../context/ApplicationConfigProvider/ApplicationConfigProvider'; import { EntityReference } from '../../../generated/type/entityReference'; import { useUserProfile } from '../../../hooks/user-profile/useUserProfile'; import { getUserByName } from '../../../rest/userAPI'; import { getNonDeletedTeams } from '../../../utils/CommonUtils'; import { getEntityName } from '../../../utils/EntityUtils'; -import { useApplicationConfigContext } from '../../ApplicationConfigProvider/ApplicationConfigProvider'; -import Loader from '../../Loader/Loader'; import { UserTeam } from '../AssigneeList/AssigneeList.interface'; +import Loader from '../Loader/Loader'; import ProfilePicture from '../ProfilePicture/ProfilePicture'; const UserTeams = React.memo(({ userName }: { userName: string }) => { diff --git a/openmetadata-ui/src/main/resources/ui/src/components/common/ProfilePicture/ProfilePicture.tsx b/openmetadata-ui/src/main/resources/ui/src/components/common/ProfilePicture/ProfilePicture.tsx index 409b31e01a74..8f618c918207 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/common/ProfilePicture/ProfilePicture.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/components/common/ProfilePicture/ProfilePicture.tsx @@ -14,14 +14,14 @@ import classNames from 'classnames'; import { ImageShape } from 'Models'; import React, { useMemo } from 'react'; +import { usePermissionProvider } from '../../../context/PermissionProvider/PermissionProvider'; +import { ResourceEntity } from '../../../context/PermissionProvider/PermissionProvider.interface'; import { EntityReference, User } from '../../../generated/entity/teams/user'; import { useUserProfile } from '../../../hooks/user-profile/useUserProfile'; import { getEntityName } from '../../../utils/EntityUtils'; import { userPermissions } from '../../../utils/PermissionsUtils'; -import Loader from '../../Loader/Loader'; -import { usePermissionProvider } from '../../PermissionProvider/PermissionProvider'; -import { ResourceEntity } from '../../PermissionProvider/PermissionProvider.interface'; import Avatar from '../AvatarComponent/Avatar'; +import Loader from '../Loader/Loader'; type UserData = Pick; diff --git a/openmetadata-ui/src/main/resources/ui/src/components/common/QueryViewer/QueryViewer.component.tsx b/openmetadata-ui/src/main/resources/ui/src/components/common/QueryViewer/QueryViewer.component.tsx index 2f17c9758f66..51e143e0dc71 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/common/QueryViewer/QueryViewer.component.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/components/common/QueryViewer/QueryViewer.component.tsx @@ -18,7 +18,7 @@ import { useTranslation } from 'react-i18next'; import { ReactComponent as CopyIcon } from '../../../assets/svg/icon-copy.svg'; import { CSMode } from '../../../enums/codemirror.enum'; import { useClipboard } from '../../../hooks/useClipBoard'; -import SchemaEditor from '../../SchemaEditor/SchemaEditor'; +import SchemaEditor from '../../Database/SchemaEditor/SchemaEditor'; import './query-viewer.style.less'; const QueryViewer = ({ diff --git a/openmetadata-ui/src/main/resources/ui/src/components/common/ResizablePanels/ResizablePanels.tsx b/openmetadata-ui/src/main/resources/ui/src/components/common/ResizablePanels/ResizablePanels.tsx index ff7ee5b36516..213b244ed067 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/common/ResizablePanels/ResizablePanels.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/components/common/ResizablePanels/ResizablePanels.tsx @@ -13,7 +13,7 @@ import classNames from 'classnames'; import React from 'react'; import { ReflexContainer, ReflexElement, ReflexSplitter } from 'react-reflex'; -import DocumentTitle from '../../../components/DocumentTitle/DocumentTitle'; +import DocumentTitle from '../DocumentTitle/DocumentTitle'; import PanelContainer from './PanelContainer/PanelContainer'; import './resizable-panels.less'; import { ResizablePanelsProps } from './ResizablePanels.interface'; diff --git a/openmetadata-ui/src/main/resources/ui/src/components/common/SearchBarComponent/SearchBar.component.tsx b/openmetadata-ui/src/main/resources/ui/src/components/common/SearchBarComponent/SearchBar.component.tsx index 87dbbbcb86ba..20b567b99ae6 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/common/SearchBarComponent/SearchBar.component.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/components/common/SearchBarComponent/SearchBar.component.tsx @@ -18,7 +18,7 @@ import { debounce } from 'lodash'; import { LoadingState } from 'Models'; import React, { useCallback, useEffect, useState } from 'react'; import { ReactComponent as IconSearchV1 } from '../../../assets/svg/search.svg'; -import Loader from '../../Loader/Loader'; +import Loader from '../Loader/Loader'; type Props = { onSearch: (text: string) => void; diff --git a/openmetadata-ui/src/main/resources/ui/src/components/common/SelectableList/SelectableList.component.tsx b/openmetadata-ui/src/main/resources/ui/src/components/common/SelectableList/SelectableList.component.tsx index 3cb0b869da7e..5ee512f628c2 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/common/SelectableList/SelectableList.component.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/components/common/SelectableList/SelectableList.component.tsx @@ -17,7 +17,6 @@ import VirtualList from 'rc-virtual-list'; import React, { UIEventHandler, useCallback, useEffect, useState } from 'react'; import { useTranslation } from 'react-i18next'; import { ReactComponent as IconRemoveColored } from '../../../assets/svg/ic-remove-colored.svg'; -import Loader from '../../../components/Loader/Loader'; import { ADD_USER_CONTAINER_HEIGHT, pagingObject, @@ -25,6 +24,7 @@ import { import { EntityReference } from '../../../generated/entity/data/table'; import { Paging } from '../../../generated/type/paging'; import { getEntityName } from '../../../utils/EntityUtils'; +import Loader from '../Loader/Loader'; import Searchbar from '../SearchBarComponent/SearchBar.component'; import '../UserSelectableList/user-select-dropdown.less'; import { UserTag } from '../UserTag/UserTag.component'; diff --git a/openmetadata-ui/src/main/resources/ui/src/components/common/ServiceDocPanel/ServiceDocPanel.tsx b/openmetadata-ui/src/main/resources/ui/src/components/common/ServiceDocPanel/ServiceDocPanel.tsx index 9164e9229c75..42f5f07ae408 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/common/ServiceDocPanel/ServiceDocPanel.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/components/common/ServiceDocPanel/ServiceDocPanel.tsx @@ -21,7 +21,7 @@ import { import { PipelineType } from '../../../generated/entity/services/ingestionPipelines/ingestionPipeline'; import { fetchMarkdownFile } from '../../../rest/miscAPI'; import { SupportedLocales } from '../../../utils/i18next/i18nextUtil'; -import Loader from '../../Loader/Loader'; +import Loader from '../Loader/Loader'; import RichTextEditorPreviewer from '../RichTextEditor/RichTextEditorPreviewer'; import './service-doc-panel.less'; diff --git a/openmetadata-ui/src/main/resources/ui/src/components/Skeleton/BreadCrumb/TitleBreadcrumbSkeleton.component.tsx b/openmetadata-ui/src/main/resources/ui/src/components/common/Skeleton/BreadCrumb/TitleBreadcrumbSkeleton.component.tsx similarity index 100% rename from openmetadata-ui/src/main/resources/ui/src/components/Skeleton/BreadCrumb/TitleBreadcrumbSkeleton.component.tsx rename to openmetadata-ui/src/main/resources/ui/src/components/common/Skeleton/BreadCrumb/TitleBreadcrumbSkeleton.component.tsx diff --git a/openmetadata-ui/src/main/resources/ui/src/components/Skeleton/CommonSkeletons/ControlElements/ControlElements.component.tsx b/openmetadata-ui/src/main/resources/ui/src/components/common/Skeleton/CommonSkeletons/ControlElements/ControlElements.component.tsx similarity index 100% rename from openmetadata-ui/src/main/resources/ui/src/components/Skeleton/CommonSkeletons/ControlElements/ControlElements.component.tsx rename to openmetadata-ui/src/main/resources/ui/src/components/common/Skeleton/CommonSkeletons/ControlElements/ControlElements.component.tsx diff --git a/openmetadata-ui/src/main/resources/ui/src/components/Skeleton/CommonSkeletons/LabelCountSkeleton/LabelCountSkeleton.component.tsx b/openmetadata-ui/src/main/resources/ui/src/components/common/Skeleton/CommonSkeletons/LabelCountSkeleton/LabelCountSkeleton.component.tsx similarity index 100% rename from openmetadata-ui/src/main/resources/ui/src/components/Skeleton/CommonSkeletons/LabelCountSkeleton/LabelCountSkeleton.component.tsx rename to openmetadata-ui/src/main/resources/ui/src/components/common/Skeleton/CommonSkeletons/LabelCountSkeleton/LabelCountSkeleton.component.tsx diff --git a/openmetadata-ui/src/main/resources/ui/src/components/Skeleton/GlossaryV1/GlossaryV1LeftPanelSkeleton.component.tsx b/openmetadata-ui/src/main/resources/ui/src/components/common/Skeleton/GlossaryV1/GlossaryV1LeftPanelSkeleton.component.tsx similarity index 95% rename from openmetadata-ui/src/main/resources/ui/src/components/Skeleton/GlossaryV1/GlossaryV1LeftPanelSkeleton.component.tsx rename to openmetadata-ui/src/main/resources/ui/src/components/common/Skeleton/GlossaryV1/GlossaryV1LeftPanelSkeleton.component.tsx index 38d15bbe2bdc..911367399c85 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/Skeleton/GlossaryV1/GlossaryV1LeftPanelSkeleton.component.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/components/common/Skeleton/GlossaryV1/GlossaryV1LeftPanelSkeleton.component.tsx @@ -13,7 +13,7 @@ import { Col, Row, Skeleton } from 'antd'; import { uniqueId } from 'lodash'; import React from 'react'; -import { getSkeletonMockData } from '../../../utils/Skeleton.utils'; +import { getSkeletonMockData } from '../../../../utils/Skeleton.utils'; import ButtonSkeleton from '../CommonSkeletons/ControlElements/ControlElements.component'; import { SkeletonInterface } from '../Skeleton.interfaces'; diff --git a/openmetadata-ui/src/main/resources/ui/src/components/Skeleton/MyData/EntityListSkeleton/EntityListSkeleton.component.tsx b/openmetadata-ui/src/main/resources/ui/src/components/common/Skeleton/MyData/EntityListSkeleton/EntityListSkeleton.component.tsx similarity index 96% rename from openmetadata-ui/src/main/resources/ui/src/components/Skeleton/MyData/EntityListSkeleton/EntityListSkeleton.component.tsx rename to openmetadata-ui/src/main/resources/ui/src/components/common/Skeleton/MyData/EntityListSkeleton/EntityListSkeleton.component.tsx index d1e0402810ef..8bcbe131c659 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/Skeleton/MyData/EntityListSkeleton/EntityListSkeleton.component.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/components/common/Skeleton/MyData/EntityListSkeleton/EntityListSkeleton.component.tsx @@ -16,7 +16,7 @@ import React from 'react'; import { DEFAULT_SKELETON_DATA_LENGTH, getSkeletonMockData, -} from '../../../../utils/Skeleton.utils'; +} from '../../../../../utils/Skeleton.utils'; import LabelCountSkeleton from '../../CommonSkeletons/LabelCountSkeleton/LabelCountSkeleton.component'; import { EntityListSkeletonProps } from '../../Skeleton.interfaces'; diff --git a/openmetadata-ui/src/main/resources/ui/src/components/Skeleton/MyData/EntityListSkeleton/EntityListSkeleton.test.tsx b/openmetadata-ui/src/main/resources/ui/src/components/common/Skeleton/MyData/EntityListSkeleton/EntityListSkeleton.test.tsx similarity index 100% rename from openmetadata-ui/src/main/resources/ui/src/components/Skeleton/MyData/EntityListSkeleton/EntityListSkeleton.test.tsx rename to openmetadata-ui/src/main/resources/ui/src/components/common/Skeleton/MyData/EntityListSkeleton/EntityListSkeleton.test.tsx diff --git a/openmetadata-ui/src/main/resources/ui/src/components/Skeleton/Skeleton.interfaces.ts b/openmetadata-ui/src/main/resources/ui/src/components/common/Skeleton/Skeleton.interfaces.ts similarity index 100% rename from openmetadata-ui/src/main/resources/ui/src/components/Skeleton/Skeleton.interfaces.ts rename to openmetadata-ui/src/main/resources/ui/src/components/common/Skeleton/Skeleton.interfaces.ts diff --git a/openmetadata-ui/src/main/resources/ui/src/components/Skeleton/SummaryPanelSkeleton/SummaryPanelSkeleton.component.tsx b/openmetadata-ui/src/main/resources/ui/src/components/common/Skeleton/SummaryPanelSkeleton/SummaryPanelSkeleton.component.tsx similarity index 79% rename from openmetadata-ui/src/main/resources/ui/src/components/Skeleton/SummaryPanelSkeleton/SummaryPanelSkeleton.component.tsx rename to openmetadata-ui/src/main/resources/ui/src/components/common/Skeleton/SummaryPanelSkeleton/SummaryPanelSkeleton.component.tsx index 46f76f4040d8..0d200b822404 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/Skeleton/SummaryPanelSkeleton/SummaryPanelSkeleton.component.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/components/common/Skeleton/SummaryPanelSkeleton/SummaryPanelSkeleton.component.tsx @@ -13,10 +13,10 @@ import { Col, Row } from 'antd'; import { uniqueId } from 'lodash'; import React from 'react'; -import ButtonSkeleton from '../../../components/Skeleton/CommonSkeletons/ControlElements/ControlElements.component'; -import LabelCountSkeleton from '../../../components/Skeleton/CommonSkeletons/LabelCountSkeleton/LabelCountSkeleton.component'; -import { SkeletonInterface } from '../../../components/Skeleton/Skeleton.interfaces'; -import { getSkeletonMockData } from '../../../utils/Skeleton.utils'; +import { getSkeletonMockData } from '../../../../utils/Skeleton.utils'; +import ButtonSkeleton from '../CommonSkeletons/ControlElements/ControlElements.component'; +import LabelCountSkeleton from '../CommonSkeletons/LabelCountSkeleton/LabelCountSkeleton.component'; +import { SkeletonInterface } from '../Skeleton.interfaces'; const SummaryPanelSkeleton = ({ loading, children }: SkeletonInterface) => { return loading ? ( diff --git a/openmetadata-ui/src/main/resources/ui/src/components/Skeleton/Tags/TagsLeftPanelSkeleton.component.tsx b/openmetadata-ui/src/main/resources/ui/src/components/common/Skeleton/Tags/TagsLeftPanelSkeleton.component.tsx similarity index 95% rename from openmetadata-ui/src/main/resources/ui/src/components/Skeleton/Tags/TagsLeftPanelSkeleton.component.tsx rename to openmetadata-ui/src/main/resources/ui/src/components/common/Skeleton/Tags/TagsLeftPanelSkeleton.component.tsx index c643758fba03..5170e5c50311 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/Skeleton/Tags/TagsLeftPanelSkeleton.component.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/components/common/Skeleton/Tags/TagsLeftPanelSkeleton.component.tsx @@ -13,7 +13,7 @@ import { Col, Row } from 'antd'; import { uniqueId } from 'lodash'; import React from 'react'; -import { getSkeletonMockData } from '../../../utils/Skeleton.utils'; +import { getSkeletonMockData } from '../../../../utils/Skeleton.utils'; import ButtonSkeleton from '../CommonSkeletons/ControlElements/ControlElements.component'; import LabelCountSkeleton from '../CommonSkeletons/LabelCountSkeleton/LabelCountSkeleton.component'; import { SkeletonInterface } from '../Skeleton.interfaces'; diff --git a/openmetadata-ui/src/main/resources/ui/src/components/SliderWithInput/SliderWithInput.interface.ts b/openmetadata-ui/src/main/resources/ui/src/components/common/SliderWithInput/SliderWithInput.interface.ts similarity index 100% rename from openmetadata-ui/src/main/resources/ui/src/components/SliderWithInput/SliderWithInput.interface.ts rename to openmetadata-ui/src/main/resources/ui/src/components/common/SliderWithInput/SliderWithInput.interface.ts diff --git a/openmetadata-ui/src/main/resources/ui/src/components/SliderWithInput/SliderWithInput.tsx b/openmetadata-ui/src/main/resources/ui/src/components/common/SliderWithInput/SliderWithInput.tsx similarity index 100% rename from openmetadata-ui/src/main/resources/ui/src/components/SliderWithInput/SliderWithInput.tsx rename to openmetadata-ui/src/main/resources/ui/src/components/common/SliderWithInput/SliderWithInput.tsx diff --git a/openmetadata-ui/src/main/resources/ui/src/components/common/SuccessScreen/SuccessScreen.tsx b/openmetadata-ui/src/main/resources/ui/src/components/common/SuccessScreen/SuccessScreen.tsx index 8ebbb5798323..3f9bc9ce950a 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/common/SuccessScreen/SuccessScreen.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/components/common/SuccessScreen/SuccessScreen.tsx @@ -21,8 +21,8 @@ import { AIRFLOW_DOCS } from '../../../constants/docs.constants'; import { PIPELINE_SERVICE_PLATFORM } from '../../../constants/Services.constant'; import { FormSubmitType } from '../../../enums/form.enum'; import { useAirflowStatus } from '../../../hooks/useAirflowStatus'; -import Loader from '../../Loader/Loader'; import AirflowMessageBanner from '../AirflowMessageBanner/AirflowMessageBanner'; +import Loader from '../Loader/Loader'; export type SuccessScreenProps = { name: string; diff --git a/openmetadata-ui/src/main/resources/ui/src/components/common/TableDataCardV2/TableDataCardV2.tsx b/openmetadata-ui/src/main/resources/ui/src/components/common/TableDataCardV2/TableDataCardV2.tsx index 2cbf68fb3cfc..fdfcb3741b42 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/common/TableDataCardV2/TableDataCardV2.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/components/common/TableDataCardV2/TableDataCardV2.tsx @@ -32,9 +32,9 @@ import { getEntityName, } from '../../../utils/EntityUtils'; import { getServiceIcon, getUsagePercentile } from '../../../utils/TableUtils'; +import TableDataCardBody from '../../Database/TableDataCardBody/TableDataCardBody'; import { EntityHeader } from '../../Entity/EntityHeader/EntityHeader.component'; import { SearchedDataProps } from '../../SearchedData/SearchedData.interface'; -import TableDataCardBody from '../../TableDataCardBody/TableDataCardBody'; import './TableDataCardV2.less'; export interface TableDataCardPropsV2 { diff --git a/openmetadata-ui/src/main/resources/ui/src/components/TabsLabel/TabsLabel.component.tsx b/openmetadata-ui/src/main/resources/ui/src/components/common/TabsLabel/TabsLabel.component.tsx similarity index 94% rename from openmetadata-ui/src/main/resources/ui/src/components/TabsLabel/TabsLabel.component.tsx rename to openmetadata-ui/src/main/resources/ui/src/components/common/TabsLabel/TabsLabel.component.tsx index fecd341368ce..82f79e310c8a 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/TabsLabel/TabsLabel.component.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/components/common/TabsLabel/TabsLabel.component.tsx @@ -13,7 +13,7 @@ import { Space } from 'antd'; import { isNil } from 'lodash'; import React from 'react'; -import { getCountBadge } from '../../utils/CommonUtils'; +import { getCountBadge } from '../../../utils/CommonUtils'; import { TabsLabelProps } from './TabsLabel.interface'; const TabsLabel = ({ name, count, isActive, id }: TabsLabelProps) => { diff --git a/openmetadata-ui/src/main/resources/ui/src/components/TabsLabel/TabsLabel.interface.ts b/openmetadata-ui/src/main/resources/ui/src/components/common/TabsLabel/TabsLabel.interface.ts similarity index 100% rename from openmetadata-ui/src/main/resources/ui/src/components/TabsLabel/TabsLabel.interface.ts rename to openmetadata-ui/src/main/resources/ui/src/components/common/TabsLabel/TabsLabel.interface.ts diff --git a/openmetadata-ui/src/main/resources/ui/src/components/TabsLabel/TabsLabel.test.tsx b/openmetadata-ui/src/main/resources/ui/src/components/common/TabsLabel/TabsLabel.test.tsx similarity index 100% rename from openmetadata-ui/src/main/resources/ui/src/components/TabsLabel/TabsLabel.test.tsx rename to openmetadata-ui/src/main/resources/ui/src/components/common/TabsLabel/TabsLabel.test.tsx diff --git a/openmetadata-ui/src/main/resources/ui/src/components/TagButton/TagButton.component.tsx b/openmetadata-ui/src/main/resources/ui/src/components/common/TagButton/TagButton.component.tsx similarity index 95% rename from openmetadata-ui/src/main/resources/ui/src/components/TagButton/TagButton.component.tsx rename to openmetadata-ui/src/main/resources/ui/src/components/common/TagButton/TagButton.component.tsx index 313db2d6c1f7..426611aed360 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/TagButton/TagButton.component.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/components/common/TagButton/TagButton.component.tsx @@ -13,7 +13,7 @@ import { Tooltip } from 'antd'; import classNames from 'classnames'; import React from 'react'; -import { VersionStatus } from '../../utils/EntityVersionUtils.interface'; +import { VersionStatus } from '../../../utils/EntityVersionUtils.interface'; interface TagButtonProps { label: string; diff --git a/openmetadata-ui/src/main/resources/ui/src/components/common/TestConnection/TestConnection.tsx b/openmetadata-ui/src/main/resources/ui/src/components/common/TestConnection/TestConnection.tsx index 2af48d4575ab..20b676ee4cea 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/common/TestConnection/TestConnection.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/components/common/TestConnection/TestConnection.tsx @@ -18,7 +18,6 @@ import { useTranslation } from 'react-i18next'; import { ReactComponent as FailIcon } from '../../../assets/svg/fail-badge.svg'; import { ReactComponent as WarningIcon } from '../../../assets/svg/ic-warning.svg'; import { ReactComponent as SuccessIcon } from '../../../assets/svg/success-badge.svg'; -import Loader from '../../../components/Loader/Loader'; import { AIRFLOW_DOCS } from '../../../constants/docs.constants'; import { FETCHING_EXPIRY_TIME, @@ -58,6 +57,7 @@ import { shouldTestConnection, } from '../../../utils/ServiceUtils'; import { showErrorToast } from '../../../utils/ToastUtils'; +import Loader from '../Loader/Loader'; import './test-connection.style.less'; import { TestConnectionProps, TestStatus } from './TestConnection.interface'; import TestConnectionModal from './TestConnectionModal/TestConnectionModal'; diff --git a/openmetadata-ui/src/main/resources/ui/src/components/common/TestIndicator/TestIndicator.test.tsx b/openmetadata-ui/src/main/resources/ui/src/components/common/TestIndicator/TestIndicator.test.tsx index c1720122fb83..00a657c4c1bf 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/common/TestIndicator/TestIndicator.test.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/components/common/TestIndicator/TestIndicator.test.tsx @@ -14,7 +14,7 @@ import { cleanup, render, screen } from '@testing-library/react'; import React from 'react'; import { TestCaseStatus } from '../../../generated/tests/testCase'; -import { TestIndicatorProps } from '../../TableProfiler/TableProfiler.interface'; +import { TestIndicatorProps } from '../../Database/TableProfiler/TableProfiler.interface'; import TestIndicator from './TestIndicator'; const mockProps: TestIndicatorProps = { diff --git a/openmetadata-ui/src/main/resources/ui/src/components/common/TestIndicator/TestIndicator.tsx b/openmetadata-ui/src/main/resources/ui/src/components/common/TestIndicator/TestIndicator.tsx index d0d8cf01607a..f176342aa17e 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/common/TestIndicator/TestIndicator.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/components/common/TestIndicator/TestIndicator.tsx @@ -14,7 +14,7 @@ import { Space } from 'antd'; import classNames from 'classnames'; import React from 'react'; -import { TestIndicatorProps } from '../../TableProfiler/TableProfiler.interface'; +import { TestIndicatorProps } from '../../Database/TableProfiler/TableProfiler.interface'; import './test-indicator.less'; const TestIndicator: React.FC = ({ value, type }) => { diff --git a/openmetadata-ui/src/main/resources/ui/src/components/common/TierCard/TierCard.tsx b/openmetadata-ui/src/main/resources/ui/src/components/common/TierCard/TierCard.tsx index 391b702c0c6c..772cbd02f9c4 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/common/TierCard/TierCard.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/components/common/TierCard/TierCard.tsx @@ -28,7 +28,7 @@ import { Tag } from '../../../generated/entity/classification/tag'; import { getTags } from '../../../rest/tagAPI'; import { getEntityName } from '../../../utils/EntityUtils'; import { showErrorToast } from '../../../utils/ToastUtils'; -import Loader from '../../Loader/Loader'; +import Loader from '../Loader/Loader'; import RichTextEditorPreviewer from '../RichTextEditor/RichTextEditorPreviewer'; import './tier-card.style.less'; import { CardWithListItems, TierCardProps } from './TierCard.interface'; diff --git a/openmetadata-ui/src/main/resources/ui/src/components/common/TitleBreadcrumb/TitleBreadcrumb.component.tsx b/openmetadata-ui/src/main/resources/ui/src/components/common/TitleBreadcrumb/TitleBreadcrumb.component.tsx index e29d3d0baf35..d63ff9b6218a 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/common/TitleBreadcrumb/TitleBreadcrumb.component.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/components/common/TitleBreadcrumb/TitleBreadcrumb.component.tsx @@ -21,7 +21,7 @@ import React, { } from 'react'; import { useTranslation } from 'react-i18next'; import { Link } from 'react-router-dom'; -import TitleBreadcrumbSkeleton from '../../Skeleton/BreadCrumb/TitleBreadcrumbSkeleton.component'; +import TitleBreadcrumbSkeleton from '../Skeleton/BreadCrumb/TitleBreadcrumbSkeleton.component'; import { TitleBreadcrumbProps } from './TitleBreadcrumb.interface'; const TitleBreadcrumb: FunctionComponent = ({ diff --git a/openmetadata-ui/src/main/resources/ui/src/components/ToggleExpandButton/ToggleExpandButton.interface.ts b/openmetadata-ui/src/main/resources/ui/src/components/common/ToggleExpandButton/ToggleExpandButton.interface.ts similarity index 100% rename from openmetadata-ui/src/main/resources/ui/src/components/ToggleExpandButton/ToggleExpandButton.interface.ts rename to openmetadata-ui/src/main/resources/ui/src/components/common/ToggleExpandButton/ToggleExpandButton.interface.ts diff --git a/openmetadata-ui/src/main/resources/ui/src/components/ToggleExpandButton/ToggleExpandButton.test.tsx b/openmetadata-ui/src/main/resources/ui/src/components/common/ToggleExpandButton/ToggleExpandButton.test.tsx similarity index 100% rename from openmetadata-ui/src/main/resources/ui/src/components/ToggleExpandButton/ToggleExpandButton.test.tsx rename to openmetadata-ui/src/main/resources/ui/src/components/common/ToggleExpandButton/ToggleExpandButton.test.tsx diff --git a/openmetadata-ui/src/main/resources/ui/src/components/ToggleExpandButton/ToggleExpandButton.tsx b/openmetadata-ui/src/main/resources/ui/src/components/common/ToggleExpandButton/ToggleExpandButton.tsx similarity index 87% rename from openmetadata-ui/src/main/resources/ui/src/components/ToggleExpandButton/ToggleExpandButton.tsx rename to openmetadata-ui/src/main/resources/ui/src/components/common/ToggleExpandButton/ToggleExpandButton.tsx index 02fbbdc4daab..085c839537b7 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/ToggleExpandButton/ToggleExpandButton.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/components/common/ToggleExpandButton/ToggleExpandButton.tsx @@ -14,9 +14,9 @@ import { Button, Space } from 'antd'; import React, { useMemo } from 'react'; import { useTranslation } from 'react-i18next'; -import { ReactComponent as DownUpArrowIcon } from '../../assets/svg/ic-down-up-arrow.svg'; -import { ReactComponent as UpDownArrowIcon } from '../../assets/svg/ic-up-down-arrow.svg'; -import { DE_ACTIVE_COLOR } from '../../constants/constants'; +import { ReactComponent as DownUpArrowIcon } from '../../../assets/svg/ic-down-up-arrow.svg'; +import { ReactComponent as UpDownArrowIcon } from '../../../assets/svg/ic-up-down-arrow.svg'; +import { DE_ACTIVE_COLOR } from '../../../constants/constants'; import { ToggleExpandButtonProps } from './ToggleExpandButton.interface'; function ToggleExpandButton({ diff --git a/openmetadata-ui/src/main/resources/ui/src/constants/Assets.constants.ts b/openmetadata-ui/src/main/resources/ui/src/constants/Assets.constants.ts index 73b8d6bf41e1..5fc621c3ddf7 100644 --- a/openmetadata-ui/src/main/resources/ui/src/constants/Assets.constants.ts +++ b/openmetadata-ui/src/main/resources/ui/src/constants/Assets.constants.ts @@ -10,7 +10,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -import { AssetsUnion } from '../components/Assets/AssetsSelectionModal/AssetSelectionModal.interface'; +import { AssetsUnion } from '../components/DataAssets/AssetsSelectionModal/AssetSelectionModal.interface'; import { EntityType } from '../enums/entity.enum'; import { SearchIndex } from '../enums/search.enum'; import i18n from '../utils/i18next/LocalUtil'; diff --git a/openmetadata-ui/src/main/resources/ui/src/constants/GlobalSettings.constants.ts b/openmetadata-ui/src/main/resources/ui/src/constants/GlobalSettings.constants.ts index 8d50f33aa69e..2b3bf93d67ed 100644 --- a/openmetadata-ui/src/main/resources/ui/src/constants/GlobalSettings.constants.ts +++ b/openmetadata-ui/src/main/resources/ui/src/constants/GlobalSettings.constants.ts @@ -11,7 +11,7 @@ * limitations under the License. */ -import { ResourceEntity } from '../components/PermissionProvider/PermissionProvider.interface'; +import { ResourceEntity } from '../context/PermissionProvider/PermissionProvider.interface'; export enum GlobalSettingsMenuCategory { ACCESS = 'access', diff --git a/openmetadata-ui/src/main/resources/ui/src/constants/Teams.constants.ts b/openmetadata-ui/src/main/resources/ui/src/constants/Teams.constants.ts index 7a93166a7d1f..4a4d797587d3 100644 --- a/openmetadata-ui/src/main/resources/ui/src/constants/Teams.constants.ts +++ b/openmetadata-ui/src/main/resources/ui/src/constants/Teams.constants.ts @@ -12,7 +12,7 @@ */ import { t } from 'i18next'; -import DraggableBodyRow from '../components/Draggable/DraggableBodyRow'; +import DraggableBodyRow from '../components/common/Draggable/DraggableBodyRow'; export const DRAGGABLE_BODY_ROW = 'DraggableBodyRow'; diff --git a/openmetadata-ui/src/main/resources/ui/src/components/ApplicationConfigProvider/ApplicationConfigProvider.test.tsx b/openmetadata-ui/src/main/resources/ui/src/context/ApplicationConfigProvider/ApplicationConfigProvider.test.tsx similarity index 100% rename from openmetadata-ui/src/main/resources/ui/src/components/ApplicationConfigProvider/ApplicationConfigProvider.test.tsx rename to openmetadata-ui/src/main/resources/ui/src/context/ApplicationConfigProvider/ApplicationConfigProvider.test.tsx diff --git a/openmetadata-ui/src/main/resources/ui/src/components/ApplicationConfigProvider/ApplicationConfigProvider.tsx b/openmetadata-ui/src/main/resources/ui/src/context/ApplicationConfigProvider/ApplicationConfigProvider.tsx similarity index 98% rename from openmetadata-ui/src/main/resources/ui/src/components/ApplicationConfigProvider/ApplicationConfigProvider.tsx rename to openmetadata-ui/src/main/resources/ui/src/context/ApplicationConfigProvider/ApplicationConfigProvider.tsx index e24c45cc2677..de7427a59955 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/ApplicationConfigProvider/ApplicationConfigProvider.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/context/ApplicationConfigProvider/ApplicationConfigProvider.tsx @@ -22,13 +22,13 @@ import React, { useState, } from 'react'; import { useLocation } from 'react-router-dom'; +import { EntityUnion } from '../../components/Explore/ExplorePage.interface'; import { LoginConfiguration } from '../../generated/configuration/loginConfiguration'; import { LogoConfiguration } from '../../generated/configuration/logoConfiguration'; import { User } from '../../generated/entity/teams/user'; import { EntityReference } from '../../generated/entity/type'; import { getCustomLogoConfig } from '../../rest/settingConfigAPI'; import { isProtectedRoute } from '../../utils/AuthProvider.util'; -import { EntityUnion } from '../Explore/ExplorePage.interface'; export interface ApplicationContextConfig extends LogoConfiguration, diff --git a/openmetadata-ui/src/main/resources/ui/src/components/DirectionProvider/DirectionProvider.tsx b/openmetadata-ui/src/main/resources/ui/src/context/DirectionProvider/DirectionProvider.tsx similarity index 100% rename from openmetadata-ui/src/main/resources/ui/src/components/DirectionProvider/DirectionProvider.tsx rename to openmetadata-ui/src/main/resources/ui/src/context/DirectionProvider/DirectionProvider.tsx diff --git a/openmetadata-ui/src/main/resources/ui/src/components/GlobalSearchProvider/GlobalSearchProvider.interface.tsx b/openmetadata-ui/src/main/resources/ui/src/context/GlobalSearchProvider/GlobalSearchProvider.interface.tsx similarity index 89% rename from openmetadata-ui/src/main/resources/ui/src/components/GlobalSearchProvider/GlobalSearchProvider.interface.tsx rename to openmetadata-ui/src/main/resources/ui/src/context/GlobalSearchProvider/GlobalSearchProvider.interface.tsx index 97a363c76521..072ff6c2b8c9 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/GlobalSearchProvider/GlobalSearchProvider.interface.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/context/GlobalSearchProvider/GlobalSearchProvider.interface.tsx @@ -10,7 +10,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -import { ExploreSearchIndex } from '../Explore/ExplorePage.interface'; +import { ExploreSearchIndex } from '../../components/Explore/ExplorePage.interface'; export interface GlobalSearchContextType { searchCriteria: ExploreSearchIndex | ''; diff --git a/openmetadata-ui/src/main/resources/ui/src/components/GlobalSearchProvider/GlobalSearchProvider.tsx b/openmetadata-ui/src/main/resources/ui/src/context/GlobalSearchProvider/GlobalSearchProvider.tsx similarity index 94% rename from openmetadata-ui/src/main/resources/ui/src/components/GlobalSearchProvider/GlobalSearchProvider.tsx rename to openmetadata-ui/src/main/resources/ui/src/context/GlobalSearchProvider/GlobalSearchProvider.tsx index 084f2afae52b..31fbdc8cbcbe 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/GlobalSearchProvider/GlobalSearchProvider.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/context/GlobalSearchProvider/GlobalSearchProvider.tsx @@ -12,7 +12,7 @@ */ import React, { FC, ReactNode, useContext, useState } from 'react'; -import { ExploreSearchIndex } from '../Explore/ExplorePage.interface'; +import { ExploreSearchIndex } from '../../components/Explore/ExplorePage.interface'; import { GlobalSearchContextType } from './GlobalSearchProvider.interface'; export const GlobalSearchContext = React.createContext( diff --git a/openmetadata-ui/src/main/resources/ui/src/components/GlobalSearchProvider/GlobalSearchSuggestions/GlobalSearchSuggestions.interface.ts b/openmetadata-ui/src/main/resources/ui/src/context/GlobalSearchProvider/GlobalSearchSuggestions/GlobalSearchSuggestions.interface.ts similarity index 100% rename from openmetadata-ui/src/main/resources/ui/src/components/GlobalSearchProvider/GlobalSearchSuggestions/GlobalSearchSuggestions.interface.ts rename to openmetadata-ui/src/main/resources/ui/src/context/GlobalSearchProvider/GlobalSearchSuggestions/GlobalSearchSuggestions.interface.ts diff --git a/openmetadata-ui/src/main/resources/ui/src/components/GlobalSearchProvider/GlobalSearchSuggestions/global-search-suggestions.less b/openmetadata-ui/src/main/resources/ui/src/context/GlobalSearchProvider/GlobalSearchSuggestions/global-search-suggestions.less similarity index 100% rename from openmetadata-ui/src/main/resources/ui/src/components/GlobalSearchProvider/GlobalSearchSuggestions/global-search-suggestions.less rename to openmetadata-ui/src/main/resources/ui/src/context/GlobalSearchProvider/GlobalSearchSuggestions/global-search-suggestions.less diff --git a/openmetadata-ui/src/main/resources/ui/src/components/LineageProvider/LineageProvider.interface.tsx b/openmetadata-ui/src/main/resources/ui/src/context/LineageProvider/LineageProvider.interface.tsx similarity index 93% rename from openmetadata-ui/src/main/resources/ui/src/components/LineageProvider/LineageProvider.interface.tsx rename to openmetadata-ui/src/main/resources/ui/src/context/LineageProvider/LineageProvider.interface.tsx index af125e3d9d32..64db9054d13e 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/LineageProvider/LineageProvider.interface.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/context/LineageProvider/LineageProvider.interface.tsx @@ -21,18 +21,18 @@ import { NodeProps, ReactFlowInstance, } from 'reactflow'; -import { EntityType } from '../../enums/entity.enum'; -import { PipelineStatus } from '../../generated/entity/data/pipeline'; -import { EntityReference } from '../../generated/entity/type'; import { EdgeTypeEnum, LineageConfig, -} from '../Entity/EntityLineage/EntityLineage.interface'; +} from '../../components/Entity/EntityLineage/EntityLineage.interface'; import { EdgeDetails, EntityLineageReponse, -} from '../Lineage/Lineage.interface'; -import { SourceType } from '../SearchedData/SearchedData.interface'; +} from '../../components/Lineage/Lineage.interface'; +import { SourceType } from '../../components/SearchedData/SearchedData.interface'; +import { EntityType } from '../../enums/entity.enum'; +import { PipelineStatus } from '../../generated/entity/data/pipeline'; +import { EntityReference } from '../../generated/entity/type'; export interface LineageProviderProps { children: ReactNode; diff --git a/openmetadata-ui/src/main/resources/ui/src/components/LineageProvider/LineageProvider.test.tsx b/openmetadata-ui/src/main/resources/ui/src/context/LineageProvider/LineageProvider.test.tsx similarity index 89% rename from openmetadata-ui/src/main/resources/ui/src/components/LineageProvider/LineageProvider.test.tsx rename to openmetadata-ui/src/main/resources/ui/src/context/LineageProvider/LineageProvider.test.tsx index a070e74a6f60..efe812fecfc3 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/LineageProvider/LineageProvider.test.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/context/LineageProvider/LineageProvider.test.tsx @@ -13,9 +13,9 @@ import { act, fireEvent, render, screen } from '@testing-library/react'; import React, { useEffect } from 'react'; import { Edge } from 'reactflow'; +import { EdgeTypeEnum } from '../../components/Entity/EntityLineage/EntityLineage.interface'; import { EntityType } from '../../enums/entity.enum'; import { getLineageDataByFQN } from '../../rest/lineageAPI'; -import { EdgeTypeEnum } from '../Entity/EntityLineage/EntityLineage.interface'; import LineageProvider, { useLineageProvider } from './LineageProvider'; const mockLocation = { @@ -93,17 +93,23 @@ jest.mock('react-router-dom', () => ({ }), })); -jest.mock('../Entity/EntityInfoDrawer/EdgeInfoDrawer.component', () => { - return jest.fn().mockImplementation(() => { - return

Edge Info Drawer

; - }); -}); - -jest.mock('../Entity/EntityLineage/EntityLineageSidebar.component', () => { - return jest.fn().mockImplementation(() => { - return

Entity Lineage Sidebar

; - }); -}); +jest.mock( + '../../components/Entity/EntityInfoDrawer/EdgeInfoDrawer.component', + () => { + return jest.fn().mockImplementation(() => { + return

Edge Info Drawer

; + }); + } +); + +jest.mock( + '../../components/Entity/EntityLineage/EntityLineageSidebar.component', + () => { + return jest.fn().mockImplementation(() => { + return

Entity Lineage Sidebar

; + }); + } +); jest.mock('../../rest/lineageAPI', () => ({ getLineageDataByFQN: jest.fn(), diff --git a/openmetadata-ui/src/main/resources/ui/src/components/LineageProvider/LineageProvider.tsx b/openmetadata-ui/src/main/resources/ui/src/context/LineageProvider/LineageProvider.tsx similarity index 97% rename from openmetadata-ui/src/main/resources/ui/src/components/LineageProvider/LineageProvider.tsx rename to openmetadata-ui/src/main/resources/ui/src/context/LineageProvider/LineageProvider.tsx index a23c12c5eb15..22c3d3c4af3f 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/LineageProvider/LineageProvider.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/context/LineageProvider/LineageProvider.tsx @@ -37,6 +37,22 @@ import { useNodesState, } from 'reactflow'; import { ReactComponent as IconTimesCircle } from '../../assets/svg/ic-times-circle.svg'; +import EdgeInfoDrawer from '../../components/Entity/EntityInfoDrawer/EdgeInfoDrawer.component'; +import EntityInfoDrawer from '../../components/Entity/EntityInfoDrawer/EntityInfoDrawer.component'; +import AddPipeLineModal from '../../components/Entity/EntityLineage/AppPipelineModel/AddPipeLineModal'; +import { + EdgeData, + EdgeTypeEnum, + ElementLoadingState, + LineageConfig, +} from '../../components/Entity/EntityLineage/EntityLineage.interface'; +import EntityLineageSidebar from '../../components/Entity/EntityLineage/EntityLineageSidebar.component'; +import NodeSuggestions from '../../components/Entity/EntityLineage/NodeSuggestions.component'; +import { + EdgeDetails, + EntityLineageReponse, +} from '../../components/Lineage/Lineage.interface'; +import { SourceType } from '../../components/SearchedData/SearchedData.interface'; import { ELEMENT_DELETE_STATE, ZOOM_TRANSITION_DURATION, @@ -79,22 +95,6 @@ import { removeLineageHandler, } from '../../utils/EntityLineageUtils'; import { showErrorToast } from '../../utils/ToastUtils'; -import EdgeInfoDrawer from '../Entity/EntityInfoDrawer/EdgeInfoDrawer.component'; -import EntityInfoDrawer from '../Entity/EntityInfoDrawer/EntityInfoDrawer.component'; -import AddPipeLineModal from '../Entity/EntityLineage/AppPipelineModel/AddPipeLineModal'; -import { - EdgeData, - EdgeTypeEnum, - ElementLoadingState, - LineageConfig, -} from '../Entity/EntityLineage/EntityLineage.interface'; -import EntityLineageSidebar from '../Entity/EntityLineage/EntityLineageSidebar.component'; -import NodeSuggestions from '../Entity/EntityLineage/NodeSuggestions.component'; -import { - EdgeDetails, - EntityLineageReponse, -} from '../Lineage/Lineage.interface'; -import { SourceType } from '../SearchedData/SearchedData.interface'; import { useTourProvider } from '../TourProvider/TourProvider'; import { LineageContextType, diff --git a/openmetadata-ui/src/main/resources/ui/src/components/PermissionProvider/PermissionProvider.interface.ts b/openmetadata-ui/src/main/resources/ui/src/context/PermissionProvider/PermissionProvider.interface.ts similarity index 100% rename from openmetadata-ui/src/main/resources/ui/src/components/PermissionProvider/PermissionProvider.interface.ts rename to openmetadata-ui/src/main/resources/ui/src/context/PermissionProvider/PermissionProvider.interface.ts diff --git a/openmetadata-ui/src/main/resources/ui/src/components/PermissionProvider/PermissionProvider.test.tsx b/openmetadata-ui/src/main/resources/ui/src/context/PermissionProvider/PermissionProvider.test.tsx similarity index 97% rename from openmetadata-ui/src/main/resources/ui/src/components/PermissionProvider/PermissionProvider.test.tsx rename to openmetadata-ui/src/main/resources/ui/src/context/PermissionProvider/PermissionProvider.test.tsx index 21c9c4615cf3..65ed69db3a7d 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/PermissionProvider/PermissionProvider.test.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/context/PermissionProvider/PermissionProvider.test.tsx @@ -44,7 +44,7 @@ let currentUser: { id: string; name: string } | null = { name: 'Test User', }; -jest.mock('../Auth/AuthProviders/AuthProvider', () => { +jest.mock('../../components/Auth/AuthProviders/AuthProvider', () => { return { useAuthContext: jest.fn().mockImplementation(() => ({ currentUser, diff --git a/openmetadata-ui/src/main/resources/ui/src/components/PermissionProvider/PermissionProvider.tsx b/openmetadata-ui/src/main/resources/ui/src/context/PermissionProvider/PermissionProvider.tsx similarity index 97% rename from openmetadata-ui/src/main/resources/ui/src/components/PermissionProvider/PermissionProvider.tsx rename to openmetadata-ui/src/main/resources/ui/src/context/PermissionProvider/PermissionProvider.tsx index 6d00bd05caeb..91e352dce3b0 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/PermissionProvider/PermissionProvider.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/context/PermissionProvider/PermissionProvider.tsx @@ -23,7 +23,8 @@ import React, { useState, } from 'react'; import { useHistory } from 'react-router-dom'; -import Loader from '../../components/Loader/Loader'; +import { useAuthContext } from '../../components/Auth/AuthProviders/AuthProvider'; +import Loader from '../../components/common/Loader/Loader'; import { REDIRECT_PATHNAME } from '../../constants/constants'; import { getEntityPermissionByFqn, @@ -36,7 +37,6 @@ import { getOperationPermissions, getUIPermission, } from '../../utils/PermissionsUtils'; -import { useAuthContext } from '../Auth/AuthProviders/AuthProvider'; import { EntityPermissionMap, PermissionContextType, diff --git a/openmetadata-ui/src/main/resources/ui/src/components/TourProvider/TourProvider.tsx b/openmetadata-ui/src/main/resources/ui/src/context/TourProvider/TourProvider.tsx similarity index 100% rename from openmetadata-ui/src/main/resources/ui/src/components/TourProvider/TourProvider.tsx rename to openmetadata-ui/src/main/resources/ui/src/context/TourProvider/TourProvider.tsx diff --git a/openmetadata-ui/src/main/resources/ui/src/components/WebSocketProvider/WebSocketProvider.tsx b/openmetadata-ui/src/main/resources/ui/src/context/WebSocketProvider/WebSocketProvider.tsx similarity index 95% rename from openmetadata-ui/src/main/resources/ui/src/components/WebSocketProvider/WebSocketProvider.tsx rename to openmetadata-ui/src/main/resources/ui/src/context/WebSocketProvider/WebSocketProvider.tsx index 4091bdad1193..6fad3277d915 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/WebSocketProvider/WebSocketProvider.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/context/WebSocketProvider/WebSocketProvider.tsx @@ -20,8 +20,8 @@ import React, { useState, } from 'react'; import { io, Socket } from 'socket.io-client'; +import { useAuthContext } from '../../components/Auth/AuthProviders/AuthProvider'; import { ROUTES } from '../../constants/constants'; -import { useAuthContext } from '../Auth/AuthProviders/AuthProvider'; export const WebSocketContext = React.createContext<{ socket?: Socket }>({}); diff --git a/openmetadata-ui/src/main/resources/ui/src/hoc/withLoader.tsx b/openmetadata-ui/src/main/resources/ui/src/hoc/withLoader.tsx index 3cbbd2e07b08..da880e4b2936 100644 --- a/openmetadata-ui/src/main/resources/ui/src/hoc/withLoader.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/hoc/withLoader.tsx @@ -12,7 +12,7 @@ */ import React, { ComponentType, PropsWithChildren } from 'react'; -import Loader from '../components/Loader/Loader'; +import Loader from '../components/common/Loader/Loader'; export interface ComponentProps { [key: string]: T; diff --git a/openmetadata-ui/src/main/resources/ui/src/hooks/user-profile/useUserProfile.ts b/openmetadata-ui/src/main/resources/ui/src/hooks/user-profile/useUserProfile.ts index dded01d09768..be42744c31f0 100644 --- a/openmetadata-ui/src/main/resources/ui/src/hooks/user-profile/useUserProfile.ts +++ b/openmetadata-ui/src/main/resources/ui/src/hooks/user-profile/useUserProfile.ts @@ -12,7 +12,7 @@ */ import { isUndefined } from 'lodash'; import { useCallback, useEffect, useState } from 'react'; -import { useApplicationConfigContext } from '../../components/ApplicationConfigProvider/ApplicationConfigProvider'; +import { useApplicationConfigContext } from '../../context/ApplicationConfigProvider/ApplicationConfigProvider'; import { User } from '../../generated/entity/teams/user'; import { getUserByName } from '../../rest/userAPI'; import { diff --git a/openmetadata-ui/src/main/resources/ui/src/mocks/ContainerVersion.mock.ts b/openmetadata-ui/src/main/resources/ui/src/mocks/ContainerVersion.mock.ts index 5b7f98035128..cca1be860d94 100644 --- a/openmetadata-ui/src/main/resources/ui/src/mocks/ContainerVersion.mock.ts +++ b/openmetadata-ui/src/main/resources/ui/src/mocks/ContainerVersion.mock.ts @@ -11,7 +11,7 @@ * limitations under the License. */ -import { ContainerVersionProp } from '../components/ContainerVersion/ContainerVersion.interface'; +import { ContainerVersionProp } from '../components/Container/ContainerVersion/ContainerVersion.interface'; import { Constraint, DataType, diff --git a/openmetadata-ui/src/main/resources/ui/src/mocks/Glossary.mock.ts b/openmetadata-ui/src/main/resources/ui/src/mocks/Glossary.mock.ts index 0229a727df80..81cc95b8e41e 100644 --- a/openmetadata-ui/src/main/resources/ui/src/mocks/Glossary.mock.ts +++ b/openmetadata-ui/src/main/resources/ui/src/mocks/Glossary.mock.ts @@ -12,7 +12,7 @@ */ /* eslint-disable max-len */ -import { OperationPermission } from '../components/PermissionProvider/PermissionProvider.interface'; +import { OperationPermission } from '../context/PermissionProvider/PermissionProvider.interface'; import { ProviderType, Status } from '../generated/entity/data/glossaryTerm'; export const mockedAssetData = { diff --git a/openmetadata-ui/src/main/resources/ui/src/mocks/IngestionListTable.mock.ts b/openmetadata-ui/src/main/resources/ui/src/mocks/IngestionListTable.mock.ts index 4324a3f34bbb..332d3e604328 100644 --- a/openmetadata-ui/src/main/resources/ui/src/mocks/IngestionListTable.mock.ts +++ b/openmetadata-ui/src/main/resources/ui/src/mocks/IngestionListTable.mock.ts @@ -11,7 +11,7 @@ * limitations under the License. */ -import { IngestionListTableProps } from '../components/Ingestion/IngestionListTable.interface'; +import { IngestionListTableProps } from '../components/Settings/Services/Ingestion/IngestionListTable.interface'; import { ServiceCategory } from '../enums/service.enum'; import { AuthProvider, diff --git a/openmetadata-ui/src/main/resources/ui/src/mocks/MlModelVersion.mock.ts b/openmetadata-ui/src/main/resources/ui/src/mocks/MlModelVersion.mock.ts index 097e075bd5b4..7dcb187acad9 100644 --- a/openmetadata-ui/src/main/resources/ui/src/mocks/MlModelVersion.mock.ts +++ b/openmetadata-ui/src/main/resources/ui/src/mocks/MlModelVersion.mock.ts @@ -11,7 +11,7 @@ * limitations under the License. */ -import { MlModelVersionProp } from '../components/MlModelVersion/MlModelVersion.interface'; +import { MlModelVersionProp } from '../components/MlModel/MlModelVersion/MlModelVersion.interface'; import { FeatureSourceDataType, FeatureType, diff --git a/openmetadata-ui/src/main/resources/ui/src/mocks/Permissions.mock.ts b/openmetadata-ui/src/main/resources/ui/src/mocks/Permissions.mock.ts index 425142f2712f..dc91bdc881db 100644 --- a/openmetadata-ui/src/main/resources/ui/src/mocks/Permissions.mock.ts +++ b/openmetadata-ui/src/main/resources/ui/src/mocks/Permissions.mock.ts @@ -10,7 +10,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -import { OperationPermission } from '../components/PermissionProvider/PermissionProvider.interface'; +import { OperationPermission } from '../context/PermissionProvider/PermissionProvider.interface'; export const PERMISSIONS = { alert: { diff --git a/openmetadata-ui/src/main/resources/ui/src/mocks/PipelineVersion.mock.ts b/openmetadata-ui/src/main/resources/ui/src/mocks/PipelineVersion.mock.ts index c1358d00071b..bfacfd45813e 100644 --- a/openmetadata-ui/src/main/resources/ui/src/mocks/PipelineVersion.mock.ts +++ b/openmetadata-ui/src/main/resources/ui/src/mocks/PipelineVersion.mock.ts @@ -11,7 +11,7 @@ * limitations under the License. */ -import { PipelineVersionProp } from '../components/PipelineVersion/PipelineVersion.interface'; +import { PipelineVersionProp } from '../components/Pipeline/PipelineVersion/PipelineVersion.interface'; import { PipelineServiceType, StatusType, diff --git a/openmetadata-ui/src/main/resources/ui/src/mocks/StoredProcedureVersion.mock.ts b/openmetadata-ui/src/main/resources/ui/src/mocks/StoredProcedureVersion.mock.ts index d1700feac4db..7aeb90e2e327 100644 --- a/openmetadata-ui/src/main/resources/ui/src/mocks/StoredProcedureVersion.mock.ts +++ b/openmetadata-ui/src/main/resources/ui/src/mocks/StoredProcedureVersion.mock.ts @@ -11,7 +11,7 @@ * limitations under the License. */ -import { StoredProcedureVersionProp } from '../components/StoredProcedureVersion/StoredProcedureVersion.interface'; +import { StoredProcedureVersionProp } from '../components/Database/StoredProcedureVersion/StoredProcedureVersion.interface'; import { DatabaseServiceType, TableType } from '../generated/entity/data/table'; import { ENTITY_PERMISSIONS } from '../mocks/Permissions.mock'; import { diff --git a/openmetadata-ui/src/main/resources/ui/src/mocks/TableVersion.mock.ts b/openmetadata-ui/src/main/resources/ui/src/mocks/TableVersion.mock.ts index b31623ac3a76..abbfe97f03ba 100644 --- a/openmetadata-ui/src/main/resources/ui/src/mocks/TableVersion.mock.ts +++ b/openmetadata-ui/src/main/resources/ui/src/mocks/TableVersion.mock.ts @@ -11,7 +11,7 @@ * limitations under the License. */ -import { TableVersionProp } from '../components/TableVersion/TableVersion.interface'; +import { TableVersionProp } from '../components/Database/TableVersion/TableVersion.interface'; import { Constraint, DatabaseServiceType, diff --git a/openmetadata-ui/src/main/resources/ui/src/mocks/TopicVersion.mock.ts b/openmetadata-ui/src/main/resources/ui/src/mocks/TopicVersion.mock.ts index 52ad2b77805a..2c5e85fe336c 100644 --- a/openmetadata-ui/src/main/resources/ui/src/mocks/TopicVersion.mock.ts +++ b/openmetadata-ui/src/main/resources/ui/src/mocks/TopicVersion.mock.ts @@ -23,7 +23,7 @@ * limitations under the License. */ -import { TopicVersionProp } from '../components/TopicVersion/TopicVersion.interface'; +import { TopicVersionProp } from '../components/Topic/TopicVersion/TopicVersion.interface'; import { CleanupPolicy, MessagingServiceType, diff --git a/openmetadata-ui/src/main/resources/ui/src/mocks/VersionTable.mock.ts b/openmetadata-ui/src/main/resources/ui/src/mocks/VersionTable.mock.ts index 1d61a2c61856..ab65d710840b 100644 --- a/openmetadata-ui/src/main/resources/ui/src/mocks/VersionTable.mock.ts +++ b/openmetadata-ui/src/main/resources/ui/src/mocks/VersionTable.mock.ts @@ -11,7 +11,7 @@ * limitations under the License. */ -import { VersionTableProps } from '../components/VersionTable/VersionTable.interfaces'; +import { VersionTableProps } from '../components/Entity/VersionTable/VersionTable.interfaces'; import { Column, ConstraintType, diff --git a/openmetadata-ui/src/main/resources/ui/src/mocks/dashboardVersion.mock.ts b/openmetadata-ui/src/main/resources/ui/src/mocks/dashboardVersion.mock.ts index 12ba555ceba8..953ebd2971f1 100644 --- a/openmetadata-ui/src/main/resources/ui/src/mocks/dashboardVersion.mock.ts +++ b/openmetadata-ui/src/main/resources/ui/src/mocks/dashboardVersion.mock.ts @@ -12,7 +12,7 @@ */ /* eslint-disable max-len */ -import { DashboardVersionProp } from '../components/DashboardVersion/DashboardVersion.interface'; +import { DashboardVersionProp } from '../components/Dashboard/DashboardVersion/DashboardVersion.interface'; import { Dashboard, DashboardType } from '../generated/entity/data/dashboard'; import { DashboardServiceType } from '../generated/entity/services/dashboardService'; import { VersionData } from '../pages/EntityVersionPage/EntityVersionPage.component'; diff --git a/openmetadata-ui/src/main/resources/ui/src/pages/AddCustomMetricPage/AddCustomMetricPage.tsx b/openmetadata-ui/src/main/resources/ui/src/pages/AddCustomMetricPage/AddCustomMetricPage.tsx index 7118be5c0b05..49228908f6a8 100644 --- a/openmetadata-ui/src/main/resources/ui/src/pages/AddCustomMetricPage/AddCustomMetricPage.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/pages/AddCustomMetricPage/AddCustomMetricPage.tsx @@ -16,15 +16,15 @@ import QueryString from 'qs'; import React, { useEffect, useMemo, useState } from 'react'; import { useTranslation } from 'react-i18next'; import { useHistory, useLocation, useParams } from 'react-router-dom'; -import RightPanel from '../../components/AddDataQualityTest/components/RightPanel'; +import Loader from '../../components/common/Loader/Loader'; import ResizablePanels from '../../components/common/ResizablePanels/ResizablePanels'; import TitleBreadcrumb from '../../components/common/TitleBreadcrumb/TitleBreadcrumb.component'; import { TitleBreadcrumbProps } from '../../components/common/TitleBreadcrumb/TitleBreadcrumb.interface'; -import CustomMetricForm from '../../components/CustomMetricForm/CustomMetricForm.component'; -import Loader from '../../components/Loader/Loader'; -import { TableProfilerTab } from '../../components/ProfilerDashboard/profilerDashboard.interface'; -import SingleColumnProfile from '../../components/TableProfiler/Component/SingleColumnProfile'; -import TableProfilerChart from '../../components/TableProfiler/Component/TableProfilerChart'; +import { TableProfilerTab } from '../../components/Database/Profiler/ProfilerDashboard/profilerDashboard.interface'; +import SingleColumnProfile from '../../components/Database/TableProfiler/SingleColumnProfile'; +import TableProfilerChart from '../../components/Database/TableProfiler/TableProfilerChart/TableProfilerChart'; +import RightPanel from '../../components/DataQuality/AddDataQualityTest/components/RightPanel'; +import CustomMetricForm from '../../components/DataQuality/CustomMetricForm/CustomMetricForm.component'; import { getTableTabPath } from '../../constants/constants'; import { DEFAULT_RANGE_DATA } from '../../constants/profiler.constant'; import { EntityTabs, EntityType } from '../../enums/entity.enum'; diff --git a/openmetadata-ui/src/main/resources/ui/src/pages/AddDataQualityTestPage/AddDataQualityTestPage.tsx b/openmetadata-ui/src/main/resources/ui/src/pages/AddDataQualityTestPage/AddDataQualityTestPage.tsx index b0fd09e897e1..cb1cdd646512 100644 --- a/openmetadata-ui/src/main/resources/ui/src/pages/AddDataQualityTestPage/AddDataQualityTestPage.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/pages/AddDataQualityTestPage/AddDataQualityTestPage.tsx @@ -13,8 +13,8 @@ import { AxiosError } from 'axios'; import React, { useEffect, useState } from 'react'; -import AddDataQualityTestV1 from '../../components/AddDataQualityTest/AddDataQualityTestV1'; -import Loader from '../../components/Loader/Loader'; +import Loader from '../../components/common/Loader/Loader'; +import AddDataQualityTestV1 from '../../components/DataQuality/AddDataQualityTest/AddDataQualityTestV1'; import { Table } from '../../generated/entity/data/table'; import { useFqn } from '../../hooks/useFqn'; import { getTableDetailsByFQN } from '../../rest/tableAPI'; diff --git a/openmetadata-ui/src/main/resources/ui/src/pages/AddGlossary/AddGlossaryPage.component.tsx b/openmetadata-ui/src/main/resources/ui/src/pages/AddGlossary/AddGlossaryPage.component.tsx index 9f622f59a84d..d8e92766ad0f 100644 --- a/openmetadata-ui/src/main/resources/ui/src/pages/AddGlossary/AddGlossaryPage.component.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/pages/AddGlossary/AddGlossaryPage.component.tsx @@ -23,9 +23,9 @@ import { useTranslation } from 'react-i18next'; import { useHistory } from 'react-router-dom'; import { TitleBreadcrumbProps } from '../../components/common/TitleBreadcrumb/TitleBreadcrumb.interface'; import AddGlossary from '../../components/Glossary/AddGlossary/AddGlossary.component'; -import { usePermissionProvider } from '../../components/PermissionProvider/PermissionProvider'; -import { ResourceEntity } from '../../components/PermissionProvider/PermissionProvider.interface'; import { ERROR_MESSAGE } from '../../constants/constants'; +import { usePermissionProvider } from '../../context/PermissionProvider/PermissionProvider'; +import { ResourceEntity } from '../../context/PermissionProvider/PermissionProvider.interface'; import { CreateGlossary } from '../../generated/api/data/createGlossary'; import { Operation } from '../../generated/entity/policies/policy'; import { addGlossaries } from '../../rest/glossaryAPI'; diff --git a/openmetadata-ui/src/main/resources/ui/src/pages/AddIngestionPage/AddIngestionPage.component.tsx b/openmetadata-ui/src/main/resources/ui/src/pages/AddIngestionPage/AddIngestionPage.component.tsx index 059f6ecf0e85..9fb1d0aed2b1 100644 --- a/openmetadata-ui/src/main/resources/ui/src/pages/AddIngestionPage/AddIngestionPage.component.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/pages/AddIngestionPage/AddIngestionPage.component.tsx @@ -16,13 +16,13 @@ import { isEmpty } from 'lodash'; import React, { useEffect, useMemo, useState } from 'react'; import { useTranslation } from 'react-i18next'; import { useHistory, useParams } from 'react-router-dom'; -import AddIngestion from '../../components/AddIngestion/AddIngestion.component'; import ErrorPlaceHolder from '../../components/common/ErrorWithPlaceholder/ErrorPlaceHolder'; +import Loader from '../../components/common/Loader/Loader'; import ResizablePanels from '../../components/common/ResizablePanels/ResizablePanels'; import ServiceDocPanel from '../../components/common/ServiceDocPanel/ServiceDocPanel'; import TitleBreadcrumb from '../../components/common/TitleBreadcrumb/TitleBreadcrumb.component'; import { TitleBreadcrumbProps } from '../../components/common/TitleBreadcrumb/TitleBreadcrumb.interface'; -import Loader from '../../components/Loader/Loader'; +import AddIngestion from '../../components/Settings/Services/AddIngestion/AddIngestion.component'; import { DEPLOYED_PROGRESS_VAL, getServiceDetailsPath, diff --git a/openmetadata-ui/src/main/resources/ui/src/pages/AddNotificationPage/AddNotificationPage.tsx b/openmetadata-ui/src/main/resources/ui/src/pages/AddNotificationPage/AddNotificationPage.tsx index c20e5b376449..244f17966901 100644 --- a/openmetadata-ui/src/main/resources/ui/src/pages/AddNotificationPage/AddNotificationPage.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/pages/AddNotificationPage/AddNotificationPage.tsx @@ -17,10 +17,10 @@ import { isEmpty } from 'lodash'; import React, { useCallback, useEffect, useMemo, useState } from 'react'; import { useTranslation } from 'react-i18next'; import { useHistory } from 'react-router-dom'; +import Loader from '../../components/common/Loader/Loader'; import ResizablePanels from '../../components/common/ResizablePanels/ResizablePanels'; import RichTextEditor from '../../components/common/RichTextEditor/RichTextEditor'; import TitleBreadcrumb from '../../components/common/TitleBreadcrumb/TitleBreadcrumb.component'; -import Loader from '../../components/Loader/Loader'; import { ROUTES } from '../../constants/constants'; import { GlobalSettingsMenuCategory } from '../../constants/GlobalSettings.constants'; import { ENTITY_NAME_REGEX } from '../../constants/regex.constants'; diff --git a/openmetadata-ui/src/main/resources/ui/src/pages/AddObservabilityPage/AddObservabilityPage.tsx b/openmetadata-ui/src/main/resources/ui/src/pages/AddObservabilityPage/AddObservabilityPage.tsx index cef30b33587e..38abd73d26ce 100644 --- a/openmetadata-ui/src/main/resources/ui/src/pages/AddObservabilityPage/AddObservabilityPage.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/pages/AddObservabilityPage/AddObservabilityPage.tsx @@ -17,10 +17,10 @@ import { isEmpty } from 'lodash'; import React, { useCallback, useEffect, useMemo, useState } from 'react'; import { useTranslation } from 'react-i18next'; import { useHistory } from 'react-router-dom'; +import Loader from '../../components/common/Loader/Loader'; import ResizablePanels from '../../components/common/ResizablePanels/ResizablePanels'; import RichTextEditor from '../../components/common/RichTextEditor/RichTextEditor'; import TitleBreadcrumb from '../../components/common/TitleBreadcrumb/TitleBreadcrumb.component'; -import Loader from '../../components/Loader/Loader'; import { ROUTES } from '../../constants/constants'; import { ENTITY_NAME_REGEX } from '../../constants/regex.constants'; import { CreateEventSubscription } from '../../generated/events/api/createEventSubscription'; diff --git a/openmetadata-ui/src/main/resources/ui/src/pages/AddObservabilityPage/DestinationFormItem/TeamAndUserSelectItem/TeamAndUserSelectItem.interface.ts b/openmetadata-ui/src/main/resources/ui/src/pages/AddObservabilityPage/DestinationFormItem/TeamAndUserSelectItem/TeamAndUserSelectItem.interface.ts index f16f62a593fc..b29a3c4271da 100644 --- a/openmetadata-ui/src/main/resources/ui/src/pages/AddObservabilityPage/DestinationFormItem/TeamAndUserSelectItem/TeamAndUserSelectItem.interface.ts +++ b/openmetadata-ui/src/main/resources/ui/src/pages/AddObservabilityPage/DestinationFormItem/TeamAndUserSelectItem/TeamAndUserSelectItem.interface.ts @@ -11,7 +11,7 @@ * limitations under the License. */ -import { SelectOption } from '../../../../components/AsyncSelectList/AsyncSelectList.interface'; +import { SelectOption } from '../../../../components/common/AsyncSelectList/AsyncSelectList.interface'; export interface TeamAndUserSelectItemProps { entityType: string; diff --git a/openmetadata-ui/src/main/resources/ui/src/pages/AddObservabilityPage/DestinationFormItem/TeamAndUserSelectItem/TeamAndUserSelectItem.tsx b/openmetadata-ui/src/main/resources/ui/src/pages/AddObservabilityPage/DestinationFormItem/TeamAndUserSelectItem/TeamAndUserSelectItem.tsx index 3232b13ba777..93720db79e8d 100644 --- a/openmetadata-ui/src/main/resources/ui/src/pages/AddObservabilityPage/DestinationFormItem/TeamAndUserSelectItem/TeamAndUserSelectItem.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/pages/AddObservabilityPage/DestinationFormItem/TeamAndUserSelectItem/TeamAndUserSelectItem.tsx @@ -35,8 +35,8 @@ import React, { } from 'react'; import { useTranslation } from 'react-i18next'; import { ReactComponent as ArrowSvg } from '../../../../assets/svg/arrow-down-light.svg'; -import { SelectOption } from '../../../../components/AsyncSelectList/AsyncSelectList.interface'; -import Loader from '../../../../components/Loader/Loader'; +import { SelectOption } from '../../../../components/common/AsyncSelectList/AsyncSelectList.interface'; +import Loader from '../../../../components/common/Loader/Loader'; import { Webhook } from '../../../../generated/events/eventSubscription'; import './team-and-user-select-item.less'; import { TeamAndUserSelectItemProps } from './TeamAndUserSelectItem.interface'; diff --git a/openmetadata-ui/src/main/resources/ui/src/pages/AddQueryPage/AddQueryPage.component.tsx b/openmetadata-ui/src/main/resources/ui/src/pages/AddQueryPage/AddQueryPage.component.tsx index e8c0e95083ff..65429095479d 100644 --- a/openmetadata-ui/src/main/resources/ui/src/pages/AddQueryPage/AddQueryPage.component.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/pages/AddQueryPage/AddQueryPage.component.tsx @@ -16,14 +16,13 @@ import { AxiosError } from 'axios'; import { filter, isEmpty } from 'lodash'; import React, { useEffect, useState } from 'react'; import { useTranslation } from 'react-i18next'; -import { AsyncSelect } from '../../components/AsyncSelect/AsyncSelect'; import { useAuthContext } from '../../components/Auth/AuthProviders/AuthProvider'; +import { AsyncSelect } from '../../components/common/AsyncSelect/AsyncSelect'; import ResizablePanels from '../../components/common/ResizablePanels/ResizablePanels'; import RichTextEditor from '../../components/common/RichTextEditor/RichTextEditor'; import TitleBreadcrumb from '../../components/common/TitleBreadcrumb/TitleBreadcrumb.component'; import { TitleBreadcrumbProps } from '../../components/common/TitleBreadcrumb/TitleBreadcrumb.interface'; -import { usePermissionProvider } from '../../components/PermissionProvider/PermissionProvider'; -import SchemaEditor from '../../components/SchemaEditor/SchemaEditor'; +import SchemaEditor from '../../components/Database/SchemaEditor/SchemaEditor'; import { HTTP_STATUS_CODE } from '../../constants/Auth.constants'; import { getTableTabPath, @@ -31,6 +30,7 @@ import { PAGE_SIZE_MEDIUM, } from '../../constants/constants'; import { NO_PERMISSION_FOR_ACTION } from '../../constants/HelperTextUtil'; +import { usePermissionProvider } from '../../context/PermissionProvider/PermissionProvider'; import { CSMode } from '../../enums/codemirror.enum'; import { EntityType } from '../../enums/entity.enum'; import { SearchIndex } from '../../enums/search.enum'; diff --git a/openmetadata-ui/src/main/resources/ui/src/pages/AddServicePage/AddServicePage.component.tsx b/openmetadata-ui/src/main/resources/ui/src/pages/AddServicePage/AddServicePage.component.tsx index 0549c99e7b75..044726b544d8 100644 --- a/openmetadata-ui/src/main/resources/ui/src/pages/AddServicePage/AddServicePage.component.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/pages/AddServicePage/AddServicePage.component.tsx @@ -17,8 +17,8 @@ import { ServicesUpdateRequest, ServiceTypes } from 'Models'; import React, { useEffect, useState } from 'react'; import { useTranslation } from 'react-i18next'; import { useParams } from 'react-router-dom'; -import AddService from '../../components/AddService/AddService.component'; import { TitleBreadcrumbProps } from '../../components/common/TitleBreadcrumb/TitleBreadcrumb.interface'; +import AddService from '../../components/Settings/Services/AddService/AddService.component'; import { DEPLOYED_PROGRESS_VAL, INGESTION_PROGRESS_END_VAL, diff --git a/openmetadata-ui/src/main/resources/ui/src/pages/AlertDetailsPage/AlertDetailsPage.tsx b/openmetadata-ui/src/main/resources/ui/src/pages/AlertDetailsPage/AlertDetailsPage.tsx index f3badabccc0c..3bc532834a6e 100644 --- a/openmetadata-ui/src/main/resources/ui/src/pages/AlertDetailsPage/AlertDetailsPage.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/pages/AlertDetailsPage/AlertDetailsPage.tsx @@ -36,10 +36,10 @@ import { Link, useHistory } from 'react-router-dom'; import { ReactComponent as EditIcon } from '../../assets/svg/edit-new.svg'; import { ReactComponent as DeleteIcon } from '../../assets/svg/ic-delete.svg'; import DeleteWidgetModal from '../../components/common/DeleteWidget/DeleteWidgetModal'; +import Loader from '../../components/common/Loader/Loader'; import ResizablePanels from '../../components/common/ResizablePanels/ResizablePanels'; import RichTextEditorPreviewer from '../../components/common/RichTextEditor/RichTextEditorPreviewer'; import TitleBreadcrumb from '../../components/common/TitleBreadcrumb/TitleBreadcrumb.component'; -import Loader from '../../components/Loader/Loader'; import { ROUTES } from '../../constants/constants'; import { GlobalSettingsMenuCategory } from '../../constants/GlobalSettings.constants'; import { EntityType } from '../../enums/entity.enum'; diff --git a/openmetadata-ui/src/main/resources/ui/src/pages/AlertsActivityFeedPage/AlertsActivityFeedPage.tsx b/openmetadata-ui/src/main/resources/ui/src/pages/AlertsActivityFeedPage/AlertsActivityFeedPage.tsx index 62681eb793b7..40c01ce77998 100644 --- a/openmetadata-ui/src/main/resources/ui/src/pages/AlertsActivityFeedPage/AlertsActivityFeedPage.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/pages/AlertsActivityFeedPage/AlertsActivityFeedPage.tsx @@ -15,8 +15,8 @@ import { Card } from 'antd'; import { noop, trim } from 'lodash'; import React, { useCallback, useEffect, useMemo, useState } from 'react'; import { useTranslation } from 'react-i18next'; -import { AlertDetailsComponent } from '../../components/Alerts/AlertsDetails/AlertDetails.component'; -import Loader from '../../components/Loader/Loader'; +import Loader from '../../components/common/Loader/Loader'; +import { AlertDetailsComponent } from '../../components/Settings/Alerts/AlertsDetails/AlertDetails.component'; import { EventFilterRule } from '../../generated/events/eventFilterRule'; import { EventSubscription, diff --git a/openmetadata-ui/src/main/resources/ui/src/pages/AppInstall/AppInstall.component.tsx b/openmetadata-ui/src/main/resources/ui/src/pages/AppInstall/AppInstall.component.tsx index 2ad2f5134fb5..90e08326fa19 100644 --- a/openmetadata-ui/src/main/resources/ui/src/pages/AppInstall/AppInstall.component.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/pages/AppInstall/AppInstall.component.tsx @@ -18,14 +18,14 @@ import { AxiosError } from 'axios'; import React, { useCallback, useEffect, useMemo, useState } from 'react'; import { useTranslation } from 'react-i18next'; import { useHistory } from 'react-router-dom'; -import TestSuiteScheduler from '../../components/AddDataQualityTest/components/TestSuiteScheduler'; -import applicationSchemaClassBase from '../../components/Applications/AppDetails/ApplicationSchemaClassBase'; -import AppInstallVerifyCard from '../../components/Applications/AppInstallVerifyCard/AppInstallVerifyCard.component'; import ErrorPlaceHolder from '../../components/common/ErrorWithPlaceholder/ErrorPlaceHolder'; import FormBuilder from '../../components/common/FormBuilder/FormBuilder'; -import IngestionStepper from '../../components/IngestionStepper/IngestionStepper.component'; -import Loader from '../../components/Loader/Loader'; +import Loader from '../../components/common/Loader/Loader'; +import TestSuiteScheduler from '../../components/DataQuality/AddDataQualityTest/components/TestSuiteScheduler'; import PageLayoutV1 from '../../components/PageLayoutV1/PageLayoutV1'; +import applicationSchemaClassBase from '../../components/Settings/Applications/AppDetails/ApplicationSchemaClassBase'; +import AppInstallVerifyCard from '../../components/Settings/Applications/AppInstallVerifyCard/AppInstallVerifyCard.component'; +import IngestionStepper from '../../components/Settings/Services/Ingestion/IngestionStepper/IngestionStepper.component'; import { APP_UI_SCHEMA, STEPS_FOR_APP_INSTALL, diff --git a/openmetadata-ui/src/main/resources/ui/src/pages/Application/ApplicationPage.test.tsx b/openmetadata-ui/src/main/resources/ui/src/pages/Application/ApplicationPage.test.tsx index 07acae61c672..d6ff9b07e6f8 100644 --- a/openmetadata-ui/src/main/resources/ui/src/pages/Application/ApplicationPage.test.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/pages/Application/ApplicationPage.test.tsx @@ -26,7 +26,7 @@ jest.mock('react-router-dom', () => ({ })); jest.mock( - '../../components/Applications/ApplicationCard/ApplicationCard.component', + '../../components/Settings/Applications/ApplicationCard/ApplicationCard.component', () => jest.fn(({ onClick }) => ) ); diff --git a/openmetadata-ui/src/main/resources/ui/src/pages/Application/ApplicationPage.tsx b/openmetadata-ui/src/main/resources/ui/src/pages/Application/ApplicationPage.tsx index c5775afe4269..568b7c98cea9 100644 --- a/openmetadata-ui/src/main/resources/ui/src/pages/Application/ApplicationPage.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/pages/Application/ApplicationPage.tsx @@ -16,7 +16,6 @@ import { isEmpty, uniqueId } from 'lodash'; import React, { useCallback, useEffect, useMemo, useState } from 'react'; import { useTranslation } from 'react-i18next'; import { useHistory } from 'react-router-dom'; -import ApplicationCard from '../../components/Applications/ApplicationCard/ApplicationCard.component'; import ErrorPlaceHolder from '../../components/common/ErrorWithPlaceholder/ErrorPlaceHolder'; import NextPrevious from '../../components/common/NextPrevious/NextPrevious'; import { PagingHandlerParams } from '../../components/common/NextPrevious/NextPrevious.interface'; @@ -24,6 +23,7 @@ import TitleBreadcrumb from '../../components/common/TitleBreadcrumb/TitleBreadc import { TitleBreadcrumbProps } from '../../components/common/TitleBreadcrumb/TitleBreadcrumb.interface'; import PageHeader from '../../components/PageHeader/PageHeader.component'; import PageLayoutV1 from '../../components/PageLayoutV1/PageLayoutV1'; +import ApplicationCard from '../../components/Settings/Applications/ApplicationCard/ApplicationCard.component'; import { ROUTES } from '../../constants/constants'; import { GlobalSettingsMenuCategory } from '../../constants/GlobalSettings.constants'; import { PAGE_HEADERS } from '../../constants/PageHeaders.constant'; diff --git a/openmetadata-ui/src/main/resources/ui/src/pages/BotDetailsPage/BotDetailsPage.tsx b/openmetadata-ui/src/main/resources/ui/src/pages/BotDetailsPage/BotDetailsPage.tsx index 08a698ccb876..a8cf48076817 100644 --- a/openmetadata-ui/src/main/resources/ui/src/pages/BotDetailsPage/BotDetailsPage.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/pages/BotDetailsPage/BotDetailsPage.tsx @@ -16,14 +16,14 @@ import { AxiosError } from 'axios'; import { compare } from 'fast-json-patch'; import React, { useEffect, useState } from 'react'; import { useTranslation } from 'react-i18next'; -import BotDetails from '../../components/BotDetails/BotDetails.component'; import ErrorPlaceHolder from '../../components/common/ErrorWithPlaceholder/ErrorPlaceHolder'; -import Loader from '../../components/Loader/Loader'; -import { usePermissionProvider } from '../../components/PermissionProvider/PermissionProvider'; +import Loader from '../../components/common/Loader/Loader'; +import BotDetails from '../../components/Settings/Bot/BotDetails/BotDetails.component'; +import { usePermissionProvider } from '../../context/PermissionProvider/PermissionProvider'; import { OperationPermission, ResourceEntity, -} from '../../components/PermissionProvider/PermissionProvider.interface'; +} from '../../context/PermissionProvider/PermissionProvider.interface'; import { ERROR_PLACEHOLDER_TYPE } from '../../enums/common.enum'; import { Bot } from '../../generated/entity/bot'; import { User } from '../../generated/entity/teams/user'; diff --git a/openmetadata-ui/src/main/resources/ui/src/pages/BotsPageV1/BotsPageV1.component.tsx b/openmetadata-ui/src/main/resources/ui/src/pages/BotsPageV1/BotsPageV1.component.tsx index 92bc37b8cdfa..7b64ff63e1bb 100644 --- a/openmetadata-ui/src/main/resources/ui/src/pages/BotsPageV1/BotsPageV1.component.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/pages/BotsPageV1/BotsPageV1.component.tsx @@ -14,8 +14,8 @@ import React, { useState } from 'react'; import { useTranslation } from 'react-i18next'; import { useHistory } from 'react-router-dom'; -import BotListV1 from '../../components/BotListV1/BotListV1.component'; import PageLayoutV1 from '../../components/PageLayoutV1/PageLayoutV1'; +import BotListV1 from '../../components/Settings/Bot/BotListV1/BotListV1.component'; import { getCreateUserPath } from '../../constants/constants'; export const BotsPageV1 = () => { diff --git a/openmetadata-ui/src/main/resources/ui/src/pages/ClassificationVersionPage/ClassificationVersionPage.test.tsx b/openmetadata-ui/src/main/resources/ui/src/pages/ClassificationVersionPage/ClassificationVersionPage.test.tsx index 45290a8e3d0b..b515bae265f2 100644 --- a/openmetadata-ui/src/main/resources/ui/src/pages/ClassificationVersionPage/ClassificationVersionPage.test.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/pages/ClassificationVersionPage/ClassificationVersionPage.test.tsx @@ -31,7 +31,7 @@ jest.mock('react-router-dom', () => ({ })); jest.mock( - '../../components/ClassificationDetails/ClassificationDetails', + '../../components/Classifications/ClassificationDetails/ClassificationDetails', () => ({ ClassificationDetails: jest .fn() @@ -53,7 +53,7 @@ jest.mock( } ); -jest.mock('../../components/Loader/Loader', () => { +jest.mock('../../components/common/Loader/Loader', () => { return jest.fn().mockReturnValue(
Loader component
); }); @@ -68,7 +68,7 @@ const mockGetEntityPermissionByFqn = jest .fn() .mockImplementation(() => Promise.resolve(ENTITY_PERMISSIONS)); -jest.mock('../../components/PermissionProvider/PermissionProvider', () => ({ +jest.mock('../../context/PermissionProvider/PermissionProvider', () => ({ usePermissionProvider: jest.fn().mockImplementation(() => ({ getEntityPermissionByFqn: mockGetEntityPermissionByFqn, })), diff --git a/openmetadata-ui/src/main/resources/ui/src/pages/ClassificationVersionPage/ClassificationVersionPage.tsx b/openmetadata-ui/src/main/resources/ui/src/pages/ClassificationVersionPage/ClassificationVersionPage.tsx index 4cd852825227..4f80906ef552 100644 --- a/openmetadata-ui/src/main/resources/ui/src/pages/ClassificationVersionPage/ClassificationVersionPage.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/pages/ClassificationVersionPage/ClassificationVersionPage.tsx @@ -16,16 +16,16 @@ import { isEmpty, toString } from 'lodash'; import React, { useCallback, useEffect, useMemo, useState } from 'react'; import { useTranslation } from 'react-i18next'; import { useHistory, useParams } from 'react-router-dom'; -import ClassificationDetails from '../../components/ClassificationDetails/ClassificationDetails'; +import ClassificationDetails from '../../components/Classifications/ClassificationDetails/ClassificationDetails'; import ErrorPlaceHolder from '../../components/common/ErrorWithPlaceholder/ErrorPlaceHolder'; +import Loader from '../../components/common/Loader/Loader'; import EntityVersionTimeLine from '../../components/Entity/EntityVersionTimeLine/EntityVersionTimeLine'; -import Loader from '../../components/Loader/Loader'; import PageLayoutV1 from '../../components/PageLayoutV1/PageLayoutV1'; -import { usePermissionProvider } from '../../components/PermissionProvider/PermissionProvider'; +import { usePermissionProvider } from '../../context/PermissionProvider/PermissionProvider'; import { OperationPermission, ResourceEntity, -} from '../../components/PermissionProvider/PermissionProvider.interface'; +} from '../../context/PermissionProvider/PermissionProvider.interface'; import { ERROR_PLACEHOLDER_TYPE } from '../../enums/common.enum'; import { Classification } from '../../generated/entity/classification/classification'; import { EntityHistory } from '../../generated/type/entityHistory'; diff --git a/openmetadata-ui/src/main/resources/ui/src/pages/Configuration/EditLoginConfiguration/EditLoginConfigurationPage.tsx b/openmetadata-ui/src/main/resources/ui/src/pages/Configuration/EditLoginConfiguration/EditLoginConfigurationPage.tsx index 3d4cdddff47a..13979e6cc925 100644 --- a/openmetadata-ui/src/main/resources/ui/src/pages/Configuration/EditLoginConfiguration/EditLoginConfigurationPage.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/pages/Configuration/EditLoginConfiguration/EditLoginConfigurationPage.tsx @@ -15,10 +15,10 @@ import { AxiosError } from 'axios'; import React, { useEffect, useMemo, useState } from 'react'; import { useTranslation } from 'react-i18next'; import { useHistory } from 'react-router-dom'; +import Loader from '../../../components/common/Loader/Loader'; import ResizablePanels from '../../../components/common/ResizablePanels/ResizablePanels'; import ServiceDocPanel from '../../../components/common/ServiceDocPanel/ServiceDocPanel'; import TitleBreadcrumb from '../../../components/common/TitleBreadcrumb/TitleBreadcrumb.component'; -import Loader from '../../../components/Loader/Loader'; import { VALIDATION_MESSAGES } from '../../../constants/constants'; import { GlobalSettingOptions, diff --git a/openmetadata-ui/src/main/resources/ui/src/pages/Configuration/LoginConfigurationDetails/LoginConfigurationPage.tsx b/openmetadata-ui/src/main/resources/ui/src/pages/Configuration/LoginConfigurationDetails/LoginConfigurationPage.tsx index a7bcb6bcf488..1bd9c06d2ade 100644 --- a/openmetadata-ui/src/main/resources/ui/src/pages/Configuration/LoginConfigurationDetails/LoginConfigurationPage.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/pages/Configuration/LoginConfigurationDetails/LoginConfigurationPage.tsx @@ -18,9 +18,9 @@ import { useTranslation } from 'react-i18next'; import { useHistory } from 'react-router-dom'; import { ReactComponent as IconEdit } from '../../../assets/svg/edit-new.svg'; import { useAuthContext } from '../../../components/Auth/AuthProviders/AuthProvider'; +import Loader from '../../../components/common/Loader/Loader'; import TitleBreadcrumb from '../../../components/common/TitleBreadcrumb/TitleBreadcrumb.component'; import { TitleBreadcrumbProps } from '../../../components/common/TitleBreadcrumb/TitleBreadcrumb.interface'; -import Loader from '../../../components/Loader/Loader'; import PageHeader from '../../../components/PageHeader/PageHeader.component'; import PageLayoutV1 from '../../../components/PageLayoutV1/PageLayoutV1'; import { diff --git a/openmetadata-ui/src/main/resources/ui/src/pages/ContainerPage/ContainerPage.tsx b/openmetadata-ui/src/main/resources/ui/src/pages/ContainerPage/ContainerPage.tsx index 8e8b30935b78..e636e6ab54b5 100644 --- a/openmetadata-ui/src/main/resources/ui/src/pages/ContainerPage/ContainerPage.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/pages/ContainerPage/ContainerPage.tsx @@ -26,28 +26,28 @@ import { useAuthContext } from '../../components/Auth/AuthProviders/AuthProvider import { CustomPropertyTable } from '../../components/common/CustomPropertyTable/CustomPropertyTable'; import DescriptionV1 from '../../components/common/EntityDescription/DescriptionV1'; import ErrorPlaceHolder from '../../components/common/ErrorWithPlaceholder/ErrorPlaceHolder'; -import ContainerChildren from '../../components/ContainerDetail/ContainerChildren/ContainerChildren'; -import ContainerDataModel from '../../components/ContainerDetail/ContainerDataModel/ContainerDataModel'; +import Loader from '../../components/common/Loader/Loader'; +import TabsLabel from '../../components/common/TabsLabel/TabsLabel.component'; +import ContainerChildren from '../../components/Container/ContainerChildren/ContainerChildren'; +import ContainerDataModel from '../../components/Container/ContainerDataModel/ContainerDataModel'; import { DataAssetsHeader } from '../../components/DataAssets/DataAssetsHeader/DataAssetsHeader.component'; +import { QueryVote } from '../../components/Database/TableQueries/TableQueries.interface'; import EntityRightPanel from '../../components/Entity/EntityRightPanel/EntityRightPanel'; import Lineage from '../../components/Lineage/Lineage.component'; -import LineageProvider from '../../components/LineageProvider/LineageProvider'; -import Loader from '../../components/Loader/Loader'; import { EntityName } from '../../components/Modals/EntityNameModal/EntityNameModal.interface'; import PageLayoutV1 from '../../components/PageLayoutV1/PageLayoutV1'; -import { usePermissionProvider } from '../../components/PermissionProvider/PermissionProvider'; -import { - OperationPermission, - ResourceEntity, -} from '../../components/PermissionProvider/PermissionProvider.interface'; import { SourceType } from '../../components/SearchedData/SearchedData.interface'; -import { QueryVote } from '../../components/TableQueries/TableQueries.interface'; -import TabsLabel from '../../components/TabsLabel/TabsLabel.component'; import { getContainerDetailPath, getVersionPath, } from '../../constants/constants'; import { FEED_COUNT_INITIAL_DATA } from '../../constants/entity.constants'; +import LineageProvider from '../../context/LineageProvider/LineageProvider'; +import { usePermissionProvider } from '../../context/PermissionProvider/PermissionProvider'; +import { + OperationPermission, + ResourceEntity, +} from '../../context/PermissionProvider/PermissionProvider.interface'; import { ERROR_PLACEHOLDER_TYPE } from '../../enums/common.enum'; import { EntityTabs, EntityType } from '../../enums/entity.enum'; import { CreateThread } from '../../generated/api/feed/createThread'; diff --git a/openmetadata-ui/src/main/resources/ui/src/pages/CreateUserPage/CreateUserPage.component.tsx b/openmetadata-ui/src/main/resources/ui/src/pages/CreateUserPage/CreateUserPage.component.tsx index e3e4aac0d835..492e2bd08741 100644 --- a/openmetadata-ui/src/main/resources/ui/src/pages/CreateUserPage/CreateUserPage.component.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/pages/CreateUserPage/CreateUserPage.component.tsx @@ -17,8 +17,8 @@ import React, { useEffect, useMemo, useState } from 'react'; import { useTranslation } from 'react-i18next'; import { useHistory, useParams } from 'react-router-dom'; import TitleBreadcrumb from '../../components/common/TitleBreadcrumb/TitleBreadcrumb.component'; -import CreateUserComponent from '../../components/CreateUser/CreateUser.component'; import PageLayoutV1 from '../../components/PageLayoutV1/PageLayoutV1'; +import CreateUserComponent from '../../components/Settings/Users/CreateUser/CreateUser.component'; import { ERROR_MESSAGE, getBotsPagePath, diff --git a/openmetadata-ui/src/main/resources/ui/src/pages/CustomLogoConfigSettingsPage/CustomLogoConfigSettingsPage.tsx b/openmetadata-ui/src/main/resources/ui/src/pages/CustomLogoConfigSettingsPage/CustomLogoConfigSettingsPage.tsx index e27a3c358c43..5315b4aca53c 100644 --- a/openmetadata-ui/src/main/resources/ui/src/pages/CustomLogoConfigSettingsPage/CustomLogoConfigSettingsPage.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/pages/CustomLogoConfigSettingsPage/CustomLogoConfigSettingsPage.tsx @@ -20,9 +20,9 @@ import { useTranslation } from 'react-i18next'; import { useHistory } from 'react-router-dom'; import { ReactComponent as IconEdit } from '../../assets/svg/edit-new.svg'; import ErrorPlaceHolder from '../../components/common/ErrorWithPlaceholder/ErrorPlaceHolder'; +import Loader from '../../components/common/Loader/Loader'; import TitleBreadcrumb from '../../components/common/TitleBreadcrumb/TitleBreadcrumb.component'; import { TitleBreadcrumbProps } from '../../components/common/TitleBreadcrumb/TitleBreadcrumb.interface'; -import Loader from '../../components/Loader/Loader'; import PageHeader from '../../components/PageHeader/PageHeader.component'; import PageLayoutV1 from '../../components/PageLayoutV1/PageLayoutV1'; import { diff --git a/openmetadata-ui/src/main/resources/ui/src/pages/CustomPropertiesPageV1/CustomPropertiesPageV1.tsx b/openmetadata-ui/src/main/resources/ui/src/pages/CustomPropertiesPageV1/CustomPropertiesPageV1.tsx index 413810c70e52..d244e3d2dbf1 100644 --- a/openmetadata-ui/src/main/resources/ui/src/pages/CustomPropertiesPageV1/CustomPropertiesPageV1.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/pages/CustomPropertiesPageV1/CustomPropertiesPageV1.tsx @@ -25,24 +25,24 @@ import { import { useTranslation } from 'react-i18next'; import { useHistory, useParams } from 'react-router-dom'; import ErrorPlaceHolder from '../../components/common/ErrorWithPlaceholder/ErrorPlaceHolder'; +import TabsLabel from '../../components/common/TabsLabel/TabsLabel.component'; import TitleBreadcrumb from '../../components/common/TitleBreadcrumb/TitleBreadcrumb.component'; import { TitleBreadcrumbProps } from '../../components/common/TitleBreadcrumb/TitleBreadcrumb.interface'; -import { CustomPropertyTable } from '../../components/CustomEntityDetail/CustomPropertyTable'; +import SchemaEditor from '../../components/Database/SchemaEditor/SchemaEditor'; import PageHeader from '../../components/PageHeader/PageHeader.component'; import PageLayoutV1 from '../../components/PageLayoutV1/PageLayoutV1'; -import { usePermissionProvider } from '../../components/PermissionProvider/PermissionProvider'; -import { - OperationPermission, - ResourceEntity, -} from '../../components/PermissionProvider/PermissionProvider.interface'; -import SchemaEditor from '../../components/SchemaEditor/SchemaEditor'; -import TabsLabel from '../../components/TabsLabel/TabsLabel.component'; +import { CustomPropertyTable } from '../../components/Settings/CustomProperty/CustomPropertyTable'; import { ENTITY_PATH, getAddCustomPropertyPath, } from '../../constants/constants'; import { GlobalSettingsMenuCategory } from '../../constants/GlobalSettings.constants'; import { PAGE_HEADERS } from '../../constants/PageHeaders.constant'; +import { usePermissionProvider } from '../../context/PermissionProvider/PermissionProvider'; +import { + OperationPermission, + ResourceEntity, +} from '../../context/PermissionProvider/PermissionProvider.interface'; import { EntityTabs } from '../../enums/entity.enum'; import { Type } from '../../generated/entity/type'; import { getTypeByFQN, updateType } from '../../rest/metadataTypeAPI'; diff --git a/openmetadata-ui/src/main/resources/ui/src/pages/CustomizablePage/CustomizablePage.tsx b/openmetadata-ui/src/main/resources/ui/src/pages/CustomizablePage/CustomizablePage.tsx index d39adc6f7a53..a3f441e96bfd 100644 --- a/openmetadata-ui/src/main/resources/ui/src/pages/CustomizablePage/CustomizablePage.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/pages/CustomizablePage/CustomizablePage.tsx @@ -18,8 +18,8 @@ import React, { useCallback, useEffect, useState } from 'react'; import { useTranslation } from 'react-i18next'; import { Link, useParams } from 'react-router-dom'; import ErrorPlaceHolder from '../../components/common/ErrorWithPlaceholder/ErrorPlaceHolder'; -import CustomizeMyData from '../../components/CustomizableComponents/CustomizeMyData/CustomizeMyData'; -import Loader from '../../components/Loader/Loader'; +import Loader from '../../components/common/Loader/Loader'; +import CustomizeMyData from '../../components/MyData/CustomizableComponents/CustomizeMyData/CustomizeMyData'; import { GlobalSettingOptions, GlobalSettingsMenuCategory, diff --git a/openmetadata-ui/src/main/resources/ui/src/pages/DashboardDetailsPage/DashboardDetailsPage.component.tsx b/openmetadata-ui/src/main/resources/ui/src/pages/DashboardDetailsPage/DashboardDetailsPage.component.tsx index afff6c7eb7c4..8b310b7efdb6 100644 --- a/openmetadata-ui/src/main/resources/ui/src/pages/DashboardDetailsPage/DashboardDetailsPage.component.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/pages/DashboardDetailsPage/DashboardDetailsPage.component.tsx @@ -19,12 +19,12 @@ import { useTranslation } from 'react-i18next'; import { useHistory } from 'react-router-dom'; import { useAuthContext } from '../../components/Auth/AuthProviders/AuthProvider'; import ErrorPlaceHolder from '../../components/common/ErrorWithPlaceholder/ErrorPlaceHolder'; -import DashboardDetails from '../../components/DashboardDetails/DashboardDetails.component'; -import Loader from '../../components/Loader/Loader'; -import { usePermissionProvider } from '../../components/PermissionProvider/PermissionProvider'; -import { ResourceEntity } from '../../components/PermissionProvider/PermissionProvider.interface'; -import { QueryVote } from '../../components/TableQueries/TableQueries.interface'; +import Loader from '../../components/common/Loader/Loader'; +import DashboardDetails from '../../components/Dashboard/DashboardDetails/DashboardDetails.component'; +import { QueryVote } from '../../components/Database/TableQueries/TableQueries.interface'; import { getVersionPath } from '../../constants/constants'; +import { usePermissionProvider } from '../../context/PermissionProvider/PermissionProvider'; +import { ResourceEntity } from '../../context/PermissionProvider/PermissionProvider.interface'; import { ERROR_PLACEHOLDER_TYPE } from '../../enums/common.enum'; import { EntityType, TabSpecificField } from '../../enums/entity.enum'; import { CreateThread } from '../../generated/api/feed/createThread'; diff --git a/openmetadata-ui/src/main/resources/ui/src/pages/DashboardDetailsPage/DashboardDetailsPage.test.tsx b/openmetadata-ui/src/main/resources/ui/src/pages/DashboardDetailsPage/DashboardDetailsPage.test.tsx index 7653565bfc49..a8f1a63d5cf9 100644 --- a/openmetadata-ui/src/main/resources/ui/src/pages/DashboardDetailsPage/DashboardDetailsPage.test.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/pages/DashboardDetailsPage/DashboardDetailsPage.test.tsx @@ -20,7 +20,7 @@ import { import userEvent from '@testing-library/user-event'; import React from 'react'; import { MemoryRouter } from 'react-router'; -import { mockUserData } from '../../components/Users/mocks/User.mocks'; +import { mockUserData } from '../../components/Settings/Users/mocks/User.mocks'; import DashboardDetailsPage from './DashboardDetailsPage.component'; import { CREATE_THREAD, diff --git a/openmetadata-ui/src/main/resources/ui/src/pages/DataInsightPage/DataInsightHeader/DataInsightHeader.component.tsx b/openmetadata-ui/src/main/resources/ui/src/pages/DataInsightPage/DataInsightHeader/DataInsightHeader.component.tsx index c8cc92617cb9..b2a34aecf9e4 100644 --- a/openmetadata-ui/src/main/resources/ui/src/pages/DataInsightPage/DataInsightHeader/DataInsightHeader.component.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/pages/DataInsightPage/DataInsightHeader/DataInsightHeader.component.tsx @@ -14,13 +14,13 @@ import { Button, Col, Row, Space, Typography } from 'antd'; import React, { useMemo } from 'react'; import { useTranslation } from 'react-i18next'; import { useHistory, useParams } from 'react-router-dom'; +import DatePickerMenu from '../../../components/common/DatePickerMenu/DatePickerMenu.component'; import DataInsightSummary from '../../../components/DataInsightDetail/DataInsightSummary'; import KPIChart from '../../../components/DataInsightDetail/KPIChart'; -import DatePickerMenu from '../../../components/DatePickerMenu/DatePickerMenu.component'; -import { usePermissionProvider } from '../../../components/PermissionProvider/PermissionProvider'; -import { ResourceEntity } from '../../../components/PermissionProvider/PermissionProvider.interface'; import SearchDropdown from '../../../components/SearchDropdown/SearchDropdown'; import { ROUTES } from '../../../constants/constants'; +import { usePermissionProvider } from '../../../context/PermissionProvider/PermissionProvider'; +import { ResourceEntity } from '../../../context/PermissionProvider/PermissionProvider.interface'; import { Operation } from '../../../generated/entity/policies/policy'; import { DataInsightTabs } from '../../../interface/data-insight.interface'; import { getOptionalDataInsightTabFlag } from '../../../utils/DataInsightUtils'; diff --git a/openmetadata-ui/src/main/resources/ui/src/pages/DataInsightPage/DataInsightPage.component.tsx b/openmetadata-ui/src/main/resources/ui/src/pages/DataInsightPage/DataInsightPage.component.tsx index 254e971cda26..1f590f4d7b81 100644 --- a/openmetadata-ui/src/main/resources/ui/src/pages/DataInsightPage/DataInsightPage.component.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/pages/DataInsightPage/DataInsightPage.component.tsx @@ -23,10 +23,10 @@ import { } from 'react-router-dom'; import ErrorPlaceHolder from '../../components/common/ErrorWithPlaceholder/ErrorPlaceHolder'; import PageLayoutV1 from '../../components/PageLayoutV1/PageLayoutV1'; -import { usePermissionProvider } from '../../components/PermissionProvider/PermissionProvider'; -import { ResourceEntity } from '../../components/PermissionProvider/PermissionProvider.interface'; import { ROUTES } from '../../constants/constants'; import { ENTITIES_CHARTS } from '../../constants/DataInsight.constants'; +import { usePermissionProvider } from '../../context/PermissionProvider/PermissionProvider'; +import { ResourceEntity } from '../../context/PermissionProvider/PermissionProvider.interface'; import { ERROR_PLACEHOLDER_TYPE } from '../../enums/common.enum'; import { DataInsightChartType } from '../../generated/dataInsight/dataInsightChartResult'; import { Operation } from '../../generated/entity/policies/policy'; diff --git a/openmetadata-ui/src/main/resources/ui/src/pages/DataInsightPage/DataInsightProvider.tsx b/openmetadata-ui/src/main/resources/ui/src/pages/DataInsightPage/DataInsightProvider.tsx index e006303d007f..81a9fc18127c 100644 --- a/openmetadata-ui/src/main/resources/ui/src/pages/DataInsightPage/DataInsightProvider.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/pages/DataInsightPage/DataInsightProvider.tsx @@ -20,7 +20,7 @@ import React, { useState, } from 'react'; import { ListItem } from 'react-awesome-query-builder'; -import Loader from '../../components/Loader/Loader'; +import Loader from '../../components/common/Loader/Loader'; import { SearchDropdownOption } from '../../components/SearchDropdown/SearchDropdown.interface'; import { autocomplete } from '../../constants/AdvancedSearch.constants'; import { PAGE_SIZE } from '../../constants/constants'; diff --git a/openmetadata-ui/src/main/resources/ui/src/pages/DataInsightPage/KPIList.test.tsx b/openmetadata-ui/src/main/resources/ui/src/pages/DataInsightPage/KPIList.test.tsx index 30cd2695f55d..4333760a52e9 100644 --- a/openmetadata-ui/src/main/resources/ui/src/pages/DataInsightPage/KPIList.test.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/pages/DataInsightPage/KPIList.test.tsx @@ -15,7 +15,7 @@ import { fireEvent, render, screen } from '@testing-library/react'; import React from 'react'; import { MemoryRouter } from 'react-router-dom'; import { act } from 'react-test-renderer'; -import { mockUserData } from '../../components/Users/mocks/User.mocks'; +import { mockUserData } from '../../components/Settings/Users/mocks/User.mocks'; import KPIList from './KPIList'; import { KPI_DATA } from './mocks/KPIList'; diff --git a/openmetadata-ui/src/main/resources/ui/src/pages/DataInsightPage/KPIList.tsx b/openmetadata-ui/src/main/resources/ui/src/pages/DataInsightPage/KPIList.tsx index 0007094414e7..530cc2e05356 100644 --- a/openmetadata-ui/src/main/resources/ui/src/pages/DataInsightPage/KPIList.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/pages/DataInsightPage/KPIList.tsx @@ -28,14 +28,14 @@ import { PagingHandlerParams } from '../../components/common/NextPrevious/NextPr import RichTextEditorPreviewer from '../../components/common/RichTextEditor/RichTextEditorPreviewer'; import Table from '../../components/common/Table/Table'; import { EmptyGraphPlaceholder } from '../../components/DataInsightDetail/EmptyGraphPlaceholder'; -import { usePermissionProvider } from '../../components/PermissionProvider/PermissionProvider'; -import { ResourceEntity } from '../../components/PermissionProvider/PermissionProvider.interface'; import { getKpiPath, INITIAL_PAGING_VALUE, PAGE_SIZE_MEDIUM, pagingObject, } from '../../constants/constants'; +import { usePermissionProvider } from '../../context/PermissionProvider/PermissionProvider'; +import { ResourceEntity } from '../../context/PermissionProvider/PermissionProvider.interface'; import { ERROR_PLACEHOLDER_TYPE } from '../../enums/common.enum'; import { EntityType } from '../../enums/entity.enum'; import { Kpi, KpiTargetType } from '../../generated/dataInsight/kpi/kpi'; diff --git a/openmetadata-ui/src/main/resources/ui/src/pages/DataModelPage/DataModelPage.component.tsx b/openmetadata-ui/src/main/resources/ui/src/pages/DataModelPage/DataModelPage.component.tsx index e8d4e9828f59..df2d637871fb 100644 --- a/openmetadata-ui/src/main/resources/ui/src/pages/DataModelPage/DataModelPage.component.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/pages/DataModelPage/DataModelPage.component.tsx @@ -25,14 +25,14 @@ import { import { useTranslation } from 'react-i18next'; import { useAuthContext } from '../../components/Auth/AuthProviders/AuthProvider'; import ErrorPlaceHolder from '../../components/common/ErrorWithPlaceholder/ErrorPlaceHolder'; -import DataModelDetails from '../../components/DataModels/DataModelDetails.component'; -import Loader from '../../components/Loader/Loader'; -import { usePermissionProvider } from '../../components/PermissionProvider/PermissionProvider'; +import Loader from '../../components/common/Loader/Loader'; +import DataModelDetails from '../../components/Dashboard/DataModel/DataModels/DataModelDetails.component'; +import { QueryVote } from '../../components/Database/TableQueries/TableQueries.interface'; +import { usePermissionProvider } from '../../context/PermissionProvider/PermissionProvider'; import { OperationPermission, ResourceEntity, -} from '../../components/PermissionProvider/PermissionProvider.interface'; -import { QueryVote } from '../../components/TableQueries/TableQueries.interface'; +} from '../../context/PermissionProvider/PermissionProvider.interface'; import { ERROR_PLACEHOLDER_TYPE } from '../../enums/common.enum'; import { CreateThread } from '../../generated/api/feed/createThread'; import { Tag } from '../../generated/entity/classification/tag'; diff --git a/openmetadata-ui/src/main/resources/ui/src/pages/DataModelPage/DataModelPage.test.tsx b/openmetadata-ui/src/main/resources/ui/src/pages/DataModelPage/DataModelPage.test.tsx index 9d4ec9a02c49..88d0a40d5324 100644 --- a/openmetadata-ui/src/main/resources/ui/src/pages/DataModelPage/DataModelPage.test.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/pages/DataModelPage/DataModelPage.test.tsx @@ -18,7 +18,7 @@ import { } from '@testing-library/react'; import userEvent from '@testing-library/user-event'; import React from 'react'; -import { mockUserData } from '../../components/Users/mocks/User.mocks'; +import { mockUserData } from '../../components/Settings/Users/mocks/User.mocks'; import DataModelsPage from './DataModelPage.component'; import { CREATE_THREAD, diff --git a/openmetadata-ui/src/main/resources/ui/src/pages/DataQuality/DataQualityPage.tsx b/openmetadata-ui/src/main/resources/ui/src/pages/DataQuality/DataQualityPage.tsx index 4bce36bb58f2..36099cd917dc 100644 --- a/openmetadata-ui/src/main/resources/ui/src/pages/DataQuality/DataQualityPage.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/pages/DataQuality/DataQualityPage.tsx @@ -16,13 +16,13 @@ import { AxiosError } from 'axios'; import React, { useEffect, useMemo, useState } from 'react'; import { useTranslation } from 'react-i18next'; import { useHistory, useParams } from 'react-router-dom'; +import TabsLabel from '../../components/common/TabsLabel/TabsLabel.component'; import { SummaryPanel } from '../../components/DataQuality/SummaryPannel/SummaryPanel.component'; import { TestCases } from '../../components/DataQuality/TestCases/TestCases.component'; import { TestSuites } from '../../components/DataQuality/TestSuites/TestSuites.component'; import PageLayoutV1 from '../../components/PageLayoutV1/PageLayoutV1'; -import { usePermissionProvider } from '../../components/PermissionProvider/PermissionProvider'; -import TabsLabel from '../../components/TabsLabel/TabsLabel.component'; import { INITIAL_TEST_SUMMARY } from '../../constants/TestSuite.constant'; +import { usePermissionProvider } from '../../context/PermissionProvider/PermissionProvider'; import { TestSummary } from '../../generated/tests/testCase'; import { getTestCaseExecutionSummary } from '../../rest/testAPI'; import { getDataQualityPagePath } from '../../utils/RouterUtils'; diff --git a/openmetadata-ui/src/main/resources/ui/src/pages/DatabaseDetailsPage/DatabaseDetailsPage.tsx b/openmetadata-ui/src/main/resources/ui/src/pages/DatabaseDetailsPage/DatabaseDetailsPage.tsx index a836235d0e8d..fc40903cd810 100644 --- a/openmetadata-ui/src/main/resources/ui/src/pages/DatabaseDetailsPage/DatabaseDetailsPage.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/pages/DatabaseDetailsPage/DatabaseDetailsPage.tsx @@ -33,20 +33,15 @@ import { withActivityFeed } from '../../components/AppRouter/withActivityFeed'; import { CustomPropertyTable } from '../../components/common/CustomPropertyTable/CustomPropertyTable'; import DescriptionV1 from '../../components/common/EntityDescription/DescriptionV1'; import ErrorPlaceHolder from '../../components/common/ErrorWithPlaceholder/ErrorPlaceHolder'; +import Loader from '../../components/common/Loader/Loader'; +import TabsLabel from '../../components/common/TabsLabel/TabsLabel.component'; import { DataAssetsHeader } from '../../components/DataAssets/DataAssetsHeader/DataAssetsHeader.component'; import { DatabaseSchemaTable } from '../../components/Database/DatabaseSchema/DatabaseSchemaTable/DatabaseSchemaTable'; +import ProfilerSettings from '../../components/Database/Profiler/ProfilerSettings/ProfilerSettings'; +import { QueryVote } from '../../components/Database/TableQueries/TableQueries.interface'; import EntityRightPanel from '../../components/Entity/EntityRightPanel/EntityRightPanel'; -import Loader from '../../components/Loader/Loader'; import { EntityName } from '../../components/Modals/EntityNameModal/EntityNameModal.interface'; import PageLayoutV1 from '../../components/PageLayoutV1/PageLayoutV1'; -import { usePermissionProvider } from '../../components/PermissionProvider/PermissionProvider'; -import { - OperationPermission, - ResourceEntity, -} from '../../components/PermissionProvider/PermissionProvider.interface'; -import ProfilerSettings from '../../components/ProfilerSettings/ProfilerSettings'; -import { QueryVote } from '../../components/TableQueries/TableQueries.interface'; -import TabsLabel from '../../components/TabsLabel/TabsLabel.component'; import { FQN_SEPARATOR_CHAR } from '../../constants/char.constants'; import { getDatabaseDetailsPath, @@ -54,6 +49,11 @@ import { getVersionPathWithTab, } from '../../constants/constants'; import { FEED_COUNT_INITIAL_DATA } from '../../constants/entity.constants'; +import { usePermissionProvider } from '../../context/PermissionProvider/PermissionProvider'; +import { + OperationPermission, + ResourceEntity, +} from '../../context/PermissionProvider/PermissionProvider.interface'; import { ERROR_PLACEHOLDER_TYPE } from '../../enums/common.enum'; import { EntityTabs, EntityType } from '../../enums/entity.enum'; import { CreateThread } from '../../generated/api/feed/createThread'; diff --git a/openmetadata-ui/src/main/resources/ui/src/pages/DatabaseSchemaPage/DatabaseSchemaPage.component.tsx b/openmetadata-ui/src/main/resources/ui/src/pages/DatabaseSchemaPage/DatabaseSchemaPage.component.tsx index 56e0e374844c..abbb382df18a 100644 --- a/openmetadata-ui/src/main/resources/ui/src/pages/DatabaseSchemaPage/DatabaseSchemaPage.component.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/pages/DatabaseSchemaPage/DatabaseSchemaPage.component.tsx @@ -34,26 +34,26 @@ import ActivityThreadPanel from '../../components/ActivityFeed/ActivityThreadPan import { withActivityFeed } from '../../components/AppRouter/withActivityFeed'; import { CustomPropertyTable } from '../../components/common/CustomPropertyTable/CustomPropertyTable'; import ErrorPlaceHolder from '../../components/common/ErrorWithPlaceholder/ErrorPlaceHolder'; +import Loader from '../../components/common/Loader/Loader'; import { PagingHandlerParams } from '../../components/common/NextPrevious/NextPrevious.interface'; +import TabsLabel from '../../components/common/TabsLabel/TabsLabel.component'; import { DataAssetsHeader } from '../../components/DataAssets/DataAssetsHeader/DataAssetsHeader.component'; +import ProfilerSettings from '../../components/Database/Profiler/ProfilerSettings/ProfilerSettings'; +import { QueryVote } from '../../components/Database/TableQueries/TableQueries.interface'; import EntityRightPanel from '../../components/Entity/EntityRightPanel/EntityRightPanel'; -import Loader from '../../components/Loader/Loader'; import { EntityName } from '../../components/Modals/EntityNameModal/EntityNameModal.interface'; import PageLayoutV1 from '../../components/PageLayoutV1/PageLayoutV1'; -import { usePermissionProvider } from '../../components/PermissionProvider/PermissionProvider'; -import { - OperationPermission, - ResourceEntity, -} from '../../components/PermissionProvider/PermissionProvider.interface'; -import ProfilerSettings from '../../components/ProfilerSettings/ProfilerSettings'; -import { QueryVote } from '../../components/TableQueries/TableQueries.interface'; -import TabsLabel from '../../components/TabsLabel/TabsLabel.component'; import { getDatabaseSchemaDetailsPath, getVersionPathWithTab, INITIAL_PAGING_VALUE, } from '../../constants/constants'; import { FEED_COUNT_INITIAL_DATA } from '../../constants/entity.constants'; +import { usePermissionProvider } from '../../context/PermissionProvider/PermissionProvider'; +import { + OperationPermission, + ResourceEntity, +} from '../../context/PermissionProvider/PermissionProvider.interface'; import { ERROR_PLACEHOLDER_TYPE } from '../../enums/common.enum'; import { EntityTabs, EntityType } from '../../enums/entity.enum'; import { CreateThread } from '../../generated/api/feed/createThread'; diff --git a/openmetadata-ui/src/main/resources/ui/src/pages/DatabaseSchemaPage/DatabaseSchemaPage.test.tsx b/openmetadata-ui/src/main/resources/ui/src/pages/DatabaseSchemaPage/DatabaseSchemaPage.test.tsx index bd923b436de7..5c24cf474e83 100644 --- a/openmetadata-ui/src/main/resources/ui/src/pages/DatabaseSchemaPage/DatabaseSchemaPage.test.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/pages/DatabaseSchemaPage/DatabaseSchemaPage.test.tsx @@ -13,8 +13,8 @@ import { act, render, screen } from '@testing-library/react'; import React from 'react'; -import { usePermissionProvider } from '../../components/PermissionProvider/PermissionProvider'; import { FEED_COUNT_INITIAL_DATA } from '../../constants/entity.constants'; +import { usePermissionProvider } from '../../context/PermissionProvider/PermissionProvider'; import { getDatabaseSchemaDetailsByFQN } from '../../rest/databaseAPI'; import { getStoredProceduresList } from '../../rest/storedProceduresAPI'; import { DEFAULT_ENTITY_PERMISSION } from '../../utils/PermissionsUtils'; diff --git a/openmetadata-ui/src/main/resources/ui/src/pages/DatabaseSchemaVersionPage/DatabaseSchemaVersionPage.tsx b/openmetadata-ui/src/main/resources/ui/src/pages/DatabaseSchemaVersionPage/DatabaseSchemaVersionPage.tsx index da6720a39864..b5600721b011 100644 --- a/openmetadata-ui/src/main/resources/ui/src/pages/DatabaseSchemaVersionPage/DatabaseSchemaVersionPage.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/pages/DatabaseSchemaVersionPage/DatabaseSchemaVersionPage.tsx @@ -20,18 +20,13 @@ import { useTranslation } from 'react-i18next'; import { useHistory, useParams } from 'react-router-dom'; import { CustomPropertyTable } from '../../components/common/CustomPropertyTable/CustomPropertyTable'; import ErrorPlaceHolder from '../../components/common/ErrorWithPlaceholder/ErrorPlaceHolder'; +import Loader from '../../components/common/Loader/Loader'; import { PagingHandlerParams } from '../../components/common/NextPrevious/NextPrevious.interface'; +import TabsLabel from '../../components/common/TabsLabel/TabsLabel.component'; import DataAssetsVersionHeader from '../../components/DataAssets/DataAssetsVersionHeader/DataAssetsVersionHeader'; -import DataProductsContainer from '../../components/DataProductsContainer/DataProductsContainer.component'; +import DataProductsContainer from '../../components/DataProducts/DataProductsContainer/DataProductsContainer.component'; import EntityVersionTimeLine from '../../components/Entity/EntityVersionTimeLine/EntityVersionTimeLine'; -import Loader from '../../components/Loader/Loader'; import PageLayoutV1 from '../../components/PageLayoutV1/PageLayoutV1'; -import { usePermissionProvider } from '../../components/PermissionProvider/PermissionProvider'; -import { - OperationPermission, - ResourceEntity, -} from '../../components/PermissionProvider/PermissionProvider.interface'; -import TabsLabel from '../../components/TabsLabel/TabsLabel.component'; import TagsContainerV2 from '../../components/Tag/TagsContainerV2/TagsContainerV2'; import { DisplayType } from '../../components/Tag/TagsViewer/TagsViewer.interface'; import { @@ -39,6 +34,11 @@ import { getVersionPathWithTab, INITIAL_PAGING_VALUE, } from '../../constants/constants'; +import { usePermissionProvider } from '../../context/PermissionProvider/PermissionProvider'; +import { + OperationPermission, + ResourceEntity, +} from '../../context/PermissionProvider/PermissionProvider.interface'; import { ERROR_PLACEHOLDER_TYPE } from '../../enums/common.enum'; import { EntityTabs, EntityType } from '../../enums/entity.enum'; import { DatabaseSchema } from '../../generated/entity/data/databaseSchema'; diff --git a/openmetadata-ui/src/main/resources/ui/src/pages/DatabaseVersionPage/DatabaseVersionPage.tsx b/openmetadata-ui/src/main/resources/ui/src/pages/DatabaseVersionPage/DatabaseVersionPage.tsx index 892cb3c21def..b7525f70f39f 100644 --- a/openmetadata-ui/src/main/resources/ui/src/pages/DatabaseVersionPage/DatabaseVersionPage.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/pages/DatabaseVersionPage/DatabaseVersionPage.tsx @@ -20,24 +20,24 @@ import { useHistory, useParams } from 'react-router-dom'; import { CustomPropertyTable } from '../../components/common/CustomPropertyTable/CustomPropertyTable'; import DescriptionV1 from '../../components/common/EntityDescription/DescriptionV1'; import ErrorPlaceHolder from '../../components/common/ErrorWithPlaceholder/ErrorPlaceHolder'; +import Loader from '../../components/common/Loader/Loader'; +import TabsLabel from '../../components/common/TabsLabel/TabsLabel.component'; import DataAssetsVersionHeader from '../../components/DataAssets/DataAssetsVersionHeader/DataAssetsVersionHeader'; import { DatabaseSchemaTable } from '../../components/Database/DatabaseSchema/DatabaseSchemaTable/DatabaseSchemaTable'; -import DataProductsContainer from '../../components/DataProductsContainer/DataProductsContainer.component'; +import DataProductsContainer from '../../components/DataProducts/DataProductsContainer/DataProductsContainer.component'; import EntityVersionTimeLine from '../../components/Entity/EntityVersionTimeLine/EntityVersionTimeLine'; -import Loader from '../../components/Loader/Loader'; import PageLayoutV1 from '../../components/PageLayoutV1/PageLayoutV1'; -import { usePermissionProvider } from '../../components/PermissionProvider/PermissionProvider'; -import { - OperationPermission, - ResourceEntity, -} from '../../components/PermissionProvider/PermissionProvider.interface'; -import TabsLabel from '../../components/TabsLabel/TabsLabel.component'; import TagsContainerV2 from '../../components/Tag/TagsContainerV2/TagsContainerV2'; import { DisplayType } from '../../components/Tag/TagsViewer/TagsViewer.interface'; import { getDatabaseDetailsPath, getVersionPathWithTab, } from '../../constants/constants'; +import { usePermissionProvider } from '../../context/PermissionProvider/PermissionProvider'; +import { + OperationPermission, + ResourceEntity, +} from '../../context/PermissionProvider/PermissionProvider.interface'; import { ERROR_PLACEHOLDER_TYPE } from '../../enums/common.enum'; import { EntityTabs, EntityType } from '../../enums/entity.enum'; import { Database } from '../../generated/entity/data/database'; diff --git a/openmetadata-ui/src/main/resources/ui/src/pages/EditConnectionFormPage/EditConnectionFormPage.component.tsx b/openmetadata-ui/src/main/resources/ui/src/pages/EditConnectionFormPage/EditConnectionFormPage.component.tsx index ce929953a2b5..34406dea91ae 100644 --- a/openmetadata-ui/src/main/resources/ui/src/pages/EditConnectionFormPage/EditConnectionFormPage.component.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/pages/EditConnectionFormPage/EditConnectionFormPage.component.tsx @@ -19,12 +19,12 @@ import React, { useEffect, useMemo, useState } from 'react'; import { useTranslation } from 'react-i18next'; import { useParams } from 'react-router-dom'; import ErrorPlaceHolder from '../../components/common/ErrorWithPlaceholder/ErrorPlaceHolder'; +import Loader from '../../components/common/Loader/Loader'; import ResizablePanels from '../../components/common/ResizablePanels/ResizablePanels'; import ServiceDocPanel from '../../components/common/ServiceDocPanel/ServiceDocPanel'; import TitleBreadcrumb from '../../components/common/TitleBreadcrumb/TitleBreadcrumb.component'; import { TitleBreadcrumbProps } from '../../components/common/TitleBreadcrumb/TitleBreadcrumb.interface'; -import Loader from '../../components/Loader/Loader'; -import ServiceConfig from '../../components/ServiceConfig/ServiceConfig'; +import ServiceConfig from '../../components/Settings/Services/ServiceConfig/ServiceConfig'; import { GlobalSettingsMenuCategory } from '../../constants/GlobalSettings.constants'; import { OPEN_METADATA } from '../../constants/Services.constant'; import { ServiceCategory } from '../../enums/service.enum'; diff --git a/openmetadata-ui/src/main/resources/ui/src/pages/EditCustomLogoConfig/EditCustomLogoConfig.tsx b/openmetadata-ui/src/main/resources/ui/src/pages/EditCustomLogoConfig/EditCustomLogoConfig.tsx index c09bf60ee759..b560e14fa3ae 100644 --- a/openmetadata-ui/src/main/resources/ui/src/pages/EditCustomLogoConfig/EditCustomLogoConfig.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/pages/EditCustomLogoConfig/EditCustomLogoConfig.tsx @@ -15,10 +15,10 @@ import { AxiosError } from 'axios'; import React, { useEffect, useMemo, useState } from 'react'; import { useTranslation } from 'react-i18next'; import { useHistory } from 'react-router-dom'; +import Loader from '../../components/common/Loader/Loader'; import ResizablePanels from '../../components/common/ResizablePanels/ResizablePanels'; import ServiceDocPanel from '../../components/common/ServiceDocPanel/ServiceDocPanel'; import TitleBreadcrumb from '../../components/common/TitleBreadcrumb/TitleBreadcrumb.component'; -import Loader from '../../components/Loader/Loader'; import { GlobalSettingOptions, GlobalSettingsMenuCategory, diff --git a/openmetadata-ui/src/main/resources/ui/src/pages/EditEmailConfigPage/EditEmailConfigPage.component.tsx b/openmetadata-ui/src/main/resources/ui/src/pages/EditEmailConfigPage/EditEmailConfigPage.component.tsx index 8c13716e1aed..a8d22c19273b 100644 --- a/openmetadata-ui/src/main/resources/ui/src/pages/EditEmailConfigPage/EditEmailConfigPage.component.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/pages/EditEmailConfigPage/EditEmailConfigPage.component.tsx @@ -25,7 +25,7 @@ import { useHistory } from 'react-router-dom'; import ResizablePanels from '../../components/common/ResizablePanels/ResizablePanels'; import ServiceDocPanel from '../../components/common/ServiceDocPanel/ServiceDocPanel'; import TitleBreadcrumb from '../../components/common/TitleBreadcrumb/TitleBreadcrumb.component'; -import EmailConfigForm from '../../components/EmailConfigForm/EmailConfigForm.component'; +import EmailConfigForm from '../../components/Settings/Email/EmailConfigForm/EmailConfigForm.component'; import { GlobalSettingOptions, GlobalSettingsMenuCategory, diff --git a/openmetadata-ui/src/main/resources/ui/src/pages/EditIngestionPage/EditIngestionPage.component.tsx b/openmetadata-ui/src/main/resources/ui/src/pages/EditIngestionPage/EditIngestionPage.component.tsx index 92743d88f03b..7fafa5dca252 100644 --- a/openmetadata-ui/src/main/resources/ui/src/pages/EditIngestionPage/EditIngestionPage.component.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/pages/EditIngestionPage/EditIngestionPage.component.tsx @@ -17,13 +17,13 @@ import { ServicesUpdateRequest } from 'Models'; import React, { useEffect, useMemo, useState } from 'react'; import { useTranslation } from 'react-i18next'; import { useHistory, useParams } from 'react-router-dom'; -import AddIngestion from '../../components/AddIngestion/AddIngestion.component'; import ErrorPlaceHolder from '../../components/common/ErrorWithPlaceholder/ErrorPlaceHolder'; +import Loader from '../../components/common/Loader/Loader'; import ResizablePanels from '../../components/common/ResizablePanels/ResizablePanels'; import ServiceDocPanel from '../../components/common/ServiceDocPanel/ServiceDocPanel'; import TitleBreadcrumb from '../../components/common/TitleBreadcrumb/TitleBreadcrumb.component'; import { TitleBreadcrumbProps } from '../../components/common/TitleBreadcrumb/TitleBreadcrumb.interface'; -import Loader from '../../components/Loader/Loader'; +import AddIngestion from '../../components/Settings/Services/AddIngestion/AddIngestion.component'; import { DEPLOYED_PROGRESS_VAL, getServiceDetailsPath, diff --git a/openmetadata-ui/src/main/resources/ui/src/pages/EmailConfigSettingsPage/EmailConfigSettingsPage.component.tsx b/openmetadata-ui/src/main/resources/ui/src/pages/EmailConfigSettingsPage/EmailConfigSettingsPage.component.tsx index 4ecde0c23bf0..1f136b57e9b2 100644 --- a/openmetadata-ui/src/main/resources/ui/src/pages/EmailConfigSettingsPage/EmailConfigSettingsPage.component.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/pages/EmailConfigSettingsPage/EmailConfigSettingsPage.component.tsx @@ -24,7 +24,7 @@ import TitleBreadcrumb from '../../components/common/TitleBreadcrumb/TitleBreadc import { TitleBreadcrumbProps } from '../../components/common/TitleBreadcrumb/TitleBreadcrumb.interface'; import PageHeader from '../../components/PageHeader/PageHeader.component'; import PageLayoutV1 from '../../components/PageLayoutV1/PageLayoutV1'; -import TestEmail from '../../components/TestEmail/TestEmail.component'; +import TestEmail from '../../components/Settings/Email/TestEmail/TestEmail.component'; import { ROUTES } from '../../constants/constants'; import { GlobalSettingsMenuCategory } from '../../constants/GlobalSettings.constants'; import { ERROR_PLACEHOLDER_TYPE } from '../../enums/common.enum'; 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 e06de244df7b..d7f4a55fad77 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 @@ -22,22 +22,17 @@ import React, { import { useTranslation } from 'react-i18next'; import { useHistory, useParams } from 'react-router-dom'; import ErrorPlaceHolder from '../../components/common/ErrorWithPlaceholder/ErrorPlaceHolder'; -import ContainerVersion from '../../components/ContainerVersion/ContainerVersion.component'; -import DashboardVersion from '../../components/DashboardVersion/DashboardVersion.component'; -import DataModelVersion from '../../components/DataModelVersion/DataModelVersion.component'; -import Loader from '../../components/Loader/Loader'; -import MlModelVersion from '../../components/MlModelVersion/MlModelVersion.component'; +import Loader from '../../components/common/Loader/Loader'; +import ContainerVersion from '../../components/Container/ContainerVersion/ContainerVersion.component'; +import DashboardVersion from '../../components/Dashboard/DashboardVersion/DashboardVersion.component'; +import DataModelVersion from '../../components/Dashboard/DataModel/DataModelVersion/DataModelVersion.component'; +import StoredProcedureVersion from '../../components/Database/StoredProcedureVersion/StoredProcedureVersion.component'; +import TableVersion from '../../components/Database/TableVersion/TableVersion.component'; +import MlModelVersion from '../../components/MlModel/MlModelVersion/MlModelVersion.component'; import PageLayoutV1 from '../../components/PageLayoutV1/PageLayoutV1'; -import { usePermissionProvider } from '../../components/PermissionProvider/PermissionProvider'; -import { - OperationPermission, - ResourceEntity, -} from '../../components/PermissionProvider/PermissionProvider.interface'; -import PipelineVersion from '../../components/PipelineVersion/PipelineVersion.component'; +import PipelineVersion from '../../components/Pipeline/PipelineVersion/PipelineVersion.component'; import SearchIndexVersion from '../../components/SearchIndexVersion/SearchIndexVersion'; -import StoredProcedureVersion from '../../components/StoredProcedureVersion/StoredProcedureVersion.component'; -import TableVersion from '../../components/TableVersion/TableVersion.component'; -import TopicVersion from '../../components/TopicVersion/TopicVersion.component'; +import TopicVersion from '../../components/Topic/TopicVersion/TopicVersion.component'; import { getContainerDetailPath, getDashboardDetailsPath, @@ -50,6 +45,11 @@ import { getVersionPath, getVersionPathWithTab, } from '../../constants/constants'; +import { usePermissionProvider } from '../../context/PermissionProvider/PermissionProvider'; +import { + OperationPermission, + ResourceEntity, +} from '../../context/PermissionProvider/PermissionProvider.interface'; import { ERROR_PLACEHOLDER_TYPE } from '../../enums/common.enum'; import { EntityTabs, EntityType } from '../../enums/entity.enum'; import { Container } from '../../generated/entity/data/container'; diff --git a/openmetadata-ui/src/main/resources/ui/src/pages/ExplorePage/ExplorePageV1.component.tsx b/openmetadata-ui/src/main/resources/ui/src/pages/ExplorePage/ExplorePageV1.component.tsx index a4832cf2403d..15ea9acad2af 100644 --- a/openmetadata-ui/src/main/resources/ui/src/pages/ExplorePage/ExplorePageV1.component.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/pages/ExplorePage/ExplorePageV1.component.tsx @@ -31,8 +31,6 @@ import { UrlParams, } from '../../components/Explore/ExplorePage.interface'; import ExploreV1 from '../../components/ExploreV1/ExploreV1.component'; -import { useGlobalSearchProvider } from '../../components/GlobalSearchProvider/GlobalSearchProvider'; -import { useTourProvider } from '../../components/TourProvider/TourProvider'; import { getExplorePath, PAGE_SIZE } from '../../constants/constants'; import { COMMON_FILTERS_FOR_DIFFERENT_TABS, @@ -44,6 +42,8 @@ import { mockSearchData, MOCK_EXPLORE_PAGE_COUNT, } from '../../constants/mockTourData.constants'; +import { useGlobalSearchProvider } from '../../context/GlobalSearchProvider/GlobalSearchProvider'; +import { useTourProvider } from '../../context/TourProvider/TourProvider'; import { SORT_ORDER } from '../../enums/common.enum'; import { EntityType } from '../../enums/entity.enum'; import { SearchIndex } from '../../enums/search.enum'; diff --git a/openmetadata-ui/src/main/resources/ui/src/pages/GlobalSettingPage/GlobalSettingCategory/GlobalSettingCategoryPage.tsx b/openmetadata-ui/src/main/resources/ui/src/pages/GlobalSettingPage/GlobalSettingCategory/GlobalSettingCategoryPage.tsx index 5cc2370ba2d5..34455e90bfc8 100644 --- a/openmetadata-ui/src/main/resources/ui/src/pages/GlobalSettingPage/GlobalSettingCategory/GlobalSettingCategoryPage.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/pages/GlobalSettingPage/GlobalSettingCategory/GlobalSettingCategoryPage.tsx @@ -18,12 +18,12 @@ import TitleBreadcrumb from '../../../components/common/TitleBreadcrumb/TitleBre import { TitleBreadcrumbProps } from '../../../components/common/TitleBreadcrumb/TitleBreadcrumb.interface'; import PageHeader from '../../../components/PageHeader/PageHeader.component'; import PageLayoutV1 from '../../../components/PageLayoutV1/PageLayoutV1'; -import { usePermissionProvider } from '../../../components/PermissionProvider/PermissionProvider'; -import SettingItemCard from '../../../components/Setting/SettingItemCard/SettingItemCard.component'; +import SettingItemCard from '../../../components/Settings/SettingItemCard/SettingItemCard.component'; import { GlobalSettingOptions, GlobalSettingsMenuCategory, } from '../../../constants/GlobalSettings.constants'; +import { usePermissionProvider } from '../../../context/PermissionProvider/PermissionProvider'; import { ELASTIC_SEARCH_RE_INDEX_PAGE_TABS } from '../../../enums/ElasticSearch.enum'; import { TeamType } from '../../../generated/entity/teams/team'; import { useAuth } from '../../../hooks/authHooks'; diff --git a/openmetadata-ui/src/main/resources/ui/src/pages/GlobalSettingPage/GlobalSettingPage.tsx b/openmetadata-ui/src/main/resources/ui/src/pages/GlobalSettingPage/GlobalSettingPage.tsx index b18bc58248ba..084fbfc51d4f 100644 --- a/openmetadata-ui/src/main/resources/ui/src/pages/GlobalSettingPage/GlobalSettingPage.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/pages/GlobalSettingPage/GlobalSettingPage.tsx @@ -19,9 +19,9 @@ import { useHistory } from 'react-router-dom'; import ErrorPlaceHolder from '../../components/common/ErrorWithPlaceholder/ErrorPlaceHolder'; import PageHeader from '../../components/PageHeader/PageHeader.component'; import PageLayoutV1 from '../../components/PageLayoutV1/PageLayoutV1'; -import { usePermissionProvider } from '../../components/PermissionProvider/PermissionProvider'; -import SettingItemCard from '../../components/Setting/SettingItemCard/SettingItemCard.component'; +import SettingItemCard from '../../components/Settings/SettingItemCard/SettingItemCard.component'; import { PAGE_HEADERS } from '../../constants/PageHeaders.constant'; +import { usePermissionProvider } from '../../context/PermissionProvider/PermissionProvider'; import { ERROR_PLACEHOLDER_TYPE } from '../../enums/common.enum'; import { useAuth } from '../../hooks/authHooks'; import { diff --git a/openmetadata-ui/src/main/resources/ui/src/pages/Glossary/GlossaryLeftPanel/GlossaryLeftPanel.component.tsx b/openmetadata-ui/src/main/resources/ui/src/pages/Glossary/GlossaryLeftPanel/GlossaryLeftPanel.component.tsx index 613871769391..c0d87c641c26 100644 --- a/openmetadata-ui/src/main/resources/ui/src/pages/Glossary/GlossaryLeftPanel/GlossaryLeftPanel.component.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/pages/Glossary/GlossaryLeftPanel/GlossaryLeftPanel.component.tsx @@ -19,10 +19,10 @@ import { useHistory } from 'react-router-dom'; import { ReactComponent as GlossaryIcon } from '../../../assets/svg/glossary.svg'; import { ReactComponent as PlusIcon } from '../../../assets/svg/plus-primary.svg'; import LeftPanelCard from '../../../components/common/LeftPanelCard/LeftPanelCard'; -import { usePermissionProvider } from '../../../components/PermissionProvider/PermissionProvider'; -import { ResourceEntity } from '../../../components/PermissionProvider/PermissionProvider.interface'; -import GlossaryV1Skeleton from '../../../components/Skeleton/GlossaryV1/GlossaryV1LeftPanelSkeleton.component'; +import GlossaryV1Skeleton from '../../../components/common/Skeleton/GlossaryV1/GlossaryV1LeftPanelSkeleton.component'; import { ROUTES } from '../../../constants/constants'; +import { usePermissionProvider } from '../../../context/PermissionProvider/PermissionProvider'; +import { ResourceEntity } from '../../../context/PermissionProvider/PermissionProvider.interface'; import { Operation } from '../../../generated/entity/policies/policy'; import { useFqn } from '../../../hooks/useFqn'; import { getEntityName } from '../../../utils/EntityUtils'; diff --git a/openmetadata-ui/src/main/resources/ui/src/pages/Glossary/GlossaryPage/GlossaryPage.component.tsx b/openmetadata-ui/src/main/resources/ui/src/pages/Glossary/GlossaryPage/GlossaryPage.component.tsx index 5a51fc12571a..7a719c8a293f 100644 --- a/openmetadata-ui/src/main/resources/ui/src/pages/Glossary/GlossaryPage/GlossaryPage.component.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/pages/Glossary/GlossaryPage/GlossaryPage.component.tsx @@ -17,17 +17,17 @@ import React, { useCallback, useEffect, useMemo, useState } from 'react'; import { useTranslation } from 'react-i18next'; import { useHistory } from 'react-router-dom'; import ErrorPlaceHolder from '../../../components/common/ErrorWithPlaceholder/ErrorPlaceHolder'; +import Loader from '../../../components/common/Loader/Loader'; +import { VotingDataProps } from '../../../components/Entity/Voting/voting.interface'; import EntitySummaryPanel from '../../../components/Explore/EntitySummaryPanel/EntitySummaryPanel.component'; import { EntityDetailsObjectInterface } from '../../../components/Explore/ExplorePage.interface'; import GlossaryV1 from '../../../components/Glossary/GlossaryV1.component'; -import Loader from '../../../components/Loader/Loader'; import PageLayoutV1 from '../../../components/PageLayoutV1/PageLayoutV1'; -import { usePermissionProvider } from '../../../components/PermissionProvider/PermissionProvider'; -import { ResourceEntity } from '../../../components/PermissionProvider/PermissionProvider.interface'; -import { VotingDataProps } from '../../../components/Voting/voting.interface'; import { FQN_SEPARATOR_CHAR } from '../../../constants/char.constants'; import { PAGE_SIZE_LARGE, ROUTES } from '../../../constants/constants'; import { GLOSSARIES_DOCS } from '../../../constants/docs.constants'; +import { usePermissionProvider } from '../../../context/PermissionProvider/PermissionProvider'; +import { ResourceEntity } from '../../../context/PermissionProvider/PermissionProvider.interface'; import { ERROR_PLACEHOLDER_TYPE, LOADING_STATE, diff --git a/openmetadata-ui/src/main/resources/ui/src/pages/IncidentManager/IncidentManagerDetailPage/IncidentManagerDetailPage.tsx b/openmetadata-ui/src/main/resources/ui/src/pages/IncidentManager/IncidentManagerDetailPage/IncidentManagerDetailPage.tsx index 84b9cbbda4ba..bb3edf409468 100644 --- a/openmetadata-ui/src/main/resources/ui/src/pages/IncidentManager/IncidentManagerDetailPage/IncidentManagerDetailPage.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/pages/IncidentManager/IncidentManagerDetailPage/IncidentManagerDetailPage.tsx @@ -21,20 +21,20 @@ import { ReactComponent as TestCaseIcon } from '../../../assets/svg/ic-checklist import ActivityFeedProvider from '../../../components/ActivityFeed/ActivityFeedProvider/ActivityFeedProvider'; import ManageButton from '../../../components/common/EntityPageInfos/ManageButton/ManageButton'; import ErrorPlaceHolder from '../../../components/common/ErrorWithPlaceholder/ErrorPlaceHolder'; +import Loader from '../../../components/common/Loader/Loader'; +import TabsLabel from '../../../components/common/TabsLabel/TabsLabel.component'; import TitleBreadcrumb from '../../../components/common/TitleBreadcrumb/TitleBreadcrumb.component'; import { TitleBreadcrumbProps } from '../../../components/common/TitleBreadcrumb/TitleBreadcrumb.interface'; +import IncidentManagerPageHeader from '../../../components/DataQuality/IncidentManager/IncidentManagerPageHeader/IncidentManagerPageHeader.component'; +import TestCaseIncidentTab from '../../../components/DataQuality/IncidentManager/TestCaseIncidentTab/TestCaseIncidentTab.component'; +import TestCaseResultTab from '../../../components/DataQuality/IncidentManager/TestCaseResultTab/TestCaseResultTab.component'; import EntityHeaderTitle from '../../../components/Entity/EntityHeaderTitle/EntityHeaderTitle.component'; -import IncidentManagerPageHeader from '../../../components/IncidentManager/IncidentManagerPageHeader/IncidentManagerPageHeader.component'; -import TestCaseIncidentTab from '../../../components/IncidentManager/TestCaseIncidentTab/TestCaseIncidentTab.component'; -import TestCaseResultTab from '../../../components/IncidentManager/TestCaseResultTab/TestCaseResultTab.component'; -import Loader from '../../../components/Loader/Loader'; import { EntityName } from '../../../components/Modals/EntityNameModal/EntityNameModal.interface'; import PageLayoutV1 from '../../../components/PageLayoutV1/PageLayoutV1'; -import { usePermissionProvider } from '../../../components/PermissionProvider/PermissionProvider'; -import { ResourceEntity } from '../../../components/PermissionProvider/PermissionProvider.interface'; -import TabsLabel from '../../../components/TabsLabel/TabsLabel.component'; import { ROUTES } from '../../../constants/constants'; import { FEED_COUNT_INITIAL_DATA } from '../../../constants/entity.constants'; +import { usePermissionProvider } from '../../../context/PermissionProvider/PermissionProvider'; +import { ResourceEntity } from '../../../context/PermissionProvider/PermissionProvider.interface'; import { ERROR_PLACEHOLDER_TYPE } from '../../../enums/common.enum'; import { EntityTabs, EntityType } from '../../../enums/entity.enum'; import { Operation } from '../../../generated/entity/policies/policy'; diff --git a/openmetadata-ui/src/main/resources/ui/src/pages/IncidentManager/IncidentManagerPage.tsx b/openmetadata-ui/src/main/resources/ui/src/pages/IncidentManager/IncidentManagerPage.tsx index 5093df868a0b..3578ee59bd93 100644 --- a/openmetadata-ui/src/main/resources/ui/src/pages/IncidentManager/IncidentManagerPage.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/pages/IncidentManager/IncidentManagerPage.tsx @@ -21,18 +21,17 @@ import QueryString from 'qs'; import React, { useCallback, useEffect, useMemo, useState } from 'react'; import { useTranslation } from 'react-i18next'; import { Link } from 'react-router-dom'; -import { AsyncSelect } from '../../components/AsyncSelect/AsyncSelect'; +import { AsyncSelect } from '../../components/common/AsyncSelect/AsyncSelect'; +import DatePickerMenu from '../../components/common/DatePickerMenu/DatePickerMenu.component'; import ErrorPlaceHolder from '../../components/common/ErrorWithPlaceholder/ErrorPlaceHolder'; import FilterTablePlaceHolder from '../../components/common/ErrorWithPlaceholder/FilterTablePlaceHolder'; import NextPrevious from '../../components/common/NextPrevious/NextPrevious'; import { PagingHandlerParams } from '../../components/common/NextPrevious/NextPrevious.interface'; import { OwnerLabel } from '../../components/common/OwnerLabel/OwnerLabel.component'; -import DatePickerMenu from '../../components/DatePickerMenu/DatePickerMenu.component'; -import Severity from '../../components/IncidentManager/Severity/Severity.component'; -import TestCaseIncidentManagerStatus from '../../components/IncidentManager/TestCaseStatus/TestCaseIncidentManagerStatus.component'; +import { TableProfilerTab } from '../../components/Database/Profiler/ProfilerDashboard/profilerDashboard.interface'; +import Severity from '../../components/DataQuality/IncidentManager/Severity/Severity.component'; +import TestCaseIncidentManagerStatus from '../../components/DataQuality/IncidentManager/TestCaseStatus/TestCaseIncidentManagerStatus.component'; import PageLayoutV1 from '../../components/PageLayoutV1/PageLayoutV1'; -import { usePermissionProvider } from '../../components/PermissionProvider/PermissionProvider'; -import { TableProfilerTab } from '../../components/ProfilerDashboard/profilerDashboard.interface'; import { WILD_CARD_CHAR } from '../../constants/char.constants'; import { getTableTabPath, @@ -41,6 +40,7 @@ import { } from '../../constants/constants'; import { PAGE_HEADERS } from '../../constants/PageHeaders.constant'; import { DEFAULT_SELECTED_RANGE } from '../../constants/profiler.constant'; +import { usePermissionProvider } from '../../context/PermissionProvider/PermissionProvider'; import { ERROR_PLACEHOLDER_TYPE } from '../../enums/common.enum'; import { EntityTabs, EntityType, FqnPart } from '../../enums/entity.enum'; import { SearchIndex } from '../../enums/search.enum'; diff --git a/openmetadata-ui/src/main/resources/ui/src/pages/KPIPage/EditKPIPage.tsx b/openmetadata-ui/src/main/resources/ui/src/pages/KPIPage/EditKPIPage.tsx index 0a5bbbd280b1..eba8229e92d3 100644 --- a/openmetadata-ui/src/main/resources/ui/src/pages/KPIPage/EditKPIPage.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/pages/KPIPage/EditKPIPage.tsx @@ -33,10 +33,10 @@ import moment from 'moment'; import React, { useEffect, useMemo, useState } from 'react'; import { useTranslation } from 'react-i18next'; import { useHistory } from 'react-router-dom'; +import Loader from '../../components/common/Loader/Loader'; import ResizablePanels from '../../components/common/ResizablePanels/ResizablePanels'; import RichTextEditor from '../../components/common/RichTextEditor/RichTextEditor'; import TitleBreadcrumb from '../../components/common/TitleBreadcrumb/TitleBreadcrumb.component'; -import Loader from '../../components/Loader/Loader'; import { ROUTES, VALIDATION_MESSAGES } from '../../constants/constants'; import { KPI_DATE_PICKER_FORMAT } from '../../constants/DataInsight.constants'; import { DataInsightChart } from '../../generated/dataInsight/dataInsightChart'; diff --git a/openmetadata-ui/src/main/resources/ui/src/pages/LoginPage/SignInPage.test.tsx b/openmetadata-ui/src/main/resources/ui/src/pages/LoginPage/SignInPage.test.tsx index 08dd8ed5ff49..b787c7c6f5a5 100644 --- a/openmetadata-ui/src/main/resources/ui/src/pages/LoginPage/SignInPage.test.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/pages/LoginPage/SignInPage.test.tsx @@ -31,23 +31,15 @@ jest.mock('react-router-dom', () => ({ jest.mock('../../components/Auth/AuthProviders/AuthProvider', () => ({ useAuthContext: jest.fn(), })); -jest.mock( - '../../components/ApplicationConfigProvider/ApplicationConfigProvider', - () => ({ - useApplicationConfigContext: jest.fn().mockImplementation(() => ({ - customLogoUrlPath: 'https://customlink.source', - - customMonogramUrlPath: 'https://customlink.source', - })), - }) -); - -jest.mock('../../assets/img/login-bg.png', () => 'login-bg.png'); jest.mock('./LoginCarousel', () => jest.fn().mockReturnValue(

LoginCarousel

) ); +jest.mock('../../components/common/BrandImage/BrandImage', () => { + return jest.fn().mockReturnValue(

testBrandLogo

); +}); + describe('Test SignInPage Component', () => { afterEach(() => { jest.clearAllMocks(); @@ -121,7 +113,7 @@ describe('Test SignInPage Component', () => { expect(signinButton).toBeInTheDocument(); }); - it('Page should render the correct logo image', async () => { + it('Page should render the brand logo', async () => { mockUseAuthContext.mockReturnValue({ isAuthDisabled: false, authConfig: { provider: 'custom-oidc', providerName: 'Custom OIDC' }, @@ -132,10 +124,8 @@ describe('Test SignInPage Component', () => { wrapper: MemoryRouter, }); - const brandLogoImage = await screen.findByTestId('brand-logo-image'); + const brandLogoImage = await screen.findByText('testBrandLogo'); expect(brandLogoImage).toBeInTheDocument(); - - expect(brandLogoImage).toHaveAttribute('src', 'https://customlink.source'); }); }); diff --git a/openmetadata-ui/src/main/resources/ui/src/pages/LoginPage/SignInPage.tsx b/openmetadata-ui/src/main/resources/ui/src/pages/LoginPage/SignInPage.tsx index c0afbcb1ae41..3e4a298ea0d7 100644 --- a/openmetadata-ui/src/main/resources/ui/src/pages/LoginPage/SignInPage.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/pages/LoginPage/SignInPage.tsx @@ -28,8 +28,8 @@ import { ReactComponent as IconFailBadge } from '../../assets/svg/fail-badge.svg import { useAuthContext } from '../../components/Auth/AuthProviders/AuthProvider'; import { useBasicAuth } from '../../components/Auth/AuthProviders/BasicAuthProvider'; import BrandImage from '../../components/common/BrandImage/BrandImage'; -import Loader from '../../components/Loader/Loader'; -import LoginButton from '../../components/LoginButton/LoginButton'; +import Loader from '../../components/common/Loader/Loader'; +import LoginButton from '../../components/common/LoginButton/LoginButton'; import { ROUTES, VALIDATION_MESSAGES } from '../../constants/constants'; import { AuthProvider } from '../../generated/settings/settings'; import localState from '../../utils/LocalStorageUtils'; diff --git a/openmetadata-ui/src/main/resources/ui/src/pages/LogsViewer/LogsViewer.component.tsx b/openmetadata-ui/src/main/resources/ui/src/pages/LogsViewer/LogsViewer.component.tsx index 47c3d495c589..d716729a7e07 100644 --- a/openmetadata-ui/src/main/resources/ui/src/pages/LogsViewer/LogsViewer.component.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/pages/LogsViewer/LogsViewer.component.tsx @@ -25,11 +25,11 @@ import React, { import { useTranslation } from 'react-i18next'; import { LazyLog } from 'react-lazylog'; import { useParams } from 'react-router-dom'; +import { CopyToClipboardButton } from '../../components/common/CopyToClipboardButton/CopyToClipboardButton'; +import Loader from '../../components/common/Loader/Loader'; import TitleBreadcrumb from '../../components/common/TitleBreadcrumb/TitleBreadcrumb.component'; -import { CopyToClipboardButton } from '../../components/CopyToClipboardButton/CopyToClipboardButton'; -import { IngestionRecentRuns } from '../../components/Ingestion/IngestionRecentRun/IngestionRecentRuns.component'; -import Loader from '../../components/Loader/Loader'; import PageLayoutV1 from '../../components/PageLayoutV1/PageLayoutV1'; +import { IngestionRecentRuns } from '../../components/Settings/Services/Ingestion/IngestionRecentRun/IngestionRecentRuns.component'; import { GlobalSettingOptions } from '../../constants/GlobalSettings.constants'; import { PIPELINE_INGESTION_RUN_STATUS } from '../../constants/pipeline.constants'; import { PipelineType } from '../../generated/api/services/ingestionPipelines/createIngestionPipeline'; diff --git a/openmetadata-ui/src/main/resources/ui/src/pages/MarketPlacePage/MarketPlacePage.tsx b/openmetadata-ui/src/main/resources/ui/src/pages/MarketPlacePage/MarketPlacePage.tsx index d7ab650fda9d..dda41fec3450 100644 --- a/openmetadata-ui/src/main/resources/ui/src/pages/MarketPlacePage/MarketPlacePage.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/pages/MarketPlacePage/MarketPlacePage.tsx @@ -17,13 +17,13 @@ import React, { useCallback, useEffect, useState } from 'react'; import { useTranslation } from 'react-i18next'; import { useHistory } from 'react-router-dom'; import { ReactComponent as HeadingIcon } from '../../assets/svg/marketplace-heading.svg'; -import ApplicationCard from '../../components/Applications/ApplicationCard/ApplicationCard.component'; +import Loader from '../../components/common/Loader/Loader'; import NextPrevious from '../../components/common/NextPrevious/NextPrevious'; import { PagingHandlerParams } from '../../components/common/NextPrevious/NextPrevious.interface'; import TitleBreadcrumb from '../../components/common/TitleBreadcrumb/TitleBreadcrumb.component'; -import Loader from '../../components/Loader/Loader'; import PageHeader from '../../components/PageHeader/PageHeader.component'; import PageLayoutV1 from '../../components/PageLayoutV1/PageLayoutV1'; +import ApplicationCard from '../../components/Settings/Applications/ApplicationCard/ApplicationCard.component'; import { GlobalSettingOptions } from '../../constants/GlobalSettings.constants'; import { PAGE_HEADERS } from '../../constants/PageHeaders.constant'; import { AppMarketPlaceDefinition } from '../../generated/entity/applications/marketplace/appMarketPlaceDefinition'; diff --git a/openmetadata-ui/src/main/resources/ui/src/pages/MlModelPage/MlModelPage.component.test.tsx b/openmetadata-ui/src/main/resources/ui/src/pages/MlModelPage/MlModelPage.component.test.tsx index fda0eb8f415d..38e23953389d 100644 --- a/openmetadata-ui/src/main/resources/ui/src/pages/MlModelPage/MlModelPage.component.test.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/pages/MlModelPage/MlModelPage.component.test.tsx @@ -147,13 +147,16 @@ jest.mock('../../rest/mlModelAPI', () => ({ .mockImplementation(() => Promise.resolve({ data: mockData })), })); -jest.mock('../../components/MlModelDetail/MlModelDetail.component', () => { - return jest - .fn() - .mockReturnValue(
MlModelDetails
); -}); +jest.mock( + '../../components/MlModel/MlModelDetail/MlModelDetail.component', + () => { + return jest + .fn() + .mockReturnValue(
MlModelDetails
); + } +); -jest.mock('../../components/PermissionProvider/PermissionProvider', () => ({ +jest.mock('../../context/PermissionProvider/PermissionProvider', () => ({ usePermissionProvider: jest.fn().mockImplementation(() => ({ permissions: {}, getEntityPermission: jest.fn().mockResolvedValue({ diff --git a/openmetadata-ui/src/main/resources/ui/src/pages/MlModelPage/MlModelPage.component.tsx b/openmetadata-ui/src/main/resources/ui/src/pages/MlModelPage/MlModelPage.component.tsx index 6da99e261b6b..5d1016e1b1e1 100644 --- a/openmetadata-ui/src/main/resources/ui/src/pages/MlModelPage/MlModelPage.component.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/pages/MlModelPage/MlModelPage.component.tsx @@ -19,12 +19,12 @@ import { useTranslation } from 'react-i18next'; import { useHistory } from 'react-router-dom'; import { useAuthContext } from '../../components/Auth/AuthProviders/AuthProvider'; import ErrorPlaceHolder from '../../components/common/ErrorWithPlaceholder/ErrorPlaceHolder'; -import Loader from '../../components/Loader/Loader'; -import MlModelDetailComponent from '../../components/MlModelDetail/MlModelDetail.component'; -import { usePermissionProvider } from '../../components/PermissionProvider/PermissionProvider'; -import { ResourceEntity } from '../../components/PermissionProvider/PermissionProvider.interface'; -import { QueryVote } from '../../components/TableQueries/TableQueries.interface'; +import Loader from '../../components/common/Loader/Loader'; +import { QueryVote } from '../../components/Database/TableQueries/TableQueries.interface'; +import MlModelDetailComponent from '../../components/MlModel/MlModelDetail/MlModelDetail.component'; import { getVersionPath } from '../../constants/constants'; +import { usePermissionProvider } from '../../context/PermissionProvider/PermissionProvider'; +import { ResourceEntity } from '../../context/PermissionProvider/PermissionProvider.interface'; import { ERROR_PLACEHOLDER_TYPE } from '../../enums/common.enum'; import { EntityType, TabSpecificField } from '../../enums/entity.enum'; import { CreateThread } from '../../generated/api/feed/createThread'; diff --git a/openmetadata-ui/src/main/resources/ui/src/pages/MyDataPage/MyDataPage.component.tsx b/openmetadata-ui/src/main/resources/ui/src/pages/MyDataPage/MyDataPage.component.tsx index 8947f37ddabe..72a2aa966cc7 100644 --- a/openmetadata-ui/src/main/resources/ui/src/pages/MyDataPage/MyDataPage.component.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/pages/MyDataPage/MyDataPage.component.tsx @@ -23,12 +23,12 @@ import React, { import RGL, { WidthProvider } from 'react-grid-layout'; import { useTranslation } from 'react-i18next'; import ActivityFeedProvider from '../../components/ActivityFeed/ActivityFeedProvider/ActivityFeedProvider'; -import { useApplicationConfigContext } from '../../components/ApplicationConfigProvider/ApplicationConfigProvider'; import { useAuthContext } from '../../components/Auth/AuthProviders/AuthProvider'; -import Loader from '../../components/Loader/Loader'; +import Loader from '../../components/common/Loader/Loader'; +import WelcomeScreen from '../../components/MyData/WelcomeScreen/WelcomeScreen.component'; import PageLayoutV1 from '../../components/PageLayoutV1/PageLayoutV1'; -import WelcomeScreen from '../../components/WelcomeScreen/WelcomeScreen.component'; import { LOGGED_IN_USER_STORAGE_KEY } from '../../constants/constants'; +import { useApplicationConfigContext } from '../../context/ApplicationConfigProvider/ApplicationConfigProvider'; import { AssetsType, EntityType } from '../../enums/entity.enum'; import { Thread } from '../../generated/entity/feed/thread'; import { PageType } from '../../generated/system/ui/page'; diff --git a/openmetadata-ui/src/main/resources/ui/src/pages/MyDataPage/MyDataPage.test.tsx b/openmetadata-ui/src/main/resources/ui/src/pages/MyDataPage/MyDataPage.test.tsx index 850f03a3f2a0..375ec7ee7e0c 100644 --- a/openmetadata-ui/src/main/resources/ui/src/pages/MyDataPage/MyDataPage.test.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/pages/MyDataPage/MyDataPage.test.tsx @@ -14,7 +14,7 @@ import { act, render, screen } from '@testing-library/react'; import userEvent from '@testing-library/user-event'; import React from 'react'; -import { useApplicationConfigContext } from '../../components/ApplicationConfigProvider/ApplicationConfigProvider'; +import { useApplicationConfigContext } from '../../context/ApplicationConfigProvider/ApplicationConfigProvider'; import { mockActiveAnnouncementData, mockCustomizePageClassBase, diff --git a/openmetadata-ui/src/main/resources/ui/src/pages/Persona/PersonaDetailsPage/PersonaDetailsPage.tsx b/openmetadata-ui/src/main/resources/ui/src/pages/Persona/PersonaDetailsPage/PersonaDetailsPage.tsx index f019edd63ec9..4d47a9531a78 100644 --- a/openmetadata-ui/src/main/resources/ui/src/pages/Persona/PersonaDetailsPage/PersonaDetailsPage.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/pages/Persona/PersonaDetailsPage/PersonaDetailsPage.tsx @@ -20,18 +20,18 @@ import { useHistory } from 'react-router-dom'; import DescriptionV1 from '../../../components/common/EntityDescription/DescriptionV1'; import ManageButton from '../../../components/common/EntityPageInfos/ManageButton/ManageButton'; import NoDataPlaceholder from '../../../components/common/ErrorWithPlaceholder/NoDataPlaceholder'; +import Loader from '../../../components/common/Loader/Loader'; import { UserSelectableList } from '../../../components/common/UserSelectableList/UserSelectableList.component'; -import Loader from '../../../components/Loader/Loader'; import { EntityName } from '../../../components/Modals/EntityNameModal/EntityNameModal.interface'; import PageHeader from '../../../components/PageHeader/PageHeader.component'; import PageLayoutV1 from '../../../components/PageLayoutV1/PageLayoutV1'; -import { usePermissionProvider } from '../../../components/PermissionProvider/PermissionProvider'; -import { ResourceEntity } from '../../../components/PermissionProvider/PermissionProvider.interface'; -import { UsersTab } from '../../../components/Users/UsersTab/UsersTabs.component'; +import { UsersTab } from '../../../components/Settings/Users/UsersTab/UsersTabs.component'; import { GlobalSettingOptions, GlobalSettingsMenuCategory, } from '../../../constants/GlobalSettings.constants'; +import { usePermissionProvider } from '../../../context/PermissionProvider/PermissionProvider'; +import { ResourceEntity } from '../../../context/PermissionProvider/PermissionProvider.interface'; import { SIZE } from '../../../enums/common.enum'; import { EntityType } from '../../../enums/entity.enum'; import { Persona } from '../../../generated/entity/teams/persona'; diff --git a/openmetadata-ui/src/main/resources/ui/src/pages/Persona/PersonaListPage/PersonaPage.tsx b/openmetadata-ui/src/main/resources/ui/src/pages/Persona/PersonaListPage/PersonaPage.tsx index b15a81fc7688..173bb50f42d4 100644 --- a/openmetadata-ui/src/main/resources/ui/src/pages/Persona/PersonaListPage/PersonaPage.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/pages/Persona/PersonaListPage/PersonaPage.tsx @@ -20,10 +20,10 @@ import NextPrevious from '../../../components/common/NextPrevious/NextPrevious'; import { PagingHandlerParams } from '../../../components/common/NextPrevious/NextPrevious.interface'; import TitleBreadcrumb from '../../../components/common/TitleBreadcrumb/TitleBreadcrumb.component'; import { TitleBreadcrumbProps } from '../../../components/common/TitleBreadcrumb/TitleBreadcrumb.interface'; +import { AddEditPersonaForm } from '../../../components/MyData/Persona/AddEditPersona/AddEditPersona.component'; +import { PersonaDetailsCard } from '../../../components/MyData/Persona/PersonaDetailsCard/PersonaDetailsCard'; import PageHeader from '../../../components/PageHeader/PageHeader.component'; import PageLayoutV1 from '../../../components/PageLayoutV1/PageLayoutV1'; -import { AddEditPersonaForm } from '../../../components/Persona/AddEditPersona/AddEditPersona.component'; -import { PersonaDetailsCard } from '../../../components/Persona/PersonaDetailsCard/PersonaDetailsCard'; import { GlobalSettingsMenuCategory } from '../../../constants/GlobalSettings.constants'; import { PAGE_HEADERS } from '../../../constants/PageHeaders.constant'; import { ERROR_PLACEHOLDER_TYPE } from '../../../enums/common.enum'; diff --git a/openmetadata-ui/src/main/resources/ui/src/pages/PipelineDetails/PipelineDetailsPage.component.tsx b/openmetadata-ui/src/main/resources/ui/src/pages/PipelineDetails/PipelineDetailsPage.component.tsx index 7e823c11840a..973d9dbb244b 100644 --- a/openmetadata-ui/src/main/resources/ui/src/pages/PipelineDetails/PipelineDetailsPage.component.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/pages/PipelineDetails/PipelineDetailsPage.component.tsx @@ -19,12 +19,12 @@ import { useTranslation } from 'react-i18next'; import { useHistory } from 'react-router-dom'; import { useAuthContext } from '../../components/Auth/AuthProviders/AuthProvider'; import ErrorPlaceHolder from '../../components/common/ErrorWithPlaceholder/ErrorPlaceHolder'; -import Loader from '../../components/Loader/Loader'; -import { usePermissionProvider } from '../../components/PermissionProvider/PermissionProvider'; -import { ResourceEntity } from '../../components/PermissionProvider/PermissionProvider.interface'; -import PipelineDetails from '../../components/PipelineDetails/PipelineDetails.component'; -import { QueryVote } from '../../components/TableQueries/TableQueries.interface'; +import Loader from '../../components/common/Loader/Loader'; +import { QueryVote } from '../../components/Database/TableQueries/TableQueries.interface'; +import PipelineDetails from '../../components/Pipeline/PipelineDetails/PipelineDetails.component'; import { getVersionPath } from '../../constants/constants'; +import { usePermissionProvider } from '../../context/PermissionProvider/PermissionProvider'; +import { ResourceEntity } from '../../context/PermissionProvider/PermissionProvider.interface'; import { ERROR_PLACEHOLDER_TYPE } from '../../enums/common.enum'; import { EntityType } from '../../enums/entity.enum'; import { Pipeline } from '../../generated/entity/data/pipeline'; diff --git a/openmetadata-ui/src/main/resources/ui/src/pages/PoliciesPage/PoliciesDetailPage/AddRulePage.tsx b/openmetadata-ui/src/main/resources/ui/src/pages/PoliciesPage/PoliciesDetailPage/AddRulePage.tsx index f3336dcf1e33..be5d08e34c64 100644 --- a/openmetadata-ui/src/main/resources/ui/src/pages/PoliciesPage/PoliciesDetailPage/AddRulePage.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/pages/PoliciesPage/PoliciesDetailPage/AddRulePage.tsx @@ -18,8 +18,8 @@ import { trim } from 'lodash'; import React, { useEffect, useMemo, useState } from 'react'; import { useTranslation } from 'react-i18next'; import { useHistory } from 'react-router-dom'; +import Loader from '../../../components/common/Loader/Loader'; import TitleBreadcrumb from '../../../components/common/TitleBreadcrumb/TitleBreadcrumb.component'; -import Loader from '../../../components/Loader/Loader'; import PageLayoutV1 from '../../../components/PageLayoutV1/PageLayoutV1'; import { HTTP_STATUS_CODE } from '../../../constants/Auth.constants'; import { GlobalSettingOptions } from '../../../constants/GlobalSettings.constants'; diff --git a/openmetadata-ui/src/main/resources/ui/src/pages/PoliciesPage/PoliciesDetailPage/EditRulePage.tsx b/openmetadata-ui/src/main/resources/ui/src/pages/PoliciesPage/PoliciesDetailPage/EditRulePage.tsx index 2c528df73707..4181c1d43afc 100644 --- a/openmetadata-ui/src/main/resources/ui/src/pages/PoliciesPage/PoliciesDetailPage/EditRulePage.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/pages/PoliciesPage/PoliciesDetailPage/EditRulePage.tsx @@ -18,8 +18,8 @@ import { trim } from 'lodash'; import React, { useEffect, useMemo, useState } from 'react'; import { useTranslation } from 'react-i18next'; import { useHistory, useParams } from 'react-router-dom'; +import Loader from '../../../components/common/Loader/Loader'; import TitleBreadcrumb from '../../../components/common/TitleBreadcrumb/TitleBreadcrumb.component'; -import Loader from '../../../components/Loader/Loader'; import PageLayoutV1 from '../../../components/PageLayoutV1/PageLayoutV1'; import { HTTP_STATUS_CODE } from '../../../constants/Auth.constants'; import { GlobalSettingOptions } from '../../../constants/GlobalSettings.constants'; diff --git a/openmetadata-ui/src/main/resources/ui/src/pages/PoliciesPage/PoliciesDetailPage/PoliciesDetailPage.tsx b/openmetadata-ui/src/main/resources/ui/src/pages/PoliciesPage/PoliciesDetailPage/PoliciesDetailPage.tsx index 8d474dc0a76e..21eb3fd5258e 100644 --- a/openmetadata-ui/src/main/resources/ui/src/pages/PoliciesPage/PoliciesDetailPage/PoliciesDetailPage.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/pages/PoliciesPage/PoliciesDetailPage/PoliciesDetailPage.tsx @@ -35,9 +35,9 @@ import { ReactComponent as EditIcon } from '../../../assets/svg/edit-new.svg'; import { ReactComponent as IconDelete } from '../../../assets/svg/ic-delete.svg'; import Description from '../../../components/common/EntityDescription/Description'; import ErrorPlaceHolder from '../../../components/common/ErrorWithPlaceholder/ErrorPlaceHolder'; +import Loader from '../../../components/common/Loader/Loader'; import RichTextEditorPreviewer from '../../../components/common/RichTextEditor/RichTextEditorPreviewer'; import TitleBreadcrumb from '../../../components/common/TitleBreadcrumb/TitleBreadcrumb.component'; -import Loader from '../../../components/Loader/Loader'; import PageLayoutV1 from '../../../components/PageLayoutV1/PageLayoutV1'; import { GlobalSettingOptions, diff --git a/openmetadata-ui/src/main/resources/ui/src/pages/PoliciesPage/PoliciesListPage/PoliciesListPage.tsx b/openmetadata-ui/src/main/resources/ui/src/pages/PoliciesPage/PoliciesListPage/PoliciesListPage.tsx index 97de625bc0e8..9502611b5cd2 100644 --- a/openmetadata-ui/src/main/resources/ui/src/pages/PoliciesPage/PoliciesListPage/PoliciesListPage.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/pages/PoliciesPage/PoliciesListPage/PoliciesListPage.tsx @@ -29,8 +29,6 @@ import TitleBreadcrumb from '../../../components/common/TitleBreadcrumb/TitleBre import { TitleBreadcrumbProps } from '../../../components/common/TitleBreadcrumb/TitleBreadcrumb.interface'; import PageHeader from '../../../components/PageHeader/PageHeader.component'; import PageLayoutV1 from '../../../components/PageLayoutV1/PageLayoutV1'; -import { usePermissionProvider } from '../../../components/PermissionProvider/PermissionProvider'; -import { ResourceEntity } from '../../../components/PermissionProvider/PermissionProvider.interface'; import { PAGE_SIZE_MEDIUM, ROUTES } from '../../../constants/constants'; import { GlobalSettingsMenuCategory } from '../../../constants/GlobalSettings.constants'; import { @@ -38,6 +36,8 @@ import { NO_PERMISSION_TO_VIEW, } from '../../../constants/HelperTextUtil'; import { PAGE_HEADERS } from '../../../constants/PageHeaders.constant'; +import { usePermissionProvider } from '../../../context/PermissionProvider/PermissionProvider'; +import { ResourceEntity } from '../../../context/PermissionProvider/PermissionProvider.interface'; import { ERROR_PLACEHOLDER_TYPE } from '../../../enums/common.enum'; import { EntityType } from '../../../enums/entity.enum'; import { Operation, Policy } from '../../../generated/entity/policies/policy'; diff --git a/openmetadata-ui/src/main/resources/ui/src/pages/QueryPage/QueryPage.component.tsx b/openmetadata-ui/src/main/resources/ui/src/pages/QueryPage/QueryPage.component.tsx index 2ec5c7d6f67d..59f692c75847 100644 --- a/openmetadata-ui/src/main/resources/ui/src/pages/QueryPage/QueryPage.component.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/pages/QueryPage/QueryPage.component.tsx @@ -18,18 +18,18 @@ import React, { useEffect, useMemo, useState } from 'react'; import { useTranslation } from 'react-i18next'; import { useParams } from 'react-router-dom'; import ErrorPlaceHolder from '../../components/common/ErrorWithPlaceholder/ErrorPlaceHolder'; +import Loader from '../../components/common/Loader/Loader'; import TitleBreadcrumb from '../../components/common/TitleBreadcrumb/TitleBreadcrumb.component'; import { TitleBreadcrumbProps } from '../../components/common/TitleBreadcrumb/TitleBreadcrumb.interface'; -import Loader from '../../components/Loader/Loader'; +import QueryCard from '../../components/Database/TableQueries/QueryCard'; +import { QueryVote } from '../../components/Database/TableQueries/TableQueries.interface'; import PageLayoutV1 from '../../components/PageLayoutV1/PageLayoutV1'; -import { usePermissionProvider } from '../../components/PermissionProvider/PermissionProvider'; +import { getTableTabPath } from '../../constants/constants'; +import { usePermissionProvider } from '../../context/PermissionProvider/PermissionProvider'; import { OperationPermission, ResourceEntity, -} from '../../components/PermissionProvider/PermissionProvider.interface'; -import QueryCard from '../../components/TableQueries/QueryCard'; -import { QueryVote } from '../../components/TableQueries/TableQueries.interface'; -import { getTableTabPath } from '../../constants/constants'; +} from '../../context/PermissionProvider/PermissionProvider.interface'; import { ERROR_PLACEHOLDER_TYPE } from '../../enums/common.enum'; import { EntityType } from '../../enums/entity.enum'; import { Query } from '../../generated/entity/data/query'; diff --git a/openmetadata-ui/src/main/resources/ui/src/pages/RolesPage/AddAttributeModal/AddAttributeModal.tsx b/openmetadata-ui/src/main/resources/ui/src/pages/RolesPage/AddAttributeModal/AddAttributeModal.tsx index 4b5583b1b29b..cc368c9b6829 100644 --- a/openmetadata-ui/src/main/resources/ui/src/pages/RolesPage/AddAttributeModal/AddAttributeModal.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/pages/RolesPage/AddAttributeModal/AddAttributeModal.tsx @@ -19,8 +19,8 @@ import { isEmpty } from 'lodash'; import React, { FC, useEffect, useState } from 'react'; import { useTranslation } from 'react-i18next'; import ErrorPlaceHolder from '../../../components/common/ErrorWithPlaceholder/ErrorPlaceHolder'; +import Loader from '../../../components/common/Loader/Loader'; import RichTextEditorPreviewer from '../../../components/common/RichTextEditor/RichTextEditorPreviewer'; -import Loader from '../../../components/Loader/Loader'; import { ERROR_PLACEHOLDER_TYPE } from '../../../enums/common.enum'; import { EntityType } from '../../../enums/entity.enum'; import { Policy } from '../../../generated/entity/policies/policy'; diff --git a/openmetadata-ui/src/main/resources/ui/src/pages/RolesPage/RolesDetailPage/RolesDetailPage.tsx b/openmetadata-ui/src/main/resources/ui/src/pages/RolesPage/RolesDetailPage/RolesDetailPage.tsx index ceb62fdcc676..360163cf1f37 100644 --- a/openmetadata-ui/src/main/resources/ui/src/pages/RolesPage/RolesDetailPage/RolesDetailPage.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/pages/RolesPage/RolesDetailPage/RolesDetailPage.tsx @@ -20,8 +20,8 @@ import { useTranslation } from 'react-i18next'; import { useHistory } from 'react-router-dom'; import Description from '../../../components/common/EntityDescription/Description'; import ErrorPlaceHolder from '../../../components/common/ErrorWithPlaceholder/ErrorPlaceHolder'; +import Loader from '../../../components/common/Loader/Loader'; import TitleBreadcrumb from '../../../components/common/TitleBreadcrumb/TitleBreadcrumb.component'; -import Loader from '../../../components/Loader/Loader'; import PageLayoutV1 from '../../../components/PageLayoutV1/PageLayoutV1'; import { GlobalSettingOptions, diff --git a/openmetadata-ui/src/main/resources/ui/src/pages/RolesPage/RolesListPage/RolesListPage.tsx b/openmetadata-ui/src/main/resources/ui/src/pages/RolesPage/RolesListPage/RolesListPage.tsx index f28e5f186016..3431a88c0337 100644 --- a/openmetadata-ui/src/main/resources/ui/src/pages/RolesPage/RolesListPage/RolesListPage.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/pages/RolesPage/RolesListPage/RolesListPage.tsx @@ -29,8 +29,6 @@ import TitleBreadcrumb from '../../../components/common/TitleBreadcrumb/TitleBre import { TitleBreadcrumbProps } from '../../../components/common/TitleBreadcrumb/TitleBreadcrumb.interface'; import PageHeader from '../../../components/PageHeader/PageHeader.component'; import PageLayoutV1 from '../../../components/PageLayoutV1/PageLayoutV1'; -import { usePermissionProvider } from '../../../components/PermissionProvider/PermissionProvider'; -import { ResourceEntity } from '../../../components/PermissionProvider/PermissionProvider.interface'; import { PAGE_SIZE_MEDIUM, ROUTES } from '../../../constants/constants'; import { GlobalSettingsMenuCategory } from '../../../constants/GlobalSettings.constants'; import { @@ -38,6 +36,8 @@ import { NO_PERMISSION_TO_VIEW, } from '../../../constants/HelperTextUtil'; import { PAGE_HEADERS } from '../../../constants/PageHeaders.constant'; +import { usePermissionProvider } from '../../../context/PermissionProvider/PermissionProvider'; +import { ResourceEntity } from '../../../context/PermissionProvider/PermissionProvider.interface'; import { ERROR_PLACEHOLDER_TYPE } from '../../../enums/common.enum'; import { EntityType } from '../../../enums/entity.enum'; import { Operation } from '../../../generated/entity/policies/policy'; diff --git a/openmetadata-ui/src/main/resources/ui/src/pages/SearchIndexDetailsPage/SearchIndexDetailsPage.test.tsx b/openmetadata-ui/src/main/resources/ui/src/pages/SearchIndexDetailsPage/SearchIndexDetailsPage.test.tsx index cb93a07ccbe9..16577ab1f48a 100644 --- a/openmetadata-ui/src/main/resources/ui/src/pages/SearchIndexDetailsPage/SearchIndexDetailsPage.test.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/pages/SearchIndexDetailsPage/SearchIndexDetailsPage.test.tsx @@ -13,7 +13,7 @@ import { act, render, screen } from '@testing-library/react'; import React from 'react'; -import { usePermissionProvider } from '../../components/PermissionProvider/PermissionProvider'; +import { usePermissionProvider } from '../../context/PermissionProvider/PermissionProvider'; import { getSearchIndexDetailsByFQN } from '../../rest/SearchIndexAPI'; import { DEFAULT_ENTITY_PERMISSION } from '../../utils/PermissionsUtils'; import SearchIndexDetailsPage from './SearchIndexDetailsPage'; diff --git a/openmetadata-ui/src/main/resources/ui/src/pages/SearchIndexDetailsPage/SearchIndexDetailsPage.tsx b/openmetadata-ui/src/main/resources/ui/src/pages/SearchIndexDetailsPage/SearchIndexDetailsPage.tsx index acc7881a6505..486ecb75b397 100644 --- a/openmetadata-ui/src/main/resources/ui/src/pages/SearchIndexDetailsPage/SearchIndexDetailsPage.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/pages/SearchIndexDetailsPage/SearchIndexDetailsPage.tsx @@ -28,25 +28,25 @@ import { useAuthContext } from '../../components/Auth/AuthProviders/AuthProvider import { CustomPropertyTable } from '../../components/common/CustomPropertyTable/CustomPropertyTable'; import DescriptionV1 from '../../components/common/EntityDescription/DescriptionV1'; import ErrorPlaceHolder from '../../components/common/ErrorWithPlaceholder/ErrorPlaceHolder'; +import Loader from '../../components/common/Loader/Loader'; import QueryViewer from '../../components/common/QueryViewer/QueryViewer.component'; +import TabsLabel from '../../components/common/TabsLabel/TabsLabel.component'; import { DataAssetsHeader } from '../../components/DataAssets/DataAssetsHeader/DataAssetsHeader.component'; +import SampleDataWithMessages from '../../components/Database/SampleDataWithMessages/SampleDataWithMessages'; +import { QueryVote } from '../../components/Database/TableQueries/TableQueries.interface'; import EntityRightPanel from '../../components/Entity/EntityRightPanel/EntityRightPanel'; import Lineage from '../../components/Lineage/Lineage.component'; -import LineageProvider from '../../components/LineageProvider/LineageProvider'; -import Loader from '../../components/Loader/Loader'; import { EntityName } from '../../components/Modals/EntityNameModal/EntityNameModal.interface'; import PageLayoutV1 from '../../components/PageLayoutV1/PageLayoutV1'; -import { usePermissionProvider } from '../../components/PermissionProvider/PermissionProvider'; -import { - OperationPermission, - ResourceEntity, -} from '../../components/PermissionProvider/PermissionProvider.interface'; -import SampleDataWithMessages from '../../components/SampleDataWithMessages/SampleDataWithMessages'; import { SourceType } from '../../components/SearchedData/SearchedData.interface'; -import { QueryVote } from '../../components/TableQueries/TableQueries.interface'; -import TabsLabel from '../../components/TabsLabel/TabsLabel.component'; import { getVersionPath } from '../../constants/constants'; import { FEED_COUNT_INITIAL_DATA } from '../../constants/entity.constants'; +import LineageProvider from '../../context/LineageProvider/LineageProvider'; +import { usePermissionProvider } from '../../context/PermissionProvider/PermissionProvider'; +import { + OperationPermission, + ResourceEntity, +} from '../../context/PermissionProvider/PermissionProvider.interface'; import { ERROR_PLACEHOLDER_TYPE } from '../../enums/common.enum'; import { EntityTabs, EntityType } from '../../enums/entity.enum'; import { diff --git a/openmetadata-ui/src/main/resources/ui/src/pages/SearchIndexDetailsPage/SearchIndexFieldsTab/SearchIndexFieldsTab.tsx b/openmetadata-ui/src/main/resources/ui/src/pages/SearchIndexDetailsPage/SearchIndexFieldsTab/SearchIndexFieldsTab.tsx index 7c64fbbc8c21..d002e7aa6d4e 100644 --- a/openmetadata-ui/src/main/resources/ui/src/pages/SearchIndexDetailsPage/SearchIndexFieldsTab/SearchIndexFieldsTab.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/pages/SearchIndexDetailsPage/SearchIndexFieldsTab/SearchIndexFieldsTab.tsx @@ -17,7 +17,7 @@ import { isEmpty, sortBy } from 'lodash'; import React, { useCallback, useEffect, useMemo, useState } from 'react'; import { useTranslation } from 'react-i18next'; import Searchbar from '../../../components/common/SearchBarComponent/SearchBar.component'; -import ToggleExpandButton from '../../../components/ToggleExpandButton/ToggleExpandButton'; +import ToggleExpandButton from '../../../components/common/ToggleExpandButton/ToggleExpandButton'; import { SearchIndexField } from '../../../generated/entity/data/searchIndex'; import { getAllRowKeysByKeyName, diff --git a/openmetadata-ui/src/main/resources/ui/src/pages/SearchIndexDetailsPage/SearchIndexFieldsTable/SearchIndexFieldsTable.tsx b/openmetadata-ui/src/main/resources/ui/src/pages/SearchIndexDetailsPage/SearchIndexFieldsTable/SearchIndexFieldsTable.tsx index 83a075ce9d59..45f9bc0d5642 100644 --- a/openmetadata-ui/src/main/resources/ui/src/pages/SearchIndexDetailsPage/SearchIndexFieldsTable/SearchIndexFieldsTable.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/pages/SearchIndexDetailsPage/SearchIndexFieldsTable/SearchIndexFieldsTable.tsx @@ -19,9 +19,9 @@ import React, { useCallback, useMemo, useState } from 'react'; import { useTranslation } from 'react-i18next'; import FilterTablePlaceHolder from '../../../components/common/ErrorWithPlaceholder/FilterTablePlaceHolder'; import Table from '../../../components/common/Table/Table'; +import TableDescription from '../../../components/Database/TableDescription/TableDescription.component'; +import TableTags from '../../../components/Database/TableTags/TableTags.component'; import { ModalWithMarkdownEditor } from '../../../components/Modals/ModalWithMarkdownEditor/ModalWithMarkdownEditor'; -import TableDescription from '../../../components/TableDescription/TableDescription.component'; -import TableTags from '../../../components/TableTags/TableTags.component'; import { NO_DATA_PLACEHOLDER } from '../../../constants/constants'; import { TABLE_SCROLL_VALUE } from '../../../constants/Table.constants'; import { EntityType } from '../../../enums/entity.enum'; diff --git a/openmetadata-ui/src/main/resources/ui/src/pages/ServiceDetailsPage/ServiceDetailsPage.tsx b/openmetadata-ui/src/main/resources/ui/src/pages/ServiceDetailsPage/ServiceDetailsPage.tsx index a5fcae9f3867..88bd9bd928ad 100644 --- a/openmetadata-ui/src/main/resources/ui/src/pages/ServiceDetailsPage/ServiceDetailsPage.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/pages/ServiceDetailsPage/ServiceDetailsPage.tsx @@ -32,24 +32,24 @@ import { useHistory, useParams } from 'react-router-dom'; import { useAuthContext } from '../../components/Auth/AuthProviders/AuthProvider'; import AirflowMessageBanner from '../../components/common/AirflowMessageBanner/AirflowMessageBanner'; import ErrorPlaceHolder from '../../components/common/ErrorWithPlaceholder/ErrorPlaceHolder'; +import Loader from '../../components/common/Loader/Loader'; import { PagingHandlerParams } from '../../components/common/NextPrevious/NextPrevious.interface'; +import TabsLabel from '../../components/common/TabsLabel/TabsLabel.component'; import TestConnection from '../../components/common/TestConnection/TestConnection'; +import DataModelTable from '../../components/Dashboard/DataModel/DataModels/DataModelsTable'; import { DataAssetsHeader } from '../../components/DataAssets/DataAssetsHeader/DataAssetsHeader.component'; -import DataModelTable from '../../components/DataModels/DataModelsTable'; -import Ingestion from '../../components/Ingestion/Ingestion.component'; -import Loader from '../../components/Loader/Loader'; import { EntityName } from '../../components/Modals/EntityNameModal/EntityNameModal.interface'; import PageLayoutV1 from '../../components/PageLayoutV1/PageLayoutV1'; -import { usePermissionProvider } from '../../components/PermissionProvider/PermissionProvider'; -import { OperationPermission } from '../../components/PermissionProvider/PermissionProvider.interface'; -import ServiceConnectionDetails from '../../components/ServiceConnectionDetails/ServiceConnectionDetails.component'; -import TabsLabel from '../../components/TabsLabel/TabsLabel.component'; +import Ingestion from '../../components/Settings/Services/Ingestion/Ingestion.component'; +import ServiceConnectionDetails from '../../components/Settings/Services/ServiceConnectionDetails/ServiceConnectionDetails.component'; import { getServiceDetailsPath, INITIAL_PAGING_VALUE, pagingObject, } from '../../constants/constants'; import { OPEN_METADATA } from '../../constants/Services.constant'; +import { usePermissionProvider } from '../../context/PermissionProvider/PermissionProvider'; +import { OperationPermission } from '../../context/PermissionProvider/PermissionProvider.interface'; import { ERROR_PLACEHOLDER_TYPE } from '../../enums/common.enum'; import { EntityTabs } from '../../enums/entity.enum'; import { ServiceCategory } from '../../enums/service.enum'; diff --git a/openmetadata-ui/src/main/resources/ui/src/pages/ServiceDetailsPage/ServiceMainTabContent.tsx b/openmetadata-ui/src/main/resources/ui/src/pages/ServiceDetailsPage/ServiceMainTabContent.tsx index c53ee12c34a5..73986f52fa78 100644 --- a/openmetadata-ui/src/main/resources/ui/src/pages/ServiceDetailsPage/ServiceMainTabContent.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/pages/ServiceDetailsPage/ServiceMainTabContent.tsx @@ -20,12 +20,12 @@ import { useTranslation } from 'react-i18next'; import { useParams } from 'react-router-dom'; import DescriptionV1 from '../../components/common/EntityDescription/DescriptionV1'; import ErrorPlaceHolder from '../../components/common/ErrorWithPlaceholder/ErrorPlaceHolder'; +import Loader from '../../components/common/Loader/Loader'; import NextPrevious from '../../components/common/NextPrevious/NextPrevious'; import { NextPreviousProps } from '../../components/common/NextPrevious/NextPrevious.interface'; import EntityRightPanel from '../../components/Entity/EntityRightPanel/EntityRightPanel'; -import Loader from '../../components/Loader/Loader'; -import { OperationPermission } from '../../components/PermissionProvider/PermissionProvider.interface'; import { PAGE_SIZE } from '../../constants/constants'; +import { OperationPermission } from '../../context/PermissionProvider/PermissionProvider.interface'; import { EntityType } from '../../enums/entity.enum'; import { DatabaseService } from '../../generated/entity/services/databaseService'; import { Paging } from '../../generated/type/paging'; diff --git a/openmetadata-ui/src/main/resources/ui/src/pages/ServiceVersionPage/ServiceVersionPage.test.tsx b/openmetadata-ui/src/main/resources/ui/src/pages/ServiceVersionPage/ServiceVersionPage.test.tsx index f018bc1cac7d..f7bcfd7721db 100644 --- a/openmetadata-ui/src/main/resources/ui/src/pages/ServiceVersionPage/ServiceVersionPage.test.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/pages/ServiceVersionPage/ServiceVersionPage.test.tsx @@ -14,7 +14,7 @@ import { act, render, screen } from '@testing-library/react'; import React from 'react'; import { useParams } from 'react-router-dom'; -import { usePermissionProvider } from '../../components/PermissionProvider/PermissionProvider'; +import { usePermissionProvider } from '../../context/PermissionProvider/PermissionProvider'; import { ENTITY_PERMISSIONS } from '../../mocks/Permissions.mock'; import { MOCK_DATABASE_SERVICE, diff --git a/openmetadata-ui/src/main/resources/ui/src/pages/ServiceVersionPage/ServiceVersionPage.tsx b/openmetadata-ui/src/main/resources/ui/src/pages/ServiceVersionPage/ServiceVersionPage.tsx index f93ce77d2b05..8dab316ab0a8 100644 --- a/openmetadata-ui/src/main/resources/ui/src/pages/ServiceVersionPage/ServiceVersionPage.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/pages/ServiceVersionPage/ServiceVersionPage.tsx @@ -19,20 +19,20 @@ import React, { useCallback, useEffect, useMemo, useState } from 'react'; import { useTranslation } from 'react-i18next'; import { useHistory, useParams } from 'react-router-dom'; import ErrorPlaceHolder from '../../components/common/ErrorWithPlaceholder/ErrorPlaceHolder'; +import Loader from '../../components/common/Loader/Loader'; import { PagingHandlerParams } from '../../components/common/NextPrevious/NextPrevious.interface'; +import TabsLabel from '../../components/common/TabsLabel/TabsLabel.component'; import DataAssetsVersionHeader from '../../components/DataAssets/DataAssetsVersionHeader/DataAssetsVersionHeader'; import EntityVersionTimeLine from '../../components/Entity/EntityVersionTimeLine/EntityVersionTimeLine'; -import Loader from '../../components/Loader/Loader'; import PageLayoutV1 from '../../components/PageLayoutV1/PageLayoutV1'; -import { usePermissionProvider } from '../../components/PermissionProvider/PermissionProvider'; -import { OperationPermission } from '../../components/PermissionProvider/PermissionProvider.interface'; -import TabsLabel from '../../components/TabsLabel/TabsLabel.component'; import { getServiceDetailsPath, INITIAL_PAGING_VALUE, pagingObject, } from '../../constants/constants'; import { EntityField } from '../../constants/Feeds.constants'; +import { usePermissionProvider } from '../../context/PermissionProvider/PermissionProvider'; +import { OperationPermission } from '../../context/PermissionProvider/PermissionProvider.interface'; import { ERROR_PLACEHOLDER_TYPE } from '../../enums/common.enum'; import { ServiceCategory } from '../../enums/service.enum'; import { ChangeDescription } from '../../generated/entity/type'; diff --git a/openmetadata-ui/src/main/resources/ui/src/pages/ServicesPage/ServicesPage.tsx b/openmetadata-ui/src/main/resources/ui/src/pages/ServicesPage/ServicesPage.tsx index d58d55a0e7e8..8fe9ebf5efc2 100644 --- a/openmetadata-ui/src/main/resources/ui/src/pages/ServicesPage/ServicesPage.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/pages/ServicesPage/ServicesPage.tsx @@ -19,12 +19,12 @@ import { useHistory, useLocation, useParams } from 'react-router-dom'; import ErrorPlaceHolder from '../../components/common/ErrorWithPlaceholder/ErrorPlaceHolder'; import TitleBreadcrumb from '../../components/common/TitleBreadcrumb/TitleBreadcrumb.component'; import { TitleBreadcrumbProps } from '../../components/common/TitleBreadcrumb/TitleBreadcrumb.interface'; -import { IngestionPipelineList } from '../../components/Ingestion/IngestionPipelineList/IngestionPipelineList.component'; import PageLayoutV1 from '../../components/PageLayoutV1/PageLayoutV1'; -import { usePermissionProvider } from '../../components/PermissionProvider/PermissionProvider'; -import Services from '../../components/Services/Services'; +import { IngestionPipelineList } from '../../components/Settings/Services/Ingestion/IngestionPipelineList/IngestionPipelineList.component'; +import Services from '../../components/Settings/Services/Services'; import { GlobalSettingsMenuCategory } from '../../constants/GlobalSettings.constants'; import { SERVICE_CATEGORY } from '../../constants/Services.constant'; +import { usePermissionProvider } from '../../context/PermissionProvider/PermissionProvider'; import { ERROR_PLACEHOLDER_TYPE } from '../../enums/common.enum'; import { ServiceCategory } from '../../enums/service.enum'; import { useAuth } from '../../hooks/authHooks'; diff --git a/openmetadata-ui/src/main/resources/ui/src/pages/SignUp/SignUpPage.tsx b/openmetadata-ui/src/main/resources/ui/src/pages/SignUp/SignUpPage.tsx index 6158101a5c78..c9014bd5b279 100644 --- a/openmetadata-ui/src/main/resources/ui/src/pages/SignUp/SignUpPage.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/pages/SignUp/SignUpPage.tsx @@ -19,7 +19,7 @@ import { useTranslation } from 'react-i18next'; import { useHistory } from 'react-router-dom'; import { useAuthContext } from '../../components/Auth/AuthProviders/AuthProvider'; import { UserProfile } from '../../components/Auth/AuthProviders/AuthProvider.interface'; -import TeamsSelectable from '../../components/TeamsSelectable/TeamsSelectable'; +import TeamsSelectable from '../../components/Settings/Team/TeamsSelectable/TeamsSelectable'; import { REDIRECT_PATHNAME, ROUTES, diff --git a/openmetadata-ui/src/main/resources/ui/src/pages/StoredProcedure/StoredProcedurePage.test.tsx b/openmetadata-ui/src/main/resources/ui/src/pages/StoredProcedure/StoredProcedurePage.test.tsx index 824827192688..e20dc2fb4f4d 100644 --- a/openmetadata-ui/src/main/resources/ui/src/pages/StoredProcedure/StoredProcedurePage.test.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/pages/StoredProcedure/StoredProcedurePage.test.tsx @@ -13,7 +13,7 @@ import { act, render, screen } from '@testing-library/react'; import React from 'react'; -import { usePermissionProvider } from '../../components/PermissionProvider/PermissionProvider'; +import { usePermissionProvider } from '../../context/PermissionProvider/PermissionProvider'; import { getStoredProceduresByFqn } from '../../rest/storedProceduresAPI'; import { DEFAULT_ENTITY_PERMISSION } from '../../utils/PermissionsUtils'; import { STORED_PROCEDURE_DEFAULT_FIELDS } from '../../utils/StoredProceduresUtils'; diff --git a/openmetadata-ui/src/main/resources/ui/src/pages/StoredProcedure/StoredProcedurePage.tsx b/openmetadata-ui/src/main/resources/ui/src/pages/StoredProcedure/StoredProcedurePage.tsx index 952ba1295b39..832609a605ca 100644 --- a/openmetadata-ui/src/main/resources/ui/src/pages/StoredProcedure/StoredProcedurePage.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/pages/StoredProcedure/StoredProcedurePage.tsx @@ -25,27 +25,27 @@ import { useAuthContext } from '../../components/Auth/AuthProviders/AuthProvider import { CustomPropertyTable } from '../../components/common/CustomPropertyTable/CustomPropertyTable'; import DescriptionV1 from '../../components/common/EntityDescription/DescriptionV1'; import ErrorPlaceHolder from '../../components/common/ErrorWithPlaceholder/ErrorPlaceHolder'; +import Loader from '../../components/common/Loader/Loader'; +import TabsLabel from '../../components/common/TabsLabel/TabsLabel.component'; import { DataAssetsHeader } from '../../components/DataAssets/DataAssetsHeader/DataAssetsHeader.component'; +import SchemaEditor from '../../components/Database/SchemaEditor/SchemaEditor'; +import { QueryVote } from '../../components/Database/TableQueries/TableQueries.interface'; import EntityRightPanel from '../../components/Entity/EntityRightPanel/EntityRightPanel'; import Lineage from '../../components/Lineage/Lineage.component'; -import LineageProvider from '../../components/LineageProvider/LineageProvider'; -import Loader from '../../components/Loader/Loader'; import { EntityName } from '../../components/Modals/EntityNameModal/EntityNameModal.interface'; import PageLayoutV1 from '../../components/PageLayoutV1/PageLayoutV1'; -import { usePermissionProvider } from '../../components/PermissionProvider/PermissionProvider'; -import { - OperationPermission, - ResourceEntity, -} from '../../components/PermissionProvider/PermissionProvider.interface'; -import SchemaEditor from '../../components/SchemaEditor/SchemaEditor'; import { SourceType } from '../../components/SearchedData/SearchedData.interface'; -import { QueryVote } from '../../components/TableQueries/TableQueries.interface'; -import TabsLabel from '../../components/TabsLabel/TabsLabel.component'; import { getStoredProcedureDetailPath, getVersionPath, } from '../../constants/constants'; import { FEED_COUNT_INITIAL_DATA } from '../../constants/entity.constants'; +import LineageProvider from '../../context/LineageProvider/LineageProvider'; +import { usePermissionProvider } from '../../context/PermissionProvider/PermissionProvider'; +import { + OperationPermission, + ResourceEntity, +} from '../../context/PermissionProvider/PermissionProvider.interface'; import { CSMode } from '../../enums/codemirror.enum'; import { ERROR_PLACEHOLDER_TYPE } from '../../enums/common.enum'; import { EntityTabs, EntityType } from '../../enums/entity.enum'; diff --git a/openmetadata-ui/src/main/resources/ui/src/pages/TableDetailsPageV1/TableDetailsPageV1.test.tsx b/openmetadata-ui/src/main/resources/ui/src/pages/TableDetailsPageV1/TableDetailsPageV1.test.tsx index d8593322f768..27f67c40417b 100644 --- a/openmetadata-ui/src/main/resources/ui/src/pages/TableDetailsPageV1/TableDetailsPageV1.test.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/pages/TableDetailsPageV1/TableDetailsPageV1.test.tsx @@ -12,7 +12,7 @@ */ import { act, render, screen } from '@testing-library/react'; import React from 'react'; -import { usePermissionProvider } from '../../components/PermissionProvider/PermissionProvider'; +import { usePermissionProvider } from '../../context/PermissionProvider/PermissionProvider'; import { getTableDetailsByFQN } from '../../rest/tableAPI'; import { DEFAULT_ENTITY_PERMISSION } from '../../utils/PermissionsUtils'; import TableDetailsPageV1 from './TableDetailsPageV1'; diff --git a/openmetadata-ui/src/main/resources/ui/src/pages/TableDetailsPageV1/TableDetailsPageV1.tsx b/openmetadata-ui/src/main/resources/ui/src/pages/TableDetailsPageV1/TableDetailsPageV1.tsx index 59e86decc5e5..a2e735cd51d8 100644 --- a/openmetadata-ui/src/main/resources/ui/src/pages/TableDetailsPageV1/TableDetailsPageV1.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/pages/TableDetailsPageV1/TableDetailsPageV1.tsx @@ -27,31 +27,31 @@ import { useAuthContext } from '../../components/Auth/AuthProviders/AuthProvider import { CustomPropertyTable } from '../../components/common/CustomPropertyTable/CustomPropertyTable'; import DescriptionV1 from '../../components/common/EntityDescription/DescriptionV1'; import ErrorPlaceHolder from '../../components/common/ErrorWithPlaceholder/ErrorPlaceHolder'; +import Loader from '../../components/common/Loader/Loader'; import QueryViewer from '../../components/common/QueryViewer/QueryViewer.component'; +import TabsLabel from '../../components/common/TabsLabel/TabsLabel.component'; import { DataAssetsHeader } from '../../components/DataAssets/DataAssetsHeader/DataAssetsHeader.component'; +import SampleDataTableComponent from '../../components/Database/SampleDataTable/SampleDataTable.component'; +import SchemaTab from '../../components/Database/SchemaTab/SchemaTab.component'; +import TableProfiler from '../../components/Database/TableProfiler/TableProfiler'; +import TableQueries from '../../components/Database/TableQueries/TableQueries'; +import { QueryVote } from '../../components/Database/TableQueries/TableQueries.interface'; import EntityRightPanel from '../../components/Entity/EntityRightPanel/EntityRightPanel'; import Lineage from '../../components/Lineage/Lineage.component'; -import LineageProvider from '../../components/LineageProvider/LineageProvider'; -import Loader from '../../components/Loader/Loader'; import { EntityName } from '../../components/Modals/EntityNameModal/EntityNameModal.interface'; import PageLayoutV1 from '../../components/PageLayoutV1/PageLayoutV1'; -import { usePermissionProvider } from '../../components/PermissionProvider/PermissionProvider'; -import { - OperationPermission, - ResourceEntity, -} from '../../components/PermissionProvider/PermissionProvider.interface'; -import SampleDataTableComponent from '../../components/SampleDataTable/SampleDataTable.component'; -import SchemaTab from '../../components/SchemaTab/SchemaTab.component'; import { SourceType } from '../../components/SearchedData/SearchedData.interface'; -import TableProfiler from '../../components/TableProfiler/TableProfiler'; -import TableQueries from '../../components/TableQueries/TableQueries'; -import { QueryVote } from '../../components/TableQueries/TableQueries.interface'; -import TabsLabel from '../../components/TabsLabel/TabsLabel.component'; -import { useTourProvider } from '../../components/TourProvider/TourProvider'; import { FQN_SEPARATOR_CHAR } from '../../constants/char.constants'; import { getTableTabPath, getVersionPath } from '../../constants/constants'; import { FEED_COUNT_INITIAL_DATA } from '../../constants/entity.constants'; import { mockDatasetData } from '../../constants/mockTourData.constants'; +import LineageProvider from '../../context/LineageProvider/LineageProvider'; +import { usePermissionProvider } from '../../context/PermissionProvider/PermissionProvider'; +import { + OperationPermission, + ResourceEntity, +} from '../../context/PermissionProvider/PermissionProvider.interface'; +import { useTourProvider } from '../../context/TourProvider/TourProvider'; import { ERROR_PLACEHOLDER_TYPE } from '../../enums/common.enum'; import { EntityTabs, diff --git a/openmetadata-ui/src/main/resources/ui/src/pages/TagsPage/TagsPage.tsx b/openmetadata-ui/src/main/resources/ui/src/pages/TagsPage/TagsPage.tsx index 53505a24d0a3..d6d08c208201 100644 --- a/openmetadata-ui/src/main/resources/ui/src/pages/TagsPage/TagsPage.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/pages/TagsPage/TagsPage.tsx @@ -26,21 +26,21 @@ import React, { import { useTranslation } from 'react-i18next'; import { useHistory } from 'react-router-dom'; import { ReactComponent as PlusIcon } from '../../assets/svg/plus-primary.svg'; -import ClassificationDetails from '../../components/ClassificationDetails/ClassificationDetails'; -import { ClassificationDetailsRef } from '../../components/ClassificationDetails/ClassificationDetails.interface'; +import ClassificationDetails from '../../components/Classifications/ClassificationDetails/ClassificationDetails'; +import { ClassificationDetailsRef } from '../../components/Classifications/ClassificationDetails/ClassificationDetails.interface'; import ErrorPlaceHolder from '../../components/common/ErrorWithPlaceholder/ErrorPlaceHolder'; import LeftPanelCard from '../../components/common/LeftPanelCard/LeftPanelCard'; -import Loader from '../../components/Loader/Loader'; +import Loader from '../../components/common/Loader/Loader'; +import TagsLeftPanelSkeleton from '../../components/common/Skeleton/Tags/TagsLeftPanelSkeleton.component'; import EntityDeleteModal from '../../components/Modals/EntityDeleteModal/EntityDeleteModal'; import PageLayoutV1 from '../../components/PageLayoutV1/PageLayoutV1'; -import { usePermissionProvider } from '../../components/PermissionProvider/PermissionProvider'; +import { HTTP_STATUS_CODE } from '../../constants/Auth.constants'; +import { TIER_CATEGORY } from '../../constants/constants'; +import { usePermissionProvider } from '../../context/PermissionProvider/PermissionProvider'; import { OperationPermission, ResourceEntity, -} from '../../components/PermissionProvider/PermissionProvider.interface'; -import TagsLeftPanelSkeleton from '../../components/Skeleton/Tags/TagsLeftPanelSkeleton.component'; -import { HTTP_STATUS_CODE } from '../../constants/Auth.constants'; -import { TIER_CATEGORY } from '../../constants/constants'; +} from '../../context/PermissionProvider/PermissionProvider.interface'; import { LOADING_STATE } from '../../enums/common.enum'; import { CreateClassification } from '../../generated/api/classification/createClassification'; import { diff --git a/openmetadata-ui/src/main/resources/ui/src/pages/TasksPage/RequestDescriptionPage/RequestDescriptionPage.tsx b/openmetadata-ui/src/main/resources/ui/src/pages/TasksPage/RequestDescriptionPage/RequestDescriptionPage.tsx index ce59149b535a..8c0a495b9a39 100644 --- a/openmetadata-ui/src/main/resources/ui/src/pages/TasksPage/RequestDescriptionPage/RequestDescriptionPage.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/pages/TasksPage/RequestDescriptionPage/RequestDescriptionPage.tsx @@ -20,12 +20,12 @@ import { useTranslation } from 'react-i18next'; import { useHistory, useLocation, useParams } from 'react-router-dom'; import { ActivityFeedTabs } from '../../../components/ActivityFeed/ActivityFeedTab/ActivityFeedTab.interface'; import { useAuthContext } from '../../../components/Auth/AuthProviders/AuthProvider'; +import Loader from '../../../components/common/Loader/Loader'; import ResizablePanels from '../../../components/common/ResizablePanels/ResizablePanels'; import RichTextEditor from '../../../components/common/RichTextEditor/RichTextEditor'; import { EditorContentRef } from '../../../components/common/RichTextEditor/RichTextEditor.interface'; import TitleBreadcrumb from '../../../components/common/TitleBreadcrumb/TitleBreadcrumb.component'; import ExploreSearchCard from '../../../components/ExploreV1/ExploreSearchCard/ExploreSearchCard'; -import Loader from '../../../components/Loader/Loader'; import { SearchedDataProps } from '../../../components/SearchedData/SearchedData.interface'; import { EntityField } from '../../../constants/Feeds.constants'; import { EntityTabs, EntityType } from '../../../enums/entity.enum'; diff --git a/openmetadata-ui/src/main/resources/ui/src/pages/TasksPage/RequestTagPage/RequestTagPage.tsx b/openmetadata-ui/src/main/resources/ui/src/pages/TasksPage/RequestTagPage/RequestTagPage.tsx index f18c7aaa99e4..c60c7db191f8 100644 --- a/openmetadata-ui/src/main/resources/ui/src/pages/TasksPage/RequestTagPage/RequestTagPage.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/pages/TasksPage/RequestTagPage/RequestTagPage.tsx @@ -20,10 +20,10 @@ import { useTranslation } from 'react-i18next'; import { useHistory, useLocation, useParams } from 'react-router-dom'; import { ActivityFeedTabs } from '../../../components/ActivityFeed/ActivityFeedTab/ActivityFeedTab.interface'; import { useAuthContext } from '../../../components/Auth/AuthProviders/AuthProvider'; +import Loader from '../../../components/common/Loader/Loader'; import ResizablePanels from '../../../components/common/ResizablePanels/ResizablePanels'; import TitleBreadcrumb from '../../../components/common/TitleBreadcrumb/TitleBreadcrumb.component'; import ExploreSearchCard from '../../../components/ExploreV1/ExploreSearchCard/ExploreSearchCard'; -import Loader from '../../../components/Loader/Loader'; import { SearchedDataProps } from '../../../components/SearchedData/SearchedData.interface'; import { EntityField } from '../../../constants/Feeds.constants'; import { EntityTabs, EntityType } from '../../../enums/entity.enum'; diff --git a/openmetadata-ui/src/main/resources/ui/src/pages/TasksPage/UpdateDescriptionPage/UpdateDescriptionPage.tsx b/openmetadata-ui/src/main/resources/ui/src/pages/TasksPage/UpdateDescriptionPage/UpdateDescriptionPage.tsx index ba2d2c5c8580..b9c0d40c6566 100644 --- a/openmetadata-ui/src/main/resources/ui/src/pages/TasksPage/UpdateDescriptionPage/UpdateDescriptionPage.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/pages/TasksPage/UpdateDescriptionPage/UpdateDescriptionPage.tsx @@ -20,10 +20,10 @@ import { useTranslation } from 'react-i18next'; import { useHistory, useLocation, useParams } from 'react-router-dom'; import { ActivityFeedTabs } from '../../../components/ActivityFeed/ActivityFeedTab/ActivityFeedTab.interface'; import { useAuthContext } from '../../../components/Auth/AuthProviders/AuthProvider'; +import Loader from '../../../components/common/Loader/Loader'; import ResizablePanels from '../../../components/common/ResizablePanels/ResizablePanels'; import TitleBreadcrumb from '../../../components/common/TitleBreadcrumb/TitleBreadcrumb.component'; import ExploreSearchCard from '../../../components/ExploreV1/ExploreSearchCard/ExploreSearchCard'; -import Loader from '../../../components/Loader/Loader'; import { SearchedDataProps } from '../../../components/SearchedData/SearchedData.interface'; import { FQN_SEPARATOR_CHAR } from '../../../constants/char.constants'; import { EntityField } from '../../../constants/Feeds.constants'; diff --git a/openmetadata-ui/src/main/resources/ui/src/pages/TasksPage/UpdateTagPage/UpdateTagPage.tsx b/openmetadata-ui/src/main/resources/ui/src/pages/TasksPage/UpdateTagPage/UpdateTagPage.tsx index cd94619249ef..b5aa79d0d32a 100644 --- a/openmetadata-ui/src/main/resources/ui/src/pages/TasksPage/UpdateTagPage/UpdateTagPage.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/pages/TasksPage/UpdateTagPage/UpdateTagPage.tsx @@ -20,10 +20,10 @@ import { useTranslation } from 'react-i18next'; import { useHistory, useLocation, useParams } from 'react-router-dom'; import { ActivityFeedTabs } from '../../../components/ActivityFeed/ActivityFeedTab/ActivityFeedTab.interface'; import { useAuthContext } from '../../../components/Auth/AuthProviders/AuthProvider'; +import Loader from '../../../components/common/Loader/Loader'; import ResizablePanels from '../../../components/common/ResizablePanels/ResizablePanels'; import TitleBreadcrumb from '../../../components/common/TitleBreadcrumb/TitleBreadcrumb.component'; import ExploreSearchCard from '../../../components/ExploreV1/ExploreSearchCard/ExploreSearchCard'; -import Loader from '../../../components/Loader/Loader'; import { SearchedDataProps } from '../../../components/SearchedData/SearchedData.interface'; import { FQN_SEPARATOR_CHAR } from '../../../constants/char.constants'; import { EntityField } from '../../../constants/Feeds.constants'; diff --git a/openmetadata-ui/src/main/resources/ui/src/pages/TasksPage/shared/TagSuggestion.tsx b/openmetadata-ui/src/main/resources/ui/src/pages/TasksPage/shared/TagSuggestion.tsx index 7e434c288222..5853e87a4927 100644 --- a/openmetadata-ui/src/main/resources/ui/src/pages/TasksPage/shared/TagSuggestion.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/pages/TasksPage/shared/TagSuggestion.tsx @@ -16,8 +16,8 @@ import { t } from 'i18next'; import { isArray, isEmpty } from 'lodash'; import { EntityTags } from 'Models'; import React, { useMemo } from 'react'; -import AsyncSelectList from '../../../components/AsyncSelectList/AsyncSelectList'; -import { SelectOption } from '../../../components/AsyncSelectList/AsyncSelectList.interface'; +import AsyncSelectList from '../../../components/common/AsyncSelectList/AsyncSelectList'; +import { SelectOption } from '../../../components/common/AsyncSelectList/AsyncSelectList.interface'; import { TagSource } from '../../../generated/entity/data/container'; import { TagLabel } from '../../../generated/type/tagLabel'; import tagClassBase from '../../../utils/TagClassBase'; diff --git a/openmetadata-ui/src/main/resources/ui/src/pages/TeamsPage/ImportTeamsPage/ImportTeamsPage.test.tsx b/openmetadata-ui/src/main/resources/ui/src/pages/TeamsPage/ImportTeamsPage/ImportTeamsPage.test.tsx index 457cf423d7a5..44ea470cc315 100644 --- a/openmetadata-ui/src/main/resources/ui/src/pages/TeamsPage/ImportTeamsPage/ImportTeamsPage.test.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/pages/TeamsPage/ImportTeamsPage/ImportTeamsPage.test.tsx @@ -18,7 +18,7 @@ import { waitForElementToBeRemoved, } from '@testing-library/react'; import React from 'react'; -import { usePermissionProvider } from '../../../components/PermissionProvider/PermissionProvider'; +import { usePermissionProvider } from '../../../context/PermissionProvider/PermissionProvider'; import { MOCK_CURRENT_TEAM, MOCK_MARKETING_TEAM, diff --git a/openmetadata-ui/src/main/resources/ui/src/pages/TeamsPage/ImportTeamsPage/ImportTeamsPage.tsx b/openmetadata-ui/src/main/resources/ui/src/pages/TeamsPage/ImportTeamsPage/ImportTeamsPage.tsx index f4d4d9492602..f7f98cd1df59 100644 --- a/openmetadata-ui/src/main/resources/ui/src/pages/TeamsPage/ImportTeamsPage/ImportTeamsPage.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/pages/TeamsPage/ImportTeamsPage/ImportTeamsPage.tsx @@ -19,16 +19,16 @@ import { useTranslation } from 'react-i18next'; import { useHistory, useLocation } from 'react-router-dom'; import { EntityImport } from '../../../components/common/EntityImport/EntityImport.component'; import ErrorPlaceHolder from '../../../components/common/ErrorWithPlaceholder/ErrorPlaceHolder'; +import Loader from '../../../components/common/Loader/Loader'; import TitleBreadcrumb from '../../../components/common/TitleBreadcrumb/TitleBreadcrumb.component'; import { TitleBreadcrumbProps } from '../../../components/common/TitleBreadcrumb/TitleBreadcrumb.interface'; -import Loader from '../../../components/Loader/Loader'; -import { usePermissionProvider } from '../../../components/PermissionProvider/PermissionProvider'; +import { TeamImportResult } from '../../../components/Settings/Team/TeamImportResult/TeamImportResult.component'; +import { UserImportResult } from '../../../components/Settings/Team/UserImportResult/UserImportResult.component'; +import { usePermissionProvider } from '../../../context/PermissionProvider/PermissionProvider'; import { OperationPermission, ResourceEntity, -} from '../../../components/PermissionProvider/PermissionProvider.interface'; -import { TeamImportResult } from '../../../components/Team/TeamImportResult/TeamImportResult.component'; -import { UserImportResult } from '../../../components/Team/UserImportResult/UserImportResult.component'; +} from '../../../context/PermissionProvider/PermissionProvider.interface'; import { ERROR_PLACEHOLDER_TYPE } from '../../../enums/common.enum'; import { Team, TeamType } from '../../../generated/entity/teams/team'; import { CSVImportResult } from '../../../generated/type/csvImportResult'; diff --git a/openmetadata-ui/src/main/resources/ui/src/pages/TeamsPage/TeamsPage.tsx b/openmetadata-ui/src/main/resources/ui/src/pages/TeamsPage/TeamsPage.tsx index 511e7f939039..0901cd74126c 100644 --- a/openmetadata-ui/src/main/resources/ui/src/pages/TeamsPage/TeamsPage.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/pages/TeamsPage/TeamsPage.tsx @@ -19,15 +19,15 @@ import { useTranslation } from 'react-i18next'; import { useHistory } from 'react-router-dom'; import { useAuthContext } from '../../components/Auth/AuthProviders/AuthProvider'; import ErrorPlaceHolder from '../../components/common/ErrorWithPlaceholder/ErrorPlaceHolder'; -import Loader from '../../components/Loader/Loader'; +import Loader from '../../components/common/Loader/Loader'; import PageLayoutV1 from '../../components/PageLayoutV1/PageLayoutV1'; -import { usePermissionProvider } from '../../components/PermissionProvider/PermissionProvider'; +import TeamDetailsV1 from '../../components/Settings/Team/TeamDetails/TeamDetailsV1'; +import { HTTP_STATUS_CODE } from '../../constants/Auth.constants'; +import { usePermissionProvider } from '../../context/PermissionProvider/PermissionProvider'; import { OperationPermission, ResourceEntity, -} from '../../components/PermissionProvider/PermissionProvider.interface'; -import TeamDetailsV1 from '../../components/Team/TeamDetails/TeamDetailsV1'; -import { HTTP_STATUS_CODE } from '../../constants/Auth.constants'; +} from '../../context/PermissionProvider/PermissionProvider.interface'; import { ERROR_PLACEHOLDER_TYPE } from '../../enums/common.enum'; import { SearchIndex } from '../../enums/search.enum'; import { CreateTeam, TeamType } from '../../generated/api/teams/createTeam'; diff --git a/openmetadata-ui/src/main/resources/ui/src/pages/TestSuiteDetailsPage/TestSuiteDetailsPage.component.tsx b/openmetadata-ui/src/main/resources/ui/src/pages/TestSuiteDetailsPage/TestSuiteDetailsPage.component.tsx index 669edadc3915..a01fdd58f17e 100644 --- a/openmetadata-ui/src/main/resources/ui/src/pages/TestSuiteDetailsPage/TestSuiteDetailsPage.component.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/pages/TestSuiteDetailsPage/TestSuiteDetailsPage.component.tsx @@ -17,10 +17,10 @@ import { compare } from 'fast-json-patch'; import React, { useCallback, useEffect, useMemo, useState } from 'react'; import { useTranslation } from 'react-i18next'; import { useHistory } from 'react-router-dom'; -import { AddTestCaseList } from '../../components/AddTestCaseList/AddTestCaseList.component'; import Description from '../../components/common/EntityDescription/Description'; import ManageButton from '../../components/common/EntityPageInfos/ManageButton/ManageButton'; import ErrorPlaceHolder from '../../components/common/ErrorWithPlaceholder/ErrorPlaceHolder'; +import Loader from '../../components/common/Loader/Loader'; import { NextPreviousProps, PagingHandlerParams, @@ -28,14 +28,14 @@ import { import { OwnerLabel } from '../../components/common/OwnerLabel/OwnerLabel.component'; import TitleBreadcrumb from '../../components/common/TitleBreadcrumb/TitleBreadcrumb.component'; import { TitleBreadcrumbProps } from '../../components/common/TitleBreadcrumb/TitleBreadcrumb.interface'; -import Loader from '../../components/Loader/Loader'; +import DataQualityTab from '../../components/Database/Profiler/DataQualityTab/DataQualityTab'; +import { AddTestCaseList } from '../../components/DataQuality/AddTestCaseList/AddTestCaseList.component'; import PageLayoutV1 from '../../components/PageLayoutV1/PageLayoutV1'; -import { usePermissionProvider } from '../../components/PermissionProvider/PermissionProvider'; +import { usePermissionProvider } from '../../context/PermissionProvider/PermissionProvider'; import { OperationPermission, ResourceEntity, -} from '../../components/PermissionProvider/PermissionProvider.interface'; -import DataQualityTab from '../../components/ProfilerDashboard/component/DataQualityTab'; +} from '../../context/PermissionProvider/PermissionProvider.interface'; import { ACTION_TYPE, ERROR_PLACEHOLDER_TYPE } from '../../enums/common.enum'; import { EntityType } from '../../enums/entity.enum'; import { TestCase } from '../../generated/tests/testCase'; diff --git a/openmetadata-ui/src/main/resources/ui/src/pages/TestSuiteDetailsPage/TestSuiteDetailsPage.test.tsx b/openmetadata-ui/src/main/resources/ui/src/pages/TestSuiteDetailsPage/TestSuiteDetailsPage.test.tsx index bae97a7c97a5..620629d7e62f 100644 --- a/openmetadata-ui/src/main/resources/ui/src/pages/TestSuiteDetailsPage/TestSuiteDetailsPage.test.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/pages/TestSuiteDetailsPage/TestSuiteDetailsPage.test.tsx @@ -12,7 +12,7 @@ */ import { act, render, screen } from '@testing-library/react'; import React from 'react'; -import { usePermissionProvider } from '../../components/PermissionProvider/PermissionProvider'; +import { usePermissionProvider } from '../../context/PermissionProvider/PermissionProvider'; import { mockEntityPermissions } from '../../pages/DatabaseSchemaPage/mocks/DatabaseSchemaPage.mock'; import { getTestSuiteByName } from '../../rest/testAPI'; import TestSuiteDetailsPage from './TestSuiteDetailsPage.component'; diff --git a/openmetadata-ui/src/main/resources/ui/src/pages/TestSuiteIngestionPage/TestSuiteIngestionPage.test.tsx b/openmetadata-ui/src/main/resources/ui/src/pages/TestSuiteIngestionPage/TestSuiteIngestionPage.test.tsx index 995cbdadb560..9413545102ca 100644 --- a/openmetadata-ui/src/main/resources/ui/src/pages/TestSuiteIngestionPage/TestSuiteIngestionPage.test.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/pages/TestSuiteIngestionPage/TestSuiteIngestionPage.test.tsx @@ -78,18 +78,21 @@ jest.mock( '../../components/common/TitleBreadcrumb/TitleBreadcrumb.component', () => jest.fn().mockReturnValue(
TitleBreadcrumb.component
) ); -jest.mock('../../components/AddDataQualityTest/TestSuiteIngestion', () => - jest.fn().mockImplementation(({ onCancel }) => ( -
-

TestSuiteIngestion.component

- -
- )) +jest.mock( + '../../components/DataQuality/AddDataQualityTest/TestSuiteIngestion', + () => + jest.fn().mockImplementation(({ onCancel }) => ( +
+

TestSuiteIngestion.component

+ +
+ )) ); -jest.mock('../../components/AddDataQualityTest/components/RightPanel', () => - jest.fn().mockReturnValue(
RightPanel.component
) +jest.mock( + '../../components/DataQuality/AddDataQualityTest/components/RightPanel', + () => jest.fn().mockReturnValue(
RightPanel.component
) ); describe('TestSuiteIngestionPage', () => { diff --git a/openmetadata-ui/src/main/resources/ui/src/pages/TestSuiteIngestionPage/TestSuiteIngestionPage.tsx b/openmetadata-ui/src/main/resources/ui/src/pages/TestSuiteIngestionPage/TestSuiteIngestionPage.tsx index 5b0d600a3d57..f7ec8a4d65aa 100644 --- a/openmetadata-ui/src/main/resources/ui/src/pages/TestSuiteIngestionPage/TestSuiteIngestionPage.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/pages/TestSuiteIngestionPage/TestSuiteIngestionPage.tsx @@ -15,14 +15,14 @@ import { isUndefined } from 'lodash'; import React, { useEffect, useState } from 'react'; import { useTranslation } from 'react-i18next'; import { useHistory } from 'react-router-dom'; -import RightPanel from '../../components/AddDataQualityTest/components/RightPanel'; -import { INGESTION_DATA } from '../../components/AddDataQualityTest/rightPanelData'; -import TestSuiteIngestion from '../../components/AddDataQualityTest/TestSuiteIngestion'; import ErrorPlaceHolder from '../../components/common/ErrorWithPlaceholder/ErrorPlaceHolder'; +import Loader from '../../components/common/Loader/Loader'; import ResizablePanels from '../../components/common/ResizablePanels/ResizablePanels'; import TitleBreadcrumb from '../../components/common/TitleBreadcrumb/TitleBreadcrumb.component'; import { TitleBreadcrumbProps } from '../../components/common/TitleBreadcrumb/TitleBreadcrumb.interface'; -import Loader from '../../components/Loader/Loader'; +import RightPanel from '../../components/DataQuality/AddDataQualityTest/components/RightPanel'; +import { INGESTION_DATA } from '../../components/DataQuality/AddDataQualityTest/rightPanelData'; +import TestSuiteIngestion from '../../components/DataQuality/AddDataQualityTest/TestSuiteIngestion'; import { getTableTabPath } from '../../constants/constants'; import { EntityTabs } from '../../enums/entity.enum'; import { IngestionPipeline } from '../../generated/entity/services/ingestionPipelines/ingestionPipeline'; diff --git a/openmetadata-ui/src/main/resources/ui/src/pages/TopicDetails/TopicDetailsPage.component.tsx b/openmetadata-ui/src/main/resources/ui/src/pages/TopicDetails/TopicDetailsPage.component.tsx index b4ac6a7e22f0..36810c5f7329 100644 --- a/openmetadata-ui/src/main/resources/ui/src/pages/TopicDetails/TopicDetailsPage.component.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/pages/TopicDetails/TopicDetailsPage.component.tsx @@ -24,15 +24,15 @@ import { useTranslation } from 'react-i18next'; import { useHistory } from 'react-router-dom'; import { useAuthContext } from '../../components/Auth/AuthProviders/AuthProvider'; import ErrorPlaceHolder from '../../components/common/ErrorWithPlaceholder/ErrorPlaceHolder'; -import Loader from '../../components/Loader/Loader'; -import { usePermissionProvider } from '../../components/PermissionProvider/PermissionProvider'; +import Loader from '../../components/common/Loader/Loader'; +import { QueryVote } from '../../components/Database/TableQueries/TableQueries.interface'; +import TopicDetails from '../../components/Topic/TopicDetails/TopicDetails.component'; +import { getVersionPath } from '../../constants/constants'; +import { usePermissionProvider } from '../../context/PermissionProvider/PermissionProvider'; import { OperationPermission, ResourceEntity, -} from '../../components/PermissionProvider/PermissionProvider.interface'; -import { QueryVote } from '../../components/TableQueries/TableQueries.interface'; -import TopicDetails from '../../components/TopicDetails/TopicDetails.component'; -import { getVersionPath } from '../../constants/constants'; +} from '../../context/PermissionProvider/PermissionProvider.interface'; import { ERROR_PLACEHOLDER_TYPE } from '../../enums/common.enum'; import { EntityType, TabSpecificField } from '../../enums/entity.enum'; import { CreateThread } from '../../generated/api/feed/createThread'; diff --git a/openmetadata-ui/src/main/resources/ui/src/pages/TourPage/TourPage.component.tsx b/openmetadata-ui/src/main/resources/ui/src/pages/TourPage/TourPage.component.tsx index d60e88a9ade4..c5bb35842b1b 100644 --- a/openmetadata-ui/src/main/resources/ui/src/pages/TourPage/TourPage.component.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/pages/TourPage/TourPage.component.tsx @@ -13,8 +13,8 @@ import React, { useEffect, useMemo } from 'react'; import Tour from '../../components/AppTour/Tour'; -import { useTourProvider } from '../../components/TourProvider/TourProvider'; import { TOUR_SEARCH_TERM } from '../../constants/constants'; +import { useTourProvider } from '../../context/TourProvider/TourProvider'; import { CurrentTourPageType } from '../../enums/tour.enum'; import { getTourSteps } from '../../utils/TourUtils'; import ExplorePageV1Component from '../ExplorePage/ExplorePageV1.component'; diff --git a/openmetadata-ui/src/main/resources/ui/src/pages/TourPage/TourPage.test.tsx b/openmetadata-ui/src/main/resources/ui/src/pages/TourPage/TourPage.test.tsx index e55b06d0b81d..0b8de85c9662 100644 --- a/openmetadata-ui/src/main/resources/ui/src/pages/TourPage/TourPage.test.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/pages/TourPage/TourPage.test.tsx @@ -12,7 +12,7 @@ */ import { fireEvent, render, screen } from '@testing-library/react'; import React from 'react'; -import { useTourProvider } from '../../components/TourProvider/TourProvider'; +import { useTourProvider } from '../../context/TourProvider/TourProvider'; import { CurrentTourPageType } from '../../enums/tour.enum'; import TourPage from './TourPage.component'; diff --git a/openmetadata-ui/src/main/resources/ui/src/pages/UserPage/UserPage.component.tsx b/openmetadata-ui/src/main/resources/ui/src/pages/UserPage/UserPage.component.tsx index b6e74d22a6b1..fe2a63568740 100644 --- a/openmetadata-ui/src/main/resources/ui/src/pages/UserPage/UserPage.component.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/pages/UserPage/UserPage.component.tsx @@ -26,8 +26,8 @@ import { import { useTranslation } from 'react-i18next'; import { useHistory } from 'react-router-dom'; import { useAuthContext } from '../../components/Auth/AuthProviders/AuthProvider'; -import Loader from '../../components/Loader/Loader'; -import Users from '../../components/Users/Users.component'; +import Loader from '../../components/common/Loader/Loader'; +import Users from '../../components/Settings/Users/Users.component'; import { User } from '../../generated/entity/teams/user'; import { useFqn } from '../../hooks/useFqn'; import { getUserByName, updateUserDetail } from '../../rest/userAPI'; diff --git a/openmetadata-ui/src/main/resources/ui/src/rest/SearchIndexAPI.ts b/openmetadata-ui/src/main/resources/ui/src/rest/SearchIndexAPI.ts index 8b1bdfe2d83d..db2909611d23 100644 --- a/openmetadata-ui/src/main/resources/ui/src/rest/SearchIndexAPI.ts +++ b/openmetadata-ui/src/main/resources/ui/src/rest/SearchIndexAPI.ts @@ -14,7 +14,7 @@ import { AxiosResponse } from 'axios'; import { Operation } from 'fast-json-patch'; import { PagingResponse, PagingWithoutTotal, RestoreRequestType } from 'Models'; -import { QueryVote } from '../components/TableQueries/TableQueries.interface'; +import { QueryVote } from '../components/Database/TableQueries/TableQueries.interface'; import { APPLICATION_JSON_CONTENT_TYPE_HEADER } from '../constants/constants'; import { EntityReference, diff --git a/openmetadata-ui/src/main/resources/ui/src/rest/applicationAPI.ts b/openmetadata-ui/src/main/resources/ui/src/rest/applicationAPI.ts index 8ad94e833d6f..4972b85b2a03 100644 --- a/openmetadata-ui/src/main/resources/ui/src/rest/applicationAPI.ts +++ b/openmetadata-ui/src/main/resources/ui/src/rest/applicationAPI.ts @@ -13,7 +13,7 @@ import { AxiosResponse } from 'axios'; import { Operation } from 'fast-json-patch'; import { PagingResponse, RestoreRequestType } from 'Models'; -import { DataInsightLatestRun } from '../components/Applications/AppDetails/AppDetails.interface'; +import { DataInsightLatestRun } from '../components/Settings/Applications/AppDetails/AppDetails.interface'; import { App } from '../generated/entity/applications/app'; import { AppRunRecord } from '../generated/entity/applications/appRunRecord'; import { CreateAppRequest } from '../generated/entity/applications/createAppRequest'; diff --git a/openmetadata-ui/src/main/resources/ui/src/rest/dashboardAPI.ts b/openmetadata-ui/src/main/resources/ui/src/rest/dashboardAPI.ts index 67c1115d52ce..9931e64a06e0 100644 --- a/openmetadata-ui/src/main/resources/ui/src/rest/dashboardAPI.ts +++ b/openmetadata-ui/src/main/resources/ui/src/rest/dashboardAPI.ts @@ -14,7 +14,7 @@ import { AxiosResponse } from 'axios'; import { Operation } from 'fast-json-patch'; import { PagingResponse, PagingWithoutTotal, RestoreRequestType } from 'Models'; -import { QueryVote } from '../components/TableQueries/TableQueries.interface'; +import { QueryVote } from '../components/Database/TableQueries/TableQueries.interface'; import { APPLICATION_JSON_CONTENT_TYPE_HEADER, PAGE_SIZE, diff --git a/openmetadata-ui/src/main/resources/ui/src/rest/dataModelsAPI.ts b/openmetadata-ui/src/main/resources/ui/src/rest/dataModelsAPI.ts index 3a26eb58c70e..b4918a8eb121 100644 --- a/openmetadata-ui/src/main/resources/ui/src/rest/dataModelsAPI.ts +++ b/openmetadata-ui/src/main/resources/ui/src/rest/dataModelsAPI.ts @@ -13,7 +13,7 @@ import { AxiosResponse } from 'axios'; import { Operation } from 'fast-json-patch'; import { RestoreRequestType } from 'Models'; -import { QueryVote } from '../components/TableQueries/TableQueries.interface'; +import { QueryVote } from '../components/Database/TableQueries/TableQueries.interface'; import { APPLICATION_JSON_CONTENT_TYPE_HEADER } from '../constants/constants'; import { DashboardDataModel } from '../generated/entity/data/dashboardDataModel'; import { EntityHistory } from '../generated/type/entityHistory'; diff --git a/openmetadata-ui/src/main/resources/ui/src/rest/databaseAPI.ts b/openmetadata-ui/src/main/resources/ui/src/rest/databaseAPI.ts index c51b57f3cbc3..fab9594bdfbf 100644 --- a/openmetadata-ui/src/main/resources/ui/src/rest/databaseAPI.ts +++ b/openmetadata-ui/src/main/resources/ui/src/rest/databaseAPI.ts @@ -14,7 +14,7 @@ import { AxiosResponse } from 'axios'; import { Operation } from 'fast-json-patch'; import { PagingWithoutTotal, RestoreRequestType } from 'Models'; -import { QueryVote } from '../components/TableQueries/TableQueries.interface'; +import { QueryVote } from '../components/Database/TableQueries/TableQueries.interface'; import { Database, DatabaseProfilerConfig as ProfilerConfig, diff --git a/openmetadata-ui/src/main/resources/ui/src/rest/glossaryAPI.ts b/openmetadata-ui/src/main/resources/ui/src/rest/glossaryAPI.ts index 2f1dd095e3b3..f09848285637 100644 --- a/openmetadata-ui/src/main/resources/ui/src/rest/glossaryAPI.ts +++ b/openmetadata-ui/src/main/resources/ui/src/rest/glossaryAPI.ts @@ -14,7 +14,7 @@ import { AxiosResponse } from 'axios'; import { Operation } from 'fast-json-patch'; import { PagingResponse } from 'Models'; -import { VotingDataProps } from '../components/Voting/voting.interface'; +import { VotingDataProps } from '../components/Entity/Voting/voting.interface'; import { AddGlossaryToAssetsRequest } from '../generated/api/addGlossaryToAssetsRequest'; import { CreateGlossary } from '../generated/api/data/createGlossary'; import { CreateGlossaryTerm } from '../generated/api/data/createGlossaryTerm'; diff --git a/openmetadata-ui/src/main/resources/ui/src/rest/mlModelAPI.ts b/openmetadata-ui/src/main/resources/ui/src/rest/mlModelAPI.ts index 8ba909c4a244..7395821a5939 100644 --- a/openmetadata-ui/src/main/resources/ui/src/rest/mlModelAPI.ts +++ b/openmetadata-ui/src/main/resources/ui/src/rest/mlModelAPI.ts @@ -14,7 +14,7 @@ import { AxiosResponse } from 'axios'; import { Operation } from 'fast-json-patch'; import { PagingWithoutTotal, RestoreRequestType } from 'Models'; -import { QueryVote } from '../components/TableQueries/TableQueries.interface'; +import { QueryVote } from '../components/Database/TableQueries/TableQueries.interface'; import { APPLICATION_JSON_CONTENT_TYPE_HEADER } from '../constants/constants'; import { Mlmodel } from '../generated/entity/data/mlmodel'; import { EntityHistory } from '../generated/type/entityHistory'; diff --git a/openmetadata-ui/src/main/resources/ui/src/rest/permissionAPI.ts b/openmetadata-ui/src/main/resources/ui/src/rest/permissionAPI.ts index 0519de97e2c3..821e0d0d7ab8 100644 --- a/openmetadata-ui/src/main/resources/ui/src/rest/permissionAPI.ts +++ b/openmetadata-ui/src/main/resources/ui/src/rest/permissionAPI.ts @@ -11,7 +11,7 @@ * limitations under the License. */ -import { ResourceEntity } from '../components/PermissionProvider/PermissionProvider.interface'; +import { ResourceEntity } from '../context/PermissionProvider/PermissionProvider.interface'; import { ResourcePermission } from '../generated/entity/policies/accessControl/resourcePermission'; import { Paging } from '../generated/type/paging'; import { getEncodedFqn } from '../utils/StringsUtils'; diff --git a/openmetadata-ui/src/main/resources/ui/src/rest/pipelineAPI.ts b/openmetadata-ui/src/main/resources/ui/src/rest/pipelineAPI.ts index feb0a6935baa..2d1781b26dbd 100644 --- a/openmetadata-ui/src/main/resources/ui/src/rest/pipelineAPI.ts +++ b/openmetadata-ui/src/main/resources/ui/src/rest/pipelineAPI.ts @@ -14,7 +14,7 @@ import { AxiosResponse } from 'axios'; import { Operation } from 'fast-json-patch'; import { PagingResponse, PagingWithoutTotal, RestoreRequestType } from 'Models'; -import { QueryVote } from '../components/TableQueries/TableQueries.interface'; +import { QueryVote } from '../components/Database/TableQueries/TableQueries.interface'; import { APPLICATION_JSON_CONTENT_TYPE_HEADER } from '../constants/constants'; import { Pipeline, PipelineStatus } from '../generated/entity/data/pipeline'; import { EntityHistory } from '../generated/type/entityHistory'; diff --git a/openmetadata-ui/src/main/resources/ui/src/rest/queryAPI.ts b/openmetadata-ui/src/main/resources/ui/src/rest/queryAPI.ts index 46a09134b951..f46084dbb0a6 100644 --- a/openmetadata-ui/src/main/resources/ui/src/rest/queryAPI.ts +++ b/openmetadata-ui/src/main/resources/ui/src/rest/queryAPI.ts @@ -14,7 +14,7 @@ import { AxiosResponse } from 'axios'; import { Operation } from 'fast-json-patch'; import { PagingResponse } from 'Models'; -import { QueryVote } from '../components/TableQueries/TableQueries.interface'; +import { QueryVote } from '../components/Database/TableQueries/TableQueries.interface'; import { CreateQuery } from '../generated/api/data/createQuery'; import { Query } from '../generated/entity/data/query'; import { ListParams } from '../interface/API.interface'; diff --git a/openmetadata-ui/src/main/resources/ui/src/rest/storageAPI.ts b/openmetadata-ui/src/main/resources/ui/src/rest/storageAPI.ts index 2de6b80e9f2a..c0e70da79b1f 100644 --- a/openmetadata-ui/src/main/resources/ui/src/rest/storageAPI.ts +++ b/openmetadata-ui/src/main/resources/ui/src/rest/storageAPI.ts @@ -13,7 +13,7 @@ import { AxiosResponse } from 'axios'; import { Operation } from 'fast-json-patch'; import { PagingWithoutTotal, RestoreRequestType } from 'Models'; -import { QueryVote } from '../components/TableQueries/TableQueries.interface'; +import { QueryVote } from '../components/Database/TableQueries/TableQueries.interface'; import { APPLICATION_JSON_CONTENT_TYPE_HEADER } from '../constants/constants'; import { Container } from '../generated/entity/data/container'; import { EntityHistory } from '../generated/type/entityHistory'; diff --git a/openmetadata-ui/src/main/resources/ui/src/rest/storedProceduresAPI.ts b/openmetadata-ui/src/main/resources/ui/src/rest/storedProceduresAPI.ts index ec09651efecf..661e04e7a962 100644 --- a/openmetadata-ui/src/main/resources/ui/src/rest/storedProceduresAPI.ts +++ b/openmetadata-ui/src/main/resources/ui/src/rest/storedProceduresAPI.ts @@ -13,7 +13,7 @@ import { AxiosResponse } from 'axios'; import { Operation } from 'fast-json-patch'; import { PagingResponse, RestoreRequestType } from 'Models'; -import { QueryVote } from '../components/TableQueries/TableQueries.interface'; +import { QueryVote } from '../components/Database/TableQueries/TableQueries.interface'; import { APPLICATION_JSON_CONTENT_TYPE_HEADER } from '../constants/constants'; import { StoredProcedure } from '../generated/entity/data/storedProcedure'; import { EntityHistory } from '../generated/type/entityHistory'; diff --git a/openmetadata-ui/src/main/resources/ui/src/rest/tableAPI.ts b/openmetadata-ui/src/main/resources/ui/src/rest/tableAPI.ts index 132a6bf025d7..8b3e7a00d10a 100644 --- a/openmetadata-ui/src/main/resources/ui/src/rest/tableAPI.ts +++ b/openmetadata-ui/src/main/resources/ui/src/rest/tableAPI.ts @@ -14,7 +14,7 @@ import { AxiosResponse } from 'axios'; import { Operation } from 'fast-json-patch'; import { PagingResponse, RestoreRequestType } from 'Models'; -import { QueryVote } from '../components/TableQueries/TableQueries.interface'; +import { QueryVote } from '../components/Database/TableQueries/TableQueries.interface'; import { APPLICATION_JSON_CONTENT_TYPE_HEADER } from '../constants/constants'; import { SystemProfile } from '../generated/api/data/createTableProfile'; import { diff --git a/openmetadata-ui/src/main/resources/ui/src/rest/topicsAPI.ts b/openmetadata-ui/src/main/resources/ui/src/rest/topicsAPI.ts index 876314a5c8c0..90731eb2eb25 100644 --- a/openmetadata-ui/src/main/resources/ui/src/rest/topicsAPI.ts +++ b/openmetadata-ui/src/main/resources/ui/src/rest/topicsAPI.ts @@ -14,7 +14,7 @@ import { AxiosResponse } from 'axios'; import { Operation } from 'fast-json-patch'; import { PagingWithoutTotal, RestoreRequestType } from 'Models'; -import { QueryVote } from '../components/TableQueries/TableQueries.interface'; +import { QueryVote } from '../components/Database/TableQueries/TableQueries.interface'; import { APPLICATION_JSON_CONTENT_TYPE_HEADER } from '../constants/constants'; import { Topic } from '../generated/entity/data/topic'; import { EntityHistory } from '../generated/type/entityHistory'; diff --git a/openmetadata-ui/src/main/resources/ui/src/utils/Alerts/AlertsUtil.tsx b/openmetadata-ui/src/main/resources/ui/src/utils/Alerts/AlertsUtil.tsx index cedf838716c5..2b6015489bff 100644 --- a/openmetadata-ui/src/main/resources/ui/src/utils/Alerts/AlertsUtil.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/utils/Alerts/AlertsUtil.tsx @@ -22,7 +22,7 @@ import { ReactComponent as MailIcon } from '../../assets/svg/ic-mail.svg'; import { ReactComponent as MSTeamsIcon } from '../../assets/svg/ms-teams.svg'; import { ReactComponent as SlackIcon } from '../../assets/svg/slack.svg'; import { ReactComponent as WebhookIcon } from '../../assets/svg/webhook.svg'; -import { AsyncSelect } from '../../components/AsyncSelect/AsyncSelect'; +import { AsyncSelect } from '../../components/common/AsyncSelect/AsyncSelect'; import { DESTINATION_TYPE_BASED_PLACEHOLDERS, EXTERNAL_CATEGORY_OPTIONS, diff --git a/openmetadata-ui/src/main/resources/ui/src/utils/Assets/AssetsUtils.ts b/openmetadata-ui/src/main/resources/ui/src/utils/Assets/AssetsUtils.ts index 7d307c33479f..cdd36212dd27 100644 --- a/openmetadata-ui/src/main/resources/ui/src/utils/Assets/AssetsUtils.ts +++ b/openmetadata-ui/src/main/resources/ui/src/utils/Assets/AssetsUtils.ts @@ -13,7 +13,7 @@ import { AxiosError } from 'axios'; import { compare, Operation } from 'fast-json-patch'; import { EntityDetailUnion } from 'Models'; -import { MapPatchAPIResponse } from '../../components/Assets/AssetsSelectionModal/AssetSelectionModal.interface'; +import { MapPatchAPIResponse } from '../../components/DataAssets/AssetsSelectionModal/AssetSelectionModal.interface'; import { AssetsOfEntity } from '../../components/Glossary/GlossaryTerms/tabs/AssetsTabs.interface'; import { EntityType } from '../../enums/entity.enum'; import { Table } from '../../generated/entity/data/table'; diff --git a/openmetadata-ui/src/main/resources/ui/src/utils/ClassificationUtils.tsx b/openmetadata-ui/src/main/resources/ui/src/utils/ClassificationUtils.tsx index e0268af33447..f997affc8c76 100644 --- a/openmetadata-ui/src/main/resources/ui/src/utils/ClassificationUtils.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/utils/ClassificationUtils.tsx @@ -20,8 +20,8 @@ import { ReactComponent as IconDisableTag } from '../assets/svg/disable-tag.svg' import { ReactComponent as EditIcon } from '../assets/svg/edit-new.svg'; import { ManageButtonItemLabel } from '../components/common/ManageButtonContentItem/ManageButtonContentItem.component'; import RichTextEditorPreviewer from '../components/common/RichTextEditor/RichTextEditorPreviewer'; -import { OperationPermission } from '../components/PermissionProvider/PermissionProvider.interface'; import { DE_ACTIVE_COLOR, NO_DATA_PLACEHOLDER } from '../constants/constants'; +import { OperationPermission } from '../context/PermissionProvider/PermissionProvider.interface'; import { ProviderType } from '../generated/entity/bot'; import { Tag } from '../generated/entity/classification/tag'; import { DeleteTagsType } from '../pages/TagsPage/TagsPage.interface'; 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 a6c4846c0545..a02e31584633 100644 --- a/openmetadata-ui/src/main/resources/ui/src/utils/CommonUtils.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/utils/CommonUtils.tsx @@ -43,7 +43,7 @@ import { getHourCron, } from '../components/common/CronEditor/CronEditor.constant'; import ErrorPlaceHolder from '../components/common/ErrorWithPlaceholder/ErrorPlaceHolder'; -import Loader from '../components/Loader/Loader'; +import Loader from '../components/common/Loader/Loader'; import { FQN_SEPARATOR_CHAR } from '../constants/char.constants'; import { getContainerDetailPath, diff --git a/openmetadata-ui/src/main/resources/ui/src/utils/CustomizableLandingPageUtils.tsx b/openmetadata-ui/src/main/resources/ui/src/utils/CustomizableLandingPageUtils.tsx index 8caa87b048e3..2770e43ea001 100644 --- a/openmetadata-ui/src/main/resources/ui/src/utils/CustomizableLandingPageUtils.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/utils/CustomizableLandingPageUtils.tsx @@ -22,7 +22,7 @@ import { } from 'lodash'; import React from 'react'; import { Layout } from 'react-grid-layout'; -import EmptyWidgetPlaceholder from '../components/CustomizableComponents/EmptyWidgetPlaceholder/EmptyWidgetPlaceholder'; +import EmptyWidgetPlaceholder from '../components/MyData/CustomizableComponents/EmptyWidgetPlaceholder/EmptyWidgetPlaceholder'; import { SIZE } from '../enums/common.enum'; import { LandingPageWidgetKeys, diff --git a/openmetadata-ui/src/main/resources/ui/src/utils/CustomizePageClassBase.ts b/openmetadata-ui/src/main/resources/ui/src/utils/CustomizePageClassBase.ts index 20ce9617ddc5..6c5e80533077 100644 --- a/openmetadata-ui/src/main/resources/ui/src/utils/CustomizePageClassBase.ts +++ b/openmetadata-ui/src/main/resources/ui/src/utils/CustomizePageClassBase.ts @@ -21,7 +21,6 @@ import MyDataImg from '../assets/img/my-data.png'; import RecentViewsImg from '../assets/img/recent-views.png'; import TotalAssetsMediumImg from '../assets/img/total-assets-medium.png'; import TotalAssetsImg from '../assets/img/total-assets.png'; -import KPIWidget from '../components/KPIWidget/KPIWidget.component'; import { MyDataWidget } from '../components/MyData/MyDataWidget/MyDataWidget.component'; import AnnouncementsWidget, { AnnouncementsWidgetProps, @@ -29,9 +28,10 @@ import AnnouncementsWidget, { import FollowingWidget, { FollowingWidgetProps, } from '../components/MyData/RightSidebar/FollowingWidget'; -import TotalDataAssetsWidget from '../components/TotalDataAssetsWidget/TotalDataAssetsWidget.component'; -import FeedsWidget from '../components/Widgets/FeedsWidget/FeedsWidget.component'; -import RecentlyViewed from '../components/Widgets/RecentlyViewed/RecentlyViewed'; +import FeedsWidget from '../components/MyData/Widgets/FeedsWidget/FeedsWidget.component'; +import KPIWidget from '../components/MyData/Widgets/KPIWidget/KPIWidget.component'; +import RecentlyViewed from '../components/MyData/Widgets/RecentlyViewed/RecentlyViewed'; +import TotalDataAssetsWidget from '../components/MyData/Widgets/TotalDataAssetsWidget/TotalDataAssetsWidget.component'; import { LandingPageWidgetKeys, WidgetWidths, diff --git a/openmetadata-ui/src/main/resources/ui/src/utils/DataQualityAndProfilerUtils.ts b/openmetadata-ui/src/main/resources/ui/src/utils/DataQualityAndProfilerUtils.ts index 8f3841e63d89..7eef973b17c3 100644 --- a/openmetadata-ui/src/main/resources/ui/src/utils/DataQualityAndProfilerUtils.ts +++ b/openmetadata-ui/src/main/resources/ui/src/utils/DataQualityAndProfilerUtils.ts @@ -11,7 +11,7 @@ * limitations under the License. */ -import { TableTestsType } from '../components/TableProfiler/TableProfiler.interface'; +import { TableTestsType } from '../components/Database/TableProfiler/TableProfiler.interface'; import { TestCaseStatus } from '../generated/tests/testCase'; export const updateTestResults = ( diff --git a/openmetadata-ui/src/main/resources/ui/src/utils/EntityImport/EntityImportUtils.test.ts b/openmetadata-ui/src/main/resources/ui/src/utils/EntityImport/EntityImportUtils.test.ts index b152783c739e..9aba9d56ea9c 100644 --- a/openmetadata-ui/src/main/resources/ui/src/utils/EntityImport/EntityImportUtils.test.ts +++ b/openmetadata-ui/src/main/resources/ui/src/utils/EntityImport/EntityImportUtils.test.ts @@ -10,7 +10,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -import { TeamCSVRecord } from '../../components/Team/TeamImportResult/TeamImportResult.interface'; +import { TeamCSVRecord } from '../../components/Settings/Team/TeamImportResult/TeamImportResult.interface'; import { MOCK_CSV_GLOSSARY_DATA } from '../../mocks/Glossary.mock'; import { MOCK_CSV_TEAM_DATA } from '../../mocks/Teams.mock'; import { parseCSV } from './EntityImportUtils'; 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 a2db0ae37750..f6007d536f3e 100644 --- a/openmetadata-ui/src/main/resources/ui/src/utils/EntityLineageUtils.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/utils/EntityLineageUtils.tsx @@ -35,6 +35,7 @@ import { ReactComponent as MlModelIcon } from '../assets/svg/mlmodal.svg'; import { ReactComponent as PipelineIcon } from '../assets/svg/pipeline-grey.svg'; import { ReactComponent as TableIcon } from '../assets/svg/table-grey.svg'; import { ReactComponent as TopicIcon } from '../assets/svg/topic-grey.svg'; +import Loader from '../components/common/Loader/Loader'; import { CustomEdge } from '../components/Entity/EntityLineage/CustomEdge.component'; import CustomNodeV1 from '../components/Entity/EntityLineage/CustomNodeV1.component'; import { @@ -46,7 +47,6 @@ import { } from '../components/Entity/EntityLineage/EntityLineage.interface'; import { ExploreSearchIndex } from '../components/Explore/ExplorePage.interface'; import { EdgeDetails } from '../components/Lineage/Lineage.interface'; -import Loader from '../components/Loader/Loader'; import { SourceType } from '../components/SearchedData/SearchedData.interface'; import { INFO_COLOR } from '../constants/constants'; import { 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 c5517670b442..ee2d24bfdb4c 100644 --- a/openmetadata-ui/src/main/resources/ui/src/utils/EntityUtils.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/utils/EntityUtils.tsx @@ -28,6 +28,7 @@ import { OwnerLabel } from '../components/common/OwnerLabel/OwnerLabel.component import ProfilePicture from '../components/common/ProfilePicture/ProfilePicture'; import QueryCount from '../components/common/QueryCount/QueryCount.component'; import { DataAssetsWithoutServiceField } from '../components/DataAssets/DataAssetsHeader/DataAssetsHeader.interface'; +import { QueryVoteType } from '../components/Database/TableQueries/TableQueries.interface'; import { LeafNodes, LineagePos, @@ -37,12 +38,10 @@ import { EntityUnion, EntityWithServices, } from '../components/Explore/ExplorePage.interface'; -import { ResourceEntity } from '../components/PermissionProvider/PermissionProvider.interface'; import { SearchedDataProps, SourceType, } from '../components/SearchedData/SearchedData.interface'; -import { QueryVoteType } from '../components/TableQueries/TableQueries.interface'; import { FQN_SEPARATOR_CHAR } from '../constants/char.constants'; import { getContainerDetailPath, @@ -62,6 +61,7 @@ import { ROUTES, } from '../constants/constants'; import { GlobalSettingsMenuCategory } from '../constants/GlobalSettings.constants'; +import { ResourceEntity } from '../context/PermissionProvider/PermissionProvider.interface'; import { AssetsType, EntityType, FqnPart } from '../enums/entity.enum'; import { ExplorePageTabs } from '../enums/Explore.enum'; import { SearchIndex } from '../enums/search.enum'; diff --git a/openmetadata-ui/src/main/resources/ui/src/utils/FeedUtils.tsx b/openmetadata-ui/src/main/resources/ui/src/utils/FeedUtils.tsx index b20a251b083e..3b58814dade1 100644 --- a/openmetadata-ui/src/main/resources/ui/src/utils/FeedUtils.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/utils/FeedUtils.tsx @@ -20,8 +20,8 @@ import React from 'react'; import ReactDOM from 'react-dom'; import Showdown from 'showdown'; import TurndownService from 'turndown'; +import { MentionSuggestionsItem } from '../components/ActivityFeed/FeedEditor/FeedEditor.interface'; import { UserTeam } from '../components/common/AssigneeList/AssigneeList.interface'; -import { MentionSuggestionsItem } from '../components/FeedEditor/FeedEditor.interface'; import { FQN_SEPARATOR_CHAR } from '../constants/char.constants'; import { entityLinkRegEx, diff --git a/openmetadata-ui/src/main/resources/ui/src/utils/GlobalSettingsUtils.tsx b/openmetadata-ui/src/main/resources/ui/src/utils/GlobalSettingsUtils.tsx index 00ae9df5a8f7..698a1ade11f4 100644 --- a/openmetadata-ui/src/main/resources/ui/src/utils/GlobalSettingsUtils.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/utils/GlobalSettingsUtils.tsx @@ -41,15 +41,15 @@ import { ReactComponent as StoredProcedureIcon } from '../assets/svg/stored-proc import { ReactComponent as TableIcon } from '../assets/svg/table-colored.svg'; import { ReactComponent as TeamsIcon } from '../assets/svg/teams-colored.svg'; import { ReactComponent as UsersIcon } from '../assets/svg/user-colored.svg'; -import { - ResourceEntity, - UIPermission, -} from '../components/PermissionProvider/PermissionProvider.interface'; import { PLACEHOLDER_ROUTE_FQN, ROUTES } from '../constants/constants'; import { GlobalSettingOptions, GlobalSettingsMenuCategory, } from '../constants/GlobalSettings.constants'; +import { + ResourceEntity, + UIPermission, +} from '../context/PermissionProvider/PermissionProvider.interface'; import { EntityType } from '../enums/entity.enum'; import { userPermissions } from '../utils/PermissionsUtils'; import { getSettingPath } from './RouterUtils'; diff --git a/openmetadata-ui/src/main/resources/ui/src/utils/LogsViewer.utils.ts b/openmetadata-ui/src/main/resources/ui/src/utils/LogsViewer.utils.ts index 737d4ccf861a..1e0e97eef2ab 100644 --- a/openmetadata-ui/src/main/resources/ui/src/utils/LogsViewer.utils.ts +++ b/openmetadata-ui/src/main/resources/ui/src/utils/LogsViewer.utils.ts @@ -12,7 +12,7 @@ */ import { isUndefined, startCase } from 'lodash'; -import { TableProfilerTab } from '../components/ProfilerDashboard/profilerDashboard.interface'; +import { TableProfilerTab } from '../components/Database/Profiler/ProfilerDashboard/profilerDashboard.interface'; import { getTableTabPath } from '../constants/constants'; import { GlobalSettingOptions } from '../constants/GlobalSettings.constants'; import { OPEN_METADATA } from '../constants/service-guide.constant'; diff --git a/openmetadata-ui/src/main/resources/ui/src/utils/PermissionsUtils.ts b/openmetadata-ui/src/main/resources/ui/src/utils/PermissionsUtils.ts index 734d095a3519..49cc70ab61d8 100644 --- a/openmetadata-ui/src/main/resources/ui/src/utils/PermissionsUtils.ts +++ b/openmetadata-ui/src/main/resources/ui/src/utils/PermissionsUtils.ts @@ -15,7 +15,7 @@ import { OperationPermission, ResourceEntity, UIPermission, -} from '../components/PermissionProvider/PermissionProvider.interface'; +} from '../context/PermissionProvider/PermissionProvider.interface'; import { Access, Permission, diff --git a/openmetadata-ui/src/main/resources/ui/src/utils/Query/QueryUtils.ts b/openmetadata-ui/src/main/resources/ui/src/utils/Query/QueryUtils.ts index a71a8783f525..b3838d703d76 100644 --- a/openmetadata-ui/src/main/resources/ui/src/utils/Query/QueryUtils.ts +++ b/openmetadata-ui/src/main/resources/ui/src/utils/Query/QueryUtils.ts @@ -12,11 +12,11 @@ */ import Qs from 'qs'; -import { SearchDropdownOption } from '../../components/SearchDropdown/SearchDropdown.interface'; import { QuerySearchFilterType, QuerySearchParams, -} from '../../components/TableQueries/TableQueries.interface'; +} from '../../components/Database/TableQueries/TableQueries.interface'; +import { SearchDropdownOption } from '../../components/SearchDropdown/SearchDropdown.interface'; export const createQueryFilter = ( allFilter: SearchDropdownOption[], diff --git a/openmetadata-ui/src/main/resources/ui/src/utils/SearchClassBase.ts b/openmetadata-ui/src/main/resources/ui/src/utils/SearchClassBase.ts index eba3a9d5a0c6..2eee6e70a399 100644 --- a/openmetadata-ui/src/main/resources/ui/src/utils/SearchClassBase.ts +++ b/openmetadata-ui/src/main/resources/ui/src/utils/SearchClassBase.ts @@ -27,10 +27,6 @@ import { ReactComponent as TableIcon } from '../assets/svg/ic-table.svg'; import { ReactComponent as TopicIcon } from '../assets/svg/ic-topic.svg'; import { ReactComponent as IconTable } from '../assets/svg/table-grey.svg'; import { ExploreSearchIndex } from '../components/Explore/ExplorePage.interface'; -import { - Option, - SearchSuggestions, -} from '../components/GlobalSearchProvider/GlobalSearchSuggestions/GlobalSearchSuggestions.interface'; import { SourceType } from '../components/SearchedData/SearchedData.interface'; import { COMMON_DROPDOWN_ITEMS, @@ -53,6 +49,10 @@ import { TAGS_INITIAL_SORT_FIELD, TAGS_INITIAL_SORT_ORDER, } from '../constants/explore.constants'; +import { + Option, + SearchSuggestions, +} from '../context/GlobalSearchProvider/GlobalSearchSuggestions/GlobalSearchSuggestions.interface'; import { EntityType } from '../enums/entity.enum'; import { SearchIndex } from '../enums/search.enum'; import { SearchSourceAlias } from '../interface/search.interface'; diff --git a/openmetadata-ui/src/main/resources/ui/src/utils/SearchUtils.tsx b/openmetadata-ui/src/main/resources/ui/src/utils/SearchUtils.tsx index 8cc9d6518c39..641921057068 100644 --- a/openmetadata-ui/src/main/resources/ui/src/utils/SearchUtils.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/utils/SearchUtils.tsx @@ -26,14 +26,14 @@ import { ReactComponent as IconPipeline } from '../assets/svg/pipeline-grey.svg' import { ReactComponent as IconTable } from '../assets/svg/table-grey.svg'; import { ReactComponent as IconTag } from '../assets/svg/tag-grey.svg'; import { ReactComponent as IconTopic } from '../assets/svg/topic-grey.svg'; -import { - Option, - SearchSuggestions, -} from '../components/GlobalSearchProvider/GlobalSearchSuggestions/GlobalSearchSuggestions.interface'; import { FQN_SEPARATOR_CHAR, WILD_CARD_CHAR, } from '../constants/char.constants'; +import { + Option, + SearchSuggestions, +} from '../context/GlobalSearchProvider/GlobalSearchSuggestions/GlobalSearchSuggestions.interface'; import { EntityType, FqnPart } from '../enums/entity.enum'; import { SearchIndex } from '../enums/search.enum'; import { SearchSourceAlias } from '../interface/search.interface'; diff --git a/openmetadata-ui/src/main/resources/ui/src/utils/ServiceUtilClassBase.ts b/openmetadata-ui/src/main/resources/ui/src/utils/ServiceUtilClassBase.ts index 5fee6fdf94ff..a0c3cd004204 100644 --- a/openmetadata-ui/src/main/resources/ui/src/utils/ServiceUtilClassBase.ts +++ b/openmetadata-ui/src/main/resources/ui/src/utils/ServiceUtilClassBase.ts @@ -12,7 +12,6 @@ */ import { cloneDeep } from 'lodash'; -import { SearchSuggestions } from '../components/GlobalSearchProvider/GlobalSearchSuggestions/GlobalSearchSuggestions.interface'; import { AIRBYTE, AIRFLOW, @@ -89,6 +88,7 @@ import { UNITYCATALOG, VERTICA, } from '../constants/Services.constant'; +import { SearchSuggestions } from '../context/GlobalSearchProvider/GlobalSearchSuggestions/GlobalSearchSuggestions.interface'; import { StorageServiceType } from '../generated/entity/data/container'; import { DashboardServiceType } from '../generated/entity/data/dashboard'; import { DatabaseServiceType } from '../generated/entity/data/database'; diff --git a/openmetadata-ui/src/main/resources/ui/src/utils/ServiceUtils.tsx b/openmetadata-ui/src/main/resources/ui/src/utils/ServiceUtils.tsx index 822d3baa5ce5..c0ad9a70c3e2 100644 --- a/openmetadata-ui/src/main/resources/ui/src/utils/ServiceUtils.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/utils/ServiceUtils.tsx @@ -16,13 +16,13 @@ import cryptoRandomString from 'crypto-random-string-with-promisify-polyfill'; import { t } from 'i18next'; import { ServiceTypes } from 'Models'; import React from 'react'; -import { ResourceEntity } from '../components/PermissionProvider/PermissionProvider.interface'; import { getDatabaseDetailsPath } from '../constants/constants'; import { GlobalSettingOptions } from '../constants/GlobalSettings.constants'; import { SERVICE_TYPES_ENUM, SERVICE_TYPE_MAP, } from '../constants/Services.constant'; +import { ResourceEntity } from '../context/PermissionProvider/PermissionProvider.interface'; import { PROMISE_STATE } from '../enums/common.enum'; import { EntityType } from '../enums/entity.enum'; import { SearchIndex } from '../enums/search.enum'; diff --git a/openmetadata-ui/src/main/resources/ui/src/utils/TableProfilerUtils.interface.ts b/openmetadata-ui/src/main/resources/ui/src/utils/TableProfilerUtils.interface.ts index cd4b1663789a..0914ea7b0f77 100644 --- a/openmetadata-ui/src/main/resources/ui/src/utils/TableProfilerUtils.interface.ts +++ b/openmetadata-ui/src/main/resources/ui/src/utils/TableProfilerUtils.interface.ts @@ -10,7 +10,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -import { MetricChartType } from '../components/ProfilerDashboard/profilerDashboard.interface'; +import { MetricChartType } from '../components/Database/Profiler/ProfilerDashboard/profilerDashboard.interface'; import { ColumnProfile } from '../generated/entity/data/table'; export interface ColumnMetricsInterface { diff --git a/openmetadata-ui/src/main/resources/ui/src/utils/TableProfilerUtils.ts b/openmetadata-ui/src/main/resources/ui/src/utils/TableProfilerUtils.ts index 7fe529a98679..0a715f4be344 100644 --- a/openmetadata-ui/src/main/resources/ui/src/utils/TableProfilerUtils.ts +++ b/openmetadata-ui/src/main/resources/ui/src/utils/TableProfilerUtils.ts @@ -12,7 +12,7 @@ */ import { findLast, isUndefined, last, sortBy } from 'lodash'; -import { MetricChartType } from '../components/ProfilerDashboard/profilerDashboard.interface'; +import { MetricChartType } from '../components/Database/Profiler/ProfilerDashboard/profilerDashboard.interface'; import { SystemProfile } from '../generated/api/data/createTableProfile'; import { Table, TableProfile } from '../generated/entity/data/table'; import { CustomMetric } from '../generated/tests/customMetric'; diff --git a/openmetadata-ui/src/main/resources/ui/src/utils/TableTags/TableTags.utils.tsx b/openmetadata-ui/src/main/resources/ui/src/utils/TableTags/TableTags.utils.tsx index 8f549c20619f..ae0c7a1bd459 100644 --- a/openmetadata-ui/src/main/resources/ui/src/utils/TableTags/TableTags.utils.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/utils/TableTags/TableTags.utils.tsx @@ -13,7 +13,7 @@ import { reduce } from 'lodash'; import { TagFilterOptions, TagsData } from 'Models'; -import { TableTagsProps } from '../../components/TableTags/TableTags.interface'; +import { TableTagsProps } from '../../components/Database/TableTags/TableTags.interface'; import { TagLabel, TagSource } from '../../generated/type/tagLabel'; export const getFilterTags = (tags: TagLabel[]): TableTagsProps => diff --git a/openmetadata-ui/src/main/resources/ui/src/utils/TagsUtils.tsx b/openmetadata-ui/src/main/resources/ui/src/utils/TagsUtils.tsx index c60044c6117f..a6ad13edb9b1 100644 --- a/openmetadata-ui/src/main/resources/ui/src/utils/TagsUtils.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/utils/TagsUtils.tsx @@ -20,8 +20,8 @@ import { EntityTags, TagOption } from 'Models'; import type { CustomTagProps } from 'rc-select/lib/BaseSelect'; import React from 'react'; import { ReactComponent as DeleteIcon } from '../assets/svg/ic-delete.svg'; +import Loader from '../components/common/Loader/Loader'; import RichTextEditorPreviewer from '../components/common/RichTextEditor/RichTextEditorPreviewer'; -import Loader from '../components/Loader/Loader'; import { FQN_SEPARATOR_CHAR } from '../constants/char.constants'; import { getExplorePath } from '../constants/constants'; import { SettledStatus } from '../enums/Axios.enum'; diff --git a/openmetadata-ui/src/main/resources/ui/src/utils/TopicDetailsUtils.ts b/openmetadata-ui/src/main/resources/ui/src/utils/TopicDetailsUtils.ts index e1ddf5e55dfc..20959667e6e1 100644 --- a/openmetadata-ui/src/main/resources/ui/src/utils/TopicDetailsUtils.ts +++ b/openmetadata-ui/src/main/resources/ui/src/utils/TopicDetailsUtils.ts @@ -11,7 +11,7 @@ * limitations under the License. */ -import { TopicConfigObjectInterface } from '../components/TopicDetails/TopicDetails.interface'; +import { TopicConfigObjectInterface } from '../components/Topic/TopicDetails/TopicDetails.interface'; import { Topic } from '../generated/entity/data/topic'; export const getConfigObject = ( diff --git a/openmetadata-ui/src/main/resources/ui/src/utils/formUtils.tsx b/openmetadata-ui/src/main/resources/ui/src/utils/formUtils.tsx index 226a9d764e68..a9fd02a470c9 100644 --- a/openmetadata-ui/src/main/resources/ui/src/utils/formUtils.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/utils/formUtils.tsx @@ -25,20 +25,20 @@ import { TooltipPlacement } from 'antd/lib/tooltip'; import classNames from 'classnames'; import { compact, startCase } from 'lodash'; import React, { Fragment, ReactNode } from 'react'; -import AsyncSelectList from '../components/AsyncSelectList/AsyncSelectList'; -import { AsyncSelectListProps } from '../components/AsyncSelectList/AsyncSelectList.interface'; +import AsyncSelectList from '../components/common/AsyncSelectList/AsyncSelectList'; +import { AsyncSelectListProps } from '../components/common/AsyncSelectList/AsyncSelectList.interface'; import ColorPicker from '../components/common/ColorPicker/ColorPicker.component'; import FilterPattern from '../components/common/FilterPattern/FilterPattern'; import { FilterPatternProps } from '../components/common/FilterPattern/filterPattern.interface'; +import FormItemLabel from '../components/common/Form/FormItemLabel'; import RichTextEditor from '../components/common/RichTextEditor/RichTextEditor'; import { RichTextEditorProp } from '../components/common/RichTextEditor/RichTextEditor.interface'; +import SliderWithInput from '../components/common/SliderWithInput/SliderWithInput'; +import { SliderWithInputProps } from '../components/common/SliderWithInput/SliderWithInput.interface'; import { UserSelectableList } from '../components/common/UserSelectableList/UserSelectableList.component'; import { UserSelectableListProps } from '../components/common/UserSelectableList/UserSelectableList.interface'; import { UserTeamSelectableList } from '../components/common/UserTeamSelectableList/UserTeamSelectableList.component'; import { UserSelectDropdownProps } from '../components/common/UserTeamSelectableList/UserTeamSelectableList.interface'; -import FormItemLabel from '../components/Form/FormItemLabel'; -import SliderWithInput from '../components/SliderWithInput/SliderWithInput'; -import { SliderWithInputProps } from '../components/SliderWithInput/SliderWithInput.interface'; import { FieldProp, FieldTypes } from '../interface/FormUtils.interface'; import TagSuggestion, { TagSuggestionProps, From ab03da6d3b824c6bbaf3c810f006707e49737aa6 Mon Sep 17 00:00:00 2001 From: Chirag Madlani <12962843+chirag-madlani@users.noreply.github.com> Date: Thu, 15 Feb 2024 21:34:15 +0530 Subject: [PATCH 2/3] fix tests --- .../ActivityFeedCard/PopoverContent.test.tsx | 2 +- .../ActivityFeedEditor.test.tsx | 2 +- .../FeedEditor/FeedEditor.test.tsx | 2 +- .../ActivityFeed/Reactions/Emoji.test.tsx | 4 +- .../ActivityFeed/Reactions/Reaction.test.tsx | 2 +- .../src/components/AppTour/AppTour.test.tsx | 2 +- .../ContainerDataModel.test.tsx | 18 ++--- .../DashboardDetails.test.tsx | 30 +++---- .../DashboardVersion.test.tsx | 60 ++++++-------- .../DataAssetAsyncSelectList.test.tsx | 8 +- .../EditTestCaseModal.test.tsx | 4 +- .../components/ParameterForm.test.tsx | 2 +- .../components/TestCaseForm.test.tsx | 4 +- .../TestCaseIncidentTab.test.tsx | 8 +- .../TestCaseResultTab.test.tsx | 8 +- .../TestCaseIncidentManagerStatus.test.tsx | 41 +++++----- .../SummaryPannel/SummaryPanel.test.tsx | 7 -- .../DataQuality/TestCases/TestCases.test.tsx | 47 +++++------ .../TestSuites/TestSuites.test.tsx | 25 +++--- .../DataQualityTab/DataQualityTab.test.tsx | 22 ++--- .../DataQualityTab/DataQualityTab.tsx | 4 +- .../DataQualityTab/data-quality-tab.less | 2 +- .../ProfilerDetailsCard.test.tsx | 4 +- .../ProfilerLatestValue.tsx | 5 +- .../ProfilerSettings.test.tsx | 4 +- .../Profiler/TestSummary/TestSummary.test.tsx | 12 +-- .../Profiler/TestSummary/TestSummary.tsx | 2 +- .../Profiler/TestSummary/test-summary.less | 2 +- .../TestSummaryCustomTooltip.test.tsx | 2 +- .../Database/SampleDataTable/RowData.test.tsx | 2 +- .../SampleDataTable/SampleDataTable.test.tsx | 6 +- .../StoredProcedureVersion.test.tsx | 28 +++---- .../TableDataCardBody.test.tsx | 28 +++---- .../ColumnProfileTable.test.tsx | 21 +++-- .../CustomMetricGraphs.test.tsx | 9 +-- .../ProfilerSettingsModal.test.tsx | 2 +- .../TableProfiler/TableProfiler.test.tsx | 43 +--------- .../TableProfilerChart.test.tsx | 16 ++-- .../Database/TableQueries/QueryCard.test.tsx | 4 +- .../QueryCardExtraOption.test.tsx | 6 +- .../QueryUsedByOtherTable.test.tsx | 4 +- .../TableQueries/TableQueries.test.tsx | 10 +-- .../TableQueryRightPanel.test.tsx | 12 +-- .../TableVersion/TableVersion.test.tsx | 30 +++---- .../DomainLeftPanel/DomainLeftPanel.test.tsx | 4 +- .../CustomEdge.component.test.tsx | 2 +- .../TaskTabIncidentManagerHeader.test.tsx | 17 ++-- .../AdvanceSearchProvider.test.tsx | 2 +- .../EntitySummaryPanel.test.tsx | 2 +- .../TableSummary/TableSummary.test.tsx | 2 +- .../TopicSummary/TopicSummary.test.tsx | 2 +- .../components/ExploreV1/ExploreV1.test.tsx | 2 +- .../GlossaryTermTab/GlossaryTermTab.test.tsx | 2 +- .../components/Glossary/GlossaryV1.test.tsx | 4 +- .../ImportGlossary/ImportGlossary.test.tsx | 2 +- .../src/components/Lineage/Lineage.test.tsx | 2 +- .../MlModelDetail.component.test.tsx | 4 + .../Modals/SchemaModal/SchemaModal.test.tsx | 2 +- .../AddWidgetModal/AddWidgetModal.test.tsx | 10 +-- .../AddWidgetTabContent.test.tsx | 2 +- .../CustomizeMyData/CustomizeMyData.test.tsx | 33 ++++---- .../GithubStarCard/GithubStarCard.test.tsx | 6 +- .../MyData/MyDataWidget/MyDataWidget.test.tsx | 2 +- .../RightSidebar/AnnouncementsWidget.test.tsx | 2 +- .../Widgets/FeedsWidget/FeedsWidget.test.tsx | 13 +-- .../RecentlyViewed/RecentlyViewed.test.tsx | 4 +- .../PageLayoutV1/PageLayoutV1.test.tsx | 2 +- .../SearchedData/SearchedData.test.tsx | 2 +- .../Settings/Users/UsersTab/UsersTab.test.tsx | 4 + .../Topic/TopicDetails/TopicDetails.test.tsx | 32 +++----- .../Topic/TopicSchema/TopicSchema.test.tsx | 4 +- .../Topic/TopicVersion/TopicVersion.test.tsx | 32 ++++---- .../AsyncSelectList/AsyncSelectList.test.tsx | 8 +- .../common/BrandImage/BrandImage.test.tsx | 15 ++-- .../CustomPropertyTable.test.tsx | 4 +- .../PropertyInput.test.tsx | 2 +- .../common/EntityImport/EntityImport.test.tsx | 7 +- .../common/ListView/ListView.test.tsx | 11 +-- .../PopOverCard/EntityPopOverCard.test.tsx | 17 ++-- .../ResizablePanels/ResziablePanels.test.tsx | 2 +- .../SearchBarComponent/Searchbar.test.tsx | 2 +- .../ServiceDocPanel/ServiceDocPanel.test.tsx | 16 ++-- .../TableDataCardV2/TableDataCardV2.test.tsx | 2 +- .../common/TierCard/TierCard.test.tsx | 2 +- .../hooks/user-profile/useUserProfile.test.ts | 2 +- .../AddCustomMetricPage.test.tsx | 14 ++-- .../AddDataQualityTestPage.test.tsx | 19 +++-- .../AddIngestionPage.test.tsx | 5 +- .../TeamAndUserSelectItem.test.tsx | 2 +- .../pages/AddQueryPage/AddQueryPage.test.tsx | 6 +- .../AddServicePage/AddServicePage.test.tsx | 9 ++- .../src/pages/AppInstall/AppInstall.test.tsx | 13 +-- .../BotDetailsPage/BotDetailsPage.test.tsx | 15 ++-- .../src/pages/BotsPageV1/BotsPageV1.test.tsx | 2 +- .../ContainerPage/ContainerPage.test.tsx | 23 ++---- .../CreateUserPage/CreateUserPage.test.tsx | 17 ++-- .../CustomPropertiesPageV1.test.tsx | 23 +++--- .../CustomizablePage.test.tsx | 4 +- .../DashboardDetailsPage.test.tsx | 78 +++++++++--------- .../DataInsightHeader.test.tsx | 7 +- .../DataInsightPage/DataInsightPage.test.tsx | 2 +- .../pages/DataInsightPage/KPIList.test.tsx | 2 +- .../DataModelPage/DataModelPage.test.tsx | 80 ++++++++++--------- .../DataQuality/DataQualityPage.test.tsx | 2 +- .../DatabaseDetailsPage.test.tsx | 4 +- .../DatabaseSchemaPage.test.tsx | 8 +- .../DatabaseSchemaVersionPage.test.tsx | 8 +- .../DatabaseVersionPage.test.tsx | 8 +- .../EditConnectionFormPage.test.tsx | 24 +++--- .../EditEmailConfigPage.test.tsx | 24 +++--- .../EntityVersionPage.test.tsx | 37 +++++---- .../pages/ExplorePage/ExplorePageV1.test.tsx | 2 +- .../GlossaryLeftPanel.test.tsx | 2 +- .../GlossaryPage/GlossaryPage.test.tsx | 2 +- .../IncidentManagerDetailPage.test.tsx | 8 +- .../IncidentManagerPage.test.tsx | 17 ++-- .../ui/src/pages/KPIPage/EditKPIPage.test.tsx | 2 +- .../LogsViewer/LogsViewer.component.test.tsx | 2 +- .../src/pages/MyDataPage/MyDataPage.test.tsx | 21 ++--- .../PersonaDetailsPage.test.tsx | 2 +- .../PersonaListPage/PersonaPage.test.tsx | 4 +- .../PipelineDetailsPage.test.tsx | 11 ++- .../PoliciesDetailPage/AddRulePage.test.tsx | 2 +- .../PoliciesDetailPage/EditRulePage.test.tsx | 2 +- .../PoliciesDetailPage.test.tsx | 2 +- .../PoliciesListPage.test.tsx | 4 +- .../ui/src/pages/QueryPage/QueryPage.test.tsx | 6 +- .../AddAttributeModal.test.tsx | 2 +- .../RolesDetailPage/RolesDetailPage.test.tsx | 2 +- .../RolesListPage/RolesListPage.test.tsx | 2 +- .../SearchIndexDetailsPage.test.tsx | 6 +- .../SearchIndexFieldsTab.test.tsx | 14 ++-- .../SearchIndexFieldsTable.test.tsx | 4 +- .../ServiceVersionPage.test.tsx | 6 +- .../ui/src/pages/SignUp/SignUpPage.test.tsx | 5 +- .../StoredProcedurePage.test.tsx | 8 +- .../StoredProcedureTab.test.tsx | 2 +- .../TableDetailsPageV1.test.tsx | 23 +++--- .../ui/src/pages/TagsPage/TagsPage.test.tsx | 2 +- .../ImportTeamsPage/ImportTeamsPage.test.tsx | 8 +- .../TestSuiteDetailsPage.test.tsx | 17 ++-- .../TopicDetails/TopicDetailsPage.test.tsx | 4 +- .../ui/src/pages/TourPage/TourPage.test.tsx | 2 +- .../UserListPage/UserListPageV1.test.tsx | 2 +- .../ui/src/pages/UserPage/UserPage.test.tsx | 4 +- 145 files changed, 715 insertions(+), 766 deletions(-) diff --git a/openmetadata-ui/src/main/resources/ui/src/components/ActivityFeed/ActivityFeedCard/PopoverContent.test.tsx b/openmetadata-ui/src/main/resources/ui/src/components/ActivityFeed/ActivityFeedCard/PopoverContent.test.tsx index 1f68d30a4db1..1ea2a8ac9129 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/ActivityFeed/ActivityFeedCard/PopoverContent.test.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/components/ActivityFeed/ActivityFeedCard/PopoverContent.test.tsx @@ -62,7 +62,7 @@ jest.mock('../../../constants/reactions.constant', () => ({ ], })); -jest.mock('../../Reactions/Reaction', () => { +jest.mock('../Reactions/Reaction', () => { return jest.fn().mockReturnValue(
Reaction
); }); diff --git a/openmetadata-ui/src/main/resources/ui/src/components/ActivityFeed/ActivityFeedEditor/ActivityFeedEditor.test.tsx b/openmetadata-ui/src/main/resources/ui/src/components/ActivityFeed/ActivityFeedEditor/ActivityFeedEditor.test.tsx index 036227e853fb..a0ad03d6ded2 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/ActivityFeed/ActivityFeedEditor/ActivityFeedEditor.test.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/components/ActivityFeed/ActivityFeedEditor/ActivityFeedEditor.test.tsx @@ -27,7 +27,7 @@ jest.mock('../../../utils/FeedUtils', () => ({ HTMLToMarkdown: jest.fn().mockReturnValue({ turndown: jest.fn() }), })); -jest.mock('../../FeedEditor/FeedEditor', () => ({ +jest.mock('../FeedEditor/FeedEditor', () => ({ __esModule: true, FeedEditor: forwardRef( jest.fn().mockImplementation(({ onChangeHandler, onSave }, ref) => { diff --git a/openmetadata-ui/src/main/resources/ui/src/components/ActivityFeed/FeedEditor/FeedEditor.test.tsx b/openmetadata-ui/src/main/resources/ui/src/components/ActivityFeed/FeedEditor/FeedEditor.test.tsx index 3326058df76c..4ed977fa498d 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/ActivityFeed/FeedEditor/FeedEditor.test.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/components/ActivityFeed/FeedEditor/FeedEditor.test.tsx @@ -73,7 +73,7 @@ jest.mock('react-quill', () => { }; }); -jest.mock('../../utils/QuillLink/QuillLink', () => { +jest.mock('../../../utils/QuillLink/QuillLink', () => { return jest.fn(); }); diff --git a/openmetadata-ui/src/main/resources/ui/src/components/ActivityFeed/Reactions/Emoji.test.tsx b/openmetadata-ui/src/main/resources/ui/src/components/ActivityFeed/Reactions/Emoji.test.tsx index 00e06a5648bc..c4844d71e5f0 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/ActivityFeed/Reactions/Emoji.test.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/components/ActivityFeed/Reactions/Emoji.test.tsx @@ -24,11 +24,11 @@ const mockUserData: User = { id: '2e424734-761a-443f-bf2a-a5b361823c80', }; -jest.mock('../../hooks/useImage', () => +jest.mock('../../../hooks/useImage', () => jest.fn().mockReturnValue({ image: null }) ); -jest.mock('../Auth/AuthProviders/AuthProvider', () => ({ +jest.mock('../../Auth/AuthProviders/AuthProvider', () => ({ useAuthContext: jest.fn(() => ({ currentUser: mockUserData, })), diff --git a/openmetadata-ui/src/main/resources/ui/src/components/ActivityFeed/Reactions/Reaction.test.tsx b/openmetadata-ui/src/main/resources/ui/src/components/ActivityFeed/Reactions/Reaction.test.tsx index 17449cf7bd36..72f6417a097c 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/ActivityFeed/Reactions/Reaction.test.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/components/ActivityFeed/Reactions/Reaction.test.tsx @@ -19,7 +19,7 @@ import Reaction from './Reaction'; const onReactionSelect = jest.fn(); const onHide = jest.fn(); -jest.mock('../../hooks/useImage', () => +jest.mock('../../../hooks/useImage', () => jest.fn().mockReturnValue({ image: null }) ); diff --git a/openmetadata-ui/src/main/resources/ui/src/components/AppTour/AppTour.test.tsx b/openmetadata-ui/src/main/resources/ui/src/components/AppTour/AppTour.test.tsx index a534327fd193..e041046e12d9 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/AppTour/AppTour.test.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/components/AppTour/AppTour.test.tsx @@ -55,7 +55,7 @@ const mockUseTourProvider = jest.fn().mockReturnValue({ updateTourPage: mockUpdateTourPage, }); -jest.mock('../TourProvider/TourProvider', () => ({ +jest.mock('../../context/TourProvider/TourProvider', () => ({ useTourProvider: jest.fn().mockImplementation(() => mockUseTourProvider()), })); diff --git a/openmetadata-ui/src/main/resources/ui/src/components/Container/ContainerDataModel/ContainerDataModel.test.tsx b/openmetadata-ui/src/main/resources/ui/src/components/Container/ContainerDataModel/ContainerDataModel.test.tsx index 257aaa4aa2bd..b36cc25715ec 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/Container/ContainerDataModel/ContainerDataModel.test.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/components/Container/ContainerDataModel/ContainerDataModel.test.tsx @@ -119,7 +119,7 @@ jest.mock( ); jest.mock( - '../../../components/Modals/ModalWithMarkdownEditor/ModalWithMarkdownEditor', + '../../Modals/ModalWithMarkdownEditor/ModalWithMarkdownEditor', () => ({ ModalWithMarkdownEditor: jest .fn() @@ -127,7 +127,7 @@ jest.mock( }) ); -jest.mock('../../../components/TableTags/TableTags.component', () => +jest.mock('../../Database/TableTags/TableTags.component', () => jest .fn() .mockImplementation(() => ( @@ -135,14 +135,12 @@ jest.mock('../../../components/TableTags/TableTags.component', () => )) ); -jest.mock( - '../../../components/common/ErrorWithPlaceholder/ErrorPlaceHolder', - () => - jest - .fn() - .mockImplementation(() => ( -
ErrorPlaceHolder
- )) +jest.mock('../../common/ErrorWithPlaceholder/ErrorPlaceHolder', () => + jest + .fn() + .mockImplementation(() => ( +
ErrorPlaceHolder
+ )) ); describe('ContainerDataModel', () => { diff --git a/openmetadata-ui/src/main/resources/ui/src/components/Dashboard/DashboardDetails/DashboardDetails.test.tsx b/openmetadata-ui/src/main/resources/ui/src/components/Dashboard/DashboardDetails/DashboardDetails.test.tsx index c8d36df87a26..1ddeebef447f 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/Dashboard/DashboardDetails/DashboardDetails.test.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/components/Dashboard/DashboardDetails/DashboardDetails.test.tsx @@ -93,18 +93,18 @@ jest.mock('react-router-dom', () => ({ useParams: jest.fn().mockImplementation(() => mockParams), })); -jest.mock('../../components/TabsLabel/TabsLabel.component', () => { +jest.mock('../../common/TabsLabel/TabsLabel.component', () => { return jest.fn().mockImplementation(({ name }) =>

{name}

); }); -jest.mock('../common/EntityDescription/Description', () => { +jest.mock('../../common/EntityDescription/Description', () => { return jest.fn().mockReturnValue(

Description Component

); }); -jest.mock('../common/RichTextEditor/RichTextEditorPreviewer', () => { +jest.mock('../../common/RichTextEditor/RichTextEditorPreviewer', () => { return jest.fn().mockReturnValue(

RichTextEditorPreviwer

); }); -jest.mock('../PermissionProvider/PermissionProvider', () => ({ +jest.mock('../../../context/PermissionProvider/PermissionProvider', () => ({ usePermissionProvider: jest.fn().mockImplementation(() => ({ getEntityPermission: jest .fn() @@ -112,7 +112,7 @@ jest.mock('../PermissionProvider/PermissionProvider', () => ({ })), })); -jest.mock('../../components/TableTags/TableTags.component', () => +jest.mock('../../Database/TableTags/TableTags.component', () => jest .fn() .mockImplementation(() => ( @@ -120,24 +120,24 @@ jest.mock('../../components/TableTags/TableTags.component', () => )) ); -jest.mock('../FeedEditor/FeedEditor', () => { - return jest.fn().mockReturnValue(

FeedEditor

); -}); - -jest.mock('../../components/Lineage/Lineage.component', () => { +jest.mock('../../Lineage/Lineage.component', () => { return jest.fn().mockReturnValue(

Lineage

); }); -jest.mock('../common/CustomPropertyTable/CustomPropertyTable', () => ({ +jest.mock('../../common/CustomPropertyTable/CustomPropertyTable', () => ({ CustomPropertyTable: jest .fn() .mockReturnValue(

CustomPropertyTable.component

), })); -jest.mock('../../components/PageLayoutV1/PageLayoutV1', () => { +jest.mock('../../PageLayoutV1/PageLayoutV1', () => { return jest.fn().mockImplementation(({ children }) =>
{children}
); }); -jest.mock('../../utils/CommonUtils', () => ({ +jest.mock('../../ActivityFeed/FeedEditor/FeedEditor', () => { + return jest.fn().mockReturnValue(

FeedEditor.component

); +}); + +jest.mock('../../../utils/CommonUtils', () => ({ addToRecentViewed: jest.fn(), getCountBadge: jest.fn(), getPartialNameFromFQN: jest.fn().mockReturnValue('PartialNameFromFQN'), @@ -150,12 +150,12 @@ jest.mock('../../utils/CommonUtils', () => ({ getOwnerValue: jest.fn().mockReturnValue('Owner'), })); -jest.mock('../../utils/TagsUtils', () => ({ +jest.mock('../../../utils/TagsUtils', () => ({ getAllTagsList: jest.fn(() => Promise.resolve(mockTagList)), getTagsHierarchy: jest.fn().mockReturnValue([]), })); -jest.mock('../../utils/GlossaryUtils', () => ({ +jest.mock('../../../utils/GlossaryUtils', () => ({ getGlossaryTermsList: jest.fn(() => Promise.resolve(mockGlossaryList)), getGlossaryTermHierarchy: jest.fn().mockReturnValue([]), })); diff --git a/openmetadata-ui/src/main/resources/ui/src/components/Dashboard/DashboardVersion/DashboardVersion.test.tsx b/openmetadata-ui/src/main/resources/ui/src/components/Dashboard/DashboardVersion/DashboardVersion.test.tsx index 6d886027f8b7..2943e2cf4e75 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/Dashboard/DashboardVersion/DashboardVersion.test.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/components/Dashboard/DashboardVersion/DashboardVersion.test.tsx @@ -26,64 +26,52 @@ import { DashboardVersionProp } from './DashboardVersion.interface'; const mockPush = jest.fn(); -jest.mock( - '../../components/common/RichTextEditor/RichTextEditorPreviewer', - () => { - return jest - .fn() - .mockImplementation(() =>
RichTextEditorPreviewer.component
); - } -); +jest.mock('../../common/RichTextEditor/RichTextEditorPreviewer', () => { + return jest + .fn() + .mockImplementation(() =>
RichTextEditorPreviewer.component
); +}); -jest.mock('../../components/common/EntityDescription/DescriptionV1', () => { +jest.mock('../../common/EntityDescription/DescriptionV1', () => { return jest.fn().mockImplementation(() =>
Description.component
); }); -jest.mock( - '../../components/Entity/EntityVersionTimeLine/EntityVersionTimeLine', - () => { - return jest - .fn() - .mockImplementation(() =>
EntityVersionTimeLine.component
); - } -); +jest.mock('../../Entity/EntityVersionTimeLine/EntityVersionTimeLine', () => { + return jest + .fn() + .mockImplementation(() =>
EntityVersionTimeLine.component
); +}); -jest.mock('../../components/Loader/Loader', () => { +jest.mock('../../common/Loader/Loader', () => { return jest.fn().mockImplementation(() =>
Loader.component
); }); -jest.mock( - '../../components/common/ErrorWithPlaceholder/ErrorPlaceHolder', - () => { - return jest.fn().mockImplementation(() =>
ErrorPlaceHolder
); - } -); +jest.mock('../../common/ErrorWithPlaceholder/ErrorPlaceHolder', () => { + return jest.fn().mockImplementation(() =>
ErrorPlaceHolder
); +}); jest.mock( - '../../components/DataAssets/DataAssetsVersionHeader/DataAssetsVersionHeader', + '../../DataAssets/DataAssetsVersionHeader/DataAssetsVersionHeader', () => jest.fn().mockImplementation(() =>
DataAssetsVersionHeader
) ); -jest.mock('../../components/TabsLabel/TabsLabel.component', () => +jest.mock('../../common/TabsLabel/TabsLabel.component', () => jest.fn().mockImplementation(({ name }) =>
{name}
) ); -jest.mock('../../components/Tag/TagsContainerV2/TagsContainerV2', () => +jest.mock('../../Tag/TagsContainerV2/TagsContainerV2', () => jest.fn().mockImplementation(() =>
TagsContainerV2
) ); -jest.mock('../../components/Tag/TagsViewer/TagsViewer', () => +jest.mock('../../Tag/TagsViewer/TagsViewer', () => jest.fn().mockImplementation(() =>
TagsViewer
) ); -jest.mock( - '../../components/common/CustomPropertyTable/CustomPropertyTable', - () => ({ - CustomPropertyTable: jest - .fn() - .mockImplementation(() =>
CustomPropertyTable
), - }) -); +jest.mock('../../common/CustomPropertyTable/CustomPropertyTable', () => ({ + CustomPropertyTable: jest + .fn() + .mockImplementation(() =>
CustomPropertyTable
), +})); jest.mock('react-router-dom', () => ({ useHistory: jest.fn().mockImplementation(() => ({ diff --git a/openmetadata-ui/src/main/resources/ui/src/components/DataAssets/DataAssetAsyncSelectList/DataAssetAsyncSelectList.test.tsx b/openmetadata-ui/src/main/resources/ui/src/components/DataAssets/DataAssetAsyncSelectList/DataAssetAsyncSelectList.test.tsx index a6a189e38eae..d3760bcc56a4 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/DataAssets/DataAssetAsyncSelectList/DataAssetAsyncSelectList.test.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/components/DataAssets/DataAssetAsyncSelectList/DataAssetAsyncSelectList.test.tsx @@ -17,9 +17,9 @@ import { searchQuery } from '../../../rest/searchAPI'; import DataAssetAsyncSelectList from './DataAssetAsyncSelectList'; import { DataAssetOption } from './DataAssetAsyncSelectList.interface'; -jest.mock('../../rest/searchAPI'); -jest.mock('../../utils/TableUtils'); -jest.mock('../../utils/EntityUtils', () => ({ +jest.mock('../../../rest/searchAPI'); +jest.mock('../../../utils/TableUtils'); +jest.mock('../../../utils/EntityUtils', () => ({ getEntityName: jest.fn().mockReturnValue('Test'), getEntityReferenceFromEntity: jest .fn() @@ -29,7 +29,7 @@ jest.mock('../../utils/EntityUtils', () => ({ type: type, })), })); -jest.mock('../common/ProfilePicture/ProfilePicture', () => { +jest.mock('../../common/ProfilePicture/ProfilePicture', () => { return jest .fn() .mockReturnValue(

ProfilePicture

); diff --git a/openmetadata-ui/src/main/resources/ui/src/components/DataQuality/AddDataQualityTest/EditTestCaseModal.test.tsx b/openmetadata-ui/src/main/resources/ui/src/components/DataQuality/AddDataQualityTest/EditTestCaseModal.test.tsx index e574aae8ded1..e2b9d3f1e981 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/DataQuality/AddDataQualityTest/EditTestCaseModal.test.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/components/DataQuality/AddDataQualityTest/EditTestCaseModal.test.tsx @@ -26,7 +26,7 @@ const mockProps: EditTestCaseModalProps = { onUpdate: jest.fn(), }; -jest.mock('../common/RichTextEditor/RichTextEditor', () => { +jest.mock('../../common/RichTextEditor/RichTextEditor', () => { return forwardRef( jest.fn().mockImplementation(() =>
RichTextEditor.component
) ); @@ -34,7 +34,7 @@ jest.mock('../common/RichTextEditor/RichTextEditor', () => { jest.mock('./components/ParameterForm', () => { return jest.fn().mockImplementation(() =>
ParameterForm.component
); }); -jest.mock('../../rest/testAPI', () => { +jest.mock('../../../rest/testAPI', () => { return { getTestDefinitionById: jest .fn() diff --git a/openmetadata-ui/src/main/resources/ui/src/components/DataQuality/AddDataQualityTest/components/ParameterForm.test.tsx b/openmetadata-ui/src/main/resources/ui/src/components/DataQuality/AddDataQualityTest/components/ParameterForm.test.tsx index 67fed8d91b00..9e4a7e2194a2 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/DataQuality/AddDataQualityTest/components/ParameterForm.test.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/components/DataQuality/AddDataQualityTest/components/ParameterForm.test.tsx @@ -22,7 +22,7 @@ import { } from '../../../../mocks/TestSuite.mock'; import ParameterForm from './ParameterForm'; -jest.mock('../../../components/SchemaEditor/SchemaEditor', () => { +jest.mock('../../../Database/SchemaEditor/SchemaEditor', () => { return jest.fn().mockReturnValue(
SchemaEditor
); }); diff --git a/openmetadata-ui/src/main/resources/ui/src/components/DataQuality/AddDataQualityTest/components/TestCaseForm.test.tsx b/openmetadata-ui/src/main/resources/ui/src/components/DataQuality/AddDataQualityTest/components/TestCaseForm.test.tsx index efbfb3070b38..04074ad17391 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/DataQuality/AddDataQualityTest/components/TestCaseForm.test.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/components/DataQuality/AddDataQualityTest/components/TestCaseForm.test.tsx @@ -79,7 +79,7 @@ jest.mock('react-router-dom', () => ({ useHistory: jest.fn(), useParams: jest.fn().mockImplementation(() => mockParams), })); -jest.mock('../../../rest/testAPI', () => ({ +jest.mock('../../../../rest/testAPI', () => ({ getListTestCase: jest .fn() .mockImplementation(() => Promise.resolve({ data: [] })), @@ -87,7 +87,7 @@ jest.mock('../../../rest/testAPI', () => ({ .fn() .mockImplementation(() => Promise.resolve(mockTestDefinition)), })); -jest.mock('../../common/RichTextEditor/RichTextEditor', () => +jest.mock('../../../common/RichTextEditor/RichTextEditor', () => forwardRef( jest.fn().mockImplementation(() =>
RichTextEditor.component
) ) diff --git a/openmetadata-ui/src/main/resources/ui/src/components/DataQuality/IncidentManager/TestCaseIncidentTab/TestCaseIncidentTab.test.tsx b/openmetadata-ui/src/main/resources/ui/src/components/DataQuality/IncidentManager/TestCaseIncidentTab/TestCaseIncidentTab.test.tsx index d002899413f0..9edd94f7d30f 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/DataQuality/IncidentManager/TestCaseIncidentTab/TestCaseIncidentTab.test.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/components/DataQuality/IncidentManager/TestCaseIncidentTab/TestCaseIncidentTab.test.tsx @@ -99,7 +99,7 @@ const mockUseActivityFeedProviderValue = { setActiveThread: jest.fn(), }; -jest.mock('../../Task/TaskTab/TaskTab.component', () => { +jest.mock('../../../Entity/Task/TaskTab/TaskTab.component', () => { return { TaskTab: jest.fn().mockImplementation(({ onAfterClose }) => (
@@ -111,11 +111,11 @@ jest.mock('../../Task/TaskTab/TaskTab.component', () => { )), }; }); -jest.mock('../../Loader/Loader', () => { +jest.mock('../../../common/Loader/Loader', () => { return jest.fn().mockImplementation(() =>
Loader
); }); jest.mock( - '../../ActivityFeed/ActivityFeedList/ActivityFeedListV1.component', + '../../../ActivityFeed/ActivityFeedList/ActivityFeedListV1.component', () => { return jest.fn().mockImplementation(({ onFeedClick }) => (
@@ -128,7 +128,7 @@ jest.mock( } ); jest.mock( - '../../ActivityFeed/ActivityFeedProvider/ActivityFeedProvider', + '../../../ActivityFeed/ActivityFeedProvider/ActivityFeedProvider', () => ({ useActivityFeedProvider: jest .fn() diff --git a/openmetadata-ui/src/main/resources/ui/src/components/DataQuality/IncidentManager/TestCaseResultTab/TestCaseResultTab.test.tsx b/openmetadata-ui/src/main/resources/ui/src/components/DataQuality/IncidentManager/TestCaseResultTab/TestCaseResultTab.test.tsx index f33a26afd2fc..57510c5af003 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/DataQuality/IncidentManager/TestCaseResultTab/TestCaseResultTab.test.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/components/DataQuality/IncidentManager/TestCaseResultTab/TestCaseResultTab.test.tsx @@ -69,13 +69,13 @@ const mockProps: TestCaseResultTabProps = { onTestCaseUpdate: jest.fn(), }; -jest.mock('../../common/EntityDescription/DescriptionV1', () => { +jest.mock('../../../common/EntityDescription/DescriptionV1', () => { return jest.fn().mockImplementation(() =>
DescriptionV1
); }); -jest.mock('../../SchemaEditor/SchemaEditor', () => { +jest.mock('../../../Database/SchemaEditor/SchemaEditor', () => { return jest.fn().mockImplementation(() =>
SchemaEditor
); }); -jest.mock('../../ProfilerDashboard/component/TestSummary', () => { +jest.mock('../../../Database/Profiler/TestSummary/TestSummary', () => { return jest.fn().mockImplementation(() =>
TestSummary
); }); jest.mock('../../AddDataQualityTest/EditTestCaseModal', () => { @@ -91,7 +91,7 @@ jest.mock('../../AddDataQualityTest/EditTestCaseModal', () => {
)); }); -jest.mock('../../../utils/PermissionsUtils', () => ({ +jest.mock('../../../../utils/PermissionsUtils', () => ({ checkPermission: jest.fn().mockReturnValue(true), })); diff --git a/openmetadata-ui/src/main/resources/ui/src/components/DataQuality/IncidentManager/TestCaseStatus/TestCaseIncidentManagerStatus.test.tsx b/openmetadata-ui/src/main/resources/ui/src/components/DataQuality/IncidentManager/TestCaseStatus/TestCaseIncidentManagerStatus.test.tsx index 351f3d1e5851..5a70c275a987 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/DataQuality/IncidentManager/TestCaseStatus/TestCaseIncidentManagerStatus.test.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/components/DataQuality/IncidentManager/TestCaseStatus/TestCaseIncidentManagerStatus.test.tsx @@ -48,32 +48,29 @@ const mockProps: TestCaseStatusIncidentManagerProps = { onSubmit: jest.fn(), }; -jest.mock('../../common/Badge/Badge.component', () => +jest.mock('../../../common/Badge/Badge.component', () => jest.fn().mockImplementation(({ label }) =>
{label}
) ); -jest.mock('../../../utils/PermissionsUtils', () => ({ +jest.mock('../../../../utils/PermissionsUtils', () => ({ checkPermission: jest.fn().mockReturnValue(true), })); -jest.mock( - '../../DataQuality/TestCaseStatusModal/TestCaseStatusModal.component', - () => ({ - TestCaseStatusModal: jest - .fn() - .mockImplementation(({ onSubmit, onCancel }) => ( -
- TestCaseStatusModal - - -
- )), - }) -); +jest.mock('../../TestCaseStatusModal/TestCaseStatusModal.component', () => ({ + TestCaseStatusModal: jest + .fn() + .mockImplementation(({ onSubmit, onCancel }) => ( +
+ TestCaseStatusModal + + +
+ )), +})); describe('TestCaseIncidentManagerStatus', () => { it('Should render component', async () => { diff --git a/openmetadata-ui/src/main/resources/ui/src/components/DataQuality/SummaryPannel/SummaryPanel.test.tsx b/openmetadata-ui/src/main/resources/ui/src/components/DataQuality/SummaryPannel/SummaryPanel.test.tsx index 4d7be77faa0f..91228de6dedf 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/DataQuality/SummaryPannel/SummaryPanel.test.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/components/DataQuality/SummaryPannel/SummaryPanel.test.tsx @@ -31,13 +31,6 @@ const mockSummary = { failed: 1, }; -jest.mock('../../PermissionProvider/PermissionProvider', () => ({ - usePermissionProvider: jest.fn().mockImplementation(() => ({ - permissions: { - testCase: testCasePermission, - }, - })), -})); jest.mock('../../common/SummaryCard/SummaryCard.component', () => { return { SummaryCard: jest diff --git a/openmetadata-ui/src/main/resources/ui/src/components/DataQuality/TestCases/TestCases.test.tsx b/openmetadata-ui/src/main/resources/ui/src/components/DataQuality/TestCases/TestCases.test.tsx index c1200772007f..07e65b73ddde 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/DataQuality/TestCases/TestCases.test.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/components/DataQuality/TestCases/TestCases.test.tsx @@ -32,7 +32,7 @@ const mockUseParam = { tab: DataQualityPageTabs.TEST_CASES } as { const mockUseHistory = { push: jest.fn() }; const mockLocation = { search: '' }; -jest.mock('../../../components/PermissionProvider/PermissionProvider', () => ({ +jest.mock('../../../context/PermissionProvider/PermissionProvider', () => ({ usePermissionProvider: jest.fn().mockImplementation(() => ({ permissions: { testCase: testCasePermission, @@ -68,35 +68,26 @@ jest.mock('react-router-dom', () => { useLocation: jest.fn().mockImplementation(() => mockLocation), }; }); -jest.mock('../../../components/common/NextPrevious/NextPrevious', () => { +jest.mock('../../common/NextPrevious/NextPrevious', () => { return jest.fn().mockImplementation(() =>
NextPrevious.component
); }); -jest.mock( - '../../../components/common/SearchBarComponent/SearchBar.component', - () => { - return jest.fn().mockImplementation(() =>
Searchbar.component
); - } -); -jest.mock( - '../../../components/ProfilerDashboard/component/DataQualityTab', - () => { - return jest - .fn() - .mockImplementation(() =>
DataQualityTab.component
); - } -); -jest.mock( - '../../../components/common/ErrorWithPlaceholder/ErrorPlaceHolder', - () => { - return jest - .fn() - .mockImplementation(({ type }) => ( -
- ErrorPlaceHolder.component -
- )); - } -); +jest.mock('../../common/SearchBarComponent/SearchBar.component', () => { + return jest.fn().mockImplementation(() =>
Searchbar.component
); +}); +jest.mock('../../Database/Profiler/DataQualityTab/DataQualityTab', () => { + return jest + .fn() + .mockImplementation(() =>
DataQualityTab.component
); +}); +jest.mock('../../common/ErrorWithPlaceholder/ErrorPlaceHolder', () => { + return jest + .fn() + .mockImplementation(({ type }) => ( +
+ ErrorPlaceHolder.component +
+ )); +}); const mockProps = { summaryPanel:
SummaryPanel.component
, diff --git a/openmetadata-ui/src/main/resources/ui/src/components/DataQuality/TestSuites/TestSuites.test.tsx b/openmetadata-ui/src/main/resources/ui/src/components/DataQuality/TestSuites/TestSuites.test.tsx index 6c1d91686647..897043944b82 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/DataQuality/TestSuites/TestSuites.test.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/components/DataQuality/TestSuites/TestSuites.test.tsx @@ -30,7 +30,7 @@ const mockUseParam = { tab: DataQualityPageTabs.TABLES } as { tab?: DataQualityPageTabs; }; -jest.mock('../../../components/PermissionProvider/PermissionProvider', () => ({ +jest.mock('../../../context/PermissionProvider/PermissionProvider', () => ({ usePermissionProvider: jest.fn().mockImplementation(() => ({ permissions: { testSuite: testSuitePermission, @@ -53,21 +53,18 @@ jest.mock('react-router-dom', () => { useParams: jest.fn().mockImplementation(() => mockUseParam), }; }); -jest.mock('../../../components/common/NextPrevious/NextPrevious', () => { +jest.mock('../../common/NextPrevious/NextPrevious', () => { return jest.fn().mockImplementation(() =>
NextPrevious.component
); }); -jest.mock( - '../../../components/common/ErrorWithPlaceholder/ErrorPlaceHolder', - () => { - return jest - .fn() - .mockImplementation(({ type }) => ( -
- ErrorPlaceHolder.component -
- )); - } -); +jest.mock('../../common/ErrorWithPlaceholder/ErrorPlaceHolder', () => { + return jest + .fn() + .mockImplementation(({ type }) => ( +
+ ErrorPlaceHolder.component +
+ )); +}); const mockProps = { summaryPanel:
SummaryPanel.component
, diff --git a/openmetadata-ui/src/main/resources/ui/src/components/Database/Profiler/DataQualityTab/DataQualityTab.test.tsx b/openmetadata-ui/src/main/resources/ui/src/components/Database/Profiler/DataQualityTab/DataQualityTab.test.tsx index 404dc25f80a6..a8482b4ad7d3 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/Database/Profiler/DataQualityTab/DataQualityTab.test.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/components/Database/Profiler/DataQualityTab/DataQualityTab.test.tsx @@ -47,29 +47,22 @@ jest.mock('react-router-dom', () => ({ {children} )), })); -jest.mock('../../../hooks/authHooks', () => ({ +jest.mock('../../../../hooks/authHooks', () => ({ useAuth: () => { return { isAdminUser: mockAuthData.isAdminUser, }; }, })); -jest.mock('../../../components/PermissionProvider/PermissionProvider', () => ({ +jest.mock('../../../../context/PermissionProvider/PermissionProvider', () => ({ usePermissionProvider: () => mockPermissionsData, })); -jest.mock('../../Auth/AuthProviders/AuthProvider', () => { - return { - useAuthContext: jest.fn(() => ({ - isAuthDisabled: mockAuthData.isAuthDisabled, - })), - }; -}); -jest.mock('../../Loader/Loader', () => { +jest.mock('../../../common/Loader/Loader', () => { return jest.fn().mockImplementation(() => { return Loader; }); }); -jest.mock('../../common/DeleteWidget/DeleteWidgetModal', () => { +jest.mock('../../../common/DeleteWidget/DeleteWidgetModal', () => { return jest.fn().mockImplementation(({ visible, onCancel }) => { return ( visible && ( @@ -81,7 +74,7 @@ jest.mock('../../common/DeleteWidget/DeleteWidgetModal', () => { ); }); }); -jest.mock('../../AddDataQualityTest/EditTestCaseModal', () => { +jest.mock('../../../DataQuality/AddDataQualityTest/EditTestCaseModal', () => { return jest.fn().mockImplementation(({ visible, onCancel, onUpdate }) => { return ( visible && ( @@ -94,11 +87,6 @@ jest.mock('../../AddDataQualityTest/EditTestCaseModal', () => { ); }); }); -jest.mock('./TestSummary', () => { - return jest.fn().mockImplementation(() => { - return
TestSummary
; - }); -}); describe('DataQualityTab test', () => { it('Component should render', async () => { diff --git a/openmetadata-ui/src/main/resources/ui/src/components/Database/Profiler/DataQualityTab/DataQualityTab.tsx b/openmetadata-ui/src/main/resources/ui/src/components/Database/Profiler/DataQualityTab/DataQualityTab.tsx index 74dca19fd810..c2ec784deae9 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/Database/Profiler/DataQualityTab/DataQualityTab.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/components/Database/Profiler/DataQualityTab/DataQualityTab.tsx @@ -21,8 +21,8 @@ import QueryString from 'qs'; import React, { useEffect, useMemo, useState } from 'react'; import { useTranslation } from 'react-i18next'; import { Link } from 'react-router-dom'; -import { ReactComponent as IconEdit } from '../../../../../assets/svg/edit-new.svg'; -import { ReactComponent as IconDelete } from '../../../../../assets/svg/ic-delete.svg'; +import { ReactComponent as IconEdit } from '../../../../assets/svg/edit-new.svg'; +import { ReactComponent as IconDelete } from '../../../../assets/svg/ic-delete.svg'; import { getTableTabPath } from '../../../../constants/constants'; import { DATA_QUALITY_PROFILER_DOCS } from '../../../../constants/docs.constants'; import { NO_PERMISSION_FOR_ACTION } from '../../../../constants/HelperTextUtil'; diff --git a/openmetadata-ui/src/main/resources/ui/src/components/Database/Profiler/DataQualityTab/data-quality-tab.less b/openmetadata-ui/src/main/resources/ui/src/components/Database/Profiler/DataQualityTab/data-quality-tab.less index 8572d9be37f9..f9d37c9dca96 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/Database/Profiler/DataQualityTab/data-quality-tab.less +++ b/openmetadata-ui/src/main/resources/ui/src/components/Database/Profiler/DataQualityTab/data-quality-tab.less @@ -10,7 +10,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -@import (reference) url('../../../../../styles/variables.less'); +@import (reference) url('../../../../styles/variables.less'); .test-case-summary-table { // Removed padding for expanded rows to prevent unnecessary scrolling behavior for the expanded row content .ant-table.ant-table-small .ant-table-tbody > tr.ant-table-expanded-row > td { diff --git a/openmetadata-ui/src/main/resources/ui/src/components/Database/Profiler/ProfilerDetailsCard/ProfilerDetailsCard.test.tsx b/openmetadata-ui/src/main/resources/ui/src/components/Database/Profiler/ProfilerDetailsCard/ProfilerDetailsCard.test.tsx index ef54ccbc11a8..353c67691649 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/Database/Profiler/ProfilerDetailsCard/ProfilerDetailsCard.test.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/components/Database/Profiler/ProfilerDetailsCard/ProfilerDetailsCard.test.tsx @@ -22,12 +22,12 @@ const mockProps: ProfilerDetailsCardProps = { name: 'rowCount', }; -jest.mock('./ProfilerLatestValue', () => { +jest.mock('../ProfilerLatestValue/ProfilerLatestValue', () => { return jest.fn().mockImplementation(() => { return
ProfilerLatestValue
; }); }); -jest.mock('../../common/ErrorWithPlaceholder/ErrorPlaceHolder', () => { +jest.mock('../../../common/ErrorWithPlaceholder/ErrorPlaceHolder', () => { return jest.fn().mockImplementation(() => { return
ErrorPlaceHolder
; }); diff --git a/openmetadata-ui/src/main/resources/ui/src/components/Database/Profiler/ProfilerLatestValue/ProfilerLatestValue.tsx b/openmetadata-ui/src/main/resources/ui/src/components/Database/Profiler/ProfilerLatestValue/ProfilerLatestValue.tsx index 301f95ecdb26..435102b1fd37 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/Database/Profiler/ProfilerLatestValue/ProfilerLatestValue.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/components/Database/Profiler/ProfilerLatestValue/ProfilerLatestValue.tsx @@ -12,13 +12,12 @@ */ import { Space, Statistic, Typography } from 'antd'; +import { isUndefined } from 'lodash'; import React from 'react'; import { getStatisticsDisplayValue } from '../../../../utils/CommonUtils'; +import '../ProfilerDashboard/profiler-dashboard.less'; import { ProfilerLatestValueProps } from '../ProfilerDashboard/profilerDashboard.interface'; -import { isUndefined } from 'lodash'; -import '../profiler-dashboard.less'; - const ProfilerLatestValue = ({ information, tickFormatter, diff --git a/openmetadata-ui/src/main/resources/ui/src/components/Database/Profiler/ProfilerSettings/ProfilerSettings.test.tsx b/openmetadata-ui/src/main/resources/ui/src/components/Database/Profiler/ProfilerSettings/ProfilerSettings.test.tsx index 99103863ba85..7f0b4ae3dfa1 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/Database/Profiler/ProfilerSettings/ProfilerSettings.test.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/components/Database/Profiler/ProfilerSettings/ProfilerSettings.test.tsx @@ -31,7 +31,7 @@ const mockProfilerConfig = { }, }; -jest.mock('../../rest/databaseAPI', () => ({ +jest.mock('../../../../rest/databaseAPI', () => ({ getDatabaseProfilerConfig: jest .fn() .mockImplementation(() => Promise.resolve(mockProfilerConfig)), @@ -46,7 +46,7 @@ jest.mock('../../rest/databaseAPI', () => ({ .mockImplementation(() => Promise.resolve(mockProfilerConfig)), })); -jest.mock('../../jsons/profilerSettings.json', () => ({ +jest.mock('../../../../jsons/profilerSettings.json', () => ({ __esModule: true, default: MOCK_SCHEMA, })); diff --git a/openmetadata-ui/src/main/resources/ui/src/components/Database/Profiler/TestSummary/TestSummary.test.tsx b/openmetadata-ui/src/main/resources/ui/src/components/Database/Profiler/TestSummary/TestSummary.test.tsx index 6118b30e6996..2315e05f741f 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/Database/Profiler/TestSummary/TestSummary.test.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/components/Database/Profiler/TestSummary/TestSummary.test.tsx @@ -30,7 +30,7 @@ const mockHistory = { goBack: jest.fn(), }; -jest.mock('../../../rest/testAPI', () => { +jest.mock('../../../../rest/testAPI', () => { return { getListTestCaseResults: jest .fn() @@ -46,23 +46,23 @@ jest.mock('react-router-dom', () => { }; }); -jest.mock('../../../components/DatePickerMenu/DatePickerMenu.component', () => { +jest.mock('../../../common/DatePickerMenu/DatePickerMenu.component', () => { return jest .fn() .mockImplementation(() =>
DatePickerMenu.component
); }); -jest.mock('../../common/ErrorWithPlaceholder/ErrorPlaceHolder', () => { +jest.mock('../../../common/ErrorWithPlaceholder/ErrorPlaceHolder', () => { return jest .fn() .mockImplementation(() =>
ErrorPlaceHolder.component
); }); -jest.mock('../../Loader/Loader', () => { +jest.mock('../../../common/Loader/Loader', () => { return jest.fn().mockImplementation(() =>
Loader.component
); }); jest.mock('../../SchemaEditor/SchemaEditor', () => { return jest.fn().mockImplementation(() =>
SchemaEditor.component
); }); -jest.mock('../../../utils/date-time/DateTimeUtils', () => { +jest.mock('../../../../utils/date-time/DateTimeUtils', () => { return { formatDateTime: jest.fn(), getCurrentMillis: jest.fn(), @@ -71,7 +71,7 @@ jest.mock('../../../utils/date-time/DateTimeUtils', () => { }); jest.mock( - '../../ActivityFeed/ActivityFeedProvider/ActivityFeedProvider', + '../../../ActivityFeed/ActivityFeedProvider/ActivityFeedProvider', () => ({ useActivityFeedProvider: jest.fn().mockImplementation(() => ({ entityThread: [], diff --git a/openmetadata-ui/src/main/resources/ui/src/components/Database/Profiler/TestSummary/TestSummary.tsx b/openmetadata-ui/src/main/resources/ui/src/components/Database/Profiler/TestSummary/TestSummary.tsx index f4752a6aa737..38db32df6edf 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/Database/Profiler/TestSummary/TestSummary.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/components/Database/Profiler/TestSummary/TestSummary.tsx @@ -46,7 +46,7 @@ import { YAxis, } from 'recharts'; import { Payload } from 'recharts/types/component/DefaultLegendContent'; -import { ReactComponent as FilterPlaceHolderIcon } from '../../../../../assets/svg/no-search-placeholder.svg'; +import { ReactComponent as FilterPlaceHolderIcon } from '../../../../assets/svg/no-search-placeholder.svg'; import { GREEN_3, GREEN_3_OPACITY, diff --git a/openmetadata-ui/src/main/resources/ui/src/components/Database/Profiler/TestSummary/test-summary.less b/openmetadata-ui/src/main/resources/ui/src/components/Database/Profiler/TestSummary/test-summary.less index ed2ae8c83b4e..028a0e9aa751 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/Database/Profiler/TestSummary/test-summary.less +++ b/openmetadata-ui/src/main/resources/ui/src/components/Database/Profiler/TestSummary/test-summary.less @@ -11,7 +11,7 @@ * limitations under the License. */ -@import url('../../../../../styles/variables.less'); +@import url('../../../../styles/variables.less'); .parameter-value-container { background: @grey-1; diff --git a/openmetadata-ui/src/main/resources/ui/src/components/Database/Profiler/TestSummaryCustomTooltip/TestSummaryCustomTooltip.test.tsx b/openmetadata-ui/src/main/resources/ui/src/components/Database/Profiler/TestSummaryCustomTooltip/TestSummaryCustomTooltip.test.tsx index 5fbb6580a567..c3b7bced1b3a 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/Database/Profiler/TestSummaryCustomTooltip/TestSummaryCustomTooltip.test.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/components/Database/Profiler/TestSummaryCustomTooltip/TestSummaryCustomTooltip.test.tsx @@ -38,7 +38,7 @@ const mockProps = { }, ], }; -jest.mock('../../../utils/date-time/DateTimeUtils', () => ({ +jest.mock('../../../../utils/date-time/DateTimeUtils', () => ({ formatDateTime: jest.fn().mockReturnValue('Jan 3, 2024, 6:45 PM'), })); diff --git a/openmetadata-ui/src/main/resources/ui/src/components/Database/SampleDataTable/RowData.test.tsx b/openmetadata-ui/src/main/resources/ui/src/components/Database/SampleDataTable/RowData.test.tsx index aac4c3aaeeef..a22d3c256910 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/Database/SampleDataTable/RowData.test.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/components/Database/SampleDataTable/RowData.test.tsx @@ -16,7 +16,7 @@ import React from 'react'; import { MemoryRouter } from 'react-router-dom'; import { RowData } from './RowData'; -jest.mock('../Modals/SchemaModal/SchemaModal', () => { +jest.mock('../../Modals/SchemaModal/SchemaModal', () => { return jest .fn() .mockReturnValue(
Schema Modal
); diff --git a/openmetadata-ui/src/main/resources/ui/src/components/Database/SampleDataTable/SampleDataTable.test.tsx b/openmetadata-ui/src/main/resources/ui/src/components/Database/SampleDataTable/SampleDataTable.test.tsx index 3c8e8579d93f..08098a9ce968 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/Database/SampleDataTable/SampleDataTable.test.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/components/Database/SampleDataTable/SampleDataTable.test.tsx @@ -38,13 +38,13 @@ jest.mock('react-router-dom', () => ({ useLocation: jest.fn().mockImplementation(() => ({ pathname: 'test' })), })); -jest.mock('../../rest/tableAPI', () => ({ +jest.mock('../../../rest/tableAPI', () => ({ getSampleDataByTableId: jest .fn() .mockImplementation(() => Promise.resolve(MOCK_TABLE)), })); -jest.mock('../common/ErrorWithPlaceholder/ErrorPlaceHolder', () => { +jest.mock('../../common/ErrorWithPlaceholder/ErrorPlaceHolder', () => { return jest .fn() .mockReturnValue( @@ -52,7 +52,7 @@ jest.mock('../common/ErrorWithPlaceholder/ErrorPlaceHolder', () => { ); }); -jest.mock('../../components/Modals/EntityDeleteModal/EntityDeleteModal', () => { +jest.mock('../../Modals/EntityDeleteModal/EntityDeleteModal', () => { return jest.fn().mockReturnValue(

EntityDeleteModal

); }); diff --git a/openmetadata-ui/src/main/resources/ui/src/components/Database/StoredProcedureVersion/StoredProcedureVersion.test.tsx b/openmetadata-ui/src/main/resources/ui/src/components/Database/StoredProcedureVersion/StoredProcedureVersion.test.tsx index 3c1d8a690116..c1f032e8be57 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/Database/StoredProcedureVersion/StoredProcedureVersion.test.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/components/Database/StoredProcedureVersion/StoredProcedureVersion.test.tsx @@ -20,37 +20,33 @@ import StoredProcedureVersion from './StoredProcedureVersion.component'; const mockPush = jest.fn(); jest.mock( - '../../components/DataAssets/DataAssetsVersionHeader/DataAssetsVersionHeader', + '../../DataAssets/DataAssetsVersionHeader/DataAssetsVersionHeader', () => jest.fn().mockImplementation(() =>
DataAssetsVersionHeader
) ); -jest.mock('../../components/TabsLabel/TabsLabel.component', () => +jest.mock('../../common/TabsLabel/TabsLabel.component', () => jest.fn().mockImplementation(({ name }) =>
{name}
) ); -jest.mock('../../components/Tag/TagsContainerV2/TagsContainerV2', () => +jest.mock('../../Tag/TagsContainerV2/TagsContainerV2', () => jest.fn().mockImplementation(() =>
TagsContainerV2
) ); -jest.mock( - '../../components/common/CustomPropertyTable/CustomPropertyTable', - () => ({ - CustomPropertyTable: jest - .fn() - .mockImplementation(() =>
CustomPropertyTable
), - }) -); +jest.mock('../../common/CustomPropertyTable/CustomPropertyTable', () => ({ + CustomPropertyTable: jest + .fn() + .mockImplementation(() =>
CustomPropertyTable
), +})); -jest.mock('../../components/common/EntityDescription/DescriptionV1', () => +jest.mock('../../common/EntityDescription/DescriptionV1', () => jest.fn().mockImplementation(() =>
DescriptionV1
) ); -jest.mock( - '../../components/Entity/EntityVersionTimeLine/EntityVersionTimeLine', - () => jest.fn().mockImplementation(() =>
EntityVersionTimeLine
) +jest.mock('../../Entity/EntityVersionTimeLine/EntityVersionTimeLine', () => + jest.fn().mockImplementation(() =>
EntityVersionTimeLine
) ); -jest.mock('../../components/Loader/Loader', () => +jest.mock('../../common/Loader/Loader', () => jest.fn().mockImplementation(() =>
Loader
) ); diff --git a/openmetadata-ui/src/main/resources/ui/src/components/Database/TableDataCardBody/TableDataCardBody.test.tsx b/openmetadata-ui/src/main/resources/ui/src/components/Database/TableDataCardBody/TableDataCardBody.test.tsx index 8d6fd1dabb85..5f9f7229555d 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/Database/TableDataCardBody/TableDataCardBody.test.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/components/Database/TableDataCardBody/TableDataCardBody.test.tsx @@ -16,24 +16,16 @@ import React from 'react'; import { TAG_CONSTANT } from '../../../constants/Tag.constants'; import TableDataCardBody from './TableDataCardBody'; -jest.mock( - '../../components/common/RichTextEditor/RichTextEditorPreviewer', - () => { - return jest.fn().mockReturnValue(

RichTextEditorPreviewer

); - } -); -jest.mock( - '../../components/common/EntitySummaryDetails/EntitySummaryDetails', - () => { - return jest - .fn() - .mockReturnValue( -

- EntitySummaryDetails component -

- ); - } -); +jest.mock('../../common/RichTextEditor/RichTextEditorPreviewer', () => { + return jest.fn().mockReturnValue(

RichTextEditorPreviewer

); +}); +jest.mock('../../common/EntitySummaryDetails/EntitySummaryDetails', () => { + return jest + .fn() + .mockReturnValue( +

EntitySummaryDetails component

+ ); +}); describe('Test TableDataCardBody Component', () => { const extraInfo = [ diff --git a/openmetadata-ui/src/main/resources/ui/src/components/Database/TableProfiler/ColumnProfileTable/ColumnProfileTable.test.tsx b/openmetadata-ui/src/main/resources/ui/src/components/Database/TableProfiler/ColumnProfileTable/ColumnProfileTable.test.tsx index 47109b735d14..746ea85c9c9c 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/Database/TableProfiler/ColumnProfileTable/ColumnProfileTable.test.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/components/Database/TableProfiler/ColumnProfileTable/ColumnProfileTable.test.tsx @@ -24,29 +24,29 @@ import { MemoryRouter } from 'react-router-dom'; import { MOCK_TABLE } from '../../../../mocks/TableData.mock'; import ColumnProfileTable from './ColumnProfileTable'; -jest.mock('../../../components/common/Table/Table', () => +jest.mock('../../../common/Table/Table', () => jest.fn().mockImplementation(() =>
Table
) ); -jest.mock('../../PageHeader/PageHeader.component', () => +jest.mock('../../../PageHeader/PageHeader.component', () => jest.fn().mockImplementation(() =>
PageHeader
) ); -jest.mock('../../DatePickerMenu/DatePickerMenu.component', () => +jest.mock('../../../common/DatePickerMenu/DatePickerMenu.component', () => jest.fn().mockImplementation(() =>
DatePickerMenu
) ); -jest.mock('./ColumnPickerMenu', () => +jest.mock('../ColumnPickerMenu', () => jest.fn().mockImplementation(() =>
ColumnPickerMenu
) ); -jest.mock('./ColumnSummary', () => +jest.mock('../ColumnSummary', () => jest.fn().mockImplementation(() =>
ColumnSummary
) ); -jest.mock('../../common/SummaryCard/SummaryCard.component', () => ({ +jest.mock('../../../common/SummaryCard/SummaryCard.component', () => ({ SummaryCard: jest.fn().mockImplementation(() =>
SummaryCard
), })); -jest.mock('../../../utils/CommonUtils', () => ({ +jest.mock('../../../../utils/CommonUtils', () => ({ formatNumberWithComma: jest.fn(), })); -jest.mock('../../common/SearchBarComponent/SearchBar.component', () => { +jest.mock('../../../common/SearchBarComponent/SearchBar.component', () => { return jest .fn() .mockImplementation(({ searchValue, onSearch }) => ( @@ -57,14 +57,14 @@ jest.mock('../../common/SearchBarComponent/SearchBar.component', () => { /> )); }); -jest.mock('./ProfilerProgressWidget', () => { +jest.mock('../ProfilerProgressWidget/ProfilerProgressWidget', () => { return jest.fn().mockImplementation(({ value }) => ( {value} Progress bar{' '} )); }); -jest.mock('../../common/TestIndicator/TestIndicator', () => { +jest.mock('../../../common/TestIndicator/TestIndicator', () => { return jest.fn().mockImplementation(({ value, type }) => ( {value} {type} @@ -77,7 +77,6 @@ jest.mock('../TableProfilerProvider', () => ({ splitTestCases: { column: [] }, })), })); -jest.mock('../../../utils/DatasetDetailsUtils'); describe('Test ColumnProfileTable component', () => { beforeEach(() => { diff --git a/openmetadata-ui/src/main/resources/ui/src/components/Database/TableProfiler/CustomMetricGraphs/CustomMetricGraphs.test.tsx b/openmetadata-ui/src/main/resources/ui/src/components/Database/TableProfiler/CustomMetricGraphs/CustomMetricGraphs.test.tsx index 241cd7184ee4..9aa40e449483 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/Database/TableProfiler/CustomMetricGraphs/CustomMetricGraphs.test.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/components/Database/TableProfiler/CustomMetricGraphs/CustomMetricGraphs.test.tsx @@ -65,12 +65,9 @@ jest.mock( return jest.fn().mockImplementation(() =>
CustomMetricForm
); } ); -jest.mock( - '../../Profiler/ProfilerDashboard/component/ProfilerLatestValue', - () => { - return jest.fn().mockImplementation(() =>
ProfilerLatestValue
); - } -); +jest.mock('../../Profiler/ProfilerLatestValue/ProfilerLatestValue', () => { + return jest.fn().mockImplementation(() =>
ProfilerLatestValue
); +}); jest.mock('../../../common/DeleteWidget/DeleteWidgetModal', () => { return jest.fn().mockImplementation(() =>
DeleteWidgetModal
); }); diff --git a/openmetadata-ui/src/main/resources/ui/src/components/Database/TableProfiler/ProfilerSettingsModal/ProfilerSettingsModal.test.tsx b/openmetadata-ui/src/main/resources/ui/src/components/Database/TableProfiler/ProfilerSettingsModal/ProfilerSettingsModal.test.tsx index 02ea657cf134..9f2106930926 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/Database/TableProfiler/ProfilerSettingsModal/ProfilerSettingsModal.test.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/components/Database/TableProfiler/ProfilerSettingsModal/ProfilerSettingsModal.test.tsx @@ -25,7 +25,7 @@ import { getTableProfilerConfig } from '../../../../rest/tableAPI'; import { ProfilerSettingsModalProps } from '../TableProfiler.interface'; import ProfilerSettingsModal from './ProfilerSettingsModal'; -jest.mock('../../../rest/tableAPI', () => ({ +jest.mock('../../../../rest/tableAPI', () => ({ getTableProfilerConfig: jest .fn() .mockImplementation(() => Promise.resolve(MOCK_TABLE)), diff --git a/openmetadata-ui/src/main/resources/ui/src/components/Database/TableProfiler/TableProfiler.test.tsx b/openmetadata-ui/src/main/resources/ui/src/components/Database/TableProfiler/TableProfiler.test.tsx index c4f6fdf68d71..2eb0a903f1bf 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/Database/TableProfiler/TableProfiler.test.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/components/Database/TableProfiler/TableProfiler.test.tsx @@ -12,13 +12,7 @@ */ // Library imports -import { - act, - cleanup, - fireEvent, - render, - screen, -} from '@testing-library/react'; +import { cleanup, render, screen } from '@testing-library/react'; import React from 'react'; // internal imports import { OperationPermission } from '../../../context/PermissionProvider/PermissionProvider.interface'; @@ -45,31 +39,18 @@ jest.mock('react-router-dom', () => ({ }), })); -// mock internal imports -jest.mock('./Component/ProfilerSettingsModal', () => { - return jest.fn().mockImplementation(() => { - return
ProfilerSettingsModal.component
; - }); -}); -jest.mock('./Component/ColumnProfileTable', () => { +jest.mock('./ColumnProfileTable/ColumnProfileTable', () => { return jest.fn().mockImplementation(() => { return
ColumnProfileTable.component
; }); }); -jest.mock('../../utils/CommonUtils', () => ({ - formatNumberWithComma: jest.fn(), - formTwoDigitNumber: jest.fn(), - getStatisticsDisplayValue: jest.fn(), - getEntityDeleteMessage: jest.fn(), -})); - -jest.mock('../../rest/testAPI', () => ({ +jest.mock('../../../rest/testAPI', () => ({ getListTestCase: jest .fn() .mockImplementation(() => Promise.resolve(TEST_CASE)), })); -jest.mock('../../rest/tableAPI', () => ({ +jest.mock('../../../rest/tableAPI', () => ({ getTableDetailsByFQN: jest.fn().mockImplementation(() => Promise.resolve()), })); jest.mock('./QualityTab/QualityTab.component', () => ({ @@ -133,20 +114,4 @@ describe('Test TableProfiler component', () => { expect(addTableTest).toBeInTheDocument(); }); - - it('CTA: Setting button should work properly', async () => { - render(); - - const settingBtn = await screen.findByTestId('profiler-setting-btn'); - - expect(settingBtn).toBeInTheDocument(); - - await act(async () => { - fireEvent.click(settingBtn); - }); - - expect( - await screen.findByText('ProfilerSettingsModal.component') - ).toBeInTheDocument(); - }); }); diff --git a/openmetadata-ui/src/main/resources/ui/src/components/Database/TableProfiler/TableProfilerChart/TableProfilerChart.test.tsx b/openmetadata-ui/src/main/resources/ui/src/components/Database/TableProfiler/TableProfilerChart/TableProfilerChart.test.tsx index 42ae06642ee9..02b654f212df 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/Database/TableProfiler/TableProfilerChart/TableProfilerChart.test.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/components/Database/TableProfiler/TableProfilerChart/TableProfilerChart.test.tsx @@ -27,28 +27,28 @@ jest.mock('react-router-dom', () => ({ useHistory: jest.fn(), })); jest.mock('../../../../rest/tableAPI'); -jest.mock('../../ProfilerDashboard/component/ProfilerLatestValue', () => { +jest.mock('../../Profiler/ProfilerLatestValue/ProfilerLatestValue', () => { return jest.fn().mockImplementation(() =>
ProfilerLatestValue
); }); -jest.mock('../../ProfilerDashboard/component/ProfilerDetailsCard', () => { +jest.mock('../../Profiler/ProfilerDetailsCard/ProfilerDetailsCard', () => { return jest.fn().mockImplementation(() =>
ProfilerDetailsCard
); }); -jest.mock('../../Chart/CustomBarChart', () => { +jest.mock('../../../Visualisations/Chart/CustomBarChart', () => { return jest.fn().mockImplementation(() =>
CustomBarChart
); }); -jest.mock('../../Chart/OperationDateBarChart', () => { +jest.mock('../../../Visualisations/Chart/OperationDateBarChart', () => { return jest.fn().mockImplementation(() =>
OperationDateBarChart
); }); -jest.mock('../../PageHeader/PageHeader.component', () => { +jest.mock('../../../PageHeader/PageHeader.component', () => { return jest.fn().mockImplementation(() =>
PageHeader
); }); -jest.mock('../../DatePickerMenu/DatePickerMenu.component', () => { +jest.mock('../../../common/DatePickerMenu/DatePickerMenu.component', () => { return jest.fn().mockImplementation(() =>
DatePickerMenu
); }); -jest.mock('./NoProfilerBanner.component', () => { +jest.mock('../NoProfilerBanner/NoProfilerBanner.component', () => { return jest.fn().mockImplementation(() =>
NoProfilerBanner
); }); -jest.mock('../../common/SummaryCard/SummaryCard.component', () => { +jest.mock('../../../common/SummaryCard/SummaryCard.component', () => { return { SummaryCard: jest.fn().mockImplementation(() =>
SummaryCard
), }; diff --git a/openmetadata-ui/src/main/resources/ui/src/components/Database/TableQueries/QueryCard.test.tsx b/openmetadata-ui/src/main/resources/ui/src/components/Database/TableQueries/QueryCard.test.tsx index 6b6726ba41b8..3aeb38e27e0a 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/Database/TableQueries/QueryCard.test.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/components/Database/TableQueries/QueryCard.test.tsx @@ -73,8 +73,8 @@ jest.mock('./QueryUsedByOtherTable/QueryUsedByOtherTable.component', () => { return jest.fn().mockReturnValue(<>QueryUsedByOtherTable); }); const mockOnCopyToClipBoard = jest.fn(); -jest.mock('../../hooks/useClipBoard', () => ({ - ...jest.requireActual('../../hooks/useClipBoard'), +jest.mock('../../../hooks/useClipBoard', () => ({ + ...jest.requireActual('../../../hooks/useClipBoard'), useClipboard: jest .fn() .mockImplementation(() => ({ onCopyToClipBoard: mockOnCopyToClipBoard })), diff --git a/openmetadata-ui/src/main/resources/ui/src/components/Database/TableQueries/QueryCardExtraOption/QueryCardExtraOption.test.tsx b/openmetadata-ui/src/main/resources/ui/src/components/Database/TableQueries/QueryCardExtraOption/QueryCardExtraOption.test.tsx index 30ae00af0fce..44f73014c5a6 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/Database/TableQueries/QueryCardExtraOption/QueryCardExtraOption.test.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/components/Database/TableQueries/QueryCardExtraOption/QueryCardExtraOption.test.tsx @@ -35,14 +35,14 @@ let mockUserData: User = { email: '', }; -jest.mock('../../Auth/AuthProviders/AuthProvider', () => ({ +jest.mock('../../../Auth/AuthProviders/AuthProvider', () => ({ useAuthContext: jest.fn(() => ({ currentUser: mockUserData, })), })); -jest.mock('../../../rest/queryAPI', () => ({ - ...jest.requireActual('../../../rest/queryAPI'), +jest.mock('../../../../rest/queryAPI', () => ({ + ...jest.requireActual('../../../../rest/queryAPI'), deleteQuery: jest.fn(), })); diff --git a/openmetadata-ui/src/main/resources/ui/src/components/Database/TableQueries/QueryUsedByOtherTable/QueryUsedByOtherTable.test.tsx b/openmetadata-ui/src/main/resources/ui/src/components/Database/TableQueries/QueryUsedByOtherTable/QueryUsedByOtherTable.test.tsx index cc585abe9577..936710e6e62d 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/Database/TableQueries/QueryUsedByOtherTable/QueryUsedByOtherTable.test.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/components/Database/TableQueries/QueryUsedByOtherTable/QueryUsedByOtherTable.test.tsx @@ -27,13 +27,13 @@ const mockProps: QueryUsedByOtherTableProps = { onChange: jest.fn(), }; -jest.mock('../../AsyncSelect/AsyncSelect', () => ({ +jest.mock('../../../common/AsyncSelect/AsyncSelect', () => ({ AsyncSelect: jest .fn() .mockImplementation(() =>
AsyncSelect.component
), })); -jest.mock('../../../rest/miscAPI', () => ({ +jest.mock('../../../../rest/miscAPI', () => ({ searchData: jest .fn() .mockReturnValue(() => Promise.resolve(MOCK_EXPLORE_SEARCH_RESULTS)), diff --git a/openmetadata-ui/src/main/resources/ui/src/components/Database/TableQueries/TableQueries.test.tsx b/openmetadata-ui/src/main/resources/ui/src/components/Database/TableQueries/TableQueries.test.tsx index 1939f2619ae2..48cab028fb74 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/Database/TableQueries/TableQueries.test.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/components/Database/TableQueries/TableQueries.test.tsx @@ -34,7 +34,7 @@ const mockTableQueriesProp: TableQueriesProp = { jest.mock('./QueryCard', () => { return jest.fn().mockReturnValue(

QueryCard

); }); -jest.mock('../../components/common/NextPrevious/NextPrevious', () => { +jest.mock('../../common/NextPrevious/NextPrevious', () => { return jest.fn().mockImplementation(() =>
NextPrevious.component
); }); jest.mock('./TableQueryRightPanel/TableQueryRightPanel.component', () => { @@ -42,15 +42,15 @@ jest.mock('./TableQueryRightPanel/TableQueryRightPanel.component', () => { .fn() .mockImplementation(() =>
TableQueryRightPanel.component
); }); -jest.mock('../../rest/queryAPI', () => ({ - ...jest.requireActual('../../rest/queryAPI'), +jest.mock('../../../rest/queryAPI', () => ({ + ...jest.requireActual('../../../rest/queryAPI'), getQueriesList: jest .fn() .mockImplementation(() => Promise.resolve({ data: MOCK_QUERIES, paging: { total: 2 } }) ), })); -jest.mock('../../components/PermissionProvider/PermissionProvider', () => ({ +jest.mock('../../../context/PermissionProvider/PermissionProvider', () => ({ usePermissionProvider: jest.fn().mockImplementation(() => ({ getEntityPermission: jest.fn(), permissions: { @@ -60,7 +60,7 @@ jest.mock('../../components/PermissionProvider/PermissionProvider', () => ({ }, })), })); -jest.mock('../../rest/miscAPI', () => ({ +jest.mock('../../../rest/miscAPI', () => ({ getSearchedUsers: jest .fn() .mockImplementation(() => Promise.resolve({ data: [] })), diff --git a/openmetadata-ui/src/main/resources/ui/src/components/Database/TableQueries/TableQueryRightPanel/TableQueryRightPanel.test.tsx b/openmetadata-ui/src/main/resources/ui/src/components/Database/TableQueries/TableQueryRightPanel/TableQueryRightPanel.test.tsx index e05e54b66c65..a625d42ac7ca 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/Database/TableQueries/TableQueryRightPanel/TableQueryRightPanel.test.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/components/Database/TableQueries/TableQueryRightPanel/TableQueryRightPanel.test.tsx @@ -29,29 +29,29 @@ const mockProps: TableQueryRightPanelProps = { }; jest.mock( - '../../../components/common/UserTeamSelectableList/UserTeamSelectableList.component', + '../../../common/UserTeamSelectableList/UserTeamSelectableList.component', () => ({ UserTeamSelectableList: jest .fn() .mockImplementation(() =>
UserTeamSelectableList
), }) ); -jest.mock('../../../components/common/EntityDescription/Description', () => { +jest.mock('../../../common/EntityDescription/Description', () => { return jest.fn().mockImplementation(() =>
Description.component
); }); -jest.mock('../../../components/TagsInput/TagsInput.component', () => { +jest.mock('../../../TagsInput/TagsInput.component', () => { return jest.fn().mockImplementation(() =>
TagsInput.component
); }); -jest.mock('../../../components/Loader/Loader', () => { +jest.mock('../../../common/Loader/Loader', () => { return jest.fn().mockImplementation(() =>
Loader
); }); -jest.mock('../../../utils/TagsUtils', () => ({ +jest.mock('../../../../utils/TagsUtils', () => ({ fetchTagsAndGlossaryTerms: jest .fn() .mockImplementation(() => Promise.resolve({ data: [] })), })); -jest.mock('../../../components/common/ProfilePicture/ProfilePicture', () => { +jest.mock('../../../common/ProfilePicture/ProfilePicture', () => { return jest.fn().mockImplementation(() => <>testProfilePicture); }); diff --git a/openmetadata-ui/src/main/resources/ui/src/components/Database/TableVersion/TableVersion.test.tsx b/openmetadata-ui/src/main/resources/ui/src/components/Database/TableVersion/TableVersion.test.tsx index aa16c9591b1a..4d86e1f0f8d3 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/Database/TableVersion/TableVersion.test.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/components/Database/TableVersion/TableVersion.test.tsx @@ -20,41 +20,37 @@ import TableVersion from './TableVersion.component'; const mockPush = jest.fn(); jest.mock( - '../../components/DataAssets/DataAssetsVersionHeader/DataAssetsVersionHeader', + '../../DataAssets/DataAssetsVersionHeader/DataAssetsVersionHeader', () => jest.fn().mockImplementation(() =>
DataAssetsVersionHeader
) ); -jest.mock('../../components/TabsLabel/TabsLabel.component', () => +jest.mock('../../common/TabsLabel/TabsLabel.component', () => jest.fn().mockImplementation(({ name }) =>
{name}
) ); -jest.mock('../../components/Tag/TagsContainerV2/TagsContainerV2', () => +jest.mock('../../Tag/TagsContainerV2/TagsContainerV2', () => jest.fn().mockImplementation(() =>
TagsContainerV2
) ); -jest.mock( - '../../components/common/CustomPropertyTable/CustomPropertyTable', - () => ({ - CustomPropertyTable: jest - .fn() - .mockImplementation(() =>
CustomPropertyTable
), - }) -); +jest.mock('../../common/CustomPropertyTable/CustomPropertyTable', () => ({ + CustomPropertyTable: jest + .fn() + .mockImplementation(() =>
CustomPropertyTable
), +})); -jest.mock('../../components/common/EntityDescription/DescriptionV1', () => +jest.mock('../../common/EntityDescription/DescriptionV1', () => jest.fn().mockImplementation(() =>
DescriptionV1
) ); -jest.mock( - '../../components/Entity/EntityVersionTimeLine/EntityVersionTimeLine', - () => jest.fn().mockImplementation(() =>
EntityVersionTimeLine
) +jest.mock('../../Entity/EntityVersionTimeLine/EntityVersionTimeLine', () => + jest.fn().mockImplementation(() =>
EntityVersionTimeLine
) ); -jest.mock('../../components/VersionTable/VersionTable.component', () => +jest.mock('../../Entity/VersionTable/VersionTable.component', () => jest.fn().mockImplementation(() =>
VersionTable
) ); -jest.mock('../../components/Loader/Loader', () => +jest.mock('../../common/Loader/Loader', () => jest.fn().mockImplementation(() =>
Loader
) ); diff --git a/openmetadata-ui/src/main/resources/ui/src/components/Domain/DomainLeftPanel/DomainLeftPanel.test.tsx b/openmetadata-ui/src/main/resources/ui/src/components/Domain/DomainLeftPanel/DomainLeftPanel.test.tsx index 623a59ade3b3..16aabd0800bf 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/Domain/DomainLeftPanel/DomainLeftPanel.test.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/components/Domain/DomainLeftPanel/DomainLeftPanel.test.tsx @@ -25,7 +25,7 @@ jest.mock('react-router-dom', () => ({ fqn: 'DomainFqn', }), })); -jest.mock('../../../components/PermissionProvider/PermissionProvider', () => ({ +jest.mock('../../../context/PermissionProvider/PermissionProvider', () => ({ usePermissionProvider: jest.fn().mockReturnValue({ getEntityPermission: jest.fn().mockReturnValue({ Create: true, @@ -63,7 +63,7 @@ jest.mock('../../../utils/PermissionsUtils', () => ({ checkPermission: jest.fn().mockReturnValue(true), })); -jest.mock('../../../components/common/LeftPanelCard/LeftPanelCard', () => { +jest.mock('../../common/LeftPanelCard/LeftPanelCard', () => { return jest .fn() .mockImplementation(({ children }) => ( diff --git a/openmetadata-ui/src/main/resources/ui/src/components/Entity/EntityLineage/CustomEdge.component.test.tsx b/openmetadata-ui/src/main/resources/ui/src/components/Entity/EntityLineage/CustomEdge.component.test.tsx index e1377f1bf81a..7cd27dbbb4a3 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/Entity/EntityLineage/CustomEdge.component.test.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/components/Entity/EntityLineage/CustomEdge.component.test.tsx @@ -65,7 +65,7 @@ const mockCustomEdgeProp = { selected: true, } as EdgeProps; -jest.mock('../../LineageProvider/LineageProvider', () => ({ +jest.mock('../../../context/LineageProvider/LineageProvider', () => ({ useLineageProvider: jest.fn().mockImplementation(() => ({ tracedNodes: [], tracedColumns: [], diff --git a/openmetadata-ui/src/main/resources/ui/src/components/Entity/Task/TaskTabIncidentManagerHeader/TaskTabIncidentManagerHeader.test.tsx b/openmetadata-ui/src/main/resources/ui/src/components/Entity/Task/TaskTabIncidentManagerHeader/TaskTabIncidentManagerHeader.test.tsx index c8934da67437..410da915f22a 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/Entity/Task/TaskTabIncidentManagerHeader/TaskTabIncidentManagerHeader.test.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/components/Entity/Task/TaskTabIncidentManagerHeader/TaskTabIncidentManagerHeader.test.tsx @@ -137,27 +137,30 @@ const mockStatus = [ ]; jest.mock( - '../../ActivityFeed/ActivityFeedProvider/ActivityFeedProvider', + '../../../ActivityFeed/ActivityFeedProvider/ActivityFeedProvider', () => ({ useActivityFeedProvider: jest .fn() .mockImplementation(() => ({ testCaseResolutionStatus: mockStatus })), }) ); -jest.mock('../../common/OwnerLabel/OwnerLabel.component', () => { +jest.mock('../../../common/OwnerLabel/OwnerLabel.component', () => { return { OwnerLabel: jest .fn() .mockImplementation(() =>
OwnerLabel.component
), }; }); -jest.mock('../../common/AssigneeList/AssigneeList', () => { +jest.mock('../../../common/AssigneeList/AssigneeList', () => { return jest.fn().mockImplementation(() =>
AssigneeList.component
); }); -jest.mock('../../IncidentManager/Severity/Severity.component', () => { - return jest.fn().mockImplementation(() =>
Severity.component
); -}); -jest.mock('../../common/RichTextEditor/RichTextEditorPreviewer', () => { +jest.mock( + '../../../DataQuality/IncidentManager/Severity/Severity.component', + () => { + return jest.fn().mockImplementation(() =>
Severity.component
); + } +); +jest.mock('../../../common/RichTextEditor/RichTextEditorPreviewer', () => { return jest .fn() .mockImplementation(() =>
RichTextEditorPreviewer.component
); diff --git a/openmetadata-ui/src/main/resources/ui/src/components/Explore/AdvanceSearchProvider/AdvanceSearchProvider.test.tsx b/openmetadata-ui/src/main/resources/ui/src/components/Explore/AdvanceSearchProvider/AdvanceSearchProvider.test.tsx index 5b40f65fb660..00ddaea651d7 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/Explore/AdvanceSearchProvider/AdvanceSearchProvider.test.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/components/Explore/AdvanceSearchProvider/AdvanceSearchProvider.test.tsx @@ -42,7 +42,7 @@ jest.mock('../AdvanceSearchModal.component', () => ({ )), })); -jest.mock('../../Loader/Loader', () => +jest.mock('../../common/Loader/Loader', () => jest.fn().mockReturnValue(
Loader
) ); diff --git a/openmetadata-ui/src/main/resources/ui/src/components/Explore/EntitySummaryPanel/EntitySummaryPanel.test.tsx b/openmetadata-ui/src/main/resources/ui/src/components/Explore/EntitySummaryPanel/EntitySummaryPanel.test.tsx index ce37b0bbc4f3..d48a9ae5f510 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/Explore/EntitySummaryPanel/EntitySummaryPanel.test.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/components/Explore/EntitySummaryPanel/EntitySummaryPanel.test.tsx @@ -77,7 +77,7 @@ jest.mock('react-router-dom', () => ({ Link: jest.fn().mockImplementation(({ children }) => <>{children}), })); -jest.mock('../../../components/PermissionProvider/PermissionProvider', () => ({ +jest.mock('../../../context/PermissionProvider/PermissionProvider', () => ({ usePermissionProvider: jest.fn().mockReturnValue({ getEntityPermission: jest.fn().mockReturnValue({ ViewBasic: true, diff --git a/openmetadata-ui/src/main/resources/ui/src/components/Explore/EntitySummaryPanel/TableSummary/TableSummary.test.tsx b/openmetadata-ui/src/main/resources/ui/src/components/Explore/EntitySummaryPanel/TableSummary/TableSummary.test.tsx index 93b29bf9c963..0123205fcd0f 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/Explore/EntitySummaryPanel/TableSummary/TableSummary.test.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/components/Explore/EntitySummaryPanel/TableSummary/TableSummary.test.tsx @@ -58,7 +58,7 @@ jest.mock('react-router-dom', () => ({ useLocation: jest.fn().mockReturnValue({ pathname: '/table' }), })); -jest.mock('../../../PermissionProvider/PermissionProvider', () => ({ +jest.mock('../../../../context/PermissionProvider/PermissionProvider', () => ({ usePermissionProvider: jest.fn().mockImplementation(() => ({ getEntityPermission: jest .fn() diff --git a/openmetadata-ui/src/main/resources/ui/src/components/Explore/EntitySummaryPanel/TopicSummary/TopicSummary.test.tsx b/openmetadata-ui/src/main/resources/ui/src/components/Explore/EntitySummaryPanel/TopicSummary/TopicSummary.test.tsx index 52ac57f5610f..339e377e7271 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/Explore/EntitySummaryPanel/TopicSummary/TopicSummary.test.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/components/Explore/EntitySummaryPanel/TopicSummary/TopicSummary.test.tsx @@ -38,7 +38,7 @@ jest.mock( ); jest.mock( - '../../../../components/Skeleton/SummaryPanelSkeleton/SummaryPanelSkeleton.component', + '../../../common/Skeleton/SummaryPanelSkeleton/SummaryPanelSkeleton.component', () => jest.fn().mockImplementation(({ children }) => <>{children}) ); diff --git a/openmetadata-ui/src/main/resources/ui/src/components/ExploreV1/ExploreV1.test.tsx b/openmetadata-ui/src/main/resources/ui/src/components/ExploreV1/ExploreV1.test.tsx index 807144b4db64..7243bcdc0099 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/ExploreV1/ExploreV1.test.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/components/ExploreV1/ExploreV1.test.tsx @@ -37,7 +37,7 @@ jest.mock('./ExploreSearchCard/ExploreSearchCard', () => { return jest.fn().mockReturnValue(

ExploreSearchCard

); }); -jest.mock('../../components/GlobalSearchProvider/GlobalSearchProvider', () => ({ +jest.mock('../../context/GlobalSearchProvider/GlobalSearchProvider', () => ({ useGlobalSearchProvider: jest.fn().mockImplementation(() => ({ searchCriteria: '', })), diff --git a/openmetadata-ui/src/main/resources/ui/src/components/Glossary/GlossaryTermTab/GlossaryTermTab.test.tsx b/openmetadata-ui/src/main/resources/ui/src/components/Glossary/GlossaryTermTab/GlossaryTermTab.test.tsx index e17861f47ec8..8b57d20e3044 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/Glossary/GlossaryTermTab/GlossaryTermTab.test.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/components/Glossary/GlossaryTermTab/GlossaryTermTab.test.tsx @@ -68,7 +68,7 @@ jest.mock('../../common/ErrorWithPlaceholder/ErrorPlaceHolder', () => )) ); -jest.mock('../../Loader/Loader', () => +jest.mock('../../common/Loader/Loader', () => jest.fn().mockImplementation(() =>
Loader
) ); diff --git a/openmetadata-ui/src/main/resources/ui/src/components/Glossary/GlossaryV1.test.tsx b/openmetadata-ui/src/main/resources/ui/src/components/Glossary/GlossaryV1.test.tsx index 7cb6da166d7e..519d4c52a8c1 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/Glossary/GlossaryV1.test.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/components/Glossary/GlossaryV1.test.tsx @@ -34,7 +34,7 @@ let params = { const mockPush = jest.fn(); -jest.mock('../PermissionProvider/PermissionProvider', () => ({ +jest.mock('../../context/PermissionProvider/PermissionProvider', () => ({ usePermissionProvider: jest.fn().mockReturnValue({ getEntityPermission: jest.fn().mockReturnValue({ Create: true, @@ -112,7 +112,7 @@ jest.mock('../common/ProfilePicture/ProfilePicture', () => jest.fn().mockReturnValue(U) ); -jest.mock('../../components/FeedEditor/FeedEditor', () => { +jest.mock('../ActivityFeed/FeedEditor/FeedEditor', () => { return jest.fn().mockReturnValue(

FeedEditor

); }); diff --git a/openmetadata-ui/src/main/resources/ui/src/components/Glossary/ImportGlossary/ImportGlossary.test.tsx b/openmetadata-ui/src/main/resources/ui/src/components/Glossary/ImportGlossary/ImportGlossary.test.tsx index eddb32f3135c..ba285d3a4042 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/Glossary/ImportGlossary/ImportGlossary.test.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/components/Glossary/ImportGlossary/ImportGlossary.test.tsx @@ -32,7 +32,7 @@ jest.mock('../../common/TitleBreadcrumb/TitleBreadcrumb.component', () => jest.fn().mockReturnValue(
Breadcrumb
) ); -jest.mock('../../Loader/Loader', () => +jest.mock('../../common/Loader/Loader', () => jest.fn().mockReturnValue(
Loader
) ); diff --git a/openmetadata-ui/src/main/resources/ui/src/components/Lineage/Lineage.test.tsx b/openmetadata-ui/src/main/resources/ui/src/components/Lineage/Lineage.test.tsx index 215ad401c814..3f3d8382d005 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/Lineage/Lineage.test.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/components/Lineage/Lineage.test.tsx @@ -82,7 +82,7 @@ let entityLineage: EntityLineageReponse | undefined = { ], }; -jest.mock('../LineageProvider/LineageProvider', () => ({ +jest.mock('../../context/LineageProvider/LineageProvider', () => ({ useLineageProvider: jest.fn().mockImplementation(() => ({ tracedNodes: [], tracedColumns: [], diff --git a/openmetadata-ui/src/main/resources/ui/src/components/MlModel/MlModelDetail/MlModelDetail.component.test.tsx b/openmetadata-ui/src/main/resources/ui/src/components/MlModel/MlModelDetail/MlModelDetail.component.test.tsx index 488416081539..21e4ac2a94a4 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/MlModel/MlModelDetail/MlModelDetail.component.test.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/components/MlModel/MlModelDetail/MlModelDetail.component.test.tsx @@ -231,6 +231,10 @@ jest.mock('../../../utils/TableUtils', () => { }; }); +jest.mock('../../ActivityFeed/FeedEditor/FeedEditor', () => { + return jest.fn().mockReturnValue(

FeedEditor.component

); +}); + jest.mock('../../common/CustomPropertyTable/CustomPropertyTable', () => ({ CustomPropertyTable: jest .fn() diff --git a/openmetadata-ui/src/main/resources/ui/src/components/Modals/SchemaModal/SchemaModal.test.tsx b/openmetadata-ui/src/main/resources/ui/src/components/Modals/SchemaModal/SchemaModal.test.tsx index 66e3c94189a8..1dd483b7b1cd 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/Modals/SchemaModal/SchemaModal.test.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/components/Modals/SchemaModal/SchemaModal.test.tsx @@ -24,7 +24,7 @@ const mockProp = { data: {}, }; -jest.mock('../../SchemaEditor/SchemaEditor', () => { +jest.mock('../../Database/SchemaEditor/SchemaEditor', () => { return jest.fn().mockReturnValue(
SchemaEditor
); }); diff --git a/openmetadata-ui/src/main/resources/ui/src/components/MyData/CustomizableComponents/AddWidgetModal/AddWidgetModal.test.tsx b/openmetadata-ui/src/main/resources/ui/src/components/MyData/CustomizableComponents/AddWidgetModal/AddWidgetModal.test.tsx index 8e1d94b63135..8b67fa28cb5e 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/MyData/CustomizableComponents/AddWidgetModal/AddWidgetModal.test.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/components/MyData/CustomizableComponents/AddWidgetModal/AddWidgetModal.test.tsx @@ -28,11 +28,11 @@ const mockProps: AddWidgetModalProps = { placeholderWidgetKey: 'placeholderKey', }; -jest.mock('../../Loader/Loader', () => +jest.mock('../../../common/Loader/Loader', () => jest.fn().mockImplementation(() =>
Loader
) ); -jest.mock('../../common/ErrorWithPlaceholder/ErrorPlaceHolder', () => +jest.mock('../../../common/ErrorWithPlaceholder/ErrorPlaceHolder', () => jest.fn().mockImplementation(() =>
ErrorPlaceHolder
) ); @@ -47,17 +47,17 @@ jest.mock('./AddWidgetTabContent', () => )) ); -jest.mock('../../../utils/ToastUtils', () => ({ +jest.mock('../../../../utils/ToastUtils', () => ({ showErrorToast: jest.fn(), })); -jest.mock('../../../rest/DocStoreAPI', () => ({ +jest.mock('../../../../rest/DocStoreAPI', () => ({ getAllKnowledgePanels: jest .fn() .mockImplementation(() => Promise.resolve(mockWidgetsData)), })); -jest.mock('../../../utils/CustomizableLandingPageUtils', () => ({ +jest.mock('../../../../utils/CustomizableLandingPageUtils', () => ({ getWidgetWidthLabelFromKey: jest.fn().mockImplementation((label) => label), })); diff --git a/openmetadata-ui/src/main/resources/ui/src/components/MyData/CustomizableComponents/AddWidgetModal/AddWidgetTabContent.test.tsx b/openmetadata-ui/src/main/resources/ui/src/components/MyData/CustomizableComponents/AddWidgetModal/AddWidgetTabContent.test.tsx index a67b4b092a85..22fe5a7a5aa2 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/MyData/CustomizableComponents/AddWidgetModal/AddWidgetTabContent.test.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/components/MyData/CustomizableComponents/AddWidgetModal/AddWidgetTabContent.test.tsx @@ -28,7 +28,7 @@ const mockProps: AddWidgetTabContentProps = { widgetSizeOptions: mockWidgetSizes, }; -jest.mock('../../../utils/CustomizePageClassBase', () => ({ +jest.mock('../../../../utils/CustomizePageClassBase', () => ({ getWidgetImageFromKey: jest.fn().mockImplementation(() => ''), })); diff --git a/openmetadata-ui/src/main/resources/ui/src/components/MyData/CustomizableComponents/CustomizeMyData/CustomizeMyData.test.tsx b/openmetadata-ui/src/main/resources/ui/src/components/MyData/CustomizableComponents/CustomizeMyData/CustomizeMyData.test.tsx index c321e8fb1e66..6883815b4ece 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/MyData/CustomizableComponents/CustomizeMyData/CustomizeMyData.test.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/components/MyData/CustomizableComponents/CustomizeMyData/CustomizeMyData.test.tsx @@ -37,7 +37,7 @@ const mockProps: CustomizeMyDataProps = { }; jest.mock( - '../../ActivityFeed/ActivityFeedProvider/ActivityFeedProvider', + '../../../ActivityFeed/ActivityFeedProvider/ActivityFeedProvider', () => { return jest .fn() @@ -56,20 +56,23 @@ jest.mock('../AddWidgetModal/AddWidgetModal', () => { )); }); -jest.mock('../EmptyWidgetPlaceholder/EmptyWidgetPlaceholder', () => { - return jest.fn().mockImplementation(({ handleOpenAddWidgetModal }) => ( -
- EmptyWidgetPlaceholder -
handleOpenAddWidgetModal
-
- )); -}); +jest.mock( + '../../../MyData/CustomizableComponents/EmptyWidgetPlaceholder/EmptyWidgetPlaceholder', + () => { + return jest.fn().mockImplementation(({ handleOpenAddWidgetModal }) => ( +
+ EmptyWidgetPlaceholder +
handleOpenAddWidgetModal
+
+ )); + } +); -jest.mock('../../../utils/CustomizePageClassBase', () => { +jest.mock('../../../../utils/CustomizePageClassBase', () => { return mockCustomizePageClassBase; }); -jest.mock('../../PageLayoutV1/PageLayoutV1', () => { +jest.mock('../../../PageLayoutV1/PageLayoutV1', () => { return jest.fn().mockImplementation(({ children, header }) => (
{header}
@@ -78,19 +81,19 @@ jest.mock('../../PageLayoutV1/PageLayoutV1', () => { )); }); -jest.mock('../../Auth/AuthProviders/AuthProvider', () => ({ +jest.mock('../../../Auth/AuthProviders/AuthProvider', () => ({ useAuthContext: jest .fn() .mockImplementation(() => ({ currentUser: mockUserData })), })); -jest.mock('../../../rest/feedsAPI', () => ({ +jest.mock('../../../../rest/feedsAPI', () => ({ getActiveAnnouncement: jest .fn() .mockImplementation(() => mockActiveAnnouncementData), })); -jest.mock('../../../rest/userAPI', () => ({ +jest.mock('../../../../rest/userAPI', () => ({ getUserById: jest.fn().mockImplementation(() => mockUserData), })); @@ -120,7 +123,7 @@ jest.mock('react-grid-layout', () => ({ default: '', })); -jest.mock('../../../hooks/authHooks', () => ({ +jest.mock('../../../../hooks/authHooks', () => ({ useAuth: jest.fn().mockImplementation(() => ({ isAuthDisabled: false })), })); diff --git a/openmetadata-ui/src/main/resources/ui/src/components/MyData/GithubStarCard/GithubStarCard.test.tsx b/openmetadata-ui/src/main/resources/ui/src/components/MyData/GithubStarCard/GithubStarCard.test.tsx index 09a56a1ecd8f..39e67c59add6 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/MyData/GithubStarCard/GithubStarCard.test.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/components/MyData/GithubStarCard/GithubStarCard.test.tsx @@ -28,11 +28,11 @@ jest.mock('react-router-dom', () => ({ )), })); -jest.mock('../../utils/WhatsNewModal.util', () => ({ +jest.mock('../../../utils/WhatsNewModal.util', () => ({ getReleaseVersionExpiry: jest.fn().mockImplementation(() => new Date()), })); -jest.mock('../../rest/commonAPI', () => ({ +jest.mock('../../../rest/commonAPI', () => ({ getRepositoryData: jest.fn().mockImplementation(() => Promise.resolve({ stargazers_count: 10, @@ -40,7 +40,7 @@ jest.mock('../../rest/commonAPI', () => ({ ), })); -jest.mock('../Auth/AuthProviders/AuthProvider', () => ({ +jest.mock('../../Auth/AuthProviders/AuthProvider', () => ({ useAuthContext: jest.fn(() => ({ currentUser: { name: 'admin', diff --git a/openmetadata-ui/src/main/resources/ui/src/components/MyData/MyDataWidget/MyDataWidget.test.tsx b/openmetadata-ui/src/main/resources/ui/src/components/MyData/MyDataWidget/MyDataWidget.test.tsx index 9acdcd6d1366..083f554158b0 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/MyData/MyDataWidget/MyDataWidget.test.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/components/MyData/MyDataWidget/MyDataWidget.test.tsx @@ -74,7 +74,7 @@ jest.mock('../../Auth/AuthProviders/AuthProvider', () => ({ })); jest.mock( - '../../../components/Skeleton/MyData/EntityListSkeleton/EntityListSkeleton.component', + '../../common/Skeleton/MyData/EntityListSkeleton/EntityListSkeleton.component', () => { return jest.fn().mockImplementation(({ children }) => <>{children}); } diff --git a/openmetadata-ui/src/main/resources/ui/src/components/MyData/RightSidebar/AnnouncementsWidget.test.tsx b/openmetadata-ui/src/main/resources/ui/src/components/MyData/RightSidebar/AnnouncementsWidget.test.tsx index 951bf2f8d025..85f52dd670cd 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/MyData/RightSidebar/AnnouncementsWidget.test.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/components/MyData/RightSidebar/AnnouncementsWidget.test.tsx @@ -58,7 +58,7 @@ jest.mock( } ); -jest.mock('../../Loader/Loader', () => +jest.mock('../../common/Loader/Loader', () => jest.fn().mockReturnValue(
Loader
) ); diff --git a/openmetadata-ui/src/main/resources/ui/src/components/MyData/Widgets/FeedsWidget/FeedsWidget.test.tsx b/openmetadata-ui/src/main/resources/ui/src/components/MyData/Widgets/FeedsWidget/FeedsWidget.test.tsx index 32dbec765c61..ece02fa5e689 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/MyData/Widgets/FeedsWidget/FeedsWidget.test.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/components/MyData/Widgets/FeedsWidget/FeedsWidget.test.tsx @@ -73,19 +73,20 @@ const widgetProps = { const tabs = ['All', 'Mentions', 'Tasks']; jest.mock( - '../../../components/ActivityFeed/ActivityFeedList/ActivityFeedListV1.component', + '../../../ActivityFeed/ActivityFeedList/ActivityFeedListV1.component', () => jest.fn().mockImplementation(({ children }) =>

{children}

) ); -jest.mock('../../common/FeedsFilterPopover/FeedsFilterPopover.component', () => - jest.fn().mockImplementation(({ children }) =>

{children}

) +jest.mock( + '../../../common/FeedsFilterPopover/FeedsFilterPopover.component', + () => jest.fn().mockImplementation(({ children }) =>

{children}

) ); -jest.mock('../../../rest/feedsAPI', () => ({ +jest.mock('../../../../rest/feedsAPI', () => ({ getFeedsWithFilter: jest.fn().mockReturnValue(Promise.resolve(mockThread)), })); -jest.mock('../../../utils/CommonUtils', () => ({ +jest.mock('../../../../utils/CommonUtils', () => ({ getCountBadge: jest.fn(), getEntityDetailLink: jest.fn(), Transi18next: jest.fn(), @@ -105,7 +106,7 @@ jest.mock('quilljs-markdown', () => { }); jest.mock( - '../../../components/ActivityFeed/ActivityFeedProvider/ActivityFeedProvider', + '../../../ActivityFeed/ActivityFeedProvider/ActivityFeedProvider', () => ({ useActivityFeedProvider: jest .fn() diff --git a/openmetadata-ui/src/main/resources/ui/src/components/MyData/Widgets/RecentlyViewed/RecentlyViewed.test.tsx b/openmetadata-ui/src/main/resources/ui/src/components/MyData/Widgets/RecentlyViewed/RecentlyViewed.test.tsx index 25d457d26fde..284be9ff2672 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/MyData/Widgets/RecentlyViewed/RecentlyViewed.test.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/components/MyData/Widgets/RecentlyViewed/RecentlyViewed.test.tsx @@ -20,7 +20,7 @@ const mockProp = { }; jest.mock( - '../../Skeleton/MyData/EntityListSkeleton/EntityListSkeleton.component', + '../../../common/Skeleton/MyData/EntityListSkeleton/EntityListSkeleton.component', () => { return jest .fn() @@ -33,7 +33,7 @@ jest.mock('react-router-dom', () => ({ Link: jest.fn().mockImplementation(() =>
Link
), })); -jest.mock('../../../utils/CommonUtils', () => ({ +jest.mock('../../../../utils/CommonUtils', () => ({ getRecentlyViewedData: jest.fn().mockReturnValue([ { displayName: 'test', diff --git a/openmetadata-ui/src/main/resources/ui/src/components/PageLayoutV1/PageLayoutV1.test.tsx b/openmetadata-ui/src/main/resources/ui/src/components/PageLayoutV1/PageLayoutV1.test.tsx index ca19f8062ab9..000631dda3ff 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/PageLayoutV1/PageLayoutV1.test.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/components/PageLayoutV1/PageLayoutV1.test.tsx @@ -14,7 +14,7 @@ import { render } from '@testing-library/react'; import React from 'react'; import PageLayoutV1 from './PageLayoutV1'; -jest.mock('../../components/DocumentTitle/DocumentTitle', () => +jest.mock('../common/DocumentTitle/DocumentTitle', () => jest.fn().mockImplementation(() =>
DocumentTitle
) ); diff --git a/openmetadata-ui/src/main/resources/ui/src/components/SearchedData/SearchedData.test.tsx b/openmetadata-ui/src/main/resources/ui/src/components/SearchedData/SearchedData.test.tsx index 27fbb8ff340d..6f37b236c862 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/SearchedData/SearchedData.test.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/components/SearchedData/SearchedData.test.tsx @@ -87,7 +87,7 @@ const mockData: SearchedDataProps['data'] = [ const mockPaginate = jest.fn(); const mockHandleSummaryPanelDisplay = jest.fn(); -jest.mock('../../components/TableDataCardBody/TableDataCardBody', () => { +jest.mock('../Database/TableDataCardBody/TableDataCardBody', () => { return jest.fn().mockReturnValue(

TableDataCardBody

); }); diff --git a/openmetadata-ui/src/main/resources/ui/src/components/Settings/Users/UsersTab/UsersTab.test.tsx b/openmetadata-ui/src/main/resources/ui/src/components/Settings/Users/UsersTab/UsersTab.test.tsx index 44dceaf7bd4c..d61a0128a35d 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/Settings/Users/UsersTab/UsersTab.test.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/components/Settings/Users/UsersTab/UsersTab.test.tsx @@ -45,6 +45,10 @@ const mockUsers = [ }, ]; +jest.mock('../../../common/PopOverCard/UserPopOverCard', () => + jest.fn().mockReturnValue('Aaron Johnson') +); + const mockOnRemoveUser = jest.fn(); describe('UsersTab', () => { diff --git a/openmetadata-ui/src/main/resources/ui/src/components/Topic/TopicDetails/TopicDetails.test.tsx b/openmetadata-ui/src/main/resources/ui/src/components/Topic/TopicDetails/TopicDetails.test.tsx index 74611f1efc65..c3ec8af9a0cf 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/Topic/TopicDetails/TopicDetails.test.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/components/Topic/TopicDetails/TopicDetails.test.tsx @@ -25,7 +25,7 @@ import TopicDetails from './TopicDetails.component'; import { TopicDetailsProps } from './TopicDetails.interface'; import { TOPIC_DETAILS } from './TopicDetails.mock'; -jest.mock('../common/EntitySummaryDetails/EntitySummaryDetails', () => { +jest.mock('../../common/EntitySummaryDetails/EntitySummaryDetails', () => { return jest .fn() .mockReturnValue( @@ -73,58 +73,50 @@ jest.mock('react-router-dom', () => ({ useParams: jest.fn().mockImplementation(() => mockParams), })); -jest.mock('../../components/Lineage/Lineage.component', () => { +jest.mock('../../Lineage/Lineage.component', () => { return jest.fn().mockReturnValue(

EntityLineage.component

); }); -jest.mock('../common/EntityDescription/Description', () => { +jest.mock('../../common/EntityDescription/Description', () => { return jest.fn().mockReturnValue(

Description Component

); }); -jest.mock('../common/TitleBreadcrumb/TitleBreadcrumb.component', () => { +jest.mock('../../common/TitleBreadcrumb/TitleBreadcrumb.component', () => { return jest.fn().mockReturnValue(

Breadcrumb

); }); -jest.mock('../../components/PageLayoutV1/PageLayoutV1', () => { +jest.mock('../../PageLayoutV1/PageLayoutV1', () => { return jest.fn().mockImplementation(({ children }) =>
{children}
); }); -jest.mock('../common/RichTextEditor/RichTextEditorPreviewer', () => { +jest.mock('../../common/RichTextEditor/RichTextEditorPreviewer', () => { return jest.fn().mockReturnValue(

RichTextEditorPreviwer

); }); -jest.mock('../../components/Tag/TagsContainerV2/TagsContainerV2', () => { - return jest.fn().mockReturnValue(

TagsContainerV2

); -}); - -jest.mock('../FeedEditor/FeedEditor', () => { - return jest.fn().mockReturnValue(

FeedEditor

); -}); - -jest.mock('../common/CustomPropertyTable/CustomPropertyTable', () => ({ +jest.mock('../../common/CustomPropertyTable/CustomPropertyTable', () => ({ CustomPropertyTable: jest .fn() .mockReturnValue(

CustomPropertyTable.component

), })); -jest.mock('../SchemaEditor/SchemaEditor', () => { - return jest.fn().mockReturnValue(

SchemaEditor

); +jest.mock('../../ActivityFeed/FeedEditor/FeedEditor', () => { + return jest.fn().mockReturnValue(

FeedEditor.component

); }); -jest.mock('./TopicSchema/TopicSchema', () => { +jest.mock('../TopicSchema/TopicSchema', () => { return jest .fn() .mockReturnValue(
TopicSchema
); }); jest.mock( - '../../components/SampleDataWithMessages/SampleDataWithMessages', + '../../Database/SampleDataWithMessages/SampleDataWithMessages', () => { return jest.fn().mockReturnValue(
SampleDataWithMessages
); } ); -jest.mock('../../utils/CommonUtils', () => ({ +jest.mock('../../../utils/CommonUtils', () => ({ addToRecentViewed: jest.fn(), getCountBadge: jest.fn(), getPartialNameFromFQN: jest.fn().mockReturnValue('PartialNameFromFQN'), diff --git a/openmetadata-ui/src/main/resources/ui/src/components/Topic/TopicSchema/TopicSchema.test.tsx b/openmetadata-ui/src/main/resources/ui/src/components/Topic/TopicSchema/TopicSchema.test.tsx index 0b38cd20f646..89ed31a63382 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/Topic/TopicSchema/TopicSchema.test.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/components/Topic/TopicSchema/TopicSchema.test.tsx @@ -66,7 +66,7 @@ jest.mock( }) ); -jest.mock('../../TableTags/TableTags.component', () => +jest.mock('../../Database/TableTags/TableTags.component', () => jest .fn() .mockImplementation(() => ( @@ -82,7 +82,7 @@ jest.mock('../../common/ErrorWithPlaceholder/ErrorPlaceHolder', () => )) ); -jest.mock('../../SchemaEditor/SchemaEditor', () => +jest.mock('../../Database/SchemaEditor/SchemaEditor', () => jest .fn() .mockImplementation(() => ( diff --git a/openmetadata-ui/src/main/resources/ui/src/components/Topic/TopicVersion/TopicVersion.test.tsx b/openmetadata-ui/src/main/resources/ui/src/components/Topic/TopicVersion/TopicVersion.test.tsx index b42fb45ca547..fc90f50356df 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/Topic/TopicVersion/TopicVersion.test.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/components/Topic/TopicVersion/TopicVersion.test.tsx @@ -21,45 +21,41 @@ import TopicVersion from './TopicVersion.component'; const mockPush = jest.fn(); jest.mock( - '../../components/DataAssets/DataAssetsVersionHeader/DataAssetsVersionHeader', + '../../DataAssets/DataAssetsVersionHeader/DataAssetsVersionHeader', () => jest.fn().mockImplementation(() =>
DataAssetsVersionHeader
) ); -jest.mock('../../components/TabsLabel/TabsLabel.component', () => +jest.mock('../../common/TabsLabel/TabsLabel.component', () => jest.fn().mockImplementation(({ name }) =>
{name}
) ); -jest.mock('../../components/Tag/TagsContainerV2/TagsContainerV2', () => +jest.mock('../../Tag/TagsContainerV2/TagsContainerV2', () => jest.fn().mockImplementation(() =>
TagsContainerV2
) ); -jest.mock( - '../../components/common/CustomPropertyTable/CustomPropertyTable', - () => ({ - CustomPropertyTable: jest - .fn() - .mockImplementation(() =>
CustomPropertyTable
), - }) -); +jest.mock('../../common/CustomPropertyTable/CustomPropertyTable', () => ({ + CustomPropertyTable: jest + .fn() + .mockImplementation(() =>
CustomPropertyTable
), +})); -jest.mock('../../components/common/EntityDescription/DescriptionV1', () => +jest.mock('../../common/EntityDescription/DescriptionV1', () => jest.fn().mockImplementation(() =>
DescriptionV1
) ); -jest.mock('../../components/common/ErrorWithPlaceholder/ErrorPlaceHolder', () => +jest.mock('../../common/ErrorWithPlaceholder/ErrorPlaceHolder', () => jest.fn().mockImplementation(() =>
ErrorPlaceHolder
) ); -jest.mock( - '../../components/Entity/EntityVersionTimeLine/EntityVersionTimeLine', - () => jest.fn().mockImplementation(() =>
EntityVersionTimeLine
) +jest.mock('../../Entity/EntityVersionTimeLine/EntityVersionTimeLine', () => + jest.fn().mockImplementation(() =>
EntityVersionTimeLine
) ); -jest.mock('../../components/TopicDetails/TopicSchema/TopicSchema', () => +jest.mock('../../Topic/TopicSchema/TopicSchema', () => jest.fn().mockImplementation(() =>
TopicSchema
) ); -jest.mock('../../components/Loader/Loader', () => +jest.mock('../../common/Loader/Loader', () => jest.fn().mockImplementation(() =>
Loader
) ); diff --git a/openmetadata-ui/src/main/resources/ui/src/components/common/AsyncSelectList/AsyncSelectList.test.tsx b/openmetadata-ui/src/main/resources/ui/src/components/common/AsyncSelectList/AsyncSelectList.test.tsx index abd6996cef9e..a295f85a991c 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/common/AsyncSelectList/AsyncSelectList.test.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/components/common/AsyncSelectList/AsyncSelectList.test.tsx @@ -31,19 +31,19 @@ jest.mock('lodash', () => { return module; }); -jest.mock('../../components/Loader/Loader', () => +jest.mock('../../common/Loader/Loader', () => jest.fn().mockImplementation(() =>
Loader
) ); -jest.mock('../Tag/TagsV1/TagsV1.component', () => +jest.mock('../../Tag/TagsV1/TagsV1.component', () => jest.fn().mockImplementation(() =>
TagsV1
) ); -jest.mock('../../utils/ToastUtils', () => ({ +jest.mock('../../../utils/ToastUtils', () => ({ showErrorToast: jest.fn(), })); -jest.mock('../../utils/TagsUtils', () => ({ +jest.mock('../../../utils/TagsUtils', () => ({ getTagDisplay: jest.fn().mockReturnValue('tags'), tagRender: jest.fn().mockReturnValue(

Tags Render

), })); diff --git a/openmetadata-ui/src/main/resources/ui/src/components/common/BrandImage/BrandImage.test.tsx b/openmetadata-ui/src/main/resources/ui/src/components/common/BrandImage/BrandImage.test.tsx index 90b9cb65e888..4b7c004e0222 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/common/BrandImage/BrandImage.test.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/components/common/BrandImage/BrandImage.test.tsx @@ -14,12 +14,15 @@ import { render, screen } from '@testing-library/react'; import React from 'react'; import BrandImage from './BrandImage'; -jest.mock('../../ApplicationConfigProvider/ApplicationConfigProvider', () => ({ - useApplicationConfigContext: jest.fn().mockImplementation(() => ({ - customLogoUrlPath: 'https://custom-logo.png', - customMonogramUrlPath: 'https://custom-monogram.png', - })), -})); +jest.mock( + '../../../context/ApplicationConfigProvider/ApplicationConfigProvider', + () => ({ + useApplicationConfigContext: jest.fn().mockImplementation(() => ({ + customLogoUrlPath: 'https://custom-logo.png', + customMonogramUrlPath: 'https://custom-monogram.png', + })), + }) +); describe('Test Brand Logo', () => { it('Should render the brand logo with default props value', () => { diff --git a/openmetadata-ui/src/main/resources/ui/src/components/common/CustomPropertyTable/CustomPropertyTable.test.tsx b/openmetadata-ui/src/main/resources/ui/src/components/common/CustomPropertyTable/CustomPropertyTable.test.tsx index 5024ada16bbe..3f3f09f69fa6 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/common/CustomPropertyTable/CustomPropertyTable.test.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/components/common/CustomPropertyTable/CustomPropertyTable.test.tsx @@ -51,7 +51,7 @@ jest.mock('../ErrorWithPlaceholder/ErrorPlaceHolder', () => { return jest.fn().mockReturnValue(
ErrorPlaceHolder.component
); }); -jest.mock('../../../components/Loader/Loader', () => { +jest.mock('../../common/Loader/Loader', () => { return jest.fn().mockReturnValue(
Loader
); }); @@ -63,7 +63,7 @@ jest.mock('../../../rest/metadataTypeAPI', () => ({ ), })); -jest.mock('../../../components/PermissionProvider/PermissionProvider', () => ({ +jest.mock('../../../context/PermissionProvider/PermissionProvider', () => ({ usePermissionProvider: jest.fn().mockReturnValue({ getEntityPermissionByFqn: jest.fn().mockReturnValue({ Create: true, diff --git a/openmetadata-ui/src/main/resources/ui/src/components/common/CustomPropertyTable/PropertyInput.test.tsx b/openmetadata-ui/src/main/resources/ui/src/components/common/CustomPropertyTable/PropertyInput.test.tsx index 27ccd2c4413d..2db6cf21a9b8 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/common/CustomPropertyTable/PropertyInput.test.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/components/common/CustomPropertyTable/PropertyInput.test.tsx @@ -28,7 +28,7 @@ const mockProp: PropertyInputProps = { isLoading: false, }; -jest.mock('../../../components/InlineEdit/InlineEdit.component', () => { +jest.mock('../InlineEdit/InlineEdit.component', () => { return jest.fn().mockImplementation(({ children, onSave }) => (
{children} diff --git a/openmetadata-ui/src/main/resources/ui/src/components/common/EntityImport/EntityImport.test.tsx b/openmetadata-ui/src/main/resources/ui/src/components/common/EntityImport/EntityImport.test.tsx index 6a101f242f42..751b403ad25b 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/common/EntityImport/EntityImport.test.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/components/common/EntityImport/EntityImport.test.tsx @@ -23,6 +23,7 @@ import { Status, } from '../../../generated/type/csvImportResult'; import { EntityImport } from './EntityImport.component'; + let mockCsvImportResult = { dryRun: true, status: 'success', @@ -33,6 +34,7 @@ let mockCsvImportResult = { success,Entity created,,Glossary2 Term,Glossary2 Term displayName,Description for Glossary2 Term,,,,\r success,Entity created,,Glossary2 term2,Glossary2 term2,Description data.,,,,\r`, } as CSVImportResult; + const mockProps = { entityName: 'Business Glossary', onImport: jest @@ -41,6 +43,7 @@ const mockProps = { onSuccess: jest.fn(), onCancel: jest.fn(), }; + const mockCsvContent = `parent,name*,displayName,description*,synonyms,relatedTerms,references,tags ,Glossary2 Term,Glossary2 Term,Description for Glossary2 Term,,,, ,Glossary2 term2,Glossary2 term2,Description data.,,,,`; @@ -50,12 +53,12 @@ const mockIncorrectCsvContent = `parent,name*,displayName,description*,synonyms, `; jest.mock( - '../../../components/IngestionStepper/IngestionStepper.component', + '../../Settings/Services/Ingestion/IngestionStepper/IngestionStepper.component', () => { return jest.fn().mockImplementation(() =>
Stepper
); } ); -jest.mock('../../../components/Loader/Loader', () => { +jest.mock('../../common/Loader/Loader', () => { return jest.fn().mockImplementation(() =>
Loader
); }); jest.mock('./ImportStatus/ImportStatus.component', () => ({ diff --git a/openmetadata-ui/src/main/resources/ui/src/components/common/ListView/ListView.test.tsx b/openmetadata-ui/src/main/resources/ui/src/components/common/ListView/ListView.test.tsx index 4ea3fd76c088..ec1e640e6023 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/common/ListView/ListView.test.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/components/common/ListView/ListView.test.tsx @@ -18,16 +18,13 @@ const mockCardRenderer = jest.fn().mockImplementation(() => <>Card); const mockOnSearch = jest.fn(); const mockHandleDeletedSwitchChange = jest.fn(); -jest.mock('../../components/common/Table/Table', () => { +jest.mock('../Table/Table', () => { return jest.fn(() =>

Table

); }); -jest.mock( - '../../components/common/SearchBarComponent/SearchBar.component', - () => { - return jest.fn().mockImplementation(() =>

Searchbar

); - } -); +jest.mock('../SearchBarComponent/SearchBar.component', () => { + return jest.fn().mockImplementation(() =>

Searchbar

); +}); describe('ListView component', () => { it('should render toggle button for card and table', async () => { diff --git a/openmetadata-ui/src/main/resources/ui/src/components/common/PopOverCard/EntityPopOverCard.test.tsx b/openmetadata-ui/src/main/resources/ui/src/components/common/PopOverCard/EntityPopOverCard.test.tsx index 90902aa8eddf..e08cba520845 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/common/PopOverCard/EntityPopOverCard.test.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/components/common/PopOverCard/EntityPopOverCard.test.tsx @@ -34,7 +34,7 @@ jest.mock('../../../utils/StringsUtils', () => ({ getEncodedFqn: jest.fn(), })); -jest.mock('../../Loader/Loader', () => { +jest.mock('../../common/Loader/Loader', () => { return jest.fn().mockImplementation(() =>

Loader

); }); @@ -104,12 +104,15 @@ jest.mock('../../../rest/topicsAPI', () => ({ getTopicByFqn: jest.fn().mockImplementation(() => Promise.resolve({})), })); -jest.mock('../../ApplicationConfigProvider/ApplicationConfigProvider', () => ({ - useApplicationConfigContext: jest.fn().mockImplementation(() => ({ - cachedEntityData: {}, - updateCachedEntityData, - })), -})); +jest.mock( + '../../../context/ApplicationConfigProvider/ApplicationConfigProvider', + () => ({ + useApplicationConfigContext: jest.fn().mockImplementation(() => ({ + cachedEntityData: {}, + updateCachedEntityData, + })), + }) +); describe('Test EntityPopoverCard component', () => { it('EntityPopoverCard should render element', () => { diff --git a/openmetadata-ui/src/main/resources/ui/src/components/common/ResizablePanels/ResziablePanels.test.tsx b/openmetadata-ui/src/main/resources/ui/src/components/common/ResizablePanels/ResziablePanels.test.tsx index 6f1d5dc626db..070c88edbf12 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/common/ResizablePanels/ResziablePanels.test.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/components/common/ResizablePanels/ResziablePanels.test.tsx @@ -13,7 +13,7 @@ import { act, render, screen } from '@testing-library/react'; import React from 'react'; import ResizablePanels from './ResizablePanels'; -jest.mock('../../../components/DocumentTitle/DocumentTitle', () => +jest.mock('../DocumentTitle/DocumentTitle', () => jest.fn().mockImplementation(() =>
DocumentTitle
) ); const firstPanel = { diff --git a/openmetadata-ui/src/main/resources/ui/src/components/common/SearchBarComponent/Searchbar.test.tsx b/openmetadata-ui/src/main/resources/ui/src/components/common/SearchBarComponent/Searchbar.test.tsx index ba8669e0373c..9194bac6a42d 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/common/SearchBarComponent/Searchbar.test.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/components/common/SearchBarComponent/Searchbar.test.tsx @@ -23,7 +23,7 @@ import Searchbar from './SearchBar.component'; jest.useRealTimers(); -jest.mock('../../Loader/Loader', () => { +jest.mock('../Loader/Loader', () => { return jest.fn().mockReturnValue(

Loader

); }); diff --git a/openmetadata-ui/src/main/resources/ui/src/components/common/ServiceDocPanel/ServiceDocPanel.test.tsx b/openmetadata-ui/src/main/resources/ui/src/components/common/ServiceDocPanel/ServiceDocPanel.test.tsx index 2b94ea3b4a54..f335863a88bd 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/common/ServiceDocPanel/ServiceDocPanel.test.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/components/common/ServiceDocPanel/ServiceDocPanel.test.tsx @@ -14,18 +14,16 @@ import { act, render, screen } from '@testing-library/react'; import React from 'react'; import ServiceRequirements from './ServiceDocPanel'; -jest.mock('../../../components/Loader/Loader', () => +jest.mock('../Loader/Loader', () => jest.fn().mockReturnValue(
Loader
) ); -jest.mock( - '../../../components/common/RichTextEditor/RichTextEditorPreviewer', - () => - jest - .fn() - .mockImplementation(({ markdown }) => ( -
{markdown}
- )) +jest.mock('../RichTextEditor/RichTextEditorPreviewer', () => + jest + .fn() + .mockImplementation(({ markdown }) => ( +
{markdown}
+ )) ); jest.mock('../../../rest/miscAPI', () => ({ diff --git a/openmetadata-ui/src/main/resources/ui/src/components/common/TableDataCardV2/TableDataCardV2.test.tsx b/openmetadata-ui/src/main/resources/ui/src/components/common/TableDataCardV2/TableDataCardV2.test.tsx index 9d169d61a9cc..069b98ec8196 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/common/TableDataCardV2/TableDataCardV2.test.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/components/common/TableDataCardV2/TableDataCardV2.test.tsx @@ -33,7 +33,7 @@ jest.mock('../../../constants/constants', () => ({ .mockImplementation((path) => `/dataset/${path}`), })); -jest.mock('../../TableDataCardBody/TableDataCardBody', () => { +jest.mock('../../Database/TableDataCardBody/TableDataCardBody', () => { return jest.fn().mockReturnValue(

TableDataCardBody

); }); diff --git a/openmetadata-ui/src/main/resources/ui/src/components/common/TierCard/TierCard.test.tsx b/openmetadata-ui/src/main/resources/ui/src/components/common/TierCard/TierCard.test.tsx index c53cbd1f328d..8917545542ac 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/common/TierCard/TierCard.test.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/components/common/TierCard/TierCard.test.tsx @@ -53,7 +53,7 @@ jest.mock('../../../rest/tagAPI', () => ({ getTags: jest.fn().mockImplementation(() => mockGetTags()), })); -jest.mock('../../Loader/Loader', () => { +jest.mock('../Loader/Loader', () => { return jest.fn().mockReturnValue(
Loader
); }); diff --git a/openmetadata-ui/src/main/resources/ui/src/hooks/user-profile/useUserProfile.test.ts b/openmetadata-ui/src/main/resources/ui/src/hooks/user-profile/useUserProfile.test.ts index 9b4bc9a7ed29..8672e65bbbe4 100644 --- a/openmetadata-ui/src/main/resources/ui/src/hooks/user-profile/useUserProfile.test.ts +++ b/openmetadata-ui/src/main/resources/ui/src/hooks/user-profile/useUserProfile.test.ts @@ -15,7 +15,7 @@ import { getUserByName } from '../../rest/userAPI'; import { useUserProfile } from './useUserProfile'; jest.mock( - '../../components/ApplicationConfigProvider/ApplicationConfigProvider', + '../../context/ApplicationConfigProvider/ApplicationConfigProvider', () => ({ useApplicationConfigContext: jest.fn().mockImplementation(() => ({ userProfilePics: { diff --git a/openmetadata-ui/src/main/resources/ui/src/pages/AddCustomMetricPage/AddCustomMetricPage.test.tsx b/openmetadata-ui/src/main/resources/ui/src/pages/AddCustomMetricPage/AddCustomMetricPage.test.tsx index 322e632a21ae..daec59c30ebf 100644 --- a/openmetadata-ui/src/main/resources/ui/src/pages/AddCustomMetricPage/AddCustomMetricPage.test.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/pages/AddCustomMetricPage/AddCustomMetricPage.test.tsx @@ -25,21 +25,21 @@ jest.mock( } ); jest.mock( - '../../components/CustomMetricForm/CustomMetricForm.component', + '../../components/DataQuality/CustomMetricForm/CustomMetricForm.component', () => { return jest.fn().mockImplementation(() =>
CustomMetricForm
); } ); +jest.mock('../../components/Database/TableProfiler/SingleColumnProfile', () => { + return jest.fn().mockImplementation(() =>
SingleColumnProfile
); +}); jest.mock( - '../../components/TableProfiler/Component/SingleColumnProfile', + '../../components/Database/TableProfiler/TableProfilerChart/TableProfilerChart', () => { - return jest.fn().mockImplementation(() =>
SingleColumnProfile
); + return jest.fn().mockImplementation(() =>
TableProfilerChart
); } ); -jest.mock('../../components/TableProfiler/Component/TableProfilerChart', () => { - return jest.fn().mockImplementation(() =>
TableProfilerChart
); -}); -jest.mock('../../components/Loader/Loader', () => { +jest.mock('../../components/common/Loader/Loader', () => { return jest.fn().mockImplementation(() =>
Loader
); }); jest.mock('react-router-dom', () => ({ diff --git a/openmetadata-ui/src/main/resources/ui/src/pages/AddDataQualityTestPage/AddDataQualityTestPage.test.tsx b/openmetadata-ui/src/main/resources/ui/src/pages/AddDataQualityTestPage/AddDataQualityTestPage.test.tsx index 9ad412f91a33..f3ae044428b6 100644 --- a/openmetadata-ui/src/main/resources/ui/src/pages/AddDataQualityTestPage/AddDataQualityTestPage.test.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/pages/AddDataQualityTestPage/AddDataQualityTestPage.test.tsx @@ -42,14 +42,17 @@ jest.mock('../../hooks/useFqn', () => ({ useFqn: jest.fn().mockReturnValue({ fqn: 'test-fqn' }), })); -jest.mock('../../components/AddDataQualityTest/AddDataQualityTestV1', () => ({ - __esModule: true, - default: jest - .fn() - .mockImplementation(() => ( -
AddDataQualityTestV1
- )), -})); +jest.mock( + '../../components/DataQuality/AddDataQualityTest/AddDataQualityTestV1', + () => ({ + __esModule: true, + default: jest + .fn() + .mockImplementation(() => ( +
AddDataQualityTestV1
+ )), + }) +); describe('AddDataQualityTestPage', () => { it('renders Add DataQuality Test Page', async () => { diff --git a/openmetadata-ui/src/main/resources/ui/src/pages/AddIngestionPage/AddIngestionPage.test.tsx b/openmetadata-ui/src/main/resources/ui/src/pages/AddIngestionPage/AddIngestionPage.test.tsx index c8d0cd013348..7065ced44435 100644 --- a/openmetadata-ui/src/main/resources/ui/src/pages/AddIngestionPage/AddIngestionPage.test.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/pages/AddIngestionPage/AddIngestionPage.test.tsx @@ -68,8 +68,9 @@ jest.mock( () => jest.fn().mockImplementation(() =>
TitleBreadcrumb
) ); -jest.mock('../../components/AddIngestion/AddIngestion.component', () => - jest.fn().mockImplementation(() =>
AddIngestion
) +jest.mock( + '../../components/Settings/Services/AddIngestion/AddIngestion.component', + () => jest.fn().mockImplementation(() =>
AddIngestion
) ); jest.mock('../../rest/ingestionPipelineAPI', () => ({ diff --git a/openmetadata-ui/src/main/resources/ui/src/pages/AddObservabilityPage/DestinationFormItem/TeamAndUserSelectItem/TeamAndUserSelectItem.test.tsx b/openmetadata-ui/src/main/resources/ui/src/pages/AddObservabilityPage/DestinationFormItem/TeamAndUserSelectItem/TeamAndUserSelectItem.test.tsx index c0fa7f619436..44310c3c89fc 100644 --- a/openmetadata-ui/src/main/resources/ui/src/pages/AddObservabilityPage/DestinationFormItem/TeamAndUserSelectItem/TeamAndUserSelectItem.test.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/pages/AddObservabilityPage/DestinationFormItem/TeamAndUserSelectItem/TeamAndUserSelectItem.test.tsx @@ -21,7 +21,7 @@ import { } from '../../../../constants/TeamAndUserSelectItem.constants'; import TeamAndUserSelectItem from './TeamAndUserSelectItem'; -jest.mock('../../../../components/Loader/Loader', () => +jest.mock('../../../../components/common/Loader/Loader', () => jest.fn().mockImplementation(() =>
Loader
) ); diff --git a/openmetadata-ui/src/main/resources/ui/src/pages/AddQueryPage/AddQueryPage.test.tsx b/openmetadata-ui/src/main/resources/ui/src/pages/AddQueryPage/AddQueryPage.test.tsx index 961f81d392e1..4e67c300c28d 100644 --- a/openmetadata-ui/src/main/resources/ui/src/pages/AddQueryPage/AddQueryPage.test.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/pages/AddQueryPage/AddQueryPage.test.tsx @@ -35,13 +35,13 @@ jest.mock( return jest.fn().mockImplementation(() =>
TitleBreadcrumb
); } ); -jest.mock('../../components/SchemaEditor/SchemaEditor', () => { +jest.mock('../../components/Database/SchemaEditor/SchemaEditor', () => { return jest.fn().mockImplementation(() =>
SchemaEditor
); }); jest.mock('../../components/common/RichTextEditor/RichTextEditor', () => { return jest.fn().mockImplementation(() =>
RichTextEditor
); }); -jest.mock('../../components/AsyncSelect/AsyncSelect', () => ({ +jest.mock('../../components/common/AsyncSelect/AsyncSelect', () => ({ AsyncSelect: jest.fn().mockImplementation(() =>
AsyncSelect
), })); jest.mock('../../components/common/ResizablePanels/ResizablePanels', () => @@ -52,7 +52,7 @@ jest.mock('../../components/common/ResizablePanels/ResizablePanels', () => )) ); -jest.mock('../../components/PermissionProvider/PermissionProvider', () => ({ +jest.mock('../../context/PermissionProvider/PermissionProvider', () => ({ usePermissionProvider: jest.fn().mockImplementation(() => ({ permissions: { query: { diff --git a/openmetadata-ui/src/main/resources/ui/src/pages/AddServicePage/AddServicePage.test.tsx b/openmetadata-ui/src/main/resources/ui/src/pages/AddServicePage/AddServicePage.test.tsx index 85160761ac5f..a3f29df5e9cc 100644 --- a/openmetadata-ui/src/main/resources/ui/src/pages/AddServicePage/AddServicePage.test.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/pages/AddServicePage/AddServicePage.test.tsx @@ -19,9 +19,12 @@ const mockParam = { serviceCategory: 'databaseServices', }; -jest.mock('../../components/AddService/AddService.component', () => { - return jest.fn().mockImplementation(() =>
AddService.component
); -}); +jest.mock( + '../../components/Settings/Services/AddService/AddService.component', + () => { + return jest.fn().mockImplementation(() =>
AddService.component
); + } +); jest.mock('react-router-dom', () => ({ useParams: jest.fn().mockImplementation(() => mockParam), diff --git a/openmetadata-ui/src/main/resources/ui/src/pages/AppInstall/AppInstall.test.tsx b/openmetadata-ui/src/main/resources/ui/src/pages/AppInstall/AppInstall.test.tsx index c06b2056ff73..19025a30f086 100644 --- a/openmetadata-ui/src/main/resources/ui/src/pages/AppInstall/AppInstall.test.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/pages/AppInstall/AppInstall.test.tsx @@ -36,7 +36,7 @@ jest.mock('react-router-dom', () => ({ })); jest.mock( - '../../components/AddDataQualityTest/components/TestSuiteScheduler', + '../../components/DataQuality/AddDataQualityTest/components/TestSuiteScheduler', () => jest.fn().mockImplementation(({ onSubmit, onCancel }) => ( <> @@ -48,14 +48,14 @@ jest.mock( ); jest.mock( - '../../components/Applications/AppDetails/ApplicationSchemaClassBase', + '../../components/Settings/Applications/AppDetails/ApplicationSchemaClassBase', () => ({ importSchema: jest.fn().mockResolvedValue({}), }) ); jest.mock( - '../../components/Applications/AppInstallVerifyCard/AppInstallVerifyCard.component', + '../../components/Settings/Applications/AppInstallVerifyCard/AppInstallVerifyCard.component', () => jest.fn().mockImplementation(({ onSave, onCancel }) => ( <> @@ -80,11 +80,12 @@ jest.mock('../../components/common/FormBuilder/FormBuilder', () => )) ); -jest.mock('../../components/IngestionStepper/IngestionStepper.component', () => - jest.fn().mockImplementation(() =>
IngestionStepper
) +jest.mock( + '../../components/Settings/Services/Ingestion/IngestionStepper/IngestionStepper.component', + () => jest.fn().mockImplementation(() =>
IngestionStepper
) ); -jest.mock('../../components/Loader/Loader', () => +jest.mock('../../components/common/Loader/Loader', () => jest.fn().mockImplementation(() =>
Loader
) ); diff --git a/openmetadata-ui/src/main/resources/ui/src/pages/BotDetailsPage/BotDetailsPage.test.tsx b/openmetadata-ui/src/main/resources/ui/src/pages/BotDetailsPage/BotDetailsPage.test.tsx index 3ab0b807a988..9cbb93290df1 100644 --- a/openmetadata-ui/src/main/resources/ui/src/pages/BotDetailsPage/BotDetailsPage.test.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/pages/BotDetailsPage/BotDetailsPage.test.tsx @@ -55,11 +55,14 @@ jest.mock('../../hooks/authHooks', () => ({ useAuth: jest.fn().mockImplementation(() => ({ isAdminUser: true })), })); -jest.mock('../../components/BotDetails/BotDetails.component', () => { - return jest - .fn() - .mockReturnValue(
BotsDetails
); -}); +jest.mock( + '../../components/Settings/Bot/BotDetails/BotDetails.component', + () => { + return jest + .fn() + .mockReturnValue(
BotsDetails
); + } +); jest.mock('../../rest/userAPI', () => ({ getBotByName: jest.fn().mockImplementation(() => Promise.resolve(botData)), @@ -68,7 +71,7 @@ jest.mock('../../rest/userAPI', () => ({ updateUserDetail: jest.fn().mockImplementation(() => Promise.resolve()), })); -jest.mock('../../components/PermissionProvider/PermissionProvider', () => ({ +jest.mock('../../context/PermissionProvider/PermissionProvider', () => ({ usePermissionProvider: jest.fn().mockReturnValue({ getEntityPermissionByFqn: jest.fn().mockReturnValue({ Create: true, diff --git a/openmetadata-ui/src/main/resources/ui/src/pages/BotsPageV1/BotsPageV1.test.tsx b/openmetadata-ui/src/main/resources/ui/src/pages/BotsPageV1/BotsPageV1.test.tsx index 1a0ff4268fed..d679bde709bb 100644 --- a/openmetadata-ui/src/main/resources/ui/src/pages/BotsPageV1/BotsPageV1.test.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/pages/BotsPageV1/BotsPageV1.test.tsx @@ -23,7 +23,7 @@ jest.mock('react-router-dom', () => ({ })), })); -jest.mock('../../components/BotListV1/BotListV1.component', () => +jest.mock('../../components/Settings/Bot/BotListV1/BotListV1.component', () => jest .fn() .mockImplementation( diff --git a/openmetadata-ui/src/main/resources/ui/src/pages/ContainerPage/ContainerPage.test.tsx b/openmetadata-ui/src/main/resources/ui/src/pages/ContainerPage/ContainerPage.test.tsx index 40a3ff34dbc7..3747f0826684 100644 --- a/openmetadata-ui/src/main/resources/ui/src/pages/ContainerPage/ContainerPage.test.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/pages/ContainerPage/ContainerPage.test.tsx @@ -10,12 +10,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -import { - act, - render, - screen, - waitForElementToBeRemoved, -} from '@testing-library/react'; +import { act, render, screen } from '@testing-library/react'; import userEvent from '@testing-library/user-event'; import React, { ReactNode } from 'react'; import { ERROR_PLACEHOLDER_TYPE } from '../../enums/common.enum'; @@ -96,7 +91,7 @@ jest.mock('../../components/common/ErrorWithPlaceholder/ErrorPlaceHolder', () => ); jest.mock( - '../../components/ContainerDetail/ContainerChildren/ContainerChildren', + '../../components/Container/ContainerChildren/ContainerChildren', () => jest.fn().mockImplementation(({ isLoading }) => { getContainerByName(CONTAINER_DATA_1.fullyQualifiedName, { @@ -113,7 +108,7 @@ jest.mock( ); jest.mock( - '../../components/ContainerDetail/ContainerDataModel/ContainerDataModel', + '../../components/Container/ContainerDataModel/ContainerDataModel', () => jest.fn().mockReturnValue(ContainerDataModel) ); @@ -139,11 +134,11 @@ jest.mock('../../components/Lineage/Lineage.component', () => jest.fn().mockReturnValue(<>EntityLineage) ); -jest.mock('../../components/LineageProvider/LineageProvider', () => +jest.mock('../../context/LineageProvider/LineageProvider', () => jest.fn().mockReturnValue(<>LineageProvider) ); -jest.mock('../../components/Loader/Loader', () => +jest.mock('../../components/common/Loader/Loader', () => jest.fn().mockReturnValue(
Loader
) ); @@ -151,13 +146,13 @@ jest.mock('../../components/PageLayoutV1/PageLayoutV1', () => jest.fn().mockImplementation(({ children }) => <>{children}) ); -jest.mock('../../components/PermissionProvider/PermissionProvider', () => ({ +jest.mock('../../context/PermissionProvider/PermissionProvider', () => ({ usePermissionProvider: jest.fn().mockImplementation(() => ({ getEntityPermissionByFqn: mockGetEntityPermissionByFqn, })), })); -jest.mock('../../components/TabsLabel/TabsLabel.component', () => +jest.mock('../../components/common/TabsLabel/TabsLabel.component', () => jest.fn().mockImplementation(({ name }) =>
{name}
) ); @@ -238,7 +233,7 @@ describe('Container Page Component', () => { ViewBasic: false, }); - await act(() => { + await act(async () => { render(); expect(screen.getByText('Loader')).toBeVisible(); @@ -248,8 +243,6 @@ describe('Container Page Component', () => { expect(getContainerByName).not.toHaveBeenCalled(); - await waitForElementToBeRemoved(() => screen.getByText('Loader')); - expect( screen.getByText(ERROR_PLACEHOLDER_TYPE.PERMISSION) ).toBeInTheDocument(); diff --git a/openmetadata-ui/src/main/resources/ui/src/pages/CreateUserPage/CreateUserPage.test.tsx b/openmetadata-ui/src/main/resources/ui/src/pages/CreateUserPage/CreateUserPage.test.tsx index 9e945f20c29d..915962992c58 100644 --- a/openmetadata-ui/src/main/resources/ui/src/pages/CreateUserPage/CreateUserPage.test.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/pages/CreateUserPage/CreateUserPage.test.tsx @@ -47,13 +47,16 @@ jest.mock('../../hooks/authHooks', () => ({ useAuth: jest.fn().mockReturnValue({ isAdminUser: true }), })); -jest.mock('../../components/CreateUser/CreateUser.component', () => { - return jest - .fn() - .mockImplementation(({ onSave }) => ( -
CreateUser component
- )); -}); +jest.mock( + '../../components/Settings/Users/CreateUser/CreateUser.component', + () => { + return jest + .fn() + .mockImplementation(({ onSave }) => ( +
CreateUser component
+ )); + } +); jest.mock('../../rest/userAPI', () => ({ createUser: jest.fn().mockImplementation(() => Promise.resolve()), diff --git a/openmetadata-ui/src/main/resources/ui/src/pages/CustomPropertiesPageV1/CustomPropertiesPageV1.test.tsx b/openmetadata-ui/src/main/resources/ui/src/pages/CustomPropertiesPageV1/CustomPropertiesPageV1.test.tsx index 3141eda2b32f..0c4ec2e8e95f 100644 --- a/openmetadata-ui/src/main/resources/ui/src/pages/CustomPropertiesPageV1/CustomPropertiesPageV1.test.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/pages/CustomPropertiesPageV1/CustomPropertiesPageV1.test.tsx @@ -37,13 +37,16 @@ jest.mock( () => jest.fn(() =>
TitleBreadcrumb
) ); -jest.mock('../../components/CustomEntityDetail/CustomPropertyTable', () => ({ - CustomPropertyTable: jest.fn(({ updateEntityType }) => ( - - )), -})); +jest.mock( + '../../components/Settings/CustomProperty/CustomPropertyTable', + () => ({ + CustomPropertyTable: jest.fn(({ updateEntityType }) => ( + + )), + }) +); jest.mock('../../components/PageHeader/PageHeader.component', () => jest.fn().mockReturnValue(
PageHeader
) @@ -57,17 +60,17 @@ const mockGetEntityPermission = jest.fn().mockResolvedValue({ EditAll: true, }); -jest.mock('../../components/PermissionProvider/PermissionProvider', () => ({ +jest.mock('../../context/PermissionProvider/PermissionProvider', () => ({ usePermissionProvider: jest.fn().mockImplementation(() => ({ getEntityPermission: jest.fn(() => mockGetEntityPermission()), })), })); -jest.mock('../../components/SchemaEditor/SchemaEditor', () => { +jest.mock('../../components/Database/SchemaEditor/SchemaEditor', () => { return jest.fn().mockImplementation(() =>
SchemaEditor
); }); -jest.mock('../../components/TabsLabel/TabsLabel.component', () => +jest.mock('../../components/common/TabsLabel/TabsLabel.component', () => jest.fn().mockImplementation(({ name }) =>
{name}
) ); diff --git a/openmetadata-ui/src/main/resources/ui/src/pages/CustomizablePage/CustomizablePage.test.tsx b/openmetadata-ui/src/main/resources/ui/src/pages/CustomizablePage/CustomizablePage.test.tsx index d598ea163302..5d682931c0cc 100644 --- a/openmetadata-ui/src/main/resources/ui/src/pages/CustomizablePage/CustomizablePage.test.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/pages/CustomizablePage/CustomizablePage.test.tsx @@ -38,7 +38,7 @@ jest.mock( ); jest.mock( - '../../components/CustomizableComponents/CustomizeMyData/CustomizeMyData', + '../../components/MyData/CustomizableComponents/CustomizeMyData/CustomizeMyData', () => jest .fn() @@ -56,7 +56,7 @@ jest.mock( ) ); -jest.mock('../../components/Loader/Loader', () => { +jest.mock('../../components/common/Loader/Loader', () => { return jest.fn().mockImplementation(() =>
Loader
); }); diff --git a/openmetadata-ui/src/main/resources/ui/src/pages/DashboardDetailsPage/DashboardDetailsPage.test.tsx b/openmetadata-ui/src/main/resources/ui/src/pages/DashboardDetailsPage/DashboardDetailsPage.test.tsx index a8f1a63d5cf9..341d03393973 100644 --- a/openmetadata-ui/src/main/resources/ui/src/pages/DashboardDetailsPage/DashboardDetailsPage.test.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/pages/DashboardDetailsPage/DashboardDetailsPage.test.tsx @@ -63,50 +63,52 @@ jest.mock('../../components/common/ErrorWithPlaceholder/ErrorPlaceHolder', () => jest.fn().mockImplementation(() =>
ErrorPlaceHolder
) ); -jest.mock('../../components/DashboardDetails/DashboardDetails.component', () => - jest - .fn() - .mockImplementation( - ({ - dashboardDetails, - createThread, - chartDescriptionUpdateHandler, - chartTagUpdateHandler, - fetchDashboard, - followDashboardHandler, - handleToggleDelete, - unFollowDashboardHandler, - versionHandler, - onDashboardUpdate, - onUpdateVote, - }) => ( -
- DashboardDetailsComponent - {dashboardDetails.deleted ? DASHBOARD_DELETED : ''} - - - - - - - - - - -
+jest.mock( + '../../components/Dashboard/DashboardDetails/DashboardDetails.component', + () => + jest + .fn() + .mockImplementation( + ({ + dashboardDetails, + createThread, + chartDescriptionUpdateHandler, + chartTagUpdateHandler, + fetchDashboard, + followDashboardHandler, + handleToggleDelete, + unFollowDashboardHandler, + versionHandler, + onDashboardUpdate, + onUpdateVote, + }) => ( +
+ DashboardDetailsComponent + {dashboardDetails.deleted ? DASHBOARD_DELETED : ''} + + + + + + + + + + +
+ ) ) - ) ); -jest.mock('../../components/Loader/Loader', () => +jest.mock('../../components/common/Loader/Loader', () => jest.fn().mockImplementation(() =>
Loader
) ); -jest.mock('../../components/PermissionProvider/PermissionProvider', () => ({ +jest.mock('../../context/PermissionProvider/PermissionProvider', () => ({ usePermissionProvider: jest.fn().mockReturnValue({ getEntityPermissionByFqn: jest.fn().mockReturnValue({ ViewAll: true, diff --git a/openmetadata-ui/src/main/resources/ui/src/pages/DataInsightPage/DataInsightHeader/DataInsightHeader.test.tsx b/openmetadata-ui/src/main/resources/ui/src/pages/DataInsightPage/DataInsightHeader/DataInsightHeader.test.tsx index b5cee374e11a..b23466c79691 100644 --- a/openmetadata-ui/src/main/resources/ui/src/pages/DataInsightPage/DataInsightHeader/DataInsightHeader.test.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/pages/DataInsightPage/DataInsightHeader/DataInsightHeader.test.tsx @@ -33,11 +33,12 @@ jest.mock('../../../components/DataInsightDetail/KPIChart', () => jest.fn(() =>
KPIChart
) ); -jest.mock('../../../components/DatePickerMenu/DatePickerMenu.component', () => - jest.fn(() =>
DatePickerMenu
) +jest.mock( + '../../../components/common/DatePickerMenu/DatePickerMenu.component', + () => jest.fn(() =>
DatePickerMenu
) ); -jest.mock('../../../components/PermissionProvider/PermissionProvider', () => ({ +jest.mock('../../../context/PermissionProvider/PermissionProvider', () => ({ usePermissionProvider: jest.fn(() => ({ permissions: {}, })), diff --git a/openmetadata-ui/src/main/resources/ui/src/pages/DataInsightPage/DataInsightPage.test.tsx b/openmetadata-ui/src/main/resources/ui/src/pages/DataInsightPage/DataInsightPage.test.tsx index 3d495cbf3d33..13b14352123b 100644 --- a/openmetadata-ui/src/main/resources/ui/src/pages/DataInsightPage/DataInsightPage.test.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/pages/DataInsightPage/DataInsightPage.test.tsx @@ -62,7 +62,7 @@ jest.mock('./DataInsightClassBase', () => ({ ]), })); -jest.mock('../../components/PermissionProvider/PermissionProvider', () => ({ +jest.mock('../../context/PermissionProvider/PermissionProvider', () => ({ usePermissionProvider: jest.fn().mockReturnValue({ permissions: { dataInsightChart: { diff --git a/openmetadata-ui/src/main/resources/ui/src/pages/DataInsightPage/KPIList.test.tsx b/openmetadata-ui/src/main/resources/ui/src/pages/DataInsightPage/KPIList.test.tsx index 4333760a52e9..11fed4923f7a 100644 --- a/openmetadata-ui/src/main/resources/ui/src/pages/DataInsightPage/KPIList.test.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/pages/DataInsightPage/KPIList.test.tsx @@ -51,7 +51,7 @@ jest.mock( () => jest.fn().mockReturnValue(
Editor
) ); -jest.mock('../../components/Loader/Loader', () => +jest.mock('../../components/common/Loader/Loader', () => jest.fn().mockReturnValue(
Loader
) ); diff --git a/openmetadata-ui/src/main/resources/ui/src/pages/DataModelPage/DataModelPage.test.tsx b/openmetadata-ui/src/main/resources/ui/src/pages/DataModelPage/DataModelPage.test.tsx index 88d0a40d5324..e38c0eb65b0f 100644 --- a/openmetadata-ui/src/main/resources/ui/src/pages/DataModelPage/DataModelPage.test.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/pages/DataModelPage/DataModelPage.test.tsx @@ -56,51 +56,53 @@ jest.mock('../../components/common/ErrorWithPlaceholder/ErrorPlaceHolder', () => jest.fn().mockImplementation(() =>
{ERROR_PLACEHOLDER}
) ); -jest.mock('../../components/DataModels/DataModelDetails.component', () => - jest - .fn() - .mockImplementation( - ({ - createThread, - dataModelData, - handleColumnUpdateDataModel, - handleFollowDataModel, - handleToggleDelete, - handleUpdateDescription, - handleUpdateOwner, - handleUpdateTags, - handleUpdateTier, - onUpdateDataModel, - onUpdateVote, - }) => ( -
- DataModelDetails -

{dataModelData.deleted ? DATA_MODEL_DELETED : ''}

- - - - - -
+jest.mock( + '../../components/Dashboard/DataModel/DataModels/DataModelDetails.component', + () => + jest + .fn() + .mockImplementation( + ({ + createThread, + dataModelData, + handleColumnUpdateDataModel, + handleFollowDataModel, + handleToggleDelete, + handleUpdateDescription, + handleUpdateOwner, + handleUpdateTags, + handleUpdateTier, + onUpdateDataModel, + onUpdateVote, + }) => ( +
+ DataModelDetails +

{dataModelData.deleted ? DATA_MODEL_DELETED : ''}

+ + + + + +
+ ) ) - ) ); -jest.mock('../../components/Loader/Loader', () => +jest.mock('../../components/common/Loader/Loader', () => jest.fn().mockImplementation(() =>
Loader
) ); -jest.mock('../../components/PermissionProvider/PermissionProvider', () => ({ +jest.mock('../../context/PermissionProvider/PermissionProvider', () => ({ usePermissionProvider: jest.fn().mockReturnValue({ getEntityPermissionByFqn: jest.fn(() => mockGetEntityPermissionByFqn()), }), diff --git a/openmetadata-ui/src/main/resources/ui/src/pages/DataQuality/DataQualityPage.test.tsx b/openmetadata-ui/src/main/resources/ui/src/pages/DataQuality/DataQualityPage.test.tsx index 491e4c79aa6d..d42866936472 100644 --- a/openmetadata-ui/src/main/resources/ui/src/pages/DataQuality/DataQualityPage.test.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/pages/DataQuality/DataQualityPage.test.tsx @@ -57,7 +57,7 @@ jest.mock( () => ({ SummaryPanel: jest.fn() }) ); -jest.mock('../../components/PermissionProvider/PermissionProvider', () => ({ +jest.mock('../../context/PermissionProvider/PermissionProvider', () => ({ usePermissionProvider: jest .fn() .mockImplementation(() => ({ permissions: DEFAULT_ENTITY_PERMISSION })), diff --git a/openmetadata-ui/src/main/resources/ui/src/pages/DatabaseDetailsPage/DatabaseDetailsPage.test.tsx b/openmetadata-ui/src/main/resources/ui/src/pages/DatabaseDetailsPage/DatabaseDetailsPage.test.tsx index a48aa30f319e..bec6f7a2094b 100644 --- a/openmetadata-ui/src/main/resources/ui/src/pages/DatabaseDetailsPage/DatabaseDetailsPage.test.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/pages/DatabaseDetailsPage/DatabaseDetailsPage.test.tsx @@ -116,7 +116,7 @@ const mockFeedCount = { ], }; -jest.mock('../../components/PermissionProvider/PermissionProvider', () => ({ +jest.mock('../../context/PermissionProvider/PermissionProvider', () => ({ usePermissionProvider: jest.fn().mockReturnValue({ getEntityPermissionByFqn: jest.fn().mockReturnValue({ Create: true, @@ -209,7 +209,7 @@ jest.mock('../../utils/TagsUtils', () => ({ }, ]), })); -jest.mock('../../components/TabsLabel/TabsLabel.component', () => { +jest.mock('../../components/common/TabsLabel/TabsLabel.component', () => { return jest .fn() .mockImplementation(({ name, id }) =>
{name}
); diff --git a/openmetadata-ui/src/main/resources/ui/src/pages/DatabaseSchemaPage/DatabaseSchemaPage.test.tsx b/openmetadata-ui/src/main/resources/ui/src/pages/DatabaseSchemaPage/DatabaseSchemaPage.test.tsx index 5c24cf474e83..724966048466 100644 --- a/openmetadata-ui/src/main/resources/ui/src/pages/DatabaseSchemaPage/DatabaseSchemaPage.test.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/pages/DatabaseSchemaPage/DatabaseSchemaPage.test.tsx @@ -29,7 +29,7 @@ const mockEntityPermissionByFqn = jest .fn() .mockImplementation(() => DEFAULT_ENTITY_PERMISSION); -jest.mock('../../components/PermissionProvider/PermissionProvider', () => ({ +jest.mock('../../context/PermissionProvider/PermissionProvider', () => ({ usePermissionProvider: jest.fn().mockImplementation(() => ({ getEntityPermissionByFqn: mockEntityPermissionByFqn, })), @@ -73,7 +73,7 @@ jest.mock( }) ); -jest.mock('../../components/TabsLabel/TabsLabel.component', () => +jest.mock('../../components/common/TabsLabel/TabsLabel.component', () => jest.fn().mockImplementation(({ name }) =>
{name}
) ); @@ -133,7 +133,7 @@ jest.mock('../../utils/ToastUtils', () => ({ .mockImplementation(({ children }) =>
{children}
), })); -jest.mock('../../components/Loader/Loader', () => +jest.mock('../../components/common/Loader/Loader', () => jest.fn().mockImplementation(() =>
testLoader
) ); @@ -141,7 +141,7 @@ jest.mock('../../components/common/ErrorWithPlaceholder/ErrorPlaceHolder', () => jest.fn().mockImplementation(() =>

ErrorPlaceHolder

) ); -jest.mock('../../components/PermissionProvider/PermissionProvider', () => ({ +jest.mock('../../context/PermissionProvider/PermissionProvider', () => ({ usePermissionProvider: jest.fn().mockImplementation(() => ({ getEntityPermissionByFqn: mockEntityPermissionByFqn, })), diff --git a/openmetadata-ui/src/main/resources/ui/src/pages/DatabaseSchemaVersionPage/DatabaseSchemaVersionPage.test.tsx b/openmetadata-ui/src/main/resources/ui/src/pages/DatabaseSchemaVersionPage/DatabaseSchemaVersionPage.test.tsx index 07a0ca7fa090..0106e93a0f16 100644 --- a/openmetadata-ui/src/main/resources/ui/src/pages/DatabaseSchemaVersionPage/DatabaseSchemaVersionPage.test.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/pages/DatabaseSchemaVersionPage/DatabaseSchemaVersionPage.test.tsx @@ -54,7 +54,7 @@ jest.mock( ); jest.mock( - '../../components/DataProductsContainer/DataProductsContainer.component', + '../../components/DataProducts/DataProductsContainer/DataProductsContainer.component', () => jest.fn().mockImplementation(() =>
{DATA_PRODUCT_CONTAINER}
) ); @@ -68,7 +68,7 @@ jest.mock( )) ); -jest.mock('../../components/Loader/Loader', () => +jest.mock('../../components/common/Loader/Loader', () => jest.fn().mockImplementation(() =>
{LOADER}
) ); @@ -80,13 +80,13 @@ const mockGetEntityPermissionByFqn = jest.fn().mockReturnValue({ ViewAll: true, }); -jest.mock('../../components/PermissionProvider/PermissionProvider', () => ({ +jest.mock('../../context/PermissionProvider/PermissionProvider', () => ({ usePermissionProvider: jest.fn().mockReturnValue({ getEntityPermissionByFqn: jest.fn(() => mockGetEntityPermissionByFqn()), }), })); -jest.mock('../../components/TabsLabel/TabsLabel.component', () => +jest.mock('../../components/common/TabsLabel/TabsLabel.component', () => jest.fn().mockImplementation(({ name }) =>
{name}
) ); diff --git a/openmetadata-ui/src/main/resources/ui/src/pages/DatabaseVersionPage/DatabaseVersionPage.test.tsx b/openmetadata-ui/src/main/resources/ui/src/pages/DatabaseVersionPage/DatabaseVersionPage.test.tsx index 621d1194ebc2..fe25751e3131 100644 --- a/openmetadata-ui/src/main/resources/ui/src/pages/DatabaseVersionPage/DatabaseVersionPage.test.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/pages/DatabaseVersionPage/DatabaseVersionPage.test.tsx @@ -75,7 +75,7 @@ jest.mock( ); jest.mock( - '../../components/DataProductsContainer/DataProductsContainer.component', + '../../components/DataProducts/DataProductsContainer/DataProductsContainer.component', () => jest.fn().mockImplementation(() =>
{DATA_PRODUCT_CONTAINER}
) ); @@ -89,7 +89,7 @@ jest.mock( )) ); -jest.mock('../../components/Loader/Loader', () => +jest.mock('../../components/common/Loader/Loader', () => jest.fn().mockImplementation(() =>
Loader
) ); @@ -101,13 +101,13 @@ const mockGetEntityPermissionByFqn = jest.fn().mockReturnValue({ ViewAll: true, }); -jest.mock('../../components/PermissionProvider/PermissionProvider', () => ({ +jest.mock('../../context/PermissionProvider/PermissionProvider', () => ({ usePermissionProvider: jest.fn().mockReturnValue({ getEntityPermissionByFqn: jest.fn(() => mockGetEntityPermissionByFqn()), }), })); -jest.mock('../../components/TabsLabel/TabsLabel.component', () => +jest.mock('../../components/common/TabsLabel/TabsLabel.component', () => jest.fn().mockImplementation(({ name }) =>
{name}
) ); diff --git a/openmetadata-ui/src/main/resources/ui/src/pages/EditConnectionFormPage/EditConnectionFormPage.test.tsx b/openmetadata-ui/src/main/resources/ui/src/pages/EditConnectionFormPage/EditConnectionFormPage.test.tsx index 1575fd99dd8a..27616775a30d 100644 --- a/openmetadata-ui/src/main/resources/ui/src/pages/EditConnectionFormPage/EditConnectionFormPage.test.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/pages/EditConnectionFormPage/EditConnectionFormPage.test.tsx @@ -47,22 +47,24 @@ jest.mock( () => jest.fn(() =>
TitleBreadcrumb
) ); -jest.mock('../../components/Loader/Loader', () => +jest.mock('../../components/common/Loader/Loader', () => jest.fn().mockImplementation(() =>
Loader
) ); let withActiveField = true; -jest.mock('../../components/ServiceConfig/ServiceConfig', () => - jest.fn().mockImplementation(({ onFocus, handleUpdate }) => ( - <> - ServiceConfig - - - - )) +jest.mock( + '../../components/Settings/Services/ServiceConfig/ServiceConfig', + () => + jest.fn().mockImplementation(({ onFocus, handleUpdate }) => ( + <> + ServiceConfig + + + + )) ); jest.mock('../../hooks/useFqn', () => ({ diff --git a/openmetadata-ui/src/main/resources/ui/src/pages/EditEmailConfigPage/EditEmailConfigPage.test.tsx b/openmetadata-ui/src/main/resources/ui/src/pages/EditEmailConfigPage/EditEmailConfigPage.test.tsx index f43f5bd8c3b4..6aeec9bb8bd7 100644 --- a/openmetadata-ui/src/main/resources/ui/src/pages/EditEmailConfigPage/EditEmailConfigPage.test.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/pages/EditEmailConfigPage/EditEmailConfigPage.test.tsx @@ -44,17 +44,19 @@ jest.mock( () => jest.fn(() =>
TitleBreadcrumb
) ); -jest.mock('../../components/EmailConfigForm/EmailConfigForm.component', () => - jest.fn().mockImplementation(({ onCancel, onFocus, onSubmit }) => ( - <> - EmailConfigForm - - - - - )) +jest.mock( + '../../components/Settings/Email/EmailConfigForm/EmailConfigForm.component', + () => + jest.fn().mockImplementation(({ onCancel, onFocus, onSubmit }) => ( + <> + EmailConfigForm + + + + + )) ); const mockPush = jest.fn(); diff --git a/openmetadata-ui/src/main/resources/ui/src/pages/EntityVersionPage/EntityVersionPage.test.tsx b/openmetadata-ui/src/main/resources/ui/src/pages/EntityVersionPage/EntityVersionPage.test.tsx index c478ad56a9ef..35e137462e4e 100644 --- a/openmetadata-ui/src/main/resources/ui/src/pages/EntityVersionPage/EntityVersionPage.test.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/pages/EntityVersionPage/EntityVersionPage.test.tsx @@ -28,33 +28,42 @@ jest.mock('react-router-dom', () => ({ useParams: jest.fn().mockImplementation(() => mockParams), })); -jest.mock('../../components/TableVersion/TableVersion.component', () => { - return jest.fn().mockReturnValue(
TableVersion component
); -}); jest.mock( - '../../components/DashboardVersion/DashboardVersion.component', + '../../components/Database/TableVersion/TableVersion.component', + () => { + return jest.fn().mockReturnValue(
TableVersion component
); + } +); +jest.mock( + '../../components/Dashboard/DashboardVersion/DashboardVersion.component', () => { return jest.fn().mockReturnValue(
DashboardVersion component
); } ); -jest.mock('../../components/PipelineVersion/PipelineVersion.component', () => { - return jest.fn().mockReturnValue(
PipelineVersion component
); -}); -jest.mock('../../components/TopicVersion/TopicVersion.component', () => { +jest.mock( + '../../components/Pipeline/PipelineVersion/PipelineVersion.component', + () => { + return jest.fn().mockReturnValue(
PipelineVersion component
); + } +); +jest.mock('../../components/Topic/TopicVersion/TopicVersion.component', () => { return jest.fn().mockReturnValue(
TopicVersion component
); }); -jest.mock('../../components/MlModelVersion/MlModelVersion.component', () => { - return jest.fn().mockReturnValue(
MlModelVersion component
); -}); jest.mock( - '../../components/ContainerVersion/ContainerVersion.component', + '../../components/MlModel/MlModelVersion/MlModelVersion.component', + () => { + return jest.fn().mockReturnValue(
MlModelVersion component
); + } +); +jest.mock( + '../../components/Container/ContainerVersion/ContainerVersion.component', () => { return jest.fn().mockReturnValue(
ContainerVersion component
); } ); jest.mock( - '../../components/DataModelVersion/DataModelVersion.component', + '../../components/Dashboard/DataModel/DataModelVersion/DataModelVersion.component', () => { return jest.fn().mockReturnValue(
DataModelVersion component
); } @@ -105,7 +114,7 @@ jest.mock('../../rest/dataModelsAPI', () => ({ .mockImplementation(() => Promise.resolve({})), })); -jest.mock('../../components/PermissionProvider/PermissionProvider', () => ({ +jest.mock('../../context/PermissionProvider/PermissionProvider', () => ({ usePermissionProvider: jest.fn().mockImplementation(() => ({ getEntityPermissionByFqn: jest .fn() diff --git a/openmetadata-ui/src/main/resources/ui/src/pages/ExplorePage/ExplorePageV1.test.tsx b/openmetadata-ui/src/main/resources/ui/src/pages/ExplorePage/ExplorePageV1.test.tsx index 34dd39737254..0be30c5f88aa 100644 --- a/openmetadata-ui/src/main/resources/ui/src/pages/ExplorePage/ExplorePageV1.test.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/pages/ExplorePage/ExplorePageV1.test.tsx @@ -32,7 +32,7 @@ jest.mock('../../components/ExploreV1/ExploreV1.component', () => { return jest.fn().mockReturnValue(

ExploreV1

); }); -jest.mock('../../components/GlobalSearchProvider/GlobalSearchProvider', () => ({ +jest.mock('../../context/GlobalSearchProvider/GlobalSearchProvider', () => ({ useGlobalSearchProvider: jest.fn().mockImplementation(() => ({ searchCriteria: '', })), diff --git a/openmetadata-ui/src/main/resources/ui/src/pages/Glossary/GlossaryLeftPanel/GlossaryLeftPanel.test.tsx b/openmetadata-ui/src/main/resources/ui/src/pages/Glossary/GlossaryLeftPanel/GlossaryLeftPanel.test.tsx index e4c0ea43777e..bf6f78dce6d2 100644 --- a/openmetadata-ui/src/main/resources/ui/src/pages/Glossary/GlossaryLeftPanel/GlossaryLeftPanel.test.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/pages/Glossary/GlossaryLeftPanel/GlossaryLeftPanel.test.tsx @@ -26,7 +26,7 @@ jest.mock('react-router-dom', () => ({ glossaryName: 'GlossaryName', }), })); -jest.mock('../../../components/PermissionProvider/PermissionProvider', () => ({ +jest.mock('../../../context/PermissionProvider/PermissionProvider', () => ({ usePermissionProvider: jest.fn().mockReturnValue({ getEntityPermission: jest.fn().mockReturnValue({ Create: true, diff --git a/openmetadata-ui/src/main/resources/ui/src/pages/Glossary/GlossaryPage/GlossaryPage.test.tsx b/openmetadata-ui/src/main/resources/ui/src/pages/Glossary/GlossaryPage/GlossaryPage.test.tsx index c22c1c9c6c45..bbc4cd0ce08b 100644 --- a/openmetadata-ui/src/main/resources/ui/src/pages/Glossary/GlossaryPage/GlossaryPage.test.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/pages/Glossary/GlossaryPage/GlossaryPage.test.tsx @@ -35,7 +35,7 @@ jest.mock('../../../components/MyData/LeftSidebar/LeftSidebar.component', () => jest.fn().mockReturnValue(

Sidebar

) ); -jest.mock('../../../components/PermissionProvider/PermissionProvider', () => { +jest.mock('../../../context/PermissionProvider/PermissionProvider', () => { return { usePermissionProvider: jest.fn(() => ({ permissions: { diff --git a/openmetadata-ui/src/main/resources/ui/src/pages/IncidentManager/IncidentManagerDetailPage/IncidentManagerDetailPage.test.tsx b/openmetadata-ui/src/main/resources/ui/src/pages/IncidentManager/IncidentManagerDetailPage/IncidentManagerDetailPage.test.tsx index bf7406f9da16..eaf9963153cf 100644 --- a/openmetadata-ui/src/main/resources/ui/src/pages/IncidentManager/IncidentManagerDetailPage/IncidentManagerDetailPage.test.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/pages/IncidentManager/IncidentManagerDetailPage/IncidentManagerDetailPage.test.tsx @@ -94,11 +94,11 @@ jest.mock('../../../components/PageLayoutV1/PageLayoutV1', () =>
{children}
)) ); -jest.mock('../../../components/Loader/Loader', () => +jest.mock('../../../components/common/Loader/Loader', () => jest.fn().mockImplementation(() =>
Loader
) ); jest.mock( - '../../../components/IncidentManager/IncidentManagerPageHeader/IncidentManagerPageHeader.component', + '../../../components/DataQuality/IncidentManager/IncidentManagerPageHeader/IncidentManagerPageHeader.component', () => jest.fn().mockImplementation(() =>
IncidentManagerPageHeader
) ); jest.mock( @@ -117,11 +117,11 @@ jest.mock( () => jest.fn().mockImplementation(() =>
EntityHeaderTitle
) ); jest.mock( - '../../../components/IncidentManager/TestCaseResultTab/TestCaseResultTab.component', + '../../../components/DataQuality/IncidentManager/TestCaseResultTab/TestCaseResultTab.component', () => jest.fn().mockImplementation(() =>
TestCaseResultTab
) ); jest.mock( - '../../../components/IncidentManager/TestCaseIncidentTab/TestCaseIncidentTab.component', + '../../../components/DataQuality/IncidentManager/TestCaseIncidentTab/TestCaseIncidentTab.component', () => jest.fn().mockImplementation(() =>
TestCaseIncidentTab
) ); jest.mock( diff --git a/openmetadata-ui/src/main/resources/ui/src/pages/IncidentManager/IncidentManagerPage.test.tsx b/openmetadata-ui/src/main/resources/ui/src/pages/IncidentManager/IncidentManagerPage.test.tsx index e12449292aa5..fb4e1e2412ce 100644 --- a/openmetadata-ui/src/main/resources/ui/src/pages/IncidentManager/IncidentManagerPage.test.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/pages/IncidentManager/IncidentManagerPage.test.tsx @@ -17,18 +17,21 @@ import IncidentManagerPage from './IncidentManagerPage'; jest.mock('../../components/common/NextPrevious/NextPrevious', () => { return jest.fn().mockImplementation(() =>
NextPrevious.component
); }); -jest.mock('../../components/DatePickerMenu/DatePickerMenu.component', () => { - return jest - .fn() - .mockImplementation(() =>
DatePickerMenu.component
); -}); +jest.mock( + '../../components/common/DatePickerMenu/DatePickerMenu.component', + () => { + return jest + .fn() + .mockImplementation(() =>
DatePickerMenu.component
); + } +); jest.mock('../../components/PageLayoutV1/PageLayoutV1', () => { return jest.fn().mockImplementation(({ children }) =>
{children}
); }); jest.mock('../TasksPage/shared/Assignees', () => { return jest.fn().mockImplementation(() =>
Assignees.component
); }); -jest.mock('../../components/AsyncSelect/AsyncSelect', () => ({ +jest.mock('../../components/common/AsyncSelect/AsyncSelect', () => ({ AsyncSelect: jest .fn() .mockImplementation(() =>
AsyncSelect.component
), @@ -37,7 +40,7 @@ jest.mock('react-router-dom', () => ({ ...jest.requireActual('react-router-dom'), Link: jest.fn().mockImplementation(() =>
Link
), })); -jest.mock('../../components/PermissionProvider/PermissionProvider', () => ({ +jest.mock('../../context/PermissionProvider/PermissionProvider', () => ({ usePermissionProvider: jest.fn().mockReturnValue({ permissions: { testCase: { diff --git a/openmetadata-ui/src/main/resources/ui/src/pages/KPIPage/EditKPIPage.test.tsx b/openmetadata-ui/src/main/resources/ui/src/pages/KPIPage/EditKPIPage.test.tsx index 651903763be4..17b429fe4861 100644 --- a/openmetadata-ui/src/main/resources/ui/src/pages/KPIPage/EditKPIPage.test.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/pages/KPIPage/EditKPIPage.test.tsx @@ -42,7 +42,7 @@ jest.mock( jest.fn().mockReturnValue(
BreadCrumb
) ); -jest.mock('../../components/Loader/Loader', () => +jest.mock('../../components/common/Loader/Loader', () => jest.fn().mockReturnValue(
Loader
) ); diff --git a/openmetadata-ui/src/main/resources/ui/src/pages/LogsViewer/LogsViewer.component.test.tsx b/openmetadata-ui/src/main/resources/ui/src/pages/LogsViewer/LogsViewer.component.test.tsx index fd5ab7b70c9c..5ab881c96eed 100644 --- a/openmetadata-ui/src/main/resources/ui/src/pages/LogsViewer/LogsViewer.component.test.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/pages/LogsViewer/LogsViewer.component.test.tsx @@ -52,7 +52,7 @@ jest.mock('../../rest/ingestionPipelineAPI', () => ({ })); jest.mock( - '../../components/Ingestion/IngestionRecentRun/IngestionRecentRuns.component', + '../../components/Settings/Services/Ingestion/IngestionRecentRun/IngestionRecentRuns.component', () => ({ IngestionRecentRuns: jest .fn() diff --git a/openmetadata-ui/src/main/resources/ui/src/pages/MyDataPage/MyDataPage.test.tsx b/openmetadata-ui/src/main/resources/ui/src/pages/MyDataPage/MyDataPage.test.tsx index 375ec7ee7e0c..945c011e8bb0 100644 --- a/openmetadata-ui/src/main/resources/ui/src/pages/MyDataPage/MyDataPage.test.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/pages/MyDataPage/MyDataPage.test.tsx @@ -57,7 +57,7 @@ jest.mock( } ); -jest.mock('../../components/Loader/Loader', () => { +jest.mock('../../components/common/Loader/Loader', () => { return jest.fn().mockImplementation(() =>
Loader
); }); @@ -73,16 +73,19 @@ jest.mock('../../components/PageLayoutV1/PageLayoutV1', () => { )); }); -jest.mock('../../components/WelcomeScreen/WelcomeScreen.component', () => { - return jest - .fn() - .mockImplementation(({ onClose }) => ( -
WelcomeScreen
- )); -}); +jest.mock( + '../../components/MyData/WelcomeScreen/WelcomeScreen.component', + () => { + return jest + .fn() + .mockImplementation(({ onClose }) => ( +
WelcomeScreen
+ )); + } +); jest.mock( - '../../components/ApplicationConfigProvider/ApplicationConfigProvider', + '../../context/ApplicationConfigProvider/ApplicationConfigProvider', () => ({ useApplicationConfigContext: jest .fn() diff --git a/openmetadata-ui/src/main/resources/ui/src/pages/Persona/PersonaDetailsPage/PersonaDetailsPage.test.tsx b/openmetadata-ui/src/main/resources/ui/src/pages/Persona/PersonaDetailsPage/PersonaDetailsPage.test.tsx index 94ca7bb25f22..09f3b611004d 100644 --- a/openmetadata-ui/src/main/resources/ui/src/pages/Persona/PersonaDetailsPage/PersonaDetailsPage.test.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/pages/Persona/PersonaDetailsPage/PersonaDetailsPage.test.tsx @@ -101,7 +101,7 @@ jest.mock( .mockImplementation(() =>
NoDataPlaceholder.component
); } ); -jest.mock('../../../components/PermissionProvider/PermissionProvider', () => ({ +jest.mock('../../../context/PermissionProvider/PermissionProvider', () => ({ usePermissionProvider: jest.fn().mockReturnValue({ getEntityPermissionByFqn: jest.fn().mockResolvedValue({ Create: true, diff --git a/openmetadata-ui/src/main/resources/ui/src/pages/Persona/PersonaListPage/PersonaPage.test.tsx b/openmetadata-ui/src/main/resources/ui/src/pages/Persona/PersonaListPage/PersonaPage.test.tsx index 97810cd8b076..7f1682c942b6 100644 --- a/openmetadata-ui/src/main/resources/ui/src/pages/Persona/PersonaListPage/PersonaPage.test.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/pages/Persona/PersonaListPage/PersonaPage.test.tsx @@ -45,7 +45,7 @@ jest.mock('../../../components/common/DeleteWidget/DeleteWidgetModal', () => { .mockImplementation(() =>
DeleteWidgetModal.component
); }); jest.mock( - '../../../components/Persona/PersonaDetailsCard/PersonaDetailsCard', + '../../../components/MyData/Persona/PersonaDetailsCard/PersonaDetailsCard', () => { return { PersonaDetailsCard: jest @@ -55,7 +55,7 @@ jest.mock( } ); jest.mock( - '../../../components/Persona/AddEditPersona/AddEditPersona.component', + '../../../components/MyData//Persona/AddEditPersona/AddEditPersona.component', () => { return { AddEditPersonaForm: jest.fn().mockImplementation(({ onSave }) => ( diff --git a/openmetadata-ui/src/main/resources/ui/src/pages/PipelineDetails/PipelineDetailsPage.test.tsx b/openmetadata-ui/src/main/resources/ui/src/pages/PipelineDetails/PipelineDetailsPage.test.tsx index 903a0ff4a42c..57903c94f37a 100644 --- a/openmetadata-ui/src/main/resources/ui/src/pages/PipelineDetails/PipelineDetailsPage.test.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/pages/PipelineDetails/PipelineDetailsPage.test.tsx @@ -36,9 +36,12 @@ jest.mock('../../rest/pipelineAPI', () => ({ getPipelineByFqn: jest.fn().mockImplementation(() => Promise.resolve({})), })); -jest.mock('../../components/PipelineDetails/PipelineDetails.component', () => { - return jest.fn().mockReturnValue(
PipelineDetails.component
); -}); +jest.mock( + '../../components/Pipeline/PipelineDetails/PipelineDetails.component', + () => { + return jest.fn().mockReturnValue(
PipelineDetails.component
); + } +); jest.mock( '../../components/common/ErrorWithPlaceholder/ErrorPlaceHolder', @@ -47,7 +50,7 @@ jest.mock( } ); -jest.mock('../../components/PermissionProvider/PermissionProvider', () => ({ +jest.mock('../../context/PermissionProvider/PermissionProvider', () => ({ usePermissionProvider: jest.fn().mockImplementation(() => ({ permissions: {}, getEntityPermission: jest.fn().mockResolvedValue({ diff --git a/openmetadata-ui/src/main/resources/ui/src/pages/PoliciesPage/PoliciesDetailPage/AddRulePage.test.tsx b/openmetadata-ui/src/main/resources/ui/src/pages/PoliciesPage/PoliciesDetailPage/AddRulePage.test.tsx index dad711dab0c0..7d86e2c28aca 100644 --- a/openmetadata-ui/src/main/resources/ui/src/pages/PoliciesPage/PoliciesDetailPage/AddRulePage.test.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/pages/PoliciesPage/PoliciesDetailPage/AddRulePage.test.tsx @@ -36,7 +36,7 @@ jest.mock( jest.fn().mockReturnValue(
BreadCrumb
) ); -jest.mock('../../../components/Loader/Loader', () => +jest.mock('../../../components/common/Loader/Loader', () => jest.fn().mockReturnValue(
Loader
) ); diff --git a/openmetadata-ui/src/main/resources/ui/src/pages/PoliciesPage/PoliciesDetailPage/EditRulePage.test.tsx b/openmetadata-ui/src/main/resources/ui/src/pages/PoliciesPage/PoliciesDetailPage/EditRulePage.test.tsx index e878df53f292..689ddbeef930 100644 --- a/openmetadata-ui/src/main/resources/ui/src/pages/PoliciesPage/PoliciesDetailPage/EditRulePage.test.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/pages/PoliciesPage/PoliciesDetailPage/EditRulePage.test.tsx @@ -36,7 +36,7 @@ jest.mock( jest.fn().mockReturnValue(
BreadCrumb
) ); -jest.mock('../../../components/Loader/Loader', () => +jest.mock('../../../components/common/Loader/Loader', () => jest.fn().mockReturnValue(
Loader
) ); diff --git a/openmetadata-ui/src/main/resources/ui/src/pages/PoliciesPage/PoliciesDetailPage/PoliciesDetailPage.test.tsx b/openmetadata-ui/src/main/resources/ui/src/pages/PoliciesPage/PoliciesDetailPage/PoliciesDetailPage.test.tsx index b3f0a9d727cc..cd46aae15cb7 100644 --- a/openmetadata-ui/src/main/resources/ui/src/pages/PoliciesPage/PoliciesDetailPage/PoliciesDetailPage.test.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/pages/PoliciesPage/PoliciesDetailPage/PoliciesDetailPage.test.tsx @@ -57,7 +57,7 @@ jest.mock( jest.fn().mockReturnValue(
BreadCrumb
) ); -jest.mock('../../../components/Loader/Loader', () => +jest.mock('../../../components/common/Loader/Loader', () => jest.fn().mockReturnValue(
Loader
) ); diff --git a/openmetadata-ui/src/main/resources/ui/src/pages/PoliciesPage/PoliciesListPage/PoliciesListPage.test.tsx b/openmetadata-ui/src/main/resources/ui/src/pages/PoliciesPage/PoliciesListPage/PoliciesListPage.test.tsx index 5c7adb66bff1..4805972749d5 100644 --- a/openmetadata-ui/src/main/resources/ui/src/pages/PoliciesPage/PoliciesListPage/PoliciesListPage.test.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/pages/PoliciesPage/PoliciesListPage/PoliciesListPage.test.tsx @@ -47,7 +47,7 @@ jest.mock('../../../components/common/NextPrevious/NextPrevious', () => jest.fn().mockReturnValue(
NextPrevious
) ); -jest.mock('../../../components/Loader/Loader', () => +jest.mock('../../../components/common/Loader/Loader', () => jest.fn().mockReturnValue(
Loader
) ); @@ -55,7 +55,7 @@ jest.mock('../../../utils/PermissionsUtils', () => ({ checkPermission: jest.fn().mockReturnValue(true), })); -jest.mock('../../../components/PermissionProvider/PermissionProvider', () => ({ +jest.mock('../../../context/PermissionProvider/PermissionProvider', () => ({ usePermissionProvider: jest.fn().mockReturnValue({ permissions: { policy: { diff --git a/openmetadata-ui/src/main/resources/ui/src/pages/QueryPage/QueryPage.test.tsx b/openmetadata-ui/src/main/resources/ui/src/pages/QueryPage/QueryPage.test.tsx index 20be7fd584a8..5979f5b7ef7e 100644 --- a/openmetadata-ui/src/main/resources/ui/src/pages/QueryPage/QueryPage.test.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/pages/QueryPage/QueryPage.test.tsx @@ -24,7 +24,7 @@ jest.mock('react-router-dom', () => ({ queryId: 'queryId', })), })); -jest.mock('../../components/PermissionProvider/PermissionProvider', () => ({ +jest.mock('../../context/PermissionProvider/PermissionProvider', () => ({ usePermissionProvider: jest.fn().mockReturnValue({ getEntityPermission: jest.fn().mockReturnValue({ ViewAll: true, @@ -41,10 +41,10 @@ jest.mock( return jest.fn().mockImplementation(() =>
TitleBreadcrumb
); } ); -jest.mock('../../components/Loader/Loader', () => { +jest.mock('../../components/common/Loader/Loader', () => { return jest.fn().mockImplementation(() =>
Loader
); }); -jest.mock('../../components/TableQueries/QueryCard', () => { +jest.mock('../../components/Database/TableQueries/QueryCard', () => { return jest.fn().mockImplementation(() =>
QueryCard
); }); jest.mock('../../rest/queryAPI', () => ({ diff --git a/openmetadata-ui/src/main/resources/ui/src/pages/RolesPage/AddAttributeModal/AddAttributeModal.test.tsx b/openmetadata-ui/src/main/resources/ui/src/pages/RolesPage/AddAttributeModal/AddAttributeModal.test.tsx index 558490bc7f93..93ca8dea4d79 100644 --- a/openmetadata-ui/src/main/resources/ui/src/pages/RolesPage/AddAttributeModal/AddAttributeModal.test.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/pages/RolesPage/AddAttributeModal/AddAttributeModal.test.tsx @@ -31,7 +31,7 @@ jest.mock( () => jest.fn().mockReturnValue(
Previewer
) ); -jest.mock('../../../components/Loader/Loader', () => +jest.mock('../../../components/common/Loader/Loader', () => jest.fn().mockReturnValue(
Loader
) ); diff --git a/openmetadata-ui/src/main/resources/ui/src/pages/RolesPage/RolesDetailPage/RolesDetailPage.test.tsx b/openmetadata-ui/src/main/resources/ui/src/pages/RolesPage/RolesDetailPage/RolesDetailPage.test.tsx index f835344d9f04..293cb7762ff6 100644 --- a/openmetadata-ui/src/main/resources/ui/src/pages/RolesPage/RolesDetailPage/RolesDetailPage.test.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/pages/RolesPage/RolesDetailPage/RolesDetailPage.test.tsx @@ -45,7 +45,7 @@ jest.mock( jest.fn().mockReturnValue(
Breadcrumb
) ); -jest.mock('../../../components/Loader/Loader', () => +jest.mock('../../../components/common/Loader/Loader', () => jest.fn().mockReturnValue(
Loader
) ); diff --git a/openmetadata-ui/src/main/resources/ui/src/pages/RolesPage/RolesListPage/RolesListPage.test.tsx b/openmetadata-ui/src/main/resources/ui/src/pages/RolesPage/RolesListPage/RolesListPage.test.tsx index d2840419d50a..0d783856fd1b 100644 --- a/openmetadata-ui/src/main/resources/ui/src/pages/RolesPage/RolesListPage/RolesListPage.test.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/pages/RolesPage/RolesListPage/RolesListPage.test.tsx @@ -57,7 +57,7 @@ jest.mock('../../../utils/PermissionsUtils', () => ({ checkPermission: jest.fn().mockReturnValue(true), })); -jest.mock('../../../components/PermissionProvider/PermissionProvider', () => ({ +jest.mock('../../../context/PermissionProvider/PermissionProvider', () => ({ usePermissionProvider: jest.fn().mockReturnValue({ permissions: { role: { diff --git a/openmetadata-ui/src/main/resources/ui/src/pages/SearchIndexDetailsPage/SearchIndexDetailsPage.test.tsx b/openmetadata-ui/src/main/resources/ui/src/pages/SearchIndexDetailsPage/SearchIndexDetailsPage.test.tsx index 16577ab1f48a..a4a26a051d8b 100644 --- a/openmetadata-ui/src/main/resources/ui/src/pages/SearchIndexDetailsPage/SearchIndexDetailsPage.test.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/pages/SearchIndexDetailsPage/SearchIndexDetailsPage.test.tsx @@ -22,7 +22,7 @@ const mockEntityPermissionByFqn = jest .fn() .mockImplementation(() => DEFAULT_ENTITY_PERMISSION); -jest.mock('../../components/PermissionProvider/PermissionProvider', () => ({ +jest.mock('../../context/PermissionProvider/PermissionProvider', () => ({ usePermissionProvider: jest.fn().mockImplementation(() => ({ getEntityPermissionByFqn: mockEntityPermissionByFqn, })), @@ -84,7 +84,7 @@ jest.mock( }) ); -jest.mock('../../components/TabsLabel/TabsLabel.component', () => { +jest.mock('../../components/common/TabsLabel/TabsLabel.component', () => { return jest.fn().mockImplementation(({ name }) =>

{name}

); }); @@ -112,7 +112,7 @@ jest.mock('react-router-dom', () => ({ useHistory: jest.fn().mockImplementation(() => ({})), })); -jest.mock('../../components/Loader/Loader', () => { +jest.mock('../../components/common/Loader/Loader', () => { return jest.fn().mockImplementation(() => <>testLoader); }); diff --git a/openmetadata-ui/src/main/resources/ui/src/pages/SearchIndexDetailsPage/SearchIndexFieldsTab/SearchIndexFieldsTab.test.tsx b/openmetadata-ui/src/main/resources/ui/src/pages/SearchIndexDetailsPage/SearchIndexFieldsTab/SearchIndexFieldsTab.test.tsx index fbfe207db64d..4c31059a1b66 100644 --- a/openmetadata-ui/src/main/resources/ui/src/pages/SearchIndexDetailsPage/SearchIndexFieldsTab/SearchIndexFieldsTab.test.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/pages/SearchIndexDetailsPage/SearchIndexFieldsTab/SearchIndexFieldsTab.test.tsx @@ -43,12 +43,14 @@ jest.mock( )) ); -jest.mock('../../../components/ToggleExpandButton/ToggleExpandButton', () => - jest - .fn() - .mockImplementation(({ toggleExpandAll }) => ( -
testToggleExpandButton
- )) +jest.mock( + '../../../components/common/ToggleExpandButton/ToggleExpandButton', + () => + jest + .fn() + .mockImplementation(({ toggleExpandAll }) => ( +
testToggleExpandButton
+ )) ); jest.mock('../SearchIndexFieldsTable/SearchIndexFieldsTable', () => diff --git a/openmetadata-ui/src/main/resources/ui/src/pages/SearchIndexDetailsPage/SearchIndexFieldsTable/SearchIndexFieldsTable.test.tsx b/openmetadata-ui/src/main/resources/ui/src/pages/SearchIndexDetailsPage/SearchIndexFieldsTable/SearchIndexFieldsTable.test.tsx index 47bf9b9ba7b0..422c9c56ec2f 100644 --- a/openmetadata-ui/src/main/resources/ui/src/pages/SearchIndexDetailsPage/SearchIndexFieldsTable/SearchIndexFieldsTable.test.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/pages/SearchIndexDetailsPage/SearchIndexFieldsTable/SearchIndexFieldsTable.test.tsx @@ -50,11 +50,11 @@ jest.mock( ); jest.mock( - '../../../components/TableDescription/TableDescription.component', + '../../../components/Database/TableDescription/TableDescription.component', () => jest.fn().mockImplementation(() =>
testTableDescription
) ); -jest.mock('../../../components/TableTags/TableTags.component', () => +jest.mock('../../../components/Database/TableTags/TableTags.component', () => jest.fn().mockImplementation(() =>
testTableTags
) ); diff --git a/openmetadata-ui/src/main/resources/ui/src/pages/ServiceVersionPage/ServiceVersionPage.test.tsx b/openmetadata-ui/src/main/resources/ui/src/pages/ServiceVersionPage/ServiceVersionPage.test.tsx index f7bcfd7721db..d76cbf332fc6 100644 --- a/openmetadata-ui/src/main/resources/ui/src/pages/ServiceVersionPage/ServiceVersionPage.test.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/pages/ServiceVersionPage/ServiceVersionPage.test.tsx @@ -52,7 +52,7 @@ jest.mock( () => jest.fn().mockImplementation(() =>
DataAssetsVersionHeader
) ); -jest.mock('../../components/TabsLabel/TabsLabel.component', () => +jest.mock('../../components/common/TabsLabel/TabsLabel.component', () => jest.fn().mockImplementation(({ name }) =>
{name}
) ); @@ -72,7 +72,7 @@ jest.mock( )) ); -jest.mock('../../components/Loader/Loader', () => +jest.mock('../../components/common/Loader/Loader', () => jest.fn().mockImplementation(() =>
Loader
) ); @@ -80,7 +80,7 @@ jest.mock('./ServiceVersionMainTabContent', () => jest.fn().mockImplementation(() =>
ServiceVersionMainTabContent
) ); -jest.mock('../../components/PermissionProvider/PermissionProvider', () => ({ +jest.mock('../../context/PermissionProvider/PermissionProvider', () => ({ usePermissionProvider: jest.fn().mockImplementation(() => ({ getEntityPermissionByFqn: jest .fn() diff --git a/openmetadata-ui/src/main/resources/ui/src/pages/SignUp/SignUpPage.test.tsx b/openmetadata-ui/src/main/resources/ui/src/pages/SignUp/SignUpPage.test.tsx index 1cfbfd72b589..13b74ca7c7cc 100644 --- a/openmetadata-ui/src/main/resources/ui/src/pages/SignUp/SignUpPage.test.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/pages/SignUp/SignUpPage.test.tsx @@ -42,8 +42,9 @@ jest.mock('../../components/Auth/AuthProviders/AuthProvider', () => ({ })), })); -jest.mock('../../components/TeamsSelectable/TeamsSelectable', () => - jest.fn().mockImplementation(() =>
TeamSelectable
) +jest.mock( + '../../components/Settings/Team/TeamsSelectable/TeamsSelectable', + () => jest.fn().mockImplementation(() =>
TeamSelectable
) ); jest.mock('../../rest/userAPI', () => ({ diff --git a/openmetadata-ui/src/main/resources/ui/src/pages/StoredProcedure/StoredProcedurePage.test.tsx b/openmetadata-ui/src/main/resources/ui/src/pages/StoredProcedure/StoredProcedurePage.test.tsx index e20dc2fb4f4d..65422e2272b7 100644 --- a/openmetadata-ui/src/main/resources/ui/src/pages/StoredProcedure/StoredProcedurePage.test.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/pages/StoredProcedure/StoredProcedurePage.test.tsx @@ -23,7 +23,7 @@ const mockEntityPermissionByFqn = jest .fn() .mockImplementation(() => DEFAULT_ENTITY_PERMISSION); -jest.mock('../../components/PermissionProvider/PermissionProvider', () => ({ +jest.mock('../../context/PermissionProvider/PermissionProvider', () => ({ usePermissionProvider: jest.fn().mockImplementation(() => ({ getEntityPermissionByFqn: mockEntityPermissionByFqn, })), @@ -95,11 +95,11 @@ jest.mock('../../components/Lineage/Lineage.component', () => { return jest.fn().mockImplementation(() =>

testEntityLineage

); }); -jest.mock('../../components/SchemaEditor/SchemaEditor', () => { +jest.mock('../../components/Database/SchemaEditor/SchemaEditor', () => { return jest.fn().mockImplementation(() =>

testSchemaEditor

); }); -jest.mock('../../components/TabsLabel/TabsLabel.component', () => { +jest.mock('../../components/common/TabsLabel/TabsLabel.component', () => { return jest.fn().mockImplementation(({ name }) =>

{name}

); }); @@ -125,7 +125,7 @@ jest.mock('react-router-dom', () => ({ useHistory: jest.fn().mockImplementation(() => ({})), })); -jest.mock('../../components/Loader/Loader', () => { +jest.mock('../../components/common/Loader/Loader', () => { return jest.fn().mockImplementation(() => <>testLoader); }); diff --git a/openmetadata-ui/src/main/resources/ui/src/pages/StoredProcedure/StoredProcedureTab.test.tsx b/openmetadata-ui/src/main/resources/ui/src/pages/StoredProcedure/StoredProcedureTab.test.tsx index a26b9106531e..12b6b0f0fff2 100644 --- a/openmetadata-ui/src/main/resources/ui/src/pages/StoredProcedure/StoredProcedureTab.test.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/pages/StoredProcedure/StoredProcedureTab.test.tsx @@ -39,7 +39,7 @@ jest.mock( } ); -jest.mock('../../components/Loader/Loader', () => { +jest.mock('../../components/common/Loader/Loader', () => { return jest.fn().mockImplementation(() =>

testLoader

); }); diff --git a/openmetadata-ui/src/main/resources/ui/src/pages/TableDetailsPageV1/TableDetailsPageV1.test.tsx b/openmetadata-ui/src/main/resources/ui/src/pages/TableDetailsPageV1/TableDetailsPageV1.test.tsx index 27f67c40417b..badcae8a65c1 100644 --- a/openmetadata-ui/src/main/resources/ui/src/pages/TableDetailsPageV1/TableDetailsPageV1.test.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/pages/TableDetailsPageV1/TableDetailsPageV1.test.tsx @@ -24,7 +24,7 @@ const mockEntityPermissionByFqn = jest const COMMON_API_FIELDS = 'columns,followers,joins,tags,owner,dataModel,tableConstraints,viewDefinition,domain,dataProducts,votes,extension'; -jest.mock('../../components/PermissionProvider/PermissionProvider', () => ({ +jest.mock('../../context/PermissionProvider/PermissionProvider', () => ({ usePermissionProvider: jest.fn().mockImplementation(() => ({ getEntityPermissionByFqn: mockEntityPermissionByFqn, })), @@ -102,23 +102,26 @@ jest.mock('../../components/Lineage/Lineage.component', () => { return jest.fn().mockImplementation(() =>

testEntityLineage

); }); -jest.mock('../../components/SampleDataTable/SampleDataTable.component', () => { - return jest.fn().mockImplementation(() =>

testSampleDataTable

); -}); +jest.mock( + '../../components/Database/SampleDataTable/SampleDataTable.component', + () => { + return jest.fn().mockImplementation(() =>

testSampleDataTable

); + } +); -jest.mock('../../components/SchemaTab/SchemaTab.component', () => { +jest.mock('../../components/Database/SchemaTab/SchemaTab.component', () => { return jest.fn().mockImplementation(() =>

testSchemaTab

); }); -jest.mock('../../components/TableProfiler/TableProfiler', () => { +jest.mock('../../components/Database/TableProfiler/TableProfiler', () => { return jest.fn().mockImplementation(() =>

testTableProfiler

); }); -jest.mock('../../components/TableQueries/TableQueries', () => { +jest.mock('../../components/Database/TableQueries/TableQueries', () => { return jest.fn().mockImplementation(() =>

testTableQueries

); }); -jest.mock('../../components/TabsLabel/TabsLabel.component', () => { +jest.mock('../../components/common/TabsLabel/TabsLabel.component', () => { return jest.fn().mockImplementation(({ name }) =>

{name}

); }); @@ -158,7 +161,7 @@ jest.mock('react-router-dom', () => ({ useHistory: jest.fn().mockImplementation(() => ({})), })); -jest.mock('../../components/TourProvider/TourProvider', () => ({ +jest.mock('../../context/TourProvider/TourProvider', () => ({ useTourProvider: jest.fn().mockImplementation(() => ({ isTourOpen: false, activeTabForTourDatasetPage: 'schema', @@ -166,7 +169,7 @@ jest.mock('../../components/TourProvider/TourProvider', () => ({ })), })); -jest.mock('../../components/Loader/Loader', () => { +jest.mock('../../components/common/Loader/Loader', () => { return jest.fn().mockImplementation(() => <>testLoader); }); diff --git a/openmetadata-ui/src/main/resources/ui/src/pages/TagsPage/TagsPage.test.tsx b/openmetadata-ui/src/main/resources/ui/src/pages/TagsPage/TagsPage.test.tsx index fdf5dec63f7f..24fc4acf9d6f 100644 --- a/openmetadata-ui/src/main/resources/ui/src/pages/TagsPage/TagsPage.test.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/pages/TagsPage/TagsPage.test.tsx @@ -158,7 +158,7 @@ const mockCategory = [ }, ]; -jest.mock('../../components/PermissionProvider/PermissionProvider', () => ({ +jest.mock('../../context/PermissionProvider/PermissionProvider', () => ({ usePermissionProvider: jest.fn().mockReturnValue({ getEntityPermission: jest.fn().mockReturnValue({ Create: true, diff --git a/openmetadata-ui/src/main/resources/ui/src/pages/TeamsPage/ImportTeamsPage/ImportTeamsPage.test.tsx b/openmetadata-ui/src/main/resources/ui/src/pages/TeamsPage/ImportTeamsPage/ImportTeamsPage.test.tsx index 44ea470cc315..3a2262b5c88b 100644 --- a/openmetadata-ui/src/main/resources/ui/src/pages/TeamsPage/ImportTeamsPage/ImportTeamsPage.test.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/pages/TeamsPage/ImportTeamsPage/ImportTeamsPage.test.tsx @@ -72,13 +72,13 @@ jest.mock( }); } ); -jest.mock('../../../components/Loader/Loader', () => { +jest.mock('../../../components/common/Loader/Loader', () => { return jest.fn().mockImplementation(() => { return
Loader
; }); }); jest.mock( - '../../../components/Team/TeamImportResult/TeamImportResult.component', + '../../../components/Settings/Team/TeamImportResult/TeamImportResult.component', () => ({ TeamImportResult: jest.fn().mockImplementation(() => { return
TeamImportResult
; @@ -86,7 +86,7 @@ jest.mock( }) ); jest.mock( - '../../../components/Team/UserImportResult/UserImportResult.component', + '../../../components/Settings/Team/UserImportResult/UserImportResult.component', () => ({ UserImportResult: jest.fn().mockImplementation(() => { return
UserImportResult
; @@ -114,7 +114,7 @@ jest.mock('../../../rest/teamsAPI', () => ({ importTeam: jest.fn(), importUserInTeam: jest.fn(), })); -jest.mock('../../../components/PermissionProvider/PermissionProvider', () => ({ +jest.mock('../../../context/PermissionProvider/PermissionProvider', () => ({ usePermissionProvider: jest.fn().mockReturnValue({ getEntityPermissionByFqn: jest.fn().mockReturnValue({ Create: true, diff --git a/openmetadata-ui/src/main/resources/ui/src/pages/TestSuiteDetailsPage/TestSuiteDetailsPage.test.tsx b/openmetadata-ui/src/main/resources/ui/src/pages/TestSuiteDetailsPage/TestSuiteDetailsPage.test.tsx index 620629d7e62f..0d25e0e6ff8a 100644 --- a/openmetadata-ui/src/main/resources/ui/src/pages/TestSuiteDetailsPage/TestSuiteDetailsPage.test.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/pages/TestSuiteDetailsPage/TestSuiteDetailsPage.test.tsx @@ -20,7 +20,7 @@ import TestSuiteDetailsPage from './TestSuiteDetailsPage.component'; jest.mock('../../components/PageLayoutV1/PageLayoutV1', () => { return jest.fn().mockImplementation(({ children }) =>
{children}
); }); -jest.mock('../../components/Loader/Loader', () => { +jest.mock('../../components/common/Loader/Loader', () => { return jest.fn().mockImplementation(() =>
Loader.component
); }); jest.mock( @@ -58,11 +58,14 @@ jest.mock( jest.mock('../../components/common/EntityDescription/Description', () => { return jest.fn().mockImplementation(() =>
Description.component
); }); -jest.mock('../../components/ProfilerDashboard/component/DataQualityTab', () => { - return jest - .fn() - .mockImplementation(() =>
DataQualityTab.component
); -}); +jest.mock( + '../../components/Database/Profiler/DataQualityTab/DataQualityTab', + () => { + return jest + .fn() + .mockImplementation(() =>
DataQualityTab.component
); + } +); jest.mock('../../components/Auth/AuthProviders/AuthProvider', () => { return { useAuthContext: jest @@ -96,7 +99,7 @@ jest.mock('../../rest/testAPI', () => { .mockImplementation(() => Promise.resolve({ data: [] })), }; }); -jest.mock('../../components/PermissionProvider/PermissionProvider', () => ({ +jest.mock('../../context/PermissionProvider/PermissionProvider', () => ({ usePermissionProvider: jest.fn().mockImplementation(() => ({ getEntityPermissionByFqn: jest .fn() diff --git a/openmetadata-ui/src/main/resources/ui/src/pages/TopicDetails/TopicDetailsPage.test.tsx b/openmetadata-ui/src/main/resources/ui/src/pages/TopicDetails/TopicDetailsPage.test.tsx index 827465d71ddf..dbddadaf1e89 100644 --- a/openmetadata-ui/src/main/resources/ui/src/pages/TopicDetails/TopicDetailsPage.test.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/pages/TopicDetails/TopicDetailsPage.test.tsx @@ -16,7 +16,7 @@ import React from 'react'; import { MemoryRouter } from 'react-router-dom'; import TopicDetailsPageComponent from './TopicDetailsPage.component'; -jest.mock('../../components/TopicDetails/TopicDetails.component', () => { +jest.mock('../../components/Topic/TopicDetails/TopicDetails.component', () => { return jest.fn().mockReturnValue(
TopicDetails.component
); }); @@ -34,7 +34,7 @@ jest.mock('react-router-dom', () => ({ useHistory: jest.fn(), })); -jest.mock('../../components/PermissionProvider/PermissionProvider', () => ({ +jest.mock('../../context/PermissionProvider/PermissionProvider', () => ({ usePermissionProvider: jest.fn().mockImplementation(() => ({ permissions: {}, getEntityPermission: jest.fn().mockResolvedValue({ diff --git a/openmetadata-ui/src/main/resources/ui/src/pages/TourPage/TourPage.test.tsx b/openmetadata-ui/src/main/resources/ui/src/pages/TourPage/TourPage.test.tsx index 0b8de85c9662..948a3b19bdd0 100644 --- a/openmetadata-ui/src/main/resources/ui/src/pages/TourPage/TourPage.test.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/pages/TourPage/TourPage.test.tsx @@ -23,7 +23,7 @@ const mockUseTourProvider = { updateTourPage: jest.fn(), updateTourSearch: jest.fn(), }; -jest.mock('../../components/TourProvider/TourProvider', () => ({ +jest.mock('../../context/TourProvider/TourProvider', () => ({ useTourProvider: jest.fn().mockImplementation(() => mockUseTourProvider), })); jest.mock('../../components/AppTour/Tour', () => { diff --git a/openmetadata-ui/src/main/resources/ui/src/pages/UserListPage/UserListPageV1.test.tsx b/openmetadata-ui/src/main/resources/ui/src/pages/UserListPage/UserListPageV1.test.tsx index dbce68a4b174..6b65580fd67c 100644 --- a/openmetadata-ui/src/main/resources/ui/src/pages/UserListPage/UserListPageV1.test.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/pages/UserListPage/UserListPageV1.test.tsx @@ -74,7 +74,7 @@ jest.mock('../../components/common/Table/Table', () => { return jest.fn().mockImplementation(() => mockTable
); }); -jest.mock('../../components/Loader/Loader', () => { +jest.mock('../../components/common/Loader/Loader', () => { return jest.fn().mockImplementation(() =>
Loader.component
); }); diff --git a/openmetadata-ui/src/main/resources/ui/src/pages/UserPage/UserPage.test.tsx b/openmetadata-ui/src/main/resources/ui/src/pages/UserPage/UserPage.test.tsx index 8eda253a7630..d1cf57cff62c 100644 --- a/openmetadata-ui/src/main/resources/ui/src/pages/UserPage/UserPage.test.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/pages/UserPage/UserPage.test.tsx @@ -119,11 +119,11 @@ jest.mock('react-router-dom', () => ({ useLocation: jest.fn().mockImplementation(() => new URLSearchParams()), })); -jest.mock('../../components/Loader/Loader', () => { +jest.mock('../../components/common/Loader/Loader', () => { return jest.fn().mockReturnValue(

Loader

); }); -jest.mock('../../components/Users/Users.component', () => { +jest.mock('../../components/Settings/Users/Users.component', () => { return jest.fn().mockReturnValue(

User Component

); }); From cd238583497ebf80a27967bf03804cd0a93d4582 Mon Sep 17 00:00:00 2001 From: Chirag Madlani <12962843+chirag-madlani@users.noreply.github.com> Date: Thu, 15 Feb 2024 23:00:32 +0530 Subject: [PATCH 3/3] fix tests --- .../QualityTab/QualityTab.test.tsx | 6 +-- .../ConnectionConfigForm.test.tsx | 43 +++++++++---------- .../ServiceConfig/ServiceConfig.test.tsx | 2 +- 3 files changed, 24 insertions(+), 27 deletions(-) diff --git a/openmetadata-ui/src/main/resources/ui/src/components/Database/TableProfiler/QualityTab/QualityTab.test.tsx b/openmetadata-ui/src/main/resources/ui/src/components/Database/TableProfiler/QualityTab/QualityTab.test.tsx index 0d95c21eb7c8..efe0e227e2e4 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/Database/TableProfiler/QualityTab/QualityTab.test.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/components/Database/TableProfiler/QualityTab/QualityTab.test.tsx @@ -43,7 +43,7 @@ jest.mock('../TableProfilerProvider', () => ({ })), })); -jest.mock('../../PermissionProvider/PermissionProvider', () => ({ +jest.mock('../../../../context/PermissionProvider/PermissionProvider', () => ({ usePermissionProvider: jest.fn().mockImplementation(() => ({ permissions: { testCase: testCasePermission, @@ -51,7 +51,7 @@ jest.mock('../../PermissionProvider/PermissionProvider', () => ({ })), })); -jest.mock('../../../hooks/useFqn', () => ({ +jest.mock('../../../../hooks/useFqn', () => ({ useFqn: jest.fn().mockImplementation(() => ({ fqn: 'testFqn' })), })); @@ -62,7 +62,7 @@ jest.mock('react-router-dom', () => ({ Link: jest.fn().mockImplementation(() =>
Link
), })); -jest.mock('../../../rest/tableAPI', () => ({ +jest.mock('../../../../rest/tableAPI', () => ({ getTableDetailsByFQN: jest .fn() .mockImplementation(() => Promise.resolve(mockTable)), diff --git a/openmetadata-ui/src/main/resources/ui/src/components/Settings/Services/ServiceConfig/ConnectionConfigForm.test.tsx b/openmetadata-ui/src/main/resources/ui/src/components/Settings/Services/ServiceConfig/ConnectionConfigForm.test.tsx index 0e279b9d3069..3952018cfd65 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/Settings/Services/ServiceConfig/ConnectionConfigForm.test.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/components/Settings/Services/ServiceConfig/ConnectionConfigForm.test.tsx @@ -109,68 +109,65 @@ jest.mock('react-router-dom', () => ({ useHistory: jest.fn(), })); -jest.mock('../../utils/DatabaseServiceUtils', () => ({ +jest.mock('../../../../utils/DatabaseServiceUtils', () => ({ getDatabaseConfig: jest.fn().mockReturnValue({ schema: MOCK_ATHENA_SERVICE, }), })); -jest.mock('../../utils/DashboardServiceUtils', () => ({ +jest.mock('../../../../utils/DashboardServiceUtils', () => ({ getDashboardConfig: jest.fn().mockReturnValue({ schema: {}, }), })); -jest.mock('../../utils/MessagingServiceUtils', () => ({ +jest.mock('../../../../utils/MessagingServiceUtils', () => ({ getMessagingConfig: jest.fn().mockReturnValue({ schema: {}, }), })); -jest.mock('../../utils/MetadataServiceUtils', () => ({ +jest.mock('../../../../utils/MetadataServiceUtils', () => ({ getMetadataConfig: jest.fn().mockReturnValue({ schema: {}, }), })); -jest.mock('../../utils/MlmodelServiceUtils', () => ({ +jest.mock('../../../../utils/MlmodelServiceUtils', () => ({ getMlmodelConfig: jest.fn().mockReturnValue({ schema: {}, }), })); -jest.mock('../../utils/PipelineServiceUtils', () => ({ +jest.mock('../../../../utils/PipelineServiceUtils', () => ({ getPipelineConfig: jest.fn().mockReturnValue({ schema: {}, }), })); -jest.mock('../../utils/SearchServiceUtils', () => ({ +jest.mock('../../../../utils/SearchServiceUtils', () => ({ getSearchServiceConfig: jest.fn().mockReturnValue({ schema: {}, }), })); -jest.mock('../../utils/ServiceUtilClassBase', () => ({ +jest.mock('../../../../utils/ServiceUtilClassBase', () => ({ serviceUtilClassBase: jest.fn(), })); -jest.mock('../../utils/JSONSchemaFormUtils', () => ({ +jest.mock('../../../../utils/JSONSchemaFormUtils', () => ({ formatFormDataForSubmit: jest.fn(), })); -jest.mock( - '../../components/common/AirflowMessageBanner/AirflowMessageBanner', - () => { - return jest - .fn() - .mockReturnValue( -
AirflowMessageBanner
- ); - } -); +jest.mock('../../../common/AirflowMessageBanner/AirflowMessageBanner', () => { + return jest + .fn() + .mockReturnValue( +
AirflowMessageBanner
+ ); +}); -jest.mock('../common/FormBuilder/FormBuilder', () => +jest.mock('../../../common/FormBuilder/FormBuilder', () => forwardRef( jest.fn().mockImplementation(({ children, onSubmit, onCancel }) => (
@@ -186,7 +183,7 @@ jest.mock('../common/FormBuilder/FormBuilder', () => ) ); -jest.mock('../common/TestConnection/TestConnection', () => +jest.mock('../../../common/TestConnection/TestConnection', () => jest .fn() .mockImplementation(() => ( @@ -194,7 +191,7 @@ jest.mock('../common/TestConnection/TestConnection', () => )) ); -jest.mock('../../rest/ingestionPipelineAPI', () => ({ +jest.mock('../../../../rest/ingestionPipelineAPI', () => ({ getPipelineServiceHostIp: jest.fn().mockReturnValue({ data: { ip: '192.168.0.1', @@ -209,7 +206,7 @@ jest.mock('react-i18next', () => ({ }), })); -jest.mock('../../hooks/useAirflowStatus', () => ({ +jest.mock('../../../../hooks/useAirflowStatus', () => ({ useAirflowStatus: jest.fn().mockImplementation(() => ({ reason: 'reason message', isAirflowAvailable: true, diff --git a/openmetadata-ui/src/main/resources/ui/src/components/Settings/Services/ServiceConfig/ServiceConfig.test.tsx b/openmetadata-ui/src/main/resources/ui/src/components/Settings/Services/ServiceConfig/ServiceConfig.test.tsx index 1a8074404c69..cb59463e0e47 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/Settings/Services/ServiceConfig/ServiceConfig.test.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/components/Settings/Services/ServiceConfig/ServiceConfig.test.tsx @@ -48,7 +48,7 @@ const mockUseHistory = { goBack: jest.fn(), }; -jest.mock('../../utils/RouterUtils', () => ({ +jest.mock('../../../../utils/RouterUtils', () => ({ getPathByServiceFQN: jest.fn().mockReturnValue('/test-path'), }));