From ca8610314d24aadcfd8c0f58b210ececee7ca101 Mon Sep 17 00:00:00 2001
From: Shailesh Parmar <shailesh.parmar.webdev@gmail.com>
Date: Sat, 23 Aug 2025 09:30:52 +0530
Subject: [PATCH] fix: improve test case form loading and structure in
 AddTestCaseNewFlow (#23068)

(cherry picked from commit 1e5d2c92680a47a4e02b1ad16e8acd0d9aab5d45)
---
 .../e2e/Features/DataQuality/AddTestCaseNewFlow.spec.ts  | 4 ++++
 .../AddDataQualityTest/components/TestCaseFormV1.tsx     | 9 +++++----
 2 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/openmetadata-ui/src/main/resources/ui/playwright/e2e/Features/DataQuality/AddTestCaseNewFlow.spec.ts b/openmetadata-ui/src/main/resources/ui/playwright/e2e/Features/DataQuality/AddTestCaseNewFlow.spec.ts
index 87ba929a5d2..95560bc1433 100644
--- a/openmetadata-ui/src/main/resources/ui/playwright/e2e/Features/DataQuality/AddTestCaseNewFlow.spec.ts
+++ b/openmetadata-ui/src/main/resources/ui/playwright/e2e/Features/DataQuality/AddTestCaseNewFlow.spec.ts
@@ -172,6 +172,10 @@ test.describe('Add TestCase New Flow', () => {
       await selectTable(page, table1.entity.name);
 
       await page.click('#testCaseFormV1_selectedColumn');
+      await page.waitForLoadState('networkidle');
+      await page.waitForSelector(
+        `.ant-select-dropdown [title="${table1.entity.columns[0].name}"]`
+      );
       await page
         .locator(
           `.ant-select-dropdown [title="${table1.entity.columns[0].name}"]`
diff --git a/openmetadata-ui/src/main/resources/ui/src/components/DataQuality/AddDataQualityTest/components/TestCaseFormV1.tsx b/openmetadata-ui/src/main/resources/ui/src/components/DataQuality/AddDataQualityTest/components/TestCaseFormV1.tsx
index a3226783746..2f7b8e5cd89 100644
--- a/openmetadata-ui/src/main/resources/ui/src/components/DataQuality/AddDataQualityTest/components/TestCaseFormV1.tsx
+++ b/openmetadata-ui/src/main/resources/ui/src/components/DataQuality/AddDataQualityTest/components/TestCaseFormV1.tsx
@@ -1038,6 +1038,7 @@ const TestCaseFormV1: FC<TestCaseFormV1Props> = ({
               api={fetchTables}
               disabled={Boolean(table)}
               getPopupContainer={getPopupContainer}
+              notFoundContent={undefined}
               placeholder={t('label.select-entity', {
                 entity: t('label.table'),
               })}
@@ -1073,10 +1074,6 @@ const TestCaseFormV1: FC<TestCaseFormV1Props> = ({
           )}
         </Card>
 
-        <Card className="form-card-section" data-testid="test-details-card">
-          {generateFormFields(testDetailsFormFields)}
-        </Card>
-
         <Card className="form-card-section" data-testid="test-type-card">
           <Form.Item className="custom-select-test-type-style m-b-md">
             {selectedTestLevel === TestLevel.TABLE && (
@@ -1172,6 +1169,10 @@ const TestCaseFormV1: FC<TestCaseFormV1Props> = ({
             generateFormFields(computeRowCountField)}
         </Card>
 
+        <Card className="form-card-section" data-testid="test-details-card">
+          {generateFormFields(testDetailsFormFields)}
+        </Card>
+
         {shouldShowScheduler && (
           <Row gutter={[20, 20]}>
             <Col span={24}>