AppRouter
); }); -jest.mock('./components/authentication/auth-provider/AuthProvider', () => { +jest.mock('./components/Auth/AuthProviders/AuthProvider', () => { return { AuthProvider: jest .fn() diff --git a/openmetadata-ui/src/main/resources/ui/src/App.tsx b/openmetadata-ui/src/main/resources/ui/src/App.tsx index c897ab6e0fb..ea4771c0dc2 100644 --- a/openmetadata-ui/src/main/resources/ui/src/App.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/App.tsx @@ -18,16 +18,16 @@ 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 { AuthProvider } from './components/authentication/auth-provider/AuthProvider'; +import AppRouter from './components/AppRouter/AppRouter'; +import { AuthProvider } from './components/Auth/AuthProviders/AuthProvider'; 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 AppRouter from './components/router/AppRouter'; import TourProvider from './components/TourProvider/TourProvider'; -import WebSocketProvider from './components/web-scoket/web-scoket.provider'; import WebAnalyticsProvider from './components/WebAnalytics/WebAnalyticsProvider'; +import WebSocketProvider from './components/WebSocketProvider/WebSocketProvider'; import { TOAST_OPTIONS } from './constants/Toasts.constants'; import { history } from './utils/HistoryUtils'; import i18n from './utils/i18next/LocalUtil'; diff --git a/openmetadata-ui/src/main/resources/ui/src/AppState.ts b/openmetadata-ui/src/main/resources/ui/src/AppState.ts index 77d5b537dfa..398f0a80611 100644 --- a/openmetadata-ui/src/main/resources/ui/src/AppState.ts +++ b/openmetadata-ui/src/main/resources/ui/src/AppState.ts @@ -14,7 +14,7 @@ import { isEmpty, isNil, isUndefined } from 'lodash'; import { action, makeAutoObservable } from 'mobx'; import { ClientAuth, NewUser } from 'Models'; -import { EntityUnion } from './components/Explore/explore.interface'; +import { EntityUnion } from './components/Explore/ExplorePage.interface'; import { ResourcePermission } from './generated/entity/policies/accessControl/resourcePermission'; import { EntityReference as UserTeams, diff --git a/openmetadata-ui/src/main/resources/ui/src/components/ActivityFeed/ActivityFeedCard/ActivityFeedCard.tsx b/openmetadata-ui/src/main/resources/ui/src/components/ActivityFeed/ActivityFeedCard/ActivityFeedCard.tsx index 0b5e4f138cb..c964535d423 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/ActivityFeed/ActivityFeedCard/ActivityFeedCard.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/components/ActivityFeed/ActivityFeedCard/ActivityFeedCard.tsx @@ -25,7 +25,7 @@ import { getEntityFQN, getEntityType, } from '../../../utils/FeedUtils'; -import { useAuthContext } from '../../authentication/auth-provider/AuthProvider'; +import { useAuthContext } from '../../Auth/AuthProviders/AuthProvider'; import UserPopOverCard from '../../common/PopOverCard/UserPopOverCard'; import ProfilePicture from '../../common/ProfilePicture/ProfilePicture'; import EditAnnouncementModal from '../../Modals/AnnouncementModal/EditAnnouncementModal'; diff --git a/openmetadata-ui/src/main/resources/ui/src/components/ActivityFeed/ActivityFeedCard/FeedCardBody/FeedCardBody.test.tsx b/openmetadata-ui/src/main/resources/ui/src/components/ActivityFeed/ActivityFeedCard/FeedCardBody/FeedCardBody.test.tsx index 1f10577c938..ac82d90461d 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/ActivityFeed/ActivityFeedCard/FeedCardBody/FeedCardBody.test.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/components/ActivityFeed/ActivityFeedCard/FeedCardBody/FeedCardBody.test.tsx @@ -32,7 +32,7 @@ jest.mock('../../../../utils/FeedUtils', () => ({ }, })); -jest.mock('../../../common/rich-text-editor/RichTextEditorPreviewer', () => { +jest.mock('../../../common/RichTextEditor/RichTextEditorPreviewer', () => { return jest.fn().mockReturnValue(RichText Preview
); }); 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 69bd598d0d0..dfac26f6f30 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 @@ -21,7 +21,7 @@ import { getFrontEndFormat, MarkdownToHTMLConverter, } from '../../../../utils/FeedUtils'; -import RichTextEditorPreviewer from '../../../common/rich-text-editor/RichTextEditorPreviewer'; +import RichTextEditorPreviewer from '../../../common/RichTextEditor/RichTextEditorPreviewer'; import Reactions from '../../../Reactions/Reactions'; import ActivityFeedEditor from '../../ActivityFeedEditor/ActivityFeedEditor'; import { FeedBodyProp } from '../ActivityFeedCard.interface'; diff --git a/openmetadata-ui/src/main/resources/ui/src/components/ActivityFeed/ActivityFeedCard/FeedCardBody/FeedCardBodyV1.tsx b/openmetadata-ui/src/main/resources/ui/src/components/ActivityFeed/ActivityFeedCard/FeedCardBody/FeedCardBodyV1.tsx index de6c6e6625c..127dafaf4c0 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/ActivityFeed/ActivityFeedCard/FeedCardBody/FeedCardBodyV1.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/components/ActivityFeed/ActivityFeedCard/FeedCardBody/FeedCardBodyV1.tsx @@ -16,7 +16,7 @@ import { isUndefined } from 'lodash'; import React, { useCallback, useMemo, useState } from 'react'; import { useTranslation } from 'react-i18next'; import ActivityFeedEditor from '../../../../components/ActivityFeed/ActivityFeedEditor/ActivityFeedEditor'; -import RichTextEditorPreviewer from '../../../../components/common/rich-text-editor/RichTextEditorPreviewer'; +import RichTextEditorPreviewer from '../../../../components/common/RichTextEditor/RichTextEditorPreviewer'; import { formatDateTime } from '../../../../utils/date-time/DateTimeUtils'; import { getFrontEndFormat, 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 91cc023886c..1f68d30a4db 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 @@ -43,7 +43,7 @@ const mockUserData: User = { isAdmin: true, }; -jest.mock('../../authentication/auth-provider/AuthProvider', () => ({ +jest.mock('../../Auth/AuthProviders/AuthProvider', () => ({ useAuthContext: jest.fn(() => ({ currentUser: mockUserData, })), 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 619624cd89c..7c015d9276f 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 @@ -23,7 +23,7 @@ import { REACTION_LIST } from '../../../constants/reactions.constant'; import { ReactionOperation } from '../../../enums/reactions.enum'; import { Post } from '../../../generated/entity/feed/thread'; import { ReactionType } from '../../../generated/type/reaction'; -import { useAuthContext } from '../../authentication/auth-provider/AuthProvider'; +import { useAuthContext } from '../../Auth/AuthProviders/AuthProvider'; import Reaction from '../../Reactions/Reaction'; import { ConfirmState } from './ActivityFeedCard.interface'; 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 a014a4bb510..945d47cfe5f 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 @@ -16,7 +16,7 @@ import React, { useEffect, useMemo, useState } from 'react'; import { useTranslation } from 'react-i18next'; import { ReactComponent as ActivityFeedIcon } from '../../../assets/svg/activity-feed.svg'; import { ReactComponent as TaskIcon } from '../../../assets/svg/ic-task.svg'; -import ErrorPlaceHolder from '../../../components/common/error-with-placeholder/ErrorPlaceHolder'; +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'; diff --git a/openmetadata-ui/src/main/resources/ui/src/components/ActivityFeed/ActivityFeedProvider/ActivityFeedProvider.tsx b/openmetadata-ui/src/main/resources/ui/src/components/ActivityFeed/ActivityFeedProvider/ActivityFeedProvider.tsx index 553295e8131..687b1bdab9a 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/ActivityFeed/ActivityFeedProvider/ActivityFeedProvider.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/components/ActivityFeed/ActivityFeedProvider/ActivityFeedProvider.tsx @@ -45,7 +45,7 @@ import { import { getEntityFeedLink } from '../../../utils/EntityUtils'; import { getUpdatedThread } from '../../../utils/FeedUtils'; import { showErrorToast } from '../../../utils/ToastUtils'; -import { useAuthContext } from '../../authentication/auth-provider/AuthProvider'; +import { useAuthContext } from '../../Auth/AuthProviders/AuthProvider'; import ActivityFeedDrawer from '../ActivityFeedDrawer/ActivityFeedDrawer'; import { ActivityFeedProviderContextType } from './ActivityFeedProviderContext.interface'; 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 e98a47b5d68..acf78d51024 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 @@ -47,10 +47,10 @@ import { ENTITY_LINK_SEPARATOR, getEntityFeedLink, } from '../../../utils/EntityUtils'; -import { useAuthContext } from '../../authentication/auth-provider/AuthProvider'; +import { useAuthContext } from '../../Auth/AuthProviders/AuthProvider'; import Loader from '../../Loader/Loader'; import { TaskTab } from '../../Task/TaskTab/TaskTab.component'; -import '../../Widgets/FeedsWidget/FeedsWidget.less'; +import '../../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 5857c51c9b4..208b75637ff 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 @@ -31,8 +31,8 @@ import { Paging } from '../../../generated/type/paging'; import { useElementInView } from '../../../hooks/useElementInView'; import { getAllFeeds } from '../../../rest/feedsAPI'; import { showErrorToast } from '../../../utils/ToastUtils'; -import { useAuthContext } from '../../authentication/auth-provider/AuthProvider'; -import ErrorPlaceHolder from '../../common/error-with-placeholder/ErrorPlaceHolder'; +import { useAuthContext } from '../../Auth/AuthProviders/AuthProvider'; +import ErrorPlaceHolder from '../../common/ErrorWithPlaceholder/ErrorPlaceHolder'; import Loader from '../../Loader/Loader'; import ConfirmationModal from '../../Modals/ConfirmationModal/ConfirmationModal'; import { ConfirmState } from '../ActivityFeedCard/ActivityFeedCard.interface'; 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 b3f7b15d105..62093bcf066 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 @@ -29,7 +29,7 @@ import { Thread, ThreadType, } from '../../../generated/entity/feed/thread'; -import { useAuthContext } from '../../authentication/auth-provider/AuthProvider'; +import { useAuthContext } from '../../Auth/AuthProviders/AuthProvider'; import { useActivityFeedProvider } from '../ActivityFeedProvider/ActivityFeedProvider'; import './activity-feed-actions.less'; diff --git a/openmetadata-ui/src/main/resources/ui/src/components/ActivityFeed/Shared/AnnouncementBadge.tsx b/openmetadata-ui/src/main/resources/ui/src/components/ActivityFeed/Shared/AnnouncementBadge.tsx index c0e17dbd2e3..3aeefb6ccca 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/ActivityFeed/Shared/AnnouncementBadge.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/components/ActivityFeed/Shared/AnnouncementBadge.tsx @@ -15,7 +15,7 @@ import { Typography } from 'antd'; import React from 'react'; import { useTranslation } from 'react-i18next'; import { ReactComponent as AnnouncementIcon } from '../../../assets/svg/announcements-v1.svg'; -import './Badge.less'; +import './task-badge.less'; const AnnouncementBadge = () => { const { t } = useTranslation(); diff --git a/openmetadata-ui/src/main/resources/ui/src/components/ActivityFeed/Shared/TaskBadge.tsx b/openmetadata-ui/src/main/resources/ui/src/components/ActivityFeed/Shared/TaskBadge.tsx index 9bbec0063dd..ca41d8036c6 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/ActivityFeed/Shared/TaskBadge.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/components/ActivityFeed/Shared/TaskBadge.tsx @@ -19,7 +19,7 @@ import { useTranslation } from 'react-i18next'; import { ReactComponent as IconTaskClose } from '../../../assets/svg/complete.svg'; import { ReactComponent as IconTaskOpen } from '../../../assets/svg/in-progress.svg'; import { ThreadTaskStatus } from '../../../generated/entity/feed/thread'; -import './Badge.less'; +import './task-badge.less'; const TaskBadge = ({ status }: { status: ThreadTaskStatus }) => { const { t } = useTranslation(); diff --git a/openmetadata-ui/src/main/resources/ui/src/components/ActivityFeed/Shared/Badge.less b/openmetadata-ui/src/main/resources/ui/src/components/ActivityFeed/Shared/task-badge.less similarity index 100% rename from openmetadata-ui/src/main/resources/ui/src/components/ActivityFeed/Shared/Badge.less rename to openmetadata-ui/src/main/resources/ui/src/components/ActivityFeed/Shared/task-badge.less diff --git a/openmetadata-ui/src/main/resources/ui/src/components/AddDataQualityTest/AddDataQualityTestV1.tsx b/openmetadata-ui/src/main/resources/ui/src/components/AddDataQualityTest/AddDataQualityTestV1.tsx index e35ee63a90f..799c3eec1a2 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/AddDataQualityTest/AddDataQualityTestV1.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/components/AddDataQualityTest/AddDataQualityTestV1.tsx @@ -46,10 +46,10 @@ import { createExecutableTestSuite, createTestCase } from '../../rest/testAPI'; import { getEntityBreadcrumbs, getEntityName } from '../../utils/EntityUtils'; import { getEncodedFqn } from '../../utils/StringsUtils'; import { showErrorToast } from '../../utils/ToastUtils'; -import { useAuthContext } from '../authentication/auth-provider/AuthProvider'; -import SuccessScreen from '../common/success-screen/SuccessScreen'; -import TitleBreadcrumb from '../common/title-breadcrumb/title-breadcrumb.component'; -import { TitleBreadcrumbProps } from '../common/title-breadcrumb/title-breadcrumb.interface'; +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'; import { AddDataQualityTestProps } from './AddDataQualityTest.interface'; import RightPanel from './components/RightPanel'; diff --git a/openmetadata-ui/src/main/resources/ui/src/components/AddDataQualityTest/EditTestCaseModal.test.tsx b/openmetadata-ui/src/main/resources/ui/src/components/AddDataQualityTest/EditTestCaseModal.test.tsx index ee87a410296..fe7dccbb035 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/AddDataQualityTest/EditTestCaseModal.test.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/components/AddDataQualityTest/EditTestCaseModal.test.tsx @@ -26,7 +26,7 @@ const mockProps: EditTestCaseModalProps = { onUpdate: jest.fn(), }; -jest.mock('../common/rich-text-editor/RichTextEditor', () => { +jest.mock('../common/RichTextEditor/RichTextEditor', () => { return forwardRef( jest.fn().mockImplementation(() =>NavBar
); }); 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 c5daefc521c..f5d0782a320 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 @@ -49,8 +49,8 @@ import { import { addToRecentSearched } from '../../utils/CommonUtils'; import SVGIcons, { Icons } from '../../utils/SvgUtils'; import { showErrorToast } from '../../utils/ToastUtils'; -import { useAuthContext } from '../authentication/auth-provider/AuthProvider'; -import NavBar from '../nav-bar/NavBar'; +import { useAuthContext } from '../Auth/AuthProviders/AuthProvider'; +import NavBar from '../NavBar/NavBar'; import './app-bar.style.less'; const Appbar: React.FC = (): JSX.Element => { diff --git a/openmetadata-ui/src/main/resources/ui/src/components/AppContainer/AppContainer.test.tsx b/openmetadata-ui/src/main/resources/ui/src/components/AppContainer/AppContainer.test.tsx index 0007f1f7b26..74d2e0352d7 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/AppContainer/AppContainer.test.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/components/AppContainer/AppContainer.test.tsx @@ -32,7 +32,7 @@ jest.mock('../../AppState', () => ({ }, })); -jest.mock('../authentication/auth-provider/AuthProvider', () => { +jest.mock('../Auth/AuthProviders/AuthProvider', () => { return { useAuthContext: jest.fn(() => ({ isAuthDisabled: false, @@ -68,7 +68,7 @@ jest.mock('../../pages/SignUp/SignUpPage', () => jest.fn().mockReturnValue(SignUpPage
) ); -jest.mock('../../components/router/AuthenticatedAppRouter', () => +jest.mock('../../components/AppRouter/AuthenticatedAppRouter', () => jest.fn().mockReturnValue(AuthenticatedAppRouter
) ); diff --git a/openmetadata-ui/src/main/resources/ui/src/components/AppContainer/AppContainer.tsx b/openmetadata-ui/src/main/resources/ui/src/components/AppContainer/AppContainer.tsx index 9c736e505c9..70118538aee 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/AppContainer/AppContainer.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/components/AppContainer/AppContainer.tsx @@ -18,8 +18,8 @@ import React from 'react'; import { Redirect, Route, Switch } from 'react-router-dom'; import AppState from '../../AppState'; import Appbar from '../../components/AppBar/Appbar'; +import AuthenticatedAppRouter from '../../components/AppRouter/AuthenticatedAppRouter'; import LeftSidebar from '../../components/MyData/LeftSidebar/LeftSidebar.component'; -import AuthenticatedAppRouter from '../../components/router/AuthenticatedAppRouter'; import { ROUTES } from '../../constants/constants'; import SignUpPage from '../../pages/SignUp/SignUpPage'; import './app-container.less'; diff --git a/openmetadata-ui/src/main/resources/ui/src/components/router/AdminProtectedRoute.tsx b/openmetadata-ui/src/main/resources/ui/src/components/AppRouter/AdminProtectedRoute.tsx similarity index 93% rename from openmetadata-ui/src/main/resources/ui/src/components/router/AdminProtectedRoute.tsx rename to openmetadata-ui/src/main/resources/ui/src/components/AppRouter/AdminProtectedRoute.tsx index 74229bdce59..92ff5f18729 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/router/AdminProtectedRoute.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/components/AppRouter/AdminProtectedRoute.tsx @@ -13,7 +13,7 @@ import React from 'react'; import { Redirect, Route, RouteProps } from 'react-router-dom'; -import ErrorPlaceHolder from '../../components/common/error-with-placeholder/ErrorPlaceHolder'; +import ErrorPlaceHolder from '../../components/common/ErrorWithPlaceholder/ErrorPlaceHolder'; import { ROUTES } from '../../constants/constants'; import { ERROR_PLACEHOLDER_TYPE } from '../../enums/common.enum'; import { useAuth } from '../../hooks/authHooks'; diff --git a/openmetadata-ui/src/main/resources/ui/src/components/router/AppRouter.tsx b/openmetadata-ui/src/main/resources/ui/src/components/AppRouter/AppRouter.tsx similarity index 92% rename from openmetadata-ui/src/main/resources/ui/src/components/router/AppRouter.tsx rename to openmetadata-ui/src/main/resources/ui/src/components/AppRouter/AppRouter.tsx index 965df9269d9..49bec08b5f7 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/router/AppRouter.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/components/AppRouter/AppRouter.tsx @@ -21,27 +21,25 @@ import { AuthProvider } from '../../generated/settings/settings'; import SamlCallback from '../../pages/SamlCallback'; import AccountActivationConfirmation from '../../pages/SignUp/account-activation-confirmation.component'; import { isProtectedRoute } from '../../utils/AuthProvider.util'; -import { useAuthContext } from '../authentication/auth-provider/AuthProvider'; +import { useAuthContext } from '../Auth/AuthProviders/AuthProvider'; import Loader from '../Loader/Loader'; import withSuspenseFallback from './withSuspenseFallback'; const SigninPage = withSuspenseFallback( - React.lazy(() => import('../../pages/login')) + React.lazy(() => import('../../pages/LoginPage')) ); const PageNotFound = withSuspenseFallback( - React.lazy(() => import('../../pages/page-not-found/PageNotFound')) + React.lazy(() => import('../../pages/PageNotFound/PageNotFound')) ); const ForgotPassword = withSuspenseFallback( React.lazy( - () => import('../../pages/forgot-password/forgot-password.component') + () => import('../../pages/ForgotPassword/forgot-password.component') ) ); const ResetPassword = withSuspenseFallback( - React.lazy( - () => import('../../pages/reset-password/reset-password.component') - ) + React.lazy(() => import('../../pages/ResetPassword/ResetPassword.component')) ); const BasicSignupPage = withSuspenseFallback( diff --git a/openmetadata-ui/src/main/resources/ui/src/components/router/AuthenticatedAppRouter.tsx b/openmetadata-ui/src/main/resources/ui/src/components/AppRouter/AuthenticatedAppRouter.tsx similarity index 98% rename from openmetadata-ui/src/main/resources/ui/src/components/router/AuthenticatedAppRouter.tsx rename to openmetadata-ui/src/main/resources/ui/src/components/AppRouter/AuthenticatedAppRouter.tsx index 963299473c0..d1c84b8a366 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/router/AuthenticatedAppRouter.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/components/AppRouter/AuthenticatedAppRouter.tsx @@ -77,7 +77,7 @@ const ServicePage = withSuspenseFallback( ); const SwaggerPage = withSuspenseFallback( - React.lazy(() => import('../../pages/swagger')) + React.lazy(() => import('../../pages/SwaggerPage')) ); const TagsPage = withSuspenseFallback( React.lazy(() => import('../../pages/TagsPage/TagsPage')) @@ -94,7 +94,7 @@ const TopicDetailsPage = withSuspenseFallback( ) ); const TourPageComponent = withSuspenseFallback( - React.lazy(() => import('../../pages/tour-page/TourPage.component')) + React.lazy(() => import('../../pages/TourPage/TourPage.component')) ); const UserPage = withSuspenseFallback( React.lazy(() => import('../../pages/UserPage/UserPage.component')) @@ -211,7 +211,7 @@ const DatabaseSchemaVersionPage = withSuspenseFallback( ) ); const ExplorePageV1 = withSuspenseFallback( - React.lazy(() => import('../../pages/explore/ExplorePageV1.component')) + React.lazy(() => import('../../pages/ExplorePage/ExplorePageV1.component')) ); const GlossaryPage = withSuspenseFallback( @@ -333,7 +333,7 @@ const AddQueryPage = withSuspenseFallback( ); const PageNotFound = withSuspenseFallback( - React.lazy(() => import('../../pages/page-not-found/PageNotFound')) + React.lazy(() => import('../../pages/PageNotFound/PageNotFound')) ); const EditLoginConfiguration = withSuspenseFallback( diff --git a/openmetadata-ui/src/main/resources/ui/src/components/router/GlobalSettingRouter.tsx b/openmetadata-ui/src/main/resources/ui/src/components/AppRouter/GlobalSettingRouter.tsx similarity index 98% rename from openmetadata-ui/src/main/resources/ui/src/components/router/GlobalSettingRouter.tsx rename to openmetadata-ui/src/main/resources/ui/src/components/AppRouter/GlobalSettingRouter.tsx index 1cd21e1923f..1d4cb71faa8 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/router/GlobalSettingRouter.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/components/AppRouter/GlobalSettingRouter.tsx @@ -37,7 +37,9 @@ const AddAlertPage = withSuspenseFallback( ); const ImportTeamsPage = withSuspenseFallback( - React.lazy(() => import('../../pages/teams/ImportTeamsPage/ImportTeamsPage')) + React.lazy( + () => import('../../pages/TeamsPage/ImportTeamsPage/ImportTeamsPage') + ) ); const AddDataInsightReportAlert = withSuspenseFallback( React.lazy( @@ -69,11 +71,11 @@ const AlertsPage = withSuspenseFallback( ); const TeamsPage = withSuspenseFallback( - React.lazy(() => import('../../pages/teams/TeamsPage')) + React.lazy(() => import('../../pages/TeamsPage/TeamsPage')) ); const ServicesPage = withSuspenseFallback( - React.lazy(() => import('../../pages/services/ServicesPage')) + React.lazy(() => import('../../pages/ServicesPage/ServicesPage')) ); const BotsPageV1 = withSuspenseFallback( React.lazy(() => import('../../pages/BotsPageV1/BotsPageV1.component')) diff --git a/openmetadata-ui/src/main/resources/ui/src/components/router/withActivityFeed.tsx b/openmetadata-ui/src/main/resources/ui/src/components/AppRouter/withActivityFeed.tsx similarity index 100% rename from openmetadata-ui/src/main/resources/ui/src/components/router/withActivityFeed.tsx rename to openmetadata-ui/src/main/resources/ui/src/components/AppRouter/withActivityFeed.tsx diff --git a/openmetadata-ui/src/main/resources/ui/src/components/router/withAdvanceSearch.tsx b/openmetadata-ui/src/main/resources/ui/src/components/AppRouter/withAdvanceSearch.tsx similarity index 100% rename from openmetadata-ui/src/main/resources/ui/src/components/router/withAdvanceSearch.tsx rename to openmetadata-ui/src/main/resources/ui/src/components/AppRouter/withAdvanceSearch.tsx diff --git a/openmetadata-ui/src/main/resources/ui/src/components/router/withSuspenseFallback.js b/openmetadata-ui/src/main/resources/ui/src/components/AppRouter/withSuspenseFallback.js similarity index 100% rename from openmetadata-ui/src/main/resources/ui/src/components/router/withSuspenseFallback.js rename to openmetadata-ui/src/main/resources/ui/src/components/AppRouter/withSuspenseFallback.js diff --git a/openmetadata-ui/src/main/resources/ui/src/components/tour/Tour.tsx b/openmetadata-ui/src/main/resources/ui/src/components/AppTour/Tour.tsx similarity index 97% rename from openmetadata-ui/src/main/resources/ui/src/components/tour/Tour.tsx rename to openmetadata-ui/src/main/resources/ui/src/components/AppTour/Tour.tsx index 48a5175572c..982f4cecddc 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/tour/Tour.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/components/AppTour/Tour.tsx @@ -16,10 +16,10 @@ import { Button } from 'antd'; import { observer } from 'mobx-react'; import React, { useState } from 'react'; import { useHistory } from 'react-router-dom'; -import { useTourProvider } from '../../components/TourProvider/TourProvider'; import { PRIMERY_COLOR } from '../../constants/constants'; 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/tour/tour.style.less b/openmetadata-ui/src/main/resources/ui/src/components/AppTour/tour.style.less similarity index 100% rename from openmetadata-ui/src/main/resources/ui/src/components/tour/tour.style.less rename to openmetadata-ui/src/main/resources/ui/src/components/AppTour/tour.style.less 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/Applications/AppDetails/AppDetails.component.tsx index 0b6a21f2afb..9aab53df867 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/Applications/AppDetails/AppDetails.component.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/components/Applications/AppDetails/AppDetails.component.tsx @@ -40,8 +40,8 @@ import { ReactComponent as IconExternalLink } from '../../../assets/svg/external 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 PageLayoutV1 from '../../../components/containers/PageLayoutV1'; import Loader from '../../../components/Loader/Loader'; +import PageLayoutV1 from '../../../components/PageLayoutV1/PageLayoutV1'; import TabsLabel from '../../../components/TabsLabel/TabsLabel.component'; import { DE_ACTIVE_COLOR } from '../../../constants/constants'; import { 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/Applications/AppInstallVerifyCard/AppInstallVerifyCard.component.tsx index 8a0f14ce351..f1edec0ceef 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/Applications/AppInstallVerifyCard/AppInstallVerifyCard.component.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/components/Applications/AppInstallVerifyCard/AppInstallVerifyCard.component.tsx @@ -29,7 +29,7 @@ import { useTranslation } from 'react-i18next'; import { Transi18next } from '../../../utils/CommonUtils'; import { getRelativeTime } from '../../../utils/date-time/DateTimeUtils'; import { getEntityName } from '../../../utils/EntityUtils'; -import { useAuthContext } from '../../authentication/auth-provider/AuthProvider'; +import { useAuthContext } from '../../Auth/AuthProviders/AuthProvider'; import BrandImage from '../../common/BrandImage/BrandImage'; import UserPopOverCard from '../../common/PopOverCard/UserPopOverCard'; import ProfilePicture from '../../common/ProfilePicture/ProfilePicture'; 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/Applications/AppLogsViewer/AppLogsViewer.component.tsx index fa5bde1fb99..d7268d0e14d 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/Applications/AppLogsViewer/AppLogsViewer.component.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/components/Applications/AppLogsViewer/AppLogsViewer.component.tsx @@ -18,7 +18,7 @@ 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 CopyToClipboardButton from '../../buttons/CopyToClipboardButton/CopyToClipboardButton'; +import CopyToClipboardButton from '../../CopyToClipboardButton/CopyToClipboardButton'; import { AppLogsViewerProps, JobStats } from './AppLogsViewer.interface'; const AppLogsViewer = ({ data }: AppLogsViewerProps) => { 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/Applications/AppRunsHistory/AppRunsHistory.component.tsx index d12f0f4c0f8..00a1a122dae 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/Applications/AppRunsHistory/AppRunsHistory.component.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/components/Applications/AppRunsHistory/AppRunsHistory.component.tsx @@ -45,9 +45,9 @@ import { } from '../../../utils/date-time/DateTimeUtils'; import { getLogsViewerPath } from '../../../utils/RouterUtils'; import { showErrorToast } from '../../../utils/ToastUtils'; -import ErrorPlaceHolder from '../../common/error-with-placeholder/ErrorPlaceHolder'; -import NextPrevious from '../../common/next-previous/NextPrevious'; -import { PagingHandlerParams } from '../../common/next-previous/NextPrevious.interface'; +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'; @@ -77,6 +77,7 @@ const AppRunsHistory = forwardRef( handlePagingChange, handlePageChange, handlePageSizeChange, + showPagination: paginationVisible, } = usePaging(); const history = useHistory(); @@ -255,7 +256,7 @@ const AppRunsHistory = forwardRef( }: PagingHandlerParams) => { handlePageChange(currentPage); fetchAppHistory({ - offset: currentPage * pageSize, + offset: (currentPage - 1) * pageSize, } as Paging); }; @@ -267,10 +268,10 @@ const AppRunsHistory = forwardRef( useEffect(() => { fetchAppHistory(); - }, [fqn]); + }, [fqn, pageSize]); return ( -Description Component
); }); @@ -122,7 +122,7 @@ jest.mock('./AuthMechanismForm', () => ) ); -jest.mock('../containers/PageLayoutV1', () => +jest.mock('../PageLayoutV1/PageLayoutV1', () => jest .fn() .mockImplementation(({ children, leftPanel, rightPanel, header }) => ( diff --git a/openmetadata-ui/src/main/resources/ui/src/components/BotDetails/AuthMechanism.less b/openmetadata-ui/src/main/resources/ui/src/components/BotDetails/auth-mechanism.less similarity index 100% rename from openmetadata-ui/src/main/resources/ui/src/components/BotDetails/AuthMechanism.less rename to openmetadata-ui/src/main/resources/ui/src/components/BotDetails/auth-mechanism.less diff --git a/openmetadata-ui/src/main/resources/ui/src/components/BotDetails/BotDetails.style.less b/openmetadata-ui/src/main/resources/ui/src/components/BotDetails/bot-details.less similarity index 100% rename from openmetadata-ui/src/main/resources/ui/src/components/BotDetails/BotDetails.style.less rename to openmetadata-ui/src/main/resources/ui/src/components/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/BotListV1/BotListV1.component.tsx index 1eb89a378ec..bb3b7bbfded 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/BotListV1/BotListV1.component.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/components/BotListV1/BotListV1.component.tsx @@ -18,8 +18,7 @@ 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 FilterTablePlaceHolder from '../../components/common/error-with-placeholder/FilterTablePlaceHolder'; -import { PagingHandlerParams } from '../../components/common/next-previous/NextPrevious.interface'; +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'; @@ -32,16 +31,16 @@ import { Paging } from '../../generated/type/paging'; import { useAuth } from '../../hooks/authHooks'; import { usePaging } from '../../hooks/paging/usePaging'; import { getBots } from '../../rest/botsAPI'; -import { showPagination } from '../../utils/CommonUtils'; import { getEntityName } from '../../utils/EntityUtils'; import SVGIcons, { Icons } from '../../utils/SvgUtils'; import { showErrorToast } from '../../utils/ToastUtils'; import DeleteWidgetModal from '../common/DeleteWidget/DeleteWidgetModal'; -import ErrorPlaceHolder from '../common/error-with-placeholder/ErrorPlaceHolder'; -import NextPrevious from '../common/next-previous/NextPrevious'; -import RichTextEditorPreviewer from '../common/rich-text-editor/RichTextEditorPreviewer'; -import Searchbar from '../common/searchbar/Searchbar'; -import PageHeader from '../header/PageHeader.component'; +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 PageHeader from '../PageHeader/PageHeader.component'; import { BotListV1Props } from './BotListV1.interfaces'; const BotListV1 = ({ @@ -62,6 +61,7 @@ const BotListV1 = ({ handlePagingChange, handlePageChange, handlePageSizeChange, + showPagination, } = usePaging(); const [handleErrorPlaceholder, setHandleErrorPlaceholder] = useState(false); @@ -288,7 +288,7 @@ const BotListV1 = ({ />TeamsSelectable component
); }); -jest.mock('../common/rich-text-editor/RichTextEditor', () => { +jest.mock('../common/RichTextEditor/RichTextEditor', () => { return forwardRef( jest.fn().mockImplementation(({ initialValue }, ref) => { returnRichTextEditorPreview
); }); jest.mock( - '../../components/common/error-with-placeholder/ErrorPlaceHolder', + '../../components/common/ErrorWithPlaceholder/ErrorPlaceHolder', () => { return jest.fn().mockReturnValue(ErrorPlaceHolder
); } diff --git a/openmetadata-ui/src/main/resources/ui/src/components/CustomEntityDetail/CustomPropertyTable.tsx b/openmetadata-ui/src/main/resources/ui/src/components/CustomEntityDetail/CustomPropertyTable.tsx index 4cff8a5a891..3c043f057dc 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/CustomEntityDetail/CustomPropertyTable.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/components/CustomEntityDetail/CustomPropertyTable.tsx @@ -17,14 +17,14 @@ 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/error-with-placeholder/ErrorPlaceHolder'; +import ErrorPlaceHolder from '../../components/common/ErrorWithPlaceholder/ErrorPlaceHolder'; import Table from '../../components/common/Table/Table'; import { 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 { getEntityName } from '../../utils/EntityUtils'; -import RichTextEditorPreviewer from '../common/rich-text-editor/RichTextEditorPreviewer'; +import RichTextEditorPreviewer from '../common/RichTextEditor/RichTextEditorPreviewer'; import ConfirmationModal from '../Modals/ConfirmationModal/ConfirmationModal'; import { ModalWithMarkdownEditor } from '../Modals/ModalWithMarkdownEditor/ModalWithMarkdownEditor'; import { CustomPropertyTableProp } from './CustomPropertyTable.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/CustomizableComponents/AddWidgetModal/AddWidgetModal.tsx index 040c494f6e2..4e3b8679985 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/CustomizableComponents/AddWidgetModal/AddWidgetModal.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/components/CustomizableComponents/AddWidgetModal/AddWidgetModal.tsx @@ -23,12 +23,12 @@ 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/error-with-placeholder/ErrorPlaceHolder'; +import ErrorPlaceHolder from '../../common/ErrorWithPlaceholder/ErrorPlaceHolder'; +import './add-widget-modal.less'; import { AddWidgetModalProps, WidgetSizeInfo, } from './AddWidgetModal.interface'; -import './AddWidgetModal.less'; import AddWidgetTabContent from './AddWidgetTabContent'; function AddWidgetModal({ diff --git a/openmetadata-ui/src/main/resources/ui/src/components/CustomizableComponents/AddWidgetModal/AddWidgetModal.less b/openmetadata-ui/src/main/resources/ui/src/components/CustomizableComponents/AddWidgetModal/add-widget-modal.less similarity index 100% rename from openmetadata-ui/src/main/resources/ui/src/components/CustomizableComponents/AddWidgetModal/AddWidgetModal.less rename to openmetadata-ui/src/main/resources/ui/src/components/CustomizableComponents/AddWidgetModal/add-widget-modal.less diff --git a/openmetadata-ui/src/main/resources/ui/src/components/CustomizableComponents/CustomizeMyData/CustomizeMyData.tsx b/openmetadata-ui/src/main/resources/ui/src/components/CustomizableComponents/CustomizeMyData/CustomizeMyData.tsx index 72b140fb3d2..c489ca4180e 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/CustomizableComponents/CustomizeMyData/CustomizeMyData.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/components/CustomizableComponents/CustomizeMyData/CustomizeMyData.tsx @@ -51,11 +51,11 @@ import { import { getDecodedFqn } from '../../../utils/StringsUtils'; import { showErrorToast } from '../../../utils/ToastUtils'; import ActivityFeedProvider from '../../ActivityFeed/ActivityFeedProvider/ActivityFeedProvider'; -import { useAuthContext } from '../../authentication/auth-provider/AuthProvider'; -import PageLayoutV1 from '../../containers/PageLayoutV1'; +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'; -import './CustomizeMyData.less'; const ReactGridLayout = WidthProvider(RGL); diff --git a/openmetadata-ui/src/main/resources/ui/src/components/CustomizableComponents/CustomizeMyData/CustomizeMyData.less b/openmetadata-ui/src/main/resources/ui/src/components/CustomizableComponents/CustomizeMyData/customize-my-data.less similarity index 100% rename from openmetadata-ui/src/main/resources/ui/src/components/CustomizableComponents/CustomizeMyData/CustomizeMyData.less rename to openmetadata-ui/src/main/resources/ui/src/components/CustomizableComponents/CustomizeMyData/customize-my-data.less diff --git a/openmetadata-ui/src/main/resources/ui/src/components/CustomizableComponents/EmptyWidgetPlaceholder/EmptyWidgetPlaceholder.tsx b/openmetadata-ui/src/main/resources/ui/src/components/CustomizableComponents/EmptyWidgetPlaceholder/EmptyWidgetPlaceholder.tsx index c81ecf110f2..4c3dc4cc08e 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/CustomizableComponents/EmptyWidgetPlaceholder/EmptyWidgetPlaceholder.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/components/CustomizableComponents/EmptyWidgetPlaceholder/EmptyWidgetPlaceholder.tsx @@ -18,8 +18,8 @@ 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 './empty-widget-placeholder.less'; import { EmptyWidgetPlaceholderProps } from './EmptyWidgetPlaceholder.interface'; -import './EmptyWidgetPlaceholder.less'; function EmptyWidgetPlaceholder({ iconHeight = SIZE.MEDIUM, diff --git a/openmetadata-ui/src/main/resources/ui/src/components/CustomizableComponents/EmptyWidgetPlaceholder/EmptyWidgetPlaceholder.less b/openmetadata-ui/src/main/resources/ui/src/components/CustomizableComponents/EmptyWidgetPlaceholder/empty-widget-placeholder.less similarity index 100% rename from openmetadata-ui/src/main/resources/ui/src/components/CustomizableComponents/EmptyWidgetPlaceholder/EmptyWidgetPlaceholder.less rename to openmetadata-ui/src/main/resources/ui/src/components/CustomizableComponents/EmptyWidgetPlaceholder/empty-widget-placeholder.less diff --git a/openmetadata-ui/src/main/resources/ui/src/components/DashboardDetails/DashboardDetails.component.tsx b/openmetadata-ui/src/main/resources/ui/src/components/DashboardDetails/DashboardDetails.component.tsx index ea2b6ddc53f..cf1eb3e7266 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/DashboardDetails/DashboardDetails.component.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/components/DashboardDetails/DashboardDetails.component.tsx @@ -23,14 +23,14 @@ 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 DescriptionV1 from '../../components/common/description/DescriptionV1'; -import ErrorPlaceHolder from '../../components/common/error-with-placeholder/ErrorPlaceHolder'; -import PageLayoutV1 from '../../components/containers/PageLayoutV1'; +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 DataProductsContainer from '../../components/DataProductsContainer/DataProductsContainer.component'; import EntityLineageComponent from '../../components/Entity/EntityLineage/EntityLineage.component'; import { EntityName } from '../../components/Modals/EntityNameModal/EntityNameModal.interface'; -import { withActivityFeed } from '../../components/router/withActivityFeed'; +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'; @@ -62,7 +62,7 @@ import { import { createTagObject, updateTierTag } from '../../utils/TagsUtils'; import { showErrorToast, showSuccessToast } from '../../utils/ToastUtils'; import ActivityThreadPanel from '../ActivityFeed/ActivityThreadPanel/ActivityThreadPanel'; -import { useAuthContext } from '../authentication/auth-provider/AuthProvider'; +import { useAuthContext } from '../Auth/AuthProviders/AuthProvider'; import { CustomPropertyTable } from '../common/CustomPropertyTable/CustomPropertyTable'; import { ModalWithMarkdownEditor } from '../Modals/ModalWithMarkdownEditor/ModalWithMarkdownEditor'; import { usePermissionProvider } from '../PermissionProvider/PermissionProvider'; diff --git a/openmetadata-ui/src/main/resources/ui/src/components/DashboardDetails/DashboardDetails.test.tsx b/openmetadata-ui/src/main/resources/ui/src/components/DashboardDetails/DashboardDetails.test.tsx index 106d5299c23..7fa6e9d762e 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/DashboardDetails/DashboardDetails.test.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/components/DashboardDetails/DashboardDetails.test.tsx @@ -97,10 +97,10 @@ jest.mock('../../components/TabsLabel/TabsLabel.component', () => { return jest.fn().mockImplementation(({ name }) =>{name}
); }); -jest.mock('../common/description/Description', () => { +jest.mock('../common/EntityDescription/Description', () => { return jest.fn().mockReturnValue(Description Component
); }); -jest.mock('../common/rich-text-editor/RichTextEditorPreviewer', () => { +jest.mock('../common/RichTextEditor/RichTextEditorPreviewer', () => { return jest.fn().mockReturnValue(RichTextEditorPreviwer
); }); @@ -136,7 +136,7 @@ jest.mock('../common/CustomPropertyTable/CustomPropertyTable', () => ({ .mockReturnValue(CustomPropertyTable.component
), })); -jest.mock('../../components/containers/PageLayoutV1', () => { +jest.mock('../../components/PageLayoutV1/PageLayoutV1', () => { return jest.fn().mockImplementation(({ children }) =>{markdown}
)) ); -jest.mock('../../common/error-with-placeholder/ErrorPlaceHolder', () => +jest.mock('../../common/ErrorWithPlaceholder/ErrorPlaceHolder', () => jest .fn() .mockImplementation(({ onClick }) => ( 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 5c74cfcad94..a653b3d7ea3 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 @@ -11,7 +11,7 @@ * limitations under the License. */ import { GlossaryTerm } from '../../../generated/entity/data/glossaryTerm'; -import { EntityDetailsObjectInterface } from '../../Explore/explore.interface'; +import { EntityDetailsObjectInterface } from '../../Explore/ExplorePage.interface'; import { OperationPermission } from '../../PermissionProvider/PermissionProvider.interface'; import { VotingDataProps } from '../../Voting/voting.interface'; diff --git a/openmetadata-ui/src/main/resources/ui/src/components/Glossary/GlossaryTerms/tabs/AssetsTabs.component.tsx b/openmetadata-ui/src/main/resources/ui/src/components/Glossary/GlossaryTerms/tabs/AssetsTabs.component.tsx index 0b4db3c5054..2fbce865558 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/Glossary/GlossaryTerms/tabs/AssetsTabs.component.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/components/Glossary/GlossaryTerms/tabs/AssetsTabs.component.tsx @@ -11,6 +11,7 @@ * limitations under the License. */ +import { FilterOutlined, PlusOutlined } from '@ant-design/icons'; import { Badge, Button, @@ -25,6 +26,7 @@ import { Tooltip, Typography, } from 'antd'; +import { AxiosError } from 'axios'; import classNames from 'classnames'; import { t } from 'i18next'; import { isEmpty, isObject } from 'lodash'; @@ -43,27 +45,24 @@ import { ASSET_MENU_KEYS, ASSET_SUB_MENU_FILTER, } from '../../../../constants/Assets.constants'; -import { PAGE_SIZE } from '../../../../constants/constants'; import { GLOSSARIES_DOCS } from '../../../../constants/docs.constants'; import { ERROR_PLACEHOLDER_TYPE } from '../../../../enums/common.enum'; import { EntityType } from '../../../../enums/entity.enum'; import { SearchIndex } from '../../../../enums/search.enum'; +import { usePaging } from '../../../../hooks/paging/usePaging'; import { searchData } from '../../../../rest/miscAPI'; import { getCountBadge, Transi18next } from '../../../../utils/CommonUtils'; +import { getEntityTypeFromSearchIndex } from '../../../../utils/SearchUtils'; +import { getEntityIcon } from '../../../../utils/TableUtils'; import { showErrorToast } from '../../../../utils/ToastUtils'; -import NextPrevious from '../../../common/next-previous/NextPrevious'; -import { PagingHandlerParams } from '../../../common/next-previous/NextPrevious.interface'; +import ErrorPlaceHolder from '../../../common/ErrorWithPlaceholder/ErrorPlaceHolder'; +import NextPrevious from '../../../common/NextPrevious/NextPrevious'; +import { PagingHandlerParams } from '../../../common/NextPrevious/NextPrevious.interface'; import ExploreSearchCard from '../../../ExploreV1/ExploreSearchCard/ExploreSearchCard'; import { SearchedDataProps, SourceType, -} from '../../../searched-data/SearchedData.interface'; - -import { FilterOutlined, PlusOutlined } from '@ant-design/icons'; -import { AxiosError } from 'axios'; -import { getEntityTypeFromSearchIndex } from '../../../../utils/SearchUtils'; -import { getEntityIcon } from '../../../../utils/TableUtils'; -import ErrorPlaceHolder from '../../../common/error-with-placeholder/ErrorPlaceHolder'; +} from '../../../SearchedData/SearchedData.interface'; import './assets-tabs.less'; import { AssetsOfEntity, AssetsTabsProps } from './AssetsTabs.interface'; @@ -95,8 +94,16 @@ const AssetsTabs = forwardRef( const { fqn } = useParams<{ fqn: string }>(); const [isLoading, setIsLoading] = useState(true); const [data, setData] = useStateGlossaryTermReferences
); }); -jest.mock('../../../common/description/DescriptionV1', () => { +jest.mock('../../../common/EntityDescription/DescriptionV1', () => { return jest.fn().mockReturnValue(Description
); }); 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 5aa906c0d05..7955d623310 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 @@ -17,8 +17,8 @@ import { cloneDeep, isEmpty } from 'lodash'; 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 { withActivityFeed } from '../../components/router/withActivityFeed'; import { HTTP_STATUS_CODE } from '../../constants/auth.constants'; import { API_RES_MAX_SIZE, @@ -48,7 +48,7 @@ import GlossaryDetails from './GlossaryDetails/GlossaryDetails.component'; import GlossaryTermModal from './GlossaryTermModal/GlossaryTermModal.component'; import GlossaryTermsV1 from './GlossaryTerms/GlossaryTermsV1.component'; import { GlossaryV1Props } from './GlossaryV1.interfaces'; -import './GlossaryV1.style.less'; +import './glossaryV1.less'; import ImportGlossary from './ImportGlossary/ImportGlossary'; const GlossaryV1 = ({ 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 3e4bb0aa595..c8fab0e7ab8 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,10 +11,10 @@ * limitations under the License. */ import { LoadingState } from 'Models'; -import { EntityDetailsObjectInterface } from '../../components/Explore/explore.interface'; import { VotingDataProps } from '../../components/Voting/voting.interface'; import { Glossary } from '../../generated/entity/data/glossary'; import { GlossaryTerm } from '../../generated/entity/data/glossaryTerm'; +import { EntityDetailsObjectInterface } from '../Explore/ExplorePage.interface'; export type GlossaryV1Props = { deleteStatus: LoadingState; 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 c8169da4bc7..7cb6da166d7 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 @@ -97,11 +97,11 @@ jest.mock('./GlossaryTerms/GlossaryTermsV1.component', () => { return jest.fn().mockReturnValue(<>Glossary-Term component); }); -jest.mock('../common/title-breadcrumb/title-breadcrumb.component', () => { +jest.mock('../common/TitleBreadcrumb/TitleBreadcrumb.component', () => { return jest.fn().mockReturnValue(<>TitleBreadcrumb); }); -jest.mock('../common/title-breadcrumb/title-breadcrumb.component', () => +jest.mock('../common/TitleBreadcrumb/TitleBreadcrumb.component', () => jest.fn().mockReturnValue(Airflow not available
); - } -); +jest.mock('../../common/ErrorWithPlaceholder/ErrorPlaceHolderIngestion', () => { + return jest.fn().mockImplementation(() =>Airflow not available
); +}); jest.mock('../../../hooks/useAirflowStatus', () => ({ ...jest.requireActual('../../../hooks/useAirflowStatus'), 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/Ingestion/IngestionPipelineList/IngestionPipelineList.component.tsx index c751fe6f716..819f50d8151 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/Ingestion/IngestionPipelineList/IngestionPipelineList.component.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/components/Ingestion/IngestionPipelineList/IngestionPipelineList.component.tsx @@ -28,15 +28,14 @@ import { deployIngestionPipelineById, getIngestionPipelines, } from '../../../rest/ingestionPipelineAPI'; -import { showPagination } from '../../../utils/CommonUtils'; 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/error-with-placeholder/ErrorPlaceHolder'; -import ErrorPlaceHolderIngestion from '../../common/error-with-placeholder/ErrorPlaceHolderIngestion'; -import NextPrevious from '../../common/next-previous/NextPrevious'; -import { PagingHandlerParams } from '../../common/next-previous/NextPrevious.interface'; +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 Loader from '../../Loader/Loader'; import { ColumnFilter } from '../../Table/ColumnFilter/ColumnFilter.component'; import { IngestionRecentRuns } from '../IngestionRecentRun/IngestionRecentRuns.component'; @@ -66,6 +65,7 @@ export const IngestionPipelineList = ({ handlePagingChange, pageSize, handlePageSizeChange, + showPagination, } = usePaging(); const { t } = useTranslation(); @@ -289,7 +289,7 @@ export const IngestionPipelineList = ({ />Table
); }); -jest.mock('../../components/common/searchbar/Searchbar', () => { - return jest.fn().mockImplementation(() =>Searchbar
); -}); +jest.mock( + '../../components/common/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/MlModelDetail/MlModelDetail.component.test.tsx b/openmetadata-ui/src/main/resources/ui/src/components/MlModelDetail/MlModelDetail.component.test.tsx index 653bf2b393d..63d8e2e6f51 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/MlModelDetail/MlModelDetail.component.test.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/components/MlModelDetail/MlModelDetail.component.test.tsx @@ -198,11 +198,11 @@ jest.mock('../../components/TabsLabel/TabsLabel.component', () => { return jest.fn().mockImplementation(({ name }) =>{name}
); }); -jest.mock('../common/description/Description', () => { +jest.mock('../common/EntityDescription/Description', () => { return jest.fn().mockReturnValue(Description
); }); -jest.mock('../common/rich-text-editor/RichTextEditorPreviewer', () => { +jest.mock('../common/RichTextEditor/RichTextEditorPreviewer', () => { return jest.fn().mockReturnValue(RichTextEditorPreviewer
); }); @@ -221,7 +221,7 @@ jest.mock('../ActivityFeed/ActivityThreadPanel/ActivityThreadPanel', () => { return jest.fn().mockReturnValue(ActivityThreadPanel
); }); -jest.mock('../../components/containers/PageLayoutV1', () => { +jest.mock('../../components/PageLayoutV1/PageLayoutV1', () => { return jest.fn().mockImplementation(({ children }) =>RichTextEditorPreviewer
); }); diff --git a/openmetadata-ui/src/main/resources/ui/src/components/MlModelDetail/MlModelFeaturesList.tsx b/openmetadata-ui/src/main/resources/ui/src/components/MlModelDetail/MlModelFeaturesList.tsx index d7ce761fb8d..43a74400962 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/MlModelDetail/MlModelFeaturesList.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/components/MlModelDetail/MlModelFeaturesList.tsx @@ -22,7 +22,7 @@ import { EntityType } from '../../enums/entity.enum'; import { MlFeature } from '../../generated/entity/data/mlmodel'; import { TagSource } from '../../generated/type/schema'; import { createTagObject } from '../../utils/TagsUtils'; -import ErrorPlaceHolder from '../common/error-with-placeholder/ErrorPlaceHolder'; +import ErrorPlaceHolder from '../common/ErrorWithPlaceholder/ErrorPlaceHolder'; 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/MlModelDetail/SourceList.component.tsx index 40a9e64b3db..446a9def07c 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/MlModelDetail/SourceList.component.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/components/MlModelDetail/SourceList.component.tsx @@ -19,7 +19,7 @@ import { Link } from 'react-router-dom'; import { EntityType } from '../../enums/entity.enum'; import { MlFeature } from '../../generated/entity/data/mlmodel'; import { getEntityLink } from '../../utils/TableUtils'; -import './SourceList.style.less'; +import './source-list.less'; const SourceList = ({ feature }: { feature: MlFeature }) => { const { t } = useTranslation(); diff --git a/openmetadata-ui/src/main/resources/ui/src/components/MlModelDetail/SourceList.style.less b/openmetadata-ui/src/main/resources/ui/src/components/MlModelDetail/source-list.less similarity index 100% rename from openmetadata-ui/src/main/resources/ui/src/components/MlModelDetail/SourceList.style.less rename to openmetadata-ui/src/main/resources/ui/src/components/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/MlModelVersion/MlModelVersion.component.tsx index 41ba615c514..afbc3af46ff 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/MlModelVersion/MlModelVersion.component.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/components/MlModelVersion/MlModelVersion.component.tsx @@ -26,9 +26,9 @@ 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/description/DescriptionV1'; -import ErrorPlaceHolder from '../../components/common/error-with-placeholder/ErrorPlaceHolder'; -import RichTextEditorPreviewer from '../../components/common/rich-text-editor/RichTextEditorPreviewer'; +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'; diff --git a/openmetadata-ui/src/main/resources/ui/src/components/MlModelVersion/MlModelVersion.interface.tsx b/openmetadata-ui/src/main/resources/ui/src/components/MlModelVersion/MlModelVersion.interface.tsx index b77cf2d1d63..3f0d557539f 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/MlModelVersion/MlModelVersion.interface.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/components/MlModelVersion/MlModelVersion.interface.tsx @@ -15,7 +15,7 @@ import { OperationPermission } from '../../components/PermissionProvider/Permiss import { Mlmodel } from '../../generated/entity/data/mlmodel'; import { EntityHistory } from '../../generated/type/entityHistory'; import { TagLabel } from '../../generated/type/tagLabel'; -import { TitleBreadcrumbProps } from '../common/title-breadcrumb/title-breadcrumb.interface'; +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/MlModelVersion/MlModelVersion.test.tsx index 7650d66bfaa..fbbeafc3a99 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/MlModelVersion/MlModelVersion.test.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/components/MlModelVersion/MlModelVersion.test.tsx @@ -44,13 +44,12 @@ jest.mock( }) ); -jest.mock('../../components/common/description/DescriptionV1', () => +jest.mock('../../components/common/EntityDescription/DescriptionV1', () => jest.fn().mockImplementation(() =>Description Component
); }); -jest.mock('../common/rich-text-editor/RichTextEditorPreviewer', () => { +jest.mock('../common/RichTextEditor/RichTextEditorPreviewer', () => { return jest.fn().mockReturnValue(RichTextEditorPreviwer
); }); @@ -153,7 +153,7 @@ jest.mock('../TasksDAGView/TasksDAGView', () => { return jest.fn().mockReturnValue(Tasks DAG
); }); -jest.mock('../containers/PageLayoutV1', () => { +jest.mock('../PageLayoutV1/PageLayoutV1', () => { return jest.fn().mockImplementation(({ children }) =>RichTextEditorPreviewer
); }); @@ -141,7 +141,7 @@ jest.mock('../Modals/ModalWithMarkdownEditor/ModalWithMarkdownEditor', () => ({ })); jest.mock( - '../../components/common/error-with-placeholder/FilterTablePlaceHolder', + '../../components/common/ErrorWithPlaceholder/FilterTablePlaceHolder', () => { return jest.fn().mockReturnValue(FilterTablePlaceHolder
); } diff --git a/openmetadata-ui/src/main/resources/ui/src/components/SearchDropdown/SearchDropdown.interface.ts b/openmetadata-ui/src/main/resources/ui/src/components/SearchDropdown/SearchDropdown.interface.ts index 9309414a778..f372c03c432 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/SearchDropdown/SearchDropdown.interface.ts +++ b/openmetadata-ui/src/main/resources/ui/src/components/SearchDropdown/SearchDropdown.interface.ts @@ -11,7 +11,7 @@ * limitations under the License. */ -import { ExploreSearchIndex } from '../Explore/explore.interface'; +import { ExploreSearchIndex } from '../Explore/ExplorePage.interface'; export interface SearchDropdownProps { label: string; 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 5c55fcb96f9..1aeb040bd5a 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 @@ -44,11 +44,11 @@ import { getSelectedOptionLabelString, } from '../../utils/AdvancedSearchUtils'; import Loader from '../Loader/Loader'; +import './search-dropdown.less'; import { SearchDropdownOption, SearchDropdownProps, } from './SearchDropdown.interface'; -import './SearchDropdown.less'; const SearchDropdown: FCTableDataCardBody
); }); -jest.mock('../common/next-previous/NextPrevious', () => { +jest.mock('../common/NextPrevious/NextPrevious', () => { return jest.fn().mockReturnValue(Pagination
); }); -jest.mock('../common/error-with-placeholder/ErrorPlaceHolderES', () => { +jest.mock('../common/ErrorWithPlaceholder/ErrorPlaceHolderES', () => { return jest.fn().mockReturnValue(ErrorPlaceHolderES
); }); diff --git a/openmetadata-ui/src/main/resources/ui/src/components/searched-data/SearchedData.tsx b/openmetadata-ui/src/main/resources/ui/src/components/SearchedData/SearchedData.tsx similarity index 96% rename from openmetadata-ui/src/main/resources/ui/src/components/searched-data/SearchedData.tsx rename to openmetadata-ui/src/main/resources/ui/src/components/SearchedData/SearchedData.tsx index 48df98e322a..a9853db2da2 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/searched-data/SearchedData.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/components/SearchedData/SearchedData.tsx @@ -16,13 +16,13 @@ import classNames from 'classnames'; import { isNumber, isUndefined } from 'lodash'; import Qs from 'qs'; import React, { useMemo } from 'react'; -import ExploreSearchCard from '../../components/ExploreV1/ExploreSearchCard/ExploreSearchCard'; import { PAGE_SIZE } from '../../constants/constants'; import { MAX_RESULT_HITS } from '../../constants/explore.constants'; import { ELASTICSEARCH_ERROR_PLACEHOLDER_TYPE } from '../../enums/common.enum'; import { pluralize } from '../../utils/CommonUtils'; import { getEntityName } from '../../utils/EntityUtils'; -import ErrorPlaceHolderES from '../common/error-with-placeholder/ErrorPlaceHolderES'; +import ErrorPlaceHolderES from '../common/ErrorWithPlaceholder/ErrorPlaceHolderES'; +import ExploreSearchCard from '../ExploreV1/ExploreSearchCard/ExploreSearchCard'; import Loader from '../Loader/Loader'; import { SearchedDataProps } from './SearchedData.interface'; diff --git a/openmetadata-ui/src/main/resources/ui/src/components/Services/Services.tsx b/openmetadata-ui/src/main/resources/ui/src/components/Services/Services.tsx index 6f0b04100ed..d76ac20d04b 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/Services/Services.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/components/Services/Services.tsx @@ -19,10 +19,8 @@ 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 NextPrevious from '../../components/common/next-previous/NextPrevious'; -import { PagingHandlerParams } from '../../components/common/next-previous/NextPrevious.interface'; import { OwnerLabel } from '../../components/common/OwnerLabel/OwnerLabel.component'; -import RichTextEditorPreviewer from '../../components/common/rich-text-editor/RichTextEditorPreviewer'; +import RichTextEditorPreviewer from '../../components/common/RichTextEditor/RichTextEditorPreviewer'; import { ListView } from '../../components/ListView/ListView.component'; import { ColumnFilter } from '../../components/Table/ColumnFilter/ColumnFilter.component'; import { getServiceDetailsPath, pagingObject } from '../../constants/constants'; @@ -42,7 +40,7 @@ import { usePaging } from '../../hooks/paging/usePaging'; import { DatabaseServiceSearchSource } from '../../interface/search.interface'; import { ServicesType } from '../../interface/service.interface'; import { getServices, searchService } from '../../rest/serviceAPI'; -import { getServiceLogo, showPagination } from '../../utils/CommonUtils'; +import { getServiceLogo } from '../../utils/CommonUtils'; import { getEntityName } from '../../utils/EntityUtils'; import { checkPermission } from '../../utils/PermissionsUtils'; import { getAddServicePath } from '../../utils/RouterUtils'; @@ -53,9 +51,11 @@ import { } from '../../utils/ServiceUtils'; import { FilterIcon } from '../../utils/TableUtils'; import { showErrorToast } from '../../utils/ToastUtils'; -import { useAuthContext } from '../authentication/auth-provider/AuthProvider'; -import ErrorPlaceHolder from '../common/error-with-placeholder/ErrorPlaceHolder'; -import PageHeader from '../header/PageHeader.component'; +import { useAuthContext } from '../Auth/AuthProviders/AuthProvider'; +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'; interface ServicesProps { @@ -82,6 +82,7 @@ const Services = ({ serviceName }: ServicesProps) => { handlePageChange, pageSize, handlePageSizeChange, + showPagination, } = usePaging(); const { permissions } = usePermissionProvider(); @@ -464,7 +465,7 @@ const Services = ({ serviceName }: ServicesProps) => { />RichTextEditorPreviewer
); } diff --git a/openmetadata-ui/src/main/resources/ui/src/components/TableDataCardBody/TableDataCardBody.tsx b/openmetadata-ui/src/main/resources/ui/src/components/TableDataCardBody/TableDataCardBody.tsx index cc9f6e6dc60..16da937edd9 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/TableDataCardBody/TableDataCardBody.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/components/TableDataCardBody/TableDataCardBody.tsx @@ -16,7 +16,7 @@ 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/rich-text-editor/RichTextEditorPreviewer'; +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'; diff --git a/openmetadata-ui/src/main/resources/ui/src/components/TableDescription/TableDescription.component.tsx b/openmetadata-ui/src/main/resources/ui/src/components/TableDescription/TableDescription.component.tsx index 203221eb7fc..3f9f86d7fe6 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/TableDescription/TableDescription.component.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/components/TableDescription/TableDescription.component.tsx @@ -15,7 +15,7 @@ import { 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/rich-text-editor/RichTextEditorPreviewer'; +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'; 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/TableProfiler/Component/ColumnProfileTable.test.tsx index b2c03829691..68b15e3b0b5 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/TableProfiler/Component/ColumnProfileTable.test.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/components/TableProfiler/Component/ColumnProfileTable.test.tsx @@ -53,7 +53,7 @@ jest.mock('../../../components/common/Table/Table', () => jest.mock('../../../utils/CommonUtils', () => ({ formatNumberWithComma: jest.fn(), })); -jest.mock('../../common/searchbar/Searchbar', () => { +jest.mock('../../common/SearchBarComponent/SearchBar.component', () => { return jest .fn() .mockImplementation(({ searchValue, onSearch }) => ( diff --git a/openmetadata-ui/src/main/resources/ui/src/components/TableProfiler/Component/ColumnProfileTable.tsx b/openmetadata-ui/src/main/resources/ui/src/components/TableProfiler/Component/ColumnProfileTable.tsx index 3084b99b613..b12bdb7ab57 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/TableProfiler/Component/ColumnProfileTable.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/components/TableProfiler/Component/ColumnProfileTable.tsx @@ -18,7 +18,7 @@ import Qs from 'qs'; import React, { FC, useEffect, useMemo, useState } from 'react'; import { useTranslation } from 'react-i18next'; import { Link, useHistory, useLocation } from 'react-router-dom'; -import FilterTablePlaceHolder from '../../../components/common/error-with-placeholder/FilterTablePlaceHolder'; +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'; @@ -31,7 +31,7 @@ import { formatNumberWithComma } from '../../../utils/CommonUtils'; import { updateTestResults } from '../../../utils/DataQualityAndProfilerUtils'; import { getEncodedFqn } from '../../../utils/StringsUtils'; import { getTableExpandableConfig } from '../../../utils/TableUtils'; -import Searchbar from '../../common/searchbar/Searchbar'; +import Searchbar from '../../common/SearchBarComponent/SearchBar.component'; import TestIndicator from '../../common/TestIndicator/TestIndicator'; import { ColumnProfileTableProps, diff --git a/openmetadata-ui/src/main/resources/ui/src/components/TableProfiler/Component/ColumnSummary.tsx b/openmetadata-ui/src/main/resources/ui/src/components/TableProfiler/Component/ColumnSummary.tsx index 995c5d1bab4..c23e2e2435e 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/TableProfiler/Component/ColumnSummary.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/components/TableProfiler/Component/ColumnSummary.tsx @@ -13,7 +13,7 @@ import { Space, Typography } from 'antd'; import { isEmpty } from 'lodash'; import React, { FC } from 'react'; -import RichTextEditorPreviewer from '../../../components/common/rich-text-editor/RichTextEditorPreviewer'; +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'; diff --git a/openmetadata-ui/src/main/resources/ui/src/components/TableProfiler/Component/ProfilerSettingsModal.tsx b/openmetadata-ui/src/main/resources/ui/src/components/TableProfiler/Component/ProfilerSettingsModal.tsx index 47c768837db..ffb8a104543 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/TableProfiler/Component/ProfilerSettingsModal.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/components/TableProfiler/Component/ProfilerSettingsModal.tsx @@ -39,7 +39,6 @@ import React, { useState, } from 'react'; import { useTranslation } from 'react-i18next'; -import SchemaEditor from '../../../components/schema-editor/SchemaEditor'; import { DEFAULT_INCLUDE_PROFILE, INTERVAL_TYPE_OPTIONS, @@ -63,13 +62,14 @@ import { import { reducerWithoutAction } from '../../../utils/CommonUtils'; import SVGIcons, { Icons } from '../../../utils/SvgUtils'; import { showErrorToast, showSuccessToast } from '../../../utils/ToastUtils'; +import SchemaEditor from '../../SchemaEditor/SchemaEditor'; import SliderWithInput from '../../SliderWithInput/SliderWithInput'; +import '../table-profiler.less'; import { ProfilerForm, ProfilerSettingModalState, ProfilerSettingsModalProps, } from '../TableProfiler.interface'; -import '../tableProfiler.less'; const ProfilerSettingsModal: React.FCSchemaEditor
); }); jest.mock('./QueryCardExtraOption/QueryCardExtraOption.component', () => { diff --git a/openmetadata-ui/src/main/resources/ui/src/components/TableQueries/QueryCard.tsx b/openmetadata-ui/src/main/resources/ui/src/components/TableQueries/QueryCard.tsx index b20551e6965..35ed81dc093 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/TableQueries/QueryCard.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/components/TableQueries/QueryCard.tsx @@ -34,7 +34,7 @@ import { useClipboard } from '../../hooks/useClipBoard'; import { customFormatDateTime } from '../../utils/date-time/DateTimeUtils'; import { parseSearchParams } from '../../utils/Query/QueryUtils'; import { getQueryPath } from '../../utils/RouterUtils'; -import SchemaEditor from '../schema-editor/SchemaEditor'; +import SchemaEditor from '../SchemaEditor/SchemaEditor'; import QueryCardExtraOption from './QueryCardExtraOption/QueryCardExtraOption.component'; import QueryUsedByOtherTable from './QueryUsedByOtherTable/QueryUsedByOtherTable.component'; import './table-queries.style.less'; 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/TableQueries/QueryCardExtraOption/QueryCardExtraOption.component.tsx index 73977b704d2..2577356b0ef 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/TableQueries/QueryCardExtraOption/QueryCardExtraOption.component.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/components/TableQueries/QueryCardExtraOption/QueryCardExtraOption.component.tsx @@ -28,7 +28,7 @@ import { AxiosError } from 'axios'; import ConfirmationModal from '../../../components/Modals/ConfirmationModal/ConfirmationModal'; import { deleteQuery } from '../../../rest/queryAPI'; import { showErrorToast } from '../../../utils/ToastUtils'; -import { useAuthContext } from '../../authentication/auth-provider/AuthProvider'; +import { useAuthContext } from '../../Auth/AuthProviders/AuthProvider'; import './query-card-extra-option.style.less'; const QueryCardExtraOption = ({ 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/TableQueries/QueryCardExtraOption/QueryCardExtraOption.test.tsx index 957b73e47b5..4ac48696d96 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/TableQueries/QueryCardExtraOption/QueryCardExtraOption.test.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/components/TableQueries/QueryCardExtraOption/QueryCardExtraOption.test.tsx @@ -35,7 +35,7 @@ let mockUserData: User = { email: '', }; -jest.mock('../../authentication/auth-provider/AuthProvider', () => ({ +jest.mock('../../Auth/AuthProviders/AuthProvider', () => ({ useAuthContext: jest.fn(() => ({ currentUser: mockUserData, })), 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/TableQueries/QueryUsedByOtherTable/QueryUsedByOtherTable.test.tsx index 364f0f5c7d0..53b5cc1e8d7 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/TableQueries/QueryUsedByOtherTable/QueryUsedByOtherTable.test.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/components/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 { MOCK_EXPLORE_SEARCH_RESULTS } from '../../../components/Explore/exlore.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.test.tsx b/openmetadata-ui/src/main/resources/ui/src/components/TableQueries/TableQueries.test.tsx index 8e7a748a4e9..aad5c00e60c 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/TableQueries/TableQueries.test.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/components/TableQueries/TableQueries.test.tsx @@ -31,7 +31,7 @@ const mockTableQueriesProp: TableQueriesProp = { jest.mock('./QueryCard', () => { return jest.fn().mockReturnValue(QueryCard
); }); -jest.mock('../../components/common/next-previous/NextPrevious', () => { +jest.mock('../../components/common/NextPrevious/NextPrevious', () => { return jest.fn().mockImplementation(() =>Description Component
); }); -jest.mock('../common/title-breadcrumb/title-breadcrumb.component', () => { +jest.mock('../common/TitleBreadcrumb/TitleBreadcrumb.component', () => { return jest.fn().mockReturnValue(Breadcrumb
); }); -jest.mock('../../components/containers/PageLayoutV1', () => { +jest.mock('../../components/PageLayoutV1/PageLayoutV1', () => { return jest.fn().mockImplementation(({ children }) =>RichTextEditorPreviwer
); }); @@ -110,7 +110,7 @@ jest.mock('../common/CustomPropertyTable/CustomPropertyTable', () => ({ .mockReturnValue(CustomPropertyTable.component
), })); -jest.mock('../schema-editor/SchemaEditor', () => { +jest.mock('../SchemaEditor/SchemaEditor', () => { return jest.fn().mockReturnValue(SchemaEditor
); }); 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/TopicDetails/TopicSchema/TopicSchema.test.tsx index 8502e84a4c7..e7b26b283bc 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/TopicDetails/TopicSchema/TopicSchema.test.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/components/TopicDetails/TopicSchema/TopicSchema.test.tsx @@ -49,7 +49,7 @@ jest.mock('../../../utils/GlossaryUtils', () => ({ getGlossaryTermsList: jest.fn().mockImplementation(() => Promise.resolve([])), })); -jest.mock('../../common/rich-text-editor/RichTextEditorPreviewer', () => +jest.mock('../../common/RichTextEditor/RichTextEditorPreviewer', () => jest .fn() .mockReturnValue( @@ -74,7 +74,7 @@ jest.mock('../../TableTags/TableTags.component', () => )) ); -jest.mock('../../common/error-with-placeholder/ErrorPlaceHolder', () => +jest.mock('../../common/ErrorWithPlaceholder/ErrorPlaceHolder', () => jest .fn() .mockImplementation(() => ( @@ -82,7 +82,7 @@ jest.mock('../../common/error-with-placeholder/ErrorPlaceHolder', () => )) ); -jest.mock('../../schema-editor/SchemaEditor', () => +jest.mock('../../SchemaEditor/SchemaEditor', () => jest .fn() .mockImplementation(() => ( diff --git a/openmetadata-ui/src/main/resources/ui/src/components/TopicDetails/TopicSchema/TopicSchema.tsx b/openmetadata-ui/src/main/resources/ui/src/components/TopicDetails/TopicSchema/TopicSchema.tsx index f53fbe80468..84dd1596bc3 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/TopicDetails/TopicSchema/TopicSchema.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/components/TopicDetails/TopicSchema/TopicSchema.tsx @@ -28,10 +28,9 @@ 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/error-with-placeholder/ErrorPlaceHolder'; -import RichTextEditorPreviewer from '../../../components/common/rich-text-editor/RichTextEditorPreviewer'; +import ErrorPlaceHolder from '../../../components/common/ErrorWithPlaceholder/ErrorPlaceHolder'; +import RichTextEditorPreviewer from '../../../components/common/RichTextEditor/RichTextEditorPreviewer'; import { ModalWithMarkdownEditor } from '../../../components/Modals/ModalWithMarkdownEditor/ModalWithMarkdownEditor'; -import SchemaEditor from '../../../components/schema-editor/SchemaEditor'; import { ColumnFilter } from '../../../components/Table/ColumnFilter/ColumnFilter.component'; import TableDescription from '../../../components/TableDescription/TableDescription.component'; import TableTags from '../../../components/TableTags/TableTags.component'; @@ -53,6 +52,7 @@ import { updateFieldDescription, updateFieldTags, } from '../../../utils/TableUtils'; +import SchemaEditor from '../../SchemaEditor/SchemaEditor'; 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/TopicVersion/TopicVersion.component.tsx index 60b2fba65f4..42e6150e825 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/TopicVersion/TopicVersion.component.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/components/TopicVersion/TopicVersion.component.tsx @@ -18,7 +18,7 @@ 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/description/DescriptionV1'; +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'; diff --git a/openmetadata-ui/src/main/resources/ui/src/components/TopicVersion/TopicVersion.interface.ts b/openmetadata-ui/src/main/resources/ui/src/components/TopicVersion/TopicVersion.interface.ts index d185d451671..8e6c6cb18f2 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/TopicVersion/TopicVersion.interface.ts +++ b/openmetadata-ui/src/main/resources/ui/src/components/TopicVersion/TopicVersion.interface.ts @@ -15,7 +15,7 @@ import { OperationPermission } from '../../components/PermissionProvider/Permiss import { Topic } from '../../generated/entity/data/topic'; import { EntityHistory } from '../../generated/type/entityHistory'; import { TagLabel } from '../../generated/type/tagLabel'; -import { TitleBreadcrumbProps } from '../common/title-breadcrumb/title-breadcrumb.interface'; +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/TopicVersion/TopicVersion.test.tsx index 2e0960da367..92c4829228d 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/TopicVersion/TopicVersion.test.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/components/TopicVersion/TopicVersion.test.tsx @@ -42,13 +42,12 @@ jest.mock( }) ); -jest.mock('../../components/common/description/DescriptionV1', () => +jest.mock('../../components/common/EntityDescription/DescriptionV1', () => jest.fn().mockImplementation(() =>- {t('message.are-you-want-to-restore', { - entity: getEntityName(selectedUser), - })} -
-SearchedData
); }); @@ -112,7 +112,7 @@ jest.mock('../../rest/teamsAPI', () => ({ getTeams: jest.fn().mockImplementation(() => Promise.resolve(mockTeamsData)), })); -jest.mock('../containers/PageLayoutV1', () => +jest.mock('../PageLayoutV1/PageLayoutV1', () => jest .fn() .mockImplementation( @@ -134,7 +134,7 @@ jest.mock('../containers/PageLayoutV1', () => ) ); -jest.mock('../common/description/Description', () => { +jest.mock('../common/EntityDescription/Description', () => { return jest.fn().mockReturnValue(Description
); }); const updateUserDetails = jest.fn(); @@ -153,7 +153,7 @@ jest.mock('../../rest/userAPI', () => ({ checkValidImage: jest.fn().mockImplementation(() => Promise.resolve(true)), })); -jest.mock('../containers/PageLayoutV1', () => +jest.mock('../PageLayoutV1/PageLayoutV1', () => jest.fn().mockImplementation(({ children, leftPanel, rightPanel }) => ({markdown}
); } @@ -197,7 +197,7 @@ jest.mock('../../utils/TableUtils', () => ({ getTagsWithoutTier: jest.fn().mockImplementation(() => []), })); -jest.mock('../../components/common/next-previous/NextPrevious', () => { +jest.mock('../../components/common/NextPrevious/NextPrevious', () => { return jest.fn().mockReturnValue(Description
); }); -jest.mock('../../components/containers/PageLayoutV1', () => { +jest.mock('../../components/PageLayoutV1/PageLayoutV1', () => { return jest.fn().mockImplementation(({ children }) => children); }); @@ -250,9 +250,12 @@ jest.mock( return jest.fn().mockReturnValue(ActivityThreadPanel
); } ); -jest.mock('../../components/common/searchbar/Searchbar', () => { - return jest.fn().mockReturnValue(Searchbar.component
); -}); +jest.mock( + '../../components/common/SearchBarComponent/SearchBar.component', + () => { + return jest.fn().mockReturnValue(Searchbar.component
); + } +); jest.mock( '../../components/DataAssets/DataAssetsHeader/DataAssetsHeader.component', @@ -269,7 +272,7 @@ jest.mock('../../utils/DatabaseDetails.utils', () => ({ .mockReturnValue(<>testDatabaseSchemaTable), })); -jest.mock('../../components/router/withActivityFeed', () => ({ +jest.mock('../../components/AppRouter/withActivityFeed', () => ({ withActivityFeed: jest.fn().mockImplementation((Some) => Some), })); 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 4dd0878b730..b5af80e170f 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 @@ -32,23 +32,23 @@ import { default as appState } from '../../AppState'; 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 { CustomPropertyTable } from '../../components/common/CustomPropertyTable/CustomPropertyTable'; -import DescriptionV1 from '../../components/common/description/DescriptionV1'; -import ErrorPlaceHolder from '../../components/common/error-with-placeholder/ErrorPlaceHolder'; -import { PagingHandlerParams } from '../../components/common/next-previous/NextPrevious.interface'; -import Searchbar from '../../components/common/searchbar/Searchbar'; -import PageLayoutV1 from '../../components/containers/PageLayoutV1'; +import DescriptionV1 from '../../components/common/EntityDescription/DescriptionV1'; +import ErrorPlaceHolder from '../../components/common/ErrorWithPlaceholder/ErrorPlaceHolder'; +import { PagingHandlerParams } from '../../components/common/NextPrevious/NextPrevious.interface'; +import Searchbar from '../../components/common/SearchBarComponent/SearchBar.component'; import { DataAssetsHeader } from '../../components/DataAssets/DataAssetsHeader/DataAssetsHeader.component'; import DataProductsContainer from '../../components/DataProductsContainer/DataProductsContainer.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, ResourceEntity, } from '../../components/PermissionProvider/PermissionProvider.interface'; import ProfilerSettings from '../../components/ProfilerSettings/ProfilerSettings'; -import { withActivityFeed } from '../../components/router/withActivityFeed'; import { QueryVote } from '../../components/TableQueries/TableQueries.interface'; import TabsLabel from '../../components/TabsLabel/TabsLabel.component'; import TagsContainerV2 from '../../components/Tag/TagsContainerV2/TagsContainerV2'; 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 63a408deafd..66477cfc6c6 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 @@ -33,21 +33,21 @@ import ActivityFeedProvider, { } 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 { CustomPropertyTable } from '../../components/common/CustomPropertyTable/CustomPropertyTable'; -import ErrorPlaceHolder from '../../components/common/error-with-placeholder/ErrorPlaceHolder'; -import { PagingHandlerParams } from '../../components/common/next-previous/NextPrevious.interface'; -import PageLayoutV1 from '../../components/containers/PageLayoutV1'; +import ErrorPlaceHolder from '../../components/common/ErrorWithPlaceholder/ErrorPlaceHolder'; +import { PagingHandlerParams } from '../../components/common/NextPrevious/NextPrevious.interface'; import { DataAssetsHeader } from '../../components/DataAssets/DataAssetsHeader/DataAssetsHeader.component'; import DataProductsContainer from '../../components/DataProductsContainer/DataProductsContainer.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, ResourceEntity, } from '../../components/PermissionProvider/PermissionProvider.interface'; import ProfilerSettings from '../../components/ProfilerSettings/ProfilerSettings'; -import { withActivityFeed } from '../../components/router/withActivityFeed'; import { QueryVote } from '../../components/TableQueries/TableQueries.interface'; import TabsLabel from '../../components/TabsLabel/TabsLabel.component'; import TagsContainerV2 from '../../components/Tag/TagsContainerV2/TagsContainerV2'; @@ -56,7 +56,6 @@ import { getDatabaseSchemaDetailsPath, getVersionPathWithTab, INITIAL_PAGING_VALUE, - pagingObject, } from '../../constants/constants'; import { ERROR_PLACEHOLDER_TYPE } from '../../enums/common.enum'; import { EntityTabs, EntityType } from '../../enums/entity.enum'; @@ -75,10 +74,7 @@ import { updateDatabaseSchemaVotes, } from '../../rest/databaseAPI'; import { getFeedCount, postThread } from '../../rest/feedsAPI'; -import { - getStoredProceduresList, - ListStoredProcedureParams, -} from '../../rest/storedProceduresAPI'; +import { getStoredProceduresList } from '../../rest/storedProceduresAPI'; import { getTableList, TableListParams } from '../../rest/tableAPI'; import { getEntityMissingError, @@ -90,7 +86,6 @@ import { getDecodedFqn } from '../../utils/StringsUtils'; import { getTagsWithoutTier, getTierTags } from '../../utils/TableUtils'; import { createTagObject, updateTierTag } from '../../utils/TagsUtils'; import { showErrorToast, showSuccessToast } from '../../utils/ToastUtils'; -import { StoredProcedureData } from './DatabaseSchemaPage.interface'; import SchemaTablesTab from './SchemaTablesTab'; const DatabaseSchemaPage: FunctionComponent = () => { @@ -126,14 +121,7 @@ const DatabaseSchemaPage: FunctionComponent = () => { const [showDeletedTables, setShowDeletedTables] = useState{children}
); }); @@ -141,9 +141,8 @@ jest.mock('../../components/Loader/Loader', () => jest.fn().mockImplementation(() =>ErrorPlaceHolder
) +jest.mock('../../components/common/ErrorWithPlaceholder/ErrorPlaceHolder', () => + jest.fn().mockImplementation(() =>ErrorPlaceHolder
) ); jest.mock('../../components/PermissionProvider/PermissionProvider', () => ({ @@ -261,8 +260,6 @@ describe('Tests for DatabaseSchemaPage', () => { expect(getStoredProceduresList).toHaveBeenCalledWith({ databaseSchema: mockParams.fqn, - fields: 'owner,tags,followers', - include: 'non-deleted', limit: 0, }); }); diff --git a/openmetadata-ui/src/main/resources/ui/src/pages/DatabaseSchemaPage/SchemaTablesTab.tsx b/openmetadata-ui/src/main/resources/ui/src/pages/DatabaseSchemaPage/SchemaTablesTab.tsx index 3ea1f85dc3e..bf92b2c570e 100644 --- a/openmetadata-ui/src/main/resources/ui/src/pages/DatabaseSchemaPage/SchemaTablesTab.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/pages/DatabaseSchemaPage/SchemaTablesTab.tsx @@ -17,11 +17,11 @@ import { PagingResponse } from 'Models'; import React, { useMemo } from 'react'; import { useTranslation } from 'react-i18next'; import { Link } from 'react-router-dom'; -import DescriptionV1 from '../../components/common/description/DescriptionV1'; -import ErrorPlaceHolder from '../../components/common/error-with-placeholder/ErrorPlaceHolder'; -import NextPrevious from '../../components/common/next-previous/NextPrevious'; -import { NextPreviousProps } from '../../components/common/next-previous/NextPrevious.interface'; -import RichTextEditorPreviewer from '../../components/common/rich-text-editor/RichTextEditorPreviewer'; +import DescriptionV1 from '../../components/common/EntityDescription/DescriptionV1'; +import ErrorPlaceHolder from '../../components/common/ErrorWithPlaceholder/ErrorPlaceHolder'; +import NextPrevious from '../../components/common/NextPrevious/NextPrevious'; +import { NextPreviousProps } from '../../components/common/NextPrevious/NextPrevious.interface'; +import RichTextEditorPreviewer from '../../components/common/RichTextEditor/RichTextEditorPreviewer'; import TableAntd from '../../components/common/Table/Table'; import { PAGE_SIZE } from '../../constants/constants'; import { ERROR_PLACEHOLDER_TYPE } from '../../enums/common.enum'; 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 56f1456a5ce..d29ea42a02c 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 @@ -19,13 +19,13 @@ import React, { 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 ErrorPlaceHolder from '../../components/common/error-with-placeholder/ErrorPlaceHolder'; -import { PagingHandlerParams } from '../../components/common/next-previous/NextPrevious.interface'; -import PageLayoutV1 from '../../components/containers/PageLayoutV1'; +import ErrorPlaceHolder from '../../components/common/ErrorWithPlaceholder/ErrorPlaceHolder'; +import { PagingHandlerParams } from '../../components/common/NextPrevious/NextPrevious.interface'; import DataAssetsVersionHeader from '../../components/DataAssets/DataAssetsVersionHeader/DataAssetsVersionHeader'; import DataProductsContainer from '../../components/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, 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 34221de6813..3213ab863c6 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 @@ -18,14 +18,14 @@ import React, { 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/description/DescriptionV1'; -import ErrorPlaceHolder from '../../components/common/error-with-placeholder/ErrorPlaceHolder'; -import { PagingHandlerParams } from '../../components/common/next-previous/NextPrevious.interface'; -import PageLayoutV1 from '../../components/containers/PageLayoutV1'; +import DescriptionV1 from '../../components/common/EntityDescription/DescriptionV1'; +import ErrorPlaceHolder from '../../components/common/ErrorWithPlaceholder/ErrorPlaceHolder'; +import { PagingHandlerParams } from '../../components/common/NextPrevious/NextPrevious.interface'; import DataAssetsVersionHeader from '../../components/DataAssets/DataAssetsVersionHeader/DataAssetsVersionHeader'; import DataProductsContainer from '../../components/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, 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 5d164bce196..281196a29bf 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 @@ -18,11 +18,11 @@ import { ServicesData, ServicesUpdateRequest, ServiceTypes } from 'Models'; import React, { useEffect, useMemo, useState } from 'react'; import { useTranslation } from 'react-i18next'; import { useParams } from 'react-router-dom'; -import ErrorPlaceHolder from '../../components/common/error-with-placeholder/ErrorPlaceHolder'; +import ErrorPlaceHolder from '../../components/common/ErrorWithPlaceholder/ErrorPlaceHolder'; import ResizablePanels from '../../components/common/ResizablePanels/ResizablePanels'; import ServiceDocPanel from '../../components/common/ServiceDocPanel/ServiceDocPanel'; -import TitleBreadcrumb from '../../components/common/title-breadcrumb/title-breadcrumb.component'; -import { TitleBreadcrumbProps } from '../../components/common/title-breadcrumb/title-breadcrumb.interface'; +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 { GlobalSettingsMenuCategory } from '../../constants/GlobalSettings.constants'; diff --git a/openmetadata-ui/src/main/resources/ui/src/pages/EditCustomLogoConfig/EditCustomLogoConfig.test.tsx b/openmetadata-ui/src/main/resources/ui/src/pages/EditCustomLogoConfig/EditCustomLogoConfig.test.tsx index eace6727b8a..78527a0f702 100644 --- a/openmetadata-ui/src/main/resources/ui/src/pages/EditCustomLogoConfig/EditCustomLogoConfig.test.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/pages/EditCustomLogoConfig/EditCustomLogoConfig.test.tsx @@ -50,7 +50,7 @@ jest.mock('../../rest/settingConfigAPI', () => ({ })); jest.mock( - '../../components/common/title-breadcrumb/title-breadcrumb.component', + '../../components/common/TitleBreadcrumb/TitleBreadcrumb.component', () => jest.fn().mockImplementation(() =>testDescriptionV1
); }); jest.mock( - '../../components/common/error-with-placeholder/ErrorPlaceHolder', + '../../components/common/ErrorWithPlaceholder/ErrorPlaceHolder', () => { return jest.fn().mockImplementation(() =>testErrorPlaceHolder
); } @@ -71,7 +71,7 @@ jest.mock('../../components/common/QueryViewer/QueryViewer.component', () => { return jest.fn().mockImplementation(() =>testQueryViewer
); }); -jest.mock('../../components/containers/PageLayoutV1', () => { +jest.mock('../../components/PageLayoutV1/PageLayoutV1', () => { return jest.fn().mockImplementation(({ children }) =>{children}
); }); 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 9c7a9a300ee..6c5b071c5b1 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 @@ -24,24 +24,24 @@ import ActivityFeedProvider, { } from '../../components/ActivityFeed/ActivityFeedProvider/ActivityFeedProvider'; import { ActivityFeedTab } from '../../components/ActivityFeed/ActivityFeedTab/ActivityFeedTab.component'; import ActivityThreadPanel from '../../components/ActivityFeed/ActivityThreadPanel/ActivityThreadPanel'; -import { useAuthContext } from '../../components/authentication/auth-provider/AuthProvider'; +import { useAuthContext } from '../../components/Auth/AuthProviders/AuthProvider'; import { CustomPropertyTable } from '../../components/common/CustomPropertyTable/CustomPropertyTable'; -import DescriptionV1 from '../../components/common/description/DescriptionV1'; -import ErrorPlaceHolder from '../../components/common/error-with-placeholder/ErrorPlaceHolder'; +import DescriptionV1 from '../../components/common/EntityDescription/DescriptionV1'; +import ErrorPlaceHolder from '../../components/common/ErrorWithPlaceholder/ErrorPlaceHolder'; import QueryViewer from '../../components/common/QueryViewer/QueryViewer.component'; -import PageLayoutV1 from '../../components/containers/PageLayoutV1'; import { DataAssetsHeader } from '../../components/DataAssets/DataAssetsHeader/DataAssetsHeader.component'; import DataProductsContainer from '../../components/DataProductsContainer/DataProductsContainer.component'; import EntityLineageComponent from '../../components/Entity/EntityLineage/EntityLineage.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, ResourceEntity, } from '../../components/PermissionProvider/PermissionProvider.interface'; import SampleDataWithMessages from '../../components/SampleDataWithMessages/SampleDataWithMessages'; -import { SourceType } from '../../components/searched-data/SearchedData.interface'; +import { SourceType } from '../../components/SearchedData/SearchedData.interface'; import { QueryVote } from '../../components/TableQueries/TableQueries.interface'; import TabsLabel from '../../components/TabsLabel/TabsLabel.component'; import TagsContainerV2 from '../../components/Tag/TagsContainerV2/TagsContainerV2'; 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 26e2924d039..fbfe207db64 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 @@ -33,12 +33,14 @@ const mockProps: SearchIndexFieldsTabProps = { entityFqn: 'search_service.search_index_fqn', }; -jest.mock('../../../components/common/searchbar/Searchbar', () => - jest - .fn() - .mockImplementation(({ onSearch }) => ( -testDescriptionV1
); }); @@ -79,13 +79,13 @@ jest.mock( ); jest.mock( - '../../components/common/error-with-placeholder/ErrorPlaceHolder', + '../../components/common/ErrorWithPlaceholder/ErrorPlaceHolder', () => { return jest.fn().mockImplementation(() =>testErrorPlaceHolder
); } ); -jest.mock('../../components/containers/PageLayoutV1', () => { +jest.mock('../../components/PageLayoutV1/PageLayoutV1', () => { return jest.fn().mockImplementation(({ children }) =>{children}
); }); @@ -105,7 +105,7 @@ jest.mock( } ); -jest.mock('../../components/schema-editor/SchemaEditor', () => { +jest.mock('../../components/SchemaEditor/SchemaEditor', () => { return jest.fn().mockImplementation(() =>testSchemaEditor
); }); 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 082875287ea..4788d17e4a2 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 @@ -20,24 +20,24 @@ 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 { useAuthContext } from '../../components/authentication/auth-provider/AuthProvider'; +import { withActivityFeed } from '../../components/AppRouter/withActivityFeed'; +import { useAuthContext } from '../../components/Auth/AuthProviders/AuthProvider'; import { CustomPropertyTable } from '../../components/common/CustomPropertyTable/CustomPropertyTable'; -import DescriptionV1 from '../../components/common/description/DescriptionV1'; -import ErrorPlaceHolder from '../../components/common/error-with-placeholder/ErrorPlaceHolder'; -import PageLayoutV1 from '../../components/containers/PageLayoutV1'; +import DescriptionV1 from '../../components/common/EntityDescription/DescriptionV1'; +import ErrorPlaceHolder from '../../components/common/ErrorWithPlaceholder/ErrorPlaceHolder'; import { DataAssetsHeader } from '../../components/DataAssets/DataAssetsHeader/DataAssetsHeader.component'; import DataProductsContainer from '../../components/DataProductsContainer/DataProductsContainer.component'; import EntityLineageComponent from '../../components/Entity/EntityLineage/EntityLineage.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, ResourceEntity, } from '../../components/PermissionProvider/PermissionProvider.interface'; -import { withActivityFeed } from '../../components/router/withActivityFeed'; -import SchemaEditor from '../../components/schema-editor/SchemaEditor'; -import { SourceType } from '../../components/searched-data/SearchedData.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 TagsContainerV2 from '../../components/Tag/TagsContainerV2/TagsContainerV2'; 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 a9ea7f6f2e3..16463654a8f 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 @@ -13,36 +13,16 @@ import { fireEvent, render, screen } from '@testing-library/react'; import React from 'react'; -import { INITIAL_PAGING_VALUE, pagingObject } from '../../constants/constants'; -import { mockStoredProcedureData } from '../../mocks/StoredProcedure.mock'; -import { StoredProcedureTabProps } from './storedProcedure.interface'; import StoredProcedureTab from './StoredProcedureTab'; -const mockPagingHandler = jest.fn(); -const mockShowDeletedHandler = jest.fn(); -const mockFetchHandler = jest.fn(); - -const mockProps: StoredProcedureTabProps = { - storedProcedure: { - data: mockStoredProcedureData, - isLoading: false, - deleted: false, - paging: pagingObject, - currentPage: INITIAL_PAGING_VALUE, - }, - pagingHandler: mockPagingHandler, - fetchStoredProcedure: mockFetchHandler, - onShowDeletedStoreProcedureChange: mockShowDeletedHandler, -}; - jest.mock( - '../../components/common/error-with-placeholder/ErrorPlaceHolder', + '../../components/common/ErrorWithPlaceholder/ErrorPlaceHolder', () => { return jest.fn().mockImplementation(() =>testErrorPlaceHolder
); } ); -jest.mock('../../components/common/next-previous/NextPrevious', () => { +jest.mock('../../components/common/NextPrevious/NextPrevious', () => { return jest.fn().mockImplementation(({ pagingHandler }) => (
testNextPrevious
@@ -51,7 +31,7 @@ jest.mock('../../components/common/next-previous/NextPrevious', () => {
});
jest.mock(
- '../../components/common/rich-text-editor/RichTextEditorPreviewer',
+ '../../components/common/RichTextEditor/RichTextEditorPreviewer',
() => {
return jest
.fn()
@@ -68,6 +48,7 @@ jest.mock('react-router-dom', () => ({
Link: jest
.fn()
.mockImplementation(({ children }) => {children}),
+ useParams: jest.fn().mockImplementation(() => ({ fqn: 'something' })),
}));
jest.mock('../../utils/EntityUtils', () => ({
@@ -76,23 +57,26 @@ jest.mock('../../utils/EntityUtils', () => ({
jest.mock('../../utils/StringsUtils', () => ({
getEncodedFqn: jest.fn().mockImplementation((fqn) => fqn),
+ getErrorText: jest.fn().mockImplementation(() => 'test'),
}));
jest.mock('../../utils/TableUtils', () => ({
getEntityLink: jest.fn().mockImplementation((link) => link),
+ getTableExpandableConfig: jest.fn(),
}));
+jest.mock('../../rest/storedProceduresAPI', () => {
+ return {
+ getStoredProceduresList: jest
+ .fn()
+ .mockResolvedValue({ data: [], paging: { total: 0 } }),
+ };
+});
+
describe('StoredProcedureTab component', () => {
- it('StoredProcedureTab should fetch details', () => {
- render( testDescriptionV1 testErrorPlaceHolder testQueryViewer {children} RichTextEditorPreviewer FormModal DescriptionComponent UserList.component
+ {t('message.are-you-want-to-restore', {
+ entity: getEntityName(selectedUser),
+ })}
+ Sidebar,
- }}
+ dataSource={storedProcedure}
+ loading={isLoading}
locale={{
emptyText:
mockTable
);
});
+
jest.mock('../../components/Loader/Loader', () => {
return jest.fn().mockImplementation(() => ,
+ }}
+ pagination={false}
+ rowKey="id"
+ size="small"
+ />
+
+