yujunjun/OpenMetadata
1
0
Fork 0
mirror of https://github.com/open-metadata/OpenMetadata.git synced 2025-08-09 01:28:11 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix(ui): remove hybrid condition from ingestion runner (#22485)

Browse Source 
* remove hybrid condition from ingestion runner

* fix test

* fix test

* revert the condition

* add dependency array
This commit is contained in:
Sweta Agarwalla 2025-07-24 17:53:04 +05:30 committed by GitHub
parent b0586f849f
commit 464fc14703
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 5 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
openmetadata-ui/src/main/resources/ui/src/pages/AddServicePage/AddServicePage.component.tsx
View File

@ -27,13 +27,11 @@ import IngestionStepper from '../../components/Settings/Services/Ingestion/Inges
import ConnectionConfigForm from '../../components/Settings/Services/ServiceConfig/ConnectionConfigForm'; import ConnectionConfigForm from '../../components/Settings/Services/ServiceConfig/ConnectionConfigForm';
import FiltersConfigForm from '../../components/Settings/Services/ServiceConfig/FiltersConfigForm'; import FiltersConfigForm from '../../components/Settings/Services/ServiceConfig/FiltersConfigForm';
import { AUTO_PILOT_APP_NAME } from '../../constants/Applications.constant'; import { AUTO_PILOT_APP_NAME } from '../../constants/Applications.constant';
import { AIRFLOW_HYBRID } from '../../constants/constants';
import { GlobalSettingsMenuCategory } from '../../constants/GlobalSettings.constants'; import { GlobalSettingsMenuCategory } from '../../constants/GlobalSettings.constants';
import { import {
SERVICE_DEFAULT_ERROR_MAP, SERVICE_DEFAULT_ERROR_MAP,
STEPS_FOR_ADD_SERVICE, STEPS_FOR_ADD_SERVICE,
} from '../../constants/Services.constant'; } from '../../constants/Services.constant';
import { useAirflowStatus } from '../../context/AirflowStatusProvider/AirflowStatusProvider';
import { ServiceCategory } from '../../enums/service.enum'; import { ServiceCategory } from '../../enums/service.enum';
import { withPageLayout } from '../../hoc/withPageLayout'; import { withPageLayout } from '../../hoc/withPageLayout';
import { useApplicationStore } from '../../hooks/useApplicationStore'; import { useApplicationStore } from '../../hooks/useApplicationStore';
@ -65,7 +63,6 @@ const AddServicePage = () => {
const { serviceCategory } = const { serviceCategory } =
useRequiredParams<{ serviceCategory: ServiceCategory }>(); useRequiredParams<{ serviceCategory: ServiceCategory }>();
const { currentUser, setInlineAlertDetails } = useApplicationStore(); const { currentUser, setInlineAlertDetails } = useApplicationStore();
const { platform } = useAirflowStatus();
const [showErrorMessage, setShowErrorMessage] = useState( const [showErrorMessage, setShowErrorMessage] = useState(
SERVICE_DEFAULT_ERROR_MAP SERVICE_DEFAULT_ERROR_MAP
@ -307,10 +304,8 @@ const AddServicePage = () => {
); );
useEffect(() => { useEffect(() => {
if (platform === AIRFLOW_HYBRID) { serviceUtilClassBase.getExtraInfo();
serviceUtilClassBase.getExtraInfo(); }, []);
}
}, [platform]);
return ( return (
<ResizablePanels <ResizablePanels

17
openmetadata-ui/src/main/resources/ui/src/pages/AddServicePage/AddServicePage.test.tsx
View File

@ -13,7 +13,6 @@
import { act, fireEvent, render, screen } from '@testing-library/react'; import { act, fireEvent, render, screen } from '@testing-library/react';
import { MemoryRouter } from 'react-router-dom'; import { MemoryRouter } from 'react-router-dom';
import { AIRFLOW_HYBRID } from '../../constants/constants';
import { useAirflowStatus } from '../../context/AirflowStatusProvider/AirflowStatusProvider'; import { useAirflowStatus } from '../../context/AirflowStatusProvider/AirflowStatusProvider';
import { ServiceCategory } from '../../enums/service.enum'; import { ServiceCategory } from '../../enums/service.enum';
import { postService } from '../../rest/serviceAPI'; import { postService } from '../../rest/serviceAPI';
@ -403,10 +402,9 @@ describe('AddServicePage', () => {
expect(mockSetInlineAlertDetails).toHaveBeenCalled(); expect(mockSetInlineAlertDetails).toHaveBeenCalled();
}); });
it('calls getExtraInfo when platform is Hybrid', () => { it('calls getExtraInfo', () => {
(useAirflowStatus as jest.Mock).mockReturnValue({ (useAirflowStatus as jest.Mock).mockReturnValue({
...baseAirflowMock, ...baseAirflowMock,
platform: AIRFLOW_HYBRID,
}); });
const mockGetExtraInfo = serviceUtilClassBaseModule.default const mockGetExtraInfo = serviceUtilClassBaseModule.default
@ -415,17 +413,4 @@ describe('AddServicePage', () => {
expect(mockGetExtraInfo).toHaveBeenCalled(); expect(mockGetExtraInfo).toHaveBeenCalled();
}); });
it('does not call getExtraInfo when platform is not Hybrid', () => {
(useAirflowStatus as jest.Mock).mockReturnValue({
...baseAirflowMock,
platform: 'Argo',
});
const mockGetExtraInfo = serviceUtilClassBaseModule.default
.getExtraInfo as jest.Mock;
render(<AddServicePage {...mockProps} />, { wrapper: MemoryRouter });
expect(mockGetExtraInfo).not.toHaveBeenCalled();
});
}); });

7
openmetadata-ui/src/main/resources/ui/src/pages/ServiceDetailsPage/ServiceDetailsPage.tsx
View File

@ -45,7 +45,6 @@ import { WorkflowStatesData } from '../../components/ServiceInsights/ServiceInsi
import Ingestion from '../../components/Settings/Services/Ingestion/Ingestion.component'; import Ingestion from '../../components/Settings/Services/Ingestion/Ingestion.component';
import ServiceConnectionDetails from '../../components/Settings/Services/ServiceConnectionDetails/ServiceConnectionDetails.component'; import ServiceConnectionDetails from '../../components/Settings/Services/ServiceConnectionDetails/ServiceConnectionDetails.component';
import { import {
AIRFLOW_HYBRID,
INITIAL_PAGING_VALUE, INITIAL_PAGING_VALUE,
pagingObject, pagingObject,
ROUTES, ROUTES,
@ -154,7 +153,7 @@ const ServiceDetailsPage: FunctionComponent = () => {
const { t } = useTranslation(); const { t } = useTranslation();
const { currentUser } = useApplicationStore(); const { currentUser } = useApplicationStore();
const airflowInformation = useAirflowStatus(); const airflowInformation = useAirflowStatus();
const { isAirflowAvailable, platform } = useMemo( const { isAirflowAvailable } = useMemo(
() => airflowInformation, () => airflowInformation,
[airflowInformation] [airflowInformation]
); );
@ -1480,9 +1479,7 @@ const ServiceDetailsPage: FunctionComponent = () => {
}, [serviceDetails.fullyQualifiedName, fetchWorkflowInstanceStates]); }, [serviceDetails.fullyQualifiedName, fetchWorkflowInstanceStates]);
useEffect(() => { useEffect(() => {
if (platform === AIRFLOW_HYBRID) { serviceUtilClassBase.getExtraInfo();
serviceUtilClassBase.getExtraInfo();
}
}, []); }, []);
if (isLoading) { if (isLoading) {