fix(e2e): resolve flaky plugin metadata test and service upstream validation

Author: DSingh0304

e2e/tests/plugin_metadata.crud-all-fields.spec.ts

@@ -36,13 +36,29 @@ const deletePluginMetadata = async (req: typeof e2eReq, name: string) => {
 const getMonacoEditorValue = async (editPluginDialog: Locator) => {
   let editorValue = '';
   const textarea = editPluginDialog.locator('textarea');
-  if (await textarea.count() > 0) {
-    editorValue = await textarea.inputValue();
-  }
-  if (!editorValue || editorValue.trim() === '{') {
-    const lines = await editPluginDialog.locator('.view-line').allTextContents();
-    editorValue = lines.join('\n').replace(/\s+/g, ' ');
+
+  // Retry logic to handle potential race conditions where editor content isn't fully loaded
+  for (let i = 0; i < 20; i++) {
+    if (await textarea.count() > 0) {
+      editorValue = await textarea.inputValue();
+    }
+
+    // Fallback to reading view-lines if textarea value seems incomplete
+    if (!editorValue || editorValue.trim() === '{') {
+      const lines = await editPluginDialog.locator('.view-line').allTextContents();
+      editorValue = lines.join('\n').replace(/\s+/g, ' ');
+    }
+
+    // If we have a valid-looking value (not just '{'), return it
+    if (editorValue && editorValue.trim() !== '{') {
+      return editorValue;
+    }
+
+    // Wait before retrying
+    // eslint-disable-next-line playwright/no-wait-for-timeout
+    await editPluginDialog.page().waitForTimeout(500);
   }
+
   if (!editorValue || editorValue.trim() === '{') {
     const allText = await editPluginDialog.textContent();
     console.log('DEBUG: editorValue fallback failed, dialog text:', allText);

e2e/tests/services.crud-required-fields.spec.ts

@@ -42,24 +42,38 @@ test('should CRUD service with required fields', async ({ page }) => {
   await servicesPom.getAddServiceBtn(page).click();
   await servicesPom.isAddPage(page);
 
+
+
+
   await test.step('submit with required fields', async () => {
     await uiFillServiceRequiredFields(page, {
       name: serviceName,
     });
-    
+
+    // Ensure upstream is valid. In some configurations (e.g. http&stream), 
+    // the backend might require a valid upstream configuration.
+    const upstreamSection = page.getByRole('group', { name: 'Upstream' }).first();
+    const addNodeBtn = page.getByRole('button', { name: 'Add a Node' });
+    await addNodeBtn.click();
+
+    const rows = upstreamSection.locator('tr.ant-table-row');
+    await rows.first().locator('input').first().fill('127.0.0.1');
+    await rows.first().locator('input').nth(1).fill('80');
+    await rows.first().locator('input').nth(2).fill('1');
+
     // Ensure the name field is properly filled before submitting
     const nameField = page.getByRole('textbox', { name: 'Name' }).first();
     await expect(nameField).toHaveValue(serviceName);
-    
+
     await servicesPom.getAddBtn(page).click();
-    
+
     // Wait for either success or error toast (longer timeout for CI)
     const alertMsg = page.getByRole('alert');
     await expect(alertMsg).toBeVisible({ timeout: 30000 });
-    
+
     // Check if it's a success message
     await expect(alertMsg).toContainText('Add Service Successfully', { timeout: 5000 });
-    
+
     // Close the toast
     await alertMsg.getByRole('button').click();
     await expect(alertMsg).toBeHidden();