diff --git a/openmetadata-ui/src/main/resources/ui/src/components/DataQuality/AddToBundleSuiteModal/AddToBundleSuiteModal.search.test.tsx b/openmetadata-ui/src/main/resources/ui/src/components/DataQuality/AddToBundleSuiteModal/AddToBundleSuiteModal.search.test.tsx
new file mode 100644
index 000000000000..90e49ebf21e6
--- /dev/null
+++ b/openmetadata-ui/src/main/resources/ui/src/components/DataQuality/AddToBundleSuiteModal/AddToBundleSuiteModal.search.test.tsx
@@ -0,0 +1,118 @@
+/*
+ * Copyright 2026 Collate.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+import { act, fireEvent, render, screen } from '@testing-library/react';
+import userEvent from '@testing-library/user-event';
+import { MemoryRouter } from 'react-router-dom';
+import { MOCK_TEST_CASE } from '../../../mocks/TestSuite.mock';
+import {
+ addTestCasesToLogicalTestSuiteBulk,
+ getListTestSuitesBySearch,
+} from '../../../rest/testAPI';
+import AddToBundleSuiteModal from './AddToBundleSuiteModal.component';
+
+jest.mock('../../../rest/testAPI', () => ({
+ getListTestSuitesBySearch: jest.fn(),
+ addTestCasesToLogicalTestSuiteBulk: jest.fn(),
+}));
+
+const initialSuite = { id: 'suite-1', name: 'Shared suite' };
+const serverMatch = { id: 'suite-16', name: 'Shared suite archive' };
+const mockGetSuites = getListTestSuitesBySearch as jest.MockedFunction<
+ typeof getListTestSuitesBySearch
+>;
+const mockAddTestCases =
+ addTestCasesToLogicalTestSuiteBulk as jest.MockedFunction<
+ typeof addTestCasesToLogicalTestSuiteBulk
+ >;
+let user: ReturnType
;
+
+const renderModal = () =>
+ render(
+
+
+
+ );
+
+describe('bundle suite search with the core combobox', () => {
+ beforeEach(() => {
+ jest.useFakeTimers();
+ user = userEvent.setup({ advanceTimers: jest.advanceTimersByTime });
+ mockGetSuites.mockImplementation(async ({ q } = {}) => ({
+ data: q ? [initialSuite, serverMatch] : [initialSuite],
+ paging: { total: q ? 2 : 16 },
+ }));
+ mockAddTestCases.mockResolvedValue(initialSuite);
+ });
+
+ afterEach(() => {
+ jest.useRealTimers();
+ });
+
+ it('searches an exact loaded label and exposes additional server matches', async () => {
+ renderModal();
+ const input = screen.getByRole('combobox');
+ await act(async () => user.click(input));
+
+ expect(
+ await screen.findByRole('option', { name: initialSuite.name })
+ ).toBeInTheDocument();
+
+ fireEvent.change(input, { target: { value: initialSuite.name } });
+ await act(async () => jest.advanceTimersByTime(400));
+
+ expect(
+ await screen.findByRole('option', { name: serverMatch.name })
+ ).toBeInTheDocument();
+ expect(screen.getByTestId('add-button')).toBeDisabled();
+ });
+
+ it('selects an option without searching its label and submits that suite', async () => {
+ renderModal();
+ await act(async () => user.click(screen.getByRole('combobox')));
+ const option = await screen.findByRole('option', {
+ name: initialSuite.name,
+ });
+ await act(async () => user.click(option));
+ await act(async () => jest.advanceTimersByTime(400));
+
+ expect(getListTestSuitesBySearch).toHaveBeenCalledTimes(1);
+ expect(screen.getByRole('combobox')).toHaveValue(initialSuite.name);
+ expect(screen.getByTestId('add-button')).toBeEnabled();
+
+ await act(async () => user.click(screen.getByTestId('add-button')));
+
+ expect(addTestCasesToLogicalTestSuiteBulk).toHaveBeenCalledWith(
+ initialSuite.id,
+ expect.objectContaining({ includeIds: [MOCK_TEST_CASE[0].id] })
+ );
+ });
+
+ it('clears the selected suite when the user edits its label', async () => {
+ renderModal();
+ const input = screen.getByRole('combobox');
+ await act(async () => user.click(input));
+ await act(async () =>
+ user.click(screen.getByRole('option', { name: initialSuite.name }))
+ );
+ fireEvent.change(input, { target: { value: 'Another suite' } });
+ await act(async () => jest.advanceTimersByTime(400));
+
+ expect(input).toHaveValue('Another suite');
+ expect(screen.getByTestId('add-button')).toBeDisabled();
+ });
+});
diff --git a/openmetadata-ui/src/main/resources/ui/src/components/DataQuality/AddToBundleSuiteModal/AddToBundleSuiteModal.test.tsx b/openmetadata-ui/src/main/resources/ui/src/components/DataQuality/AddToBundleSuiteModal/AddToBundleSuiteModal.test.tsx
index 45753f46e232..29635c73e300 100644
--- a/openmetadata-ui/src/main/resources/ui/src/components/DataQuality/AddToBundleSuiteModal/AddToBundleSuiteModal.test.tsx
+++ b/openmetadata-ui/src/main/resources/ui/src/components/DataQuality/AddToBundleSuiteModal/AddToBundleSuiteModal.test.tsx
@@ -25,9 +25,9 @@ import observabilityRouterClassBase from '../../../utils/ObservabilityRouterClas
import AddToBundleSuiteModal from './AddToBundleSuiteModal.component';
import { AddToBundleSuiteModalProps } from './AddToBundleSuiteModal.interface';
-type MockSelectProps = {
- onChange?: (value: string | undefined) => void;
- onSearch?: (value: string) => void;
+type MockComboBoxProps = {
+ onInputChange?: (value: string) => void;
+ onSelectionChange?: (key: string | null) => void;
'data-testid'?: string;
};
@@ -75,24 +75,6 @@ jest.mock('../../../utils/ToastUtils', () => ({
showErrorToast: jest.fn(),
}));
-jest.mock('antd', () => ({
- ...jest.requireActual('antd'),
- Select: ({ onChange, onSearch, 'data-testid': testId }: MockSelectProps) => (
-
- onSearch?.(e.target.value)}
- />
-
-
- ),
-}));
-
jest.mock('@openmetadata/ui-core-components', () => {
const MockDialogContent = ({ children }: { children: React.ReactNode }) => (
{children}
@@ -126,7 +108,35 @@ jest.mock('@openmetadata/ui-core-components', () => {
}
);
+ const MockSelect = Object.assign(() => null, {
+ ComboBox: ({
+ onInputChange,
+ onSelectionChange,
+ 'data-testid': testId,
+ }: MockComboBoxProps) => (
+
+ onInputChange?.(e.target.value)}
+ />
+
+
+
+ ),
+ Item: () => null,
+ });
+
return {
+ Select: MockSelect,
Button: ({
children,
onPress,
@@ -300,6 +310,18 @@ describe('AddToBundleSuiteModal', () => {
expect(mockNavigate).toHaveBeenCalled();
});
+ it('should disable add button again once the selection is cleared', async () => {
+ render();
+
+ fireEvent.click(await screen.findByTestId('bundle-suite-select-option'));
+
+ expect(screen.getByTestId('add-button')).not.toBeDisabled();
+
+ fireEvent.click(screen.getByTestId('bundle-suite-select-clear'));
+
+ expect(screen.getByTestId('add-button')).toBeDisabled();
+ });
+
it('should search bundle suites on input', async () => {
jest.useFakeTimers();
diff --git a/openmetadata-ui/src/main/resources/ui/src/components/DataQuality/BundleSuiteForm/BundleSuiteForm.interface.ts b/openmetadata-ui/src/main/resources/ui/src/components/DataQuality/BundleSuiteForm/BundleSuiteForm.interface.ts
index e3eabce58b57..95694fe191c1 100644
--- a/openmetadata-ui/src/main/resources/ui/src/components/DataQuality/BundleSuiteForm/BundleSuiteForm.interface.ts
+++ b/openmetadata-ui/src/main/resources/ui/src/components/DataQuality/BundleSuiteForm/BundleSuiteForm.interface.ts
@@ -11,14 +11,12 @@
* limitations under the License.
*/
-import { DrawerProps } from 'antd';
import { ReactNode } from 'react';
import { TestCase } from '../../../generated/tests/testCase';
import { TestSuite } from '../../../generated/tests/testSuite';
import { AddTestCaseListChangePayload } from '../AddTestCaseList/AddTestCaseList.interface';
export interface BundleSuiteFormProps {
- drawerProps?: DrawerProps;
className?: string;
onCancel?: () => void;
onSuccess?: (testSuite: TestSuite) => void;
diff --git a/openmetadata-ui/src/main/resources/ui/src/components/DataQuality/IncidentManager/Severity/Severity.component.tsx b/openmetadata-ui/src/main/resources/ui/src/components/DataQuality/IncidentManager/Severity/Severity.component.tsx
index 12c4145a835d..d0e880754ee9 100644
--- a/openmetadata-ui/src/main/resources/ui/src/components/DataQuality/IncidentManager/Severity/Severity.component.tsx
+++ b/openmetadata-ui/src/main/resources/ui/src/components/DataQuality/IncidentManager/Severity/Severity.component.tsx
@@ -52,7 +52,7 @@ const Severity = ({
const onCancel = useCallback(() => setIsEditSeverity(false), []);
const handleSubmit = useCallback(
- async (data: Severities) => {
+ async (data?: Severities) => {
await onSubmit?.(data);
onCancel();
},
diff --git a/openmetadata-ui/src/main/resources/ui/src/components/DataQuality/IncidentManager/Severity/Severity.interface.ts b/openmetadata-ui/src/main/resources/ui/src/components/DataQuality/IncidentManager/Severity/Severity.interface.ts
index 5f9ee18ecbbf..cbfcff881d7b 100644
--- a/openmetadata-ui/src/main/resources/ui/src/components/DataQuality/IncidentManager/Severity/Severity.interface.ts
+++ b/openmetadata-ui/src/main/resources/ui/src/components/DataQuality/IncidentManager/Severity/Severity.interface.ts
@@ -28,7 +28,7 @@ export interface SeverityProps extends SeverityFormProps {
export interface SeverityModalProps {
initialSeverity?: Severities;
onCancel: () => void;
- onSubmit: (severity: Severities) => Promise;
+ onSubmit: (severity?: Severities) => Promise;
}
export interface InlineSeverityProps {
diff --git a/openmetadata-ui/src/main/resources/ui/src/components/DataQuality/IncidentManager/Severity/SeverityModal.component.tsx b/openmetadata-ui/src/main/resources/ui/src/components/DataQuality/IncidentManager/Severity/SeverityModal.component.tsx
index c68c9d98f931..7e94f3185fde 100644
--- a/openmetadata-ui/src/main/resources/ui/src/components/DataQuality/IncidentManager/Severity/SeverityModal.component.tsx
+++ b/openmetadata-ui/src/main/resources/ui/src/components/DataQuality/IncidentManager/Severity/SeverityModal.component.tsx
@@ -11,69 +11,76 @@
* limitations under the License.
*/
-import { Form, Modal, Select } from 'antd';
-import { FormProps, useForm } from 'antd/lib/form/Form';
-import { keys, startCase } from 'lodash';
+import { Form, Select, SimpleModal } from '@openmetadata/ui-core-components';
+import { startCase } from 'lodash';
import { useState } from 'react';
import { useTranslation } from 'react-i18next';
import { Severities } from '../../../../generated/tests/testCaseResolutionStatus';
import { SeverityModalProps } from './Severity.interface';
+const NO_SEVERITY = 'none';
+
const SeverityModal = ({
initialSeverity,
onCancel,
onSubmit,
}: SeverityModalProps) => {
- const [form] = useForm();
const { t } = useTranslation();
+ const [severity, setSeverity] = useState(
+ initialSeverity
+ );
const [isLoading, setIsLoading] = useState(false);
- const handleFormSubmit: FormProps['onFinish'] = (data) => {
+ // The leading "No severity" item stands in for antd's allowClear.
+ const severityItems = [
+ {
+ id: NO_SEVERITY,
+ label: t('label.no-entity', { entity: t('label.severity') }),
+ },
+ ...Object.values(Severities).map((value) => ({
+ id: value,
+ label: startCase(value),
+ })),
+ ];
+
+ const handleSubmit = () => {
setIsLoading(true);
- onSubmit(data.severity).finally(() => {
+ onSubmit(severity).finally(() => {
setIsLoading(false);
});
};
return (
- form.submit()}>
-
-
+
);
};
diff --git a/openmetadata-ui/src/main/resources/ui/src/components/DataQuality/IncidentManager/Severity/SeverityModal.test.tsx b/openmetadata-ui/src/main/resources/ui/src/components/DataQuality/IncidentManager/Severity/SeverityModal.test.tsx
index b3cc19d1cf14..8fc97a15afb8 100644
--- a/openmetadata-ui/src/main/resources/ui/src/components/DataQuality/IncidentManager/Severity/SeverityModal.test.tsx
+++ b/openmetadata-ui/src/main/resources/ui/src/components/DataQuality/IncidentManager/Severity/SeverityModal.test.tsx
@@ -20,21 +20,47 @@ const mockProps = {
onSubmit: jest.fn().mockResolvedValue([]),
};
+const press = (element: HTMLElement) => {
+ fireEvent.pointerDown(element, {
+ button: 0,
+ pointerId: 1,
+ pointerType: 'mouse',
+ });
+ fireEvent.pointerUp(element, {
+ button: 0,
+ pointerId: 1,
+ pointerType: 'mouse',
+ });
+ fireEvent.click(element);
+};
+
+const pickSeverity = async (optionName: string) => {
+ await act(async () => {
+ press(screen.getByRole('button', { name: /label.severity/ }));
+ });
+ await act(async () => {
+ press(screen.getByRole('option', { name: optionName }));
+ });
+};
+
describe('SeverityModal', () => {
+ beforeEach(() => {
+ jest.clearAllMocks();
+ });
+
it('Should render component', async () => {
render();
- const form = await screen.findByTestId('severity-form');
- const severitySelect = await screen.findByTestId('severity-form');
-
- expect(form).toBeInTheDocument();
- expect(severitySelect).toBeInTheDocument();
+ expect(await screen.findByTestId('severity-form')).toBeInTheDocument();
+ expect(await screen.findByTestId('severity-select')).toBeInTheDocument();
});
it('Initial value should be visible', async () => {
render();
- expect(await screen.findByText('Severity 1')).toBeInTheDocument();
+ expect(
+ await screen.findByRole('button', { name: /Severity 1/ })
+ ).toBeInTheDocument();
});
it('onCancel should work', async () => {
@@ -54,4 +80,31 @@ describe('SeverityModal', () => {
expect(mockProps.onSubmit).toHaveBeenCalledWith(Severities.Severity1);
});
+
+ it('should submit the newly picked severity', async () => {
+ render();
+
+ await pickSeverity('Severity 3');
+ await act(async () => {
+ fireEvent.click(screen.getByText('label.save'));
+ });
+
+ expect(mockProps.onSubmit).toHaveBeenCalledWith(Severities.Severity3);
+ });
+
+ it('should submit undefined once the severity is cleared', async () => {
+ render();
+
+ await pickSeverity('label.no-entity');
+
+ expect(
+ screen.getByRole('button', { name: /label.please-select-entity/ })
+ ).toBeInTheDocument();
+
+ await act(async () => {
+ fireEvent.click(screen.getByText('label.save'));
+ });
+
+ expect(mockProps.onSubmit).toHaveBeenCalledWith(undefined);
+ });
});
diff --git a/openmetadata-ui/src/main/resources/ui/src/components/DataQuality/IncidentManager/TestCaseStatus/TestCaseIncidentManagerStatus.component.tsx b/openmetadata-ui/src/main/resources/ui/src/components/DataQuality/IncidentManager/TestCaseStatus/TestCaseIncidentManagerStatus.component.tsx
index 3b45f2fe9f31..f779dca7b008 100644
--- a/openmetadata-ui/src/main/resources/ui/src/components/DataQuality/IncidentManager/TestCaseStatus/TestCaseIncidentManagerStatus.component.tsx
+++ b/openmetadata-ui/src/main/resources/ui/src/components/DataQuality/IncidentManager/TestCaseStatus/TestCaseIncidentManagerStatus.component.tsx
@@ -13,9 +13,9 @@
import {
Box,
+ Tooltip,
Typography as CoreTypography,
} from '@openmetadata/ui-core-components';
-import { Tooltip } from 'antd';
import classNames from 'classnames';
import { useCallback, useMemo, useState } from 'react';
import { useTranslation } from 'react-i18next';
@@ -107,14 +107,16 @@ const TestCaseIncidentManagerStatus = ({
/>
)}