test(FR-2652): fast-path folder dialog wait and assert vfolder selection

Author: agatha197

e2e/utils/classes/AdminModelCardPage.ts

@@ -194,21 +194,19 @@ export class AdminModelCardPage {
     // After clicking "+", either:
     //   (a) a Popconfirm appears asking to "Change Project" first, or
     //   (b) the FolderCreateModal opens directly (project is already model-store).
-    // Check for the Popconfirm button first (short timeout); if it doesn't appear,
-    // fall through to wait for the folder dialog directly. Using Promise.race was
-    // unreliable because the race could resolve on the folder dialog while the
-    // Popconfirm button was also appearing, causing the button click to be missed.
+    // Wait for whichever appears first so the direct-open path doesn't always pay
+    // the full Popconfirm timeout. If the Popconfirm branch appears, click it and
+    // then continue waiting for the folder dialog.
     const folderDialog = this.getFolderCreateDialog();
     const changeProjectButton = this.page.getByRole('button', {
       name: 'Change Project',
     });
 
-    const changeProjectVisible = await changeProjectButton
-      .waitFor({ state: 'visible', timeout: 5000 })
-      .then(() => true)
-      .catch(() => false);
+    await expect(changeProjectButton.or(folderDialog)).toBeVisible({
+      timeout: 5000,
+    });
 
-    if (changeProjectVisible) {
+    if (await changeProjectButton.isVisible()) {
       await changeProjectButton.click();
     }
 
@@ -229,6 +227,18 @@ export class AdminModelCardPage {
       .getByRole('button', { name: 'Create', exact: true })
       .click();
     await expect(folderDialog).toBeHidden({ timeout: 15000 });
+
+    // onRequestClose asynchronously sets `vfolderId` in the Create Model Card form and
+    // triggers a BAIVFolderSelect refetch. Assert the VFolder select reflects the
+    // newly created folder name before proceeding so downstream submit steps don't
+    // race the refetch.
+    await expect(
+      modal
+        .locator('.ant-form-item')
+        .filter({ hasText: 'Model Storage Folder' })
+        .locator('.ant-select-selection-item')
+        .filter({ hasText: folderName }),
+    ).toBeVisible({ timeout: 15000 });
   }
 
   async fillCreateModal(fields: {