fix(FR-2652): add Form.Item name to BAIDeleteConfirmModal for label-input association

agatha197 · agatha197 · commit a6ec9e4d4976 · 2026-04-28T19:45:45.000+09:00
diff --git a/e2e/E2E_COVERAGE_REPORT.md b/e2e/E2E_COVERAGE_REPORT.md
@@ -1,6 +1,6 @@
 # E2E Test Coverage Report
 
-> **Last Updated:** 2026-04-22
+> **Last Updated:** 2026-04-24
 > **Router Source:** [`react/src/routes.tsx`](../react/src/routes.tsx)
 > **E2E Root:** [`e2e/`](.)
 >
diff --git a/e2e/admin-model-card/admin-model-card-delete.spec.ts b/e2e/admin-model-card/admin-model-card-delete.spec.ts
@@ -15,10 +15,49 @@ test.describe(
   () => {
     test.setTimeout(60000);
 
+    const createdResources: Array<{ cardName?: string; folderName?: string }> =
+      [];
+
     test.beforeEach(async ({ page, request }) => {
       await loginAsAdmin(page, request);
     });
 
+    test.afterEach(async ({ page }) => {
+      const adminModelCardPage = new AdminModelCardPage(page);
+      for (const r of [...createdResources].reverse()) {
+        if (r.cardName) {
+          try {
+            await page.goto(`${webuiEndpoint}/admin-serving?tab=model-store`);
+            await adminModelCardPage.waitForTableLoad();
+            await adminModelCardPage.applyNameFilter(r.cardName);
+            const row = adminModelCardPage.getRowByName(r.cardName);
+            if (await row.isVisible()) {
+              await adminModelCardPage.deleteModelCardByName(r.cardName);
+            }
+          } catch {
+            // ignore — card may have already been deleted by the test
+          }
+        }
+        if (r.folderName) {
+          try {
+            await moveToTrashAndVerify(page, r.folderName, 'admin-data');
+          } catch {
+            // ignore — folder may already be in trash or deleted
+          }
+          try {
+            await deleteForeverAndVerifyFromTrash(
+              page,
+              r.folderName,
+              'admin-data',
+            );
+          } catch {
+            // ignore — folder may already be permanently deleted
+          }
+        }
+      }
+      createdResources.length = 0;
+    });
+
     // 5.1 Superadmin can delete a model card via the trash icon with confirmation
     test('Superadmin can delete a model card via the trash icon with confirmation', async ({
       page,
@@ -29,6 +68,9 @@ test.describe(
       const folderName = `e2e-test-delete-single-folder-${timestamp}`;
       const cardName = `e2e-test-delete-single-${timestamp}`;
 
+      // Track folder for cleanup (card will be deleted by test, folder needs cleanup)
+      createdResources.push({ folderName });
+
       // Setup: create a dedicated folder and model card
       await page.goto(`${webuiEndpoint}/admin-serving?tab=model-store`);
       await adminModelCardPage.waitForTableLoad();
@@ -47,13 +89,12 @@ test.describe(
 
       const confirmDialog = adminModelCardPage.getDeleteConfirmDialog();
 
-      // Verify the confirmation dialog shows description and item name
+      // Verify the confirmation dialog shows description text
+      // (For single item + requireConfirmInput, the item list box is removed;
+      // the card name appears in the description text instead)
       await expect(
         confirmDialog.getByText(/Are you sure you want to delete/),
       ).toBeVisible();
-      await expect(
-        confirmDialog.getByText(cardName, { exact: true }).first(),
-      ).toBeVisible();
       await expect(
         confirmDialog.getByText('This action cannot be undone.'),
       ).toBeVisible();
@@ -83,9 +124,7 @@ test.describe(
         '0 items',
       );
 
-      // Cleanup: move folder to trash then permanently delete
-      await moveToTrashAndVerify(page, folderName, 'admin-data');
-      await deleteForeverAndVerifyFromTrash(page, folderName, 'admin-data');
+      // Card was successfully deleted — afterEach only needs to clean up the folder
     });
 
     // 5.2 Superadmin can cancel a single-delete confirmation without deleting
@@ -98,6 +137,9 @@ test.describe(
       const folderName = `e2e-test-no-delete-folder-${timestamp}`;
       const cardName = `e2e-test-no-delete-${timestamp}`;
 
+      // Track both for cleanup (test does not delete them)
+      createdResources.push({ cardName, folderName });
+
       // Setup: create a dedicated folder and model card
       await page.goto(`${webuiEndpoint}/admin-serving?tab=model-store`);
       await adminModelCardPage.waitForTableLoad();
@@ -122,11 +164,6 @@ test.describe(
 
       // Verify the model card is still in the table
       await expect(adminModelCardPage.getRowByName(cardName)).toBeVisible();
-
-      // Cleanup: delete card only, then move folder to trash and permanently delete
-      await adminModelCardPage.deleteModelCardByName(cardName);
-      await moveToTrashAndVerify(page, folderName, 'admin-data');
-      await deleteForeverAndVerifyFromTrash(page, folderName, 'admin-data');
     });
 
     // 5.3 Superadmin can select multiple model cards and delete them in bulk
@@ -144,6 +181,9 @@ test.describe(
         `${filterPrefix}-3`,
       ];
 
+      // Track folder for cleanup (cards will be deleted by test)
+      createdResources.push({ folderName });
+
       // Setup: create a shared folder via the "+" button for the first card,
       // then reuse it for the remaining cards
       await page.goto(`${webuiEndpoint}/admin-serving?tab=model-store`);
@@ -171,7 +211,9 @@ test.describe(
       });
 
       // Check the header checkbox to select all visible rows
-      await adminModelCardPage.getHeaderCheckbox().check();
+      // Use .click() instead of .check() — Ant Design's "select all" checkbox can be in
+      // indeterminate state when some rows are pre-selected, and .check() fails in that case.
+      await adminModelCardPage.getHeaderCheckbox().click();
 
       // Verify the BAISelectionLabel appears showing selected count
       await expect(adminModelCardPage.getSelectionLabel()).toBeVisible();
@@ -194,7 +236,7 @@ test.describe(
       }
 
       // Type "Delete" in the confirmation input (required for bulk delete)
-      await bulkDialog.getByRole('textbox').fill('Delete');
+      await bulkDialog.getByLabel(/Type.*to confirm/i).fill('Delete');
 
       // Click Delete to confirm
       await bulkDialog.getByRole('button', { name: 'Delete' }).click();
@@ -205,10 +247,7 @@ test.describe(
       // Verify the selection label disappears
       await expect(adminModelCardPage.getSelectionLabel()).toBeHidden();
 
-      // Cleanup: model cards were deleted but the shared folder remains;
-      // move it to trash and permanently delete
-      await moveToTrashAndVerify(page, folderName, 'admin-data');
-      await deleteForeverAndVerifyFromTrash(page, folderName, 'admin-data');
+      // Cards were deleted by test — afterEach only needs to clean up the shared folder
     });
 
     // 5.4 Superadmin can cancel bulk deletion
@@ -220,6 +259,10 @@ test.describe(
       const filterPrefix = `e2e-test-bulk-cancel-${timestamp}`;
       const cardNames = [`${filterPrefix}-1`, `${filterPrefix}-2`];
 
+      // Track both cards and folder for cleanup (test does not delete them)
+      createdResources.push({ cardName: cardNames[0], folderName });
+      createdResources.push({ cardName: cardNames[1] });
+
       // Setup: create a shared folder via the "+" button for the first card,
       // then reuse it for the second card
       await page.goto(`${webuiEndpoint}/admin-serving?tab=model-store`);
@@ -267,13 +310,6 @@ test.describe(
       for (const name of cardNames) {
         await expect(adminModelCardPage.getRowByName(name)).toBeVisible();
       }
-
-      // Cleanup: delete each model card (card only), then clean up the shared folder
-      for (const name of cardNames) {
-        await adminModelCardPage.deleteModelCardByName(name);
-      }
-      await moveToTrashAndVerify(page, folderName, 'admin-data');
-      await deleteForeverAndVerifyFromTrash(page, folderName, 'admin-data');
     });
 
     // 5.5 Superadmin can clear selection using the BAISelectionLabel clear button
@@ -286,6 +322,9 @@ test.describe(
       const folderName = `e2e-test-clear-sel-folder-${timestamp}`;
       const cardName = `e2e-test-clear-sel-${timestamp}`;
 
+      // Track both for cleanup (test does not delete them)
+      createdResources.push({ cardName, folderName });
+
       // Setup: create a model card so the table has at least one row with a checkbox
       await page.goto(`${webuiEndpoint}/admin-serving?tab=model-store`);
       await adminModelCardPage.waitForTableLoad();
@@ -320,11 +359,6 @@ test.describe(
 
       // Verify the BAISelectionLabel disappears
       await expect(adminModelCardPage.getSelectionLabel()).toBeHidden();
-
-      // Cleanup: delete the model card then clean up the folder
-      await adminModelCardPage.deleteModelCardByName(cardName);
-      await moveToTrashAndVerify(page, folderName, 'admin-data');
-      await deleteForeverAndVerifyFromTrash(page, folderName, 'admin-data');
     });
 
     // 5.6 Superadmin can select all model cards using the header checkbox
@@ -337,6 +371,9 @@ test.describe(
       const folderName = `e2e-test-select-all-folder-${timestamp}`;
       const cardName = `e2e-test-select-all-${timestamp}`;
 
+      // Track both for cleanup
+      createdResources.push({ cardName, folderName });
+
       // Setup: create a model card so the table has at least one row
       await page.goto(`${webuiEndpoint}/admin-serving?tab=model-store`);
       await adminModelCardPage.waitForTableLoad();
@@ -370,17 +407,6 @@ test.describe(
         selectionText?.match(/(\d+) selected/)?.[1] ?? '0',
       );
       expect(selectedCount).toBeGreaterThan(0);
-
-      // Cleanup: navigate fresh to reset selection state, then delete the model card
-      await page.goto(`${webuiEndpoint}/admin-serving?tab=model-store`);
-      await adminModelCardPage.waitForTableLoad();
-      await adminModelCardPage.applyNameFilter(cardName);
-      await expect(adminModelCardPage.getRowByName(cardName)).toBeVisible({
-        timeout: 15000,
-      });
-      await adminModelCardPage.deleteModelCardByName(cardName);
-      await moveToTrashAndVerify(page, folderName, 'admin-data');
-      await deleteForeverAndVerifyFromTrash(page, folderName, 'admin-data');
     });
 
     // 5.7 Superadmin can delete a model card and its associated folder together
@@ -393,6 +419,11 @@ test.describe(
       const folderName = `e2e-test-delete-folder-${timestamp}`;
       const cardName = `e2e-test-delete-with-folder-${timestamp}`;
 
+      // No createdResources.push here — this test fully handles its own cleanup:
+      // the modal deletes the card, and deleteForeverAndVerifyFromTrash permanently
+      // removes the folder at the end of the test body. afterEach must not attempt
+      // to re-clean a folder that no longer exists (it would hang until timeout).
+
       // Create a model card with a new dedicated folder via the "+" button
       await page.goto(`${webuiEndpoint}/admin-serving?tab=model-store`);
       await adminModelCardPage.waitForTableLoad();
@@ -445,20 +476,27 @@ test.describe(
       await expect(goToTrashLink).toBeVisible();
 
       // Click "Go to Data > Trash" and verify URL includes folder filter
+      // The link navigates to /admin-data (not /data) with statusCategory=deleted and folder filter.
+      // The filter param value may appear URL-encoded in various ways depending on the library
+      // (e.g. `name+%3D%3D+%22folderName%22` or `name%20%3D%3D%20%22folderName%22`).
+      // Use decodeURIComponent after re-encoding to normalize before comparison.
       await goToTrashLink.click();
       await page.waitForURL(
-        (url) =>
-          url.pathname === '/data' &&
-          url.searchParams.get('statusCategory') === 'deleted' &&
-          url.searchParams.get('filter') === `name == "${folderName}"`,
+        (url) => {
+          if (url.pathname !== '/admin-data') return false;
+          if (url.searchParams.get('statusCategory') !== 'deleted')
+            return false;
+          const rawFilter = url.searchParams.get('filter') ?? '';
+          return rawFilter === `name == "${folderName}"`;
+        },
         { timeout: 10000 },
       );
 
       // Verify the folder row is visible in the trash list and permanently delete it
       await deleteForeverAndVerifyFromTrash(page, folderName, 'admin-data');
     });
 
-    // 5.8 Superadmin deletes card only: notification shows correct message and Go to Trash navigates correctly
+    // 5.8 Superadmin deletes card only: notification shows correct message (no folder link)
     test('Superadmin can delete a model card only and navigate to trash without folder filter', async ({
       page,
     }) => {
@@ -468,6 +506,9 @@ test.describe(
       const folderName = `e2e-test-keep-folder-${timestamp}`;
       const cardName = `e2e-test-delete-card-only-${timestamp}`;
 
+      // Track folder for cleanup (card is deleted by test, folder is kept)
+      createdResources.push({ folderName });
+
       // Create a model card with a new dedicated folder via the "+" button
       await page.goto(`${webuiEndpoint}/admin-serving?tab=model-store`);
       await adminModelCardPage.waitForTableLoad();
@@ -495,30 +536,15 @@ test.describe(
       // Confirm deletion
       await adminModelCardPage.getDeleteConfirmButton().click();
 
-      // Verify the notification message for card-only deletion
+      // When folder is NOT deleted, a message.success() toast is shown (no "Go to Data > Trash" link)
+      // Verify the success toast for card-only deletion
       await expect(
         page.getByText(
           'Model card has been deleted. The model folder was not deleted.',
         ),
       ).toBeVisible({ timeout: 15000 });
 
-      // Verify "Go to Data > Trash" link is visible
-      const goToTrashLink = page.getByText('Go to Data > Trash');
-      await expect(goToTrashLink).toBeVisible();
-
-      // Click "Go to Data > Trash" and verify URL (no folder filter)
-      await goToTrashLink.click();
-      await page.waitForURL(
-        (url) =>
-          url.pathname === '/data' &&
-          url.searchParams.get('statusCategory') === 'deleted' &&
-          !url.searchParams.has('filter'),
-        { timeout: 10000 },
-      );
-
-      // Cleanup: move the kept test folder to trash then permanently delete it
-      await moveToTrashAndVerify(page, folderName, 'admin-data');
-      await deleteForeverAndVerifyFromTrash(page, folderName, 'admin-data');
+      // Card was deleted; afterEach will clean up the folder
     });
   },
 );
diff --git a/packages/backend.ai-ui/src/components/BAIDeleteConfirmModal.tsx b/packages/backend.ai-ui/src/components/BAIDeleteConfirmModal.tsx
@@ -160,11 +160,11 @@ const BAIDeleteConfirmModal: React.FC<BAIDeleteConfirmModalProps> = ({
         <BAIFlex direction="column" align="stretch" gap="xs">
           <Text>{resolvedDescription}</Text>
           {items.length > 1 && itemListContent}
-          <Form layout="vertical" preserve={false}>
+          <Form layout="vertical" requiredMark={false} preserve={false}>
             <Form.Item
+              name="confirmText"
               label={resolvedInputLabel}
               style={{ marginBottom: 0 }}
-              required
             >
               <Input
                 autoFocus

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`# E2E Test Coverage Report`
`2`	`2`
`3`		`-> Last Updated: 2026-04-22`
	`3`	`+> Last Updated: 2026-04-24`
`4`	`4`	> Router Source: [`react/src/routes.tsx`](../react/src/routes.tsx)
`5`	`5`	> E2E Root: [`e2e/`](.)
`6`	`6`	`>`