Merge branch 'main' of https://github.com/Azure/LogicAppsUX into ccas…

…trotrejo/fixError
Azure · Jan 23, 2025 · 7362c99 · 7362c99
2 parents 854c61c + 0ec40fd
commit 7362c99
Show file tree

Hide file tree

Showing 2 changed files with 23 additions and 0 deletions.
diff --git a/e2e/designer/editors/condition.spec.ts b/e2e/designer/editors/condition.spec.ts
@@ -0,0 +1,22 @@
+import { test, expect } from '@playwright/test';
+import { GoToMockWorkflow } from '../utils/GoToWorkflow';
+
+test(
+  'condition editor',
+  {
+    tag: '@mock',
+  },
+  async ({ page }) => {
+    await page.goto('/');
+
+    await GoToMockWorkflow(page, 'Conditionals');
+    await expect(page.getByLabel('Condition operation')).toBeVisible();
+
+    await page.getByLabel('Condition operation').click();
+
+    await page.getByText('OR', { exact: true }).click();
+    await page.getByRole('option', { name: 'AND' }).click();
+
+    await expect(page.getByRole('alert')).toContainText('Enter a valid condition statement.');
+  }
+);
diff --git a/libs/designer/src/lib/ui/CustomNodes/ScopeCardNode.tsx b/libs/designer/src/lib/ui/CustomNodes/ScopeCardNode.tsx
@@ -99,6 +99,7 @@ const ScopeCardNode = ({ data, targetPosition = Position.Top, sourcePosition = P
       return data;
     },
     {
+      initialData: null,
       refetchOnWindowFocus: false,
       refetchOnReconnect: false,
       refetchOnMount: false,