fix batch operation query bug (#1840)

* fix batch operation query bug * add integration test * remove uncecessary step
temporalio · Jan 31, 2024 · 0c30139 · 0c30139
1 parent 563937c
commit 0c30139
Show file tree

Hide file tree

Showing 2 changed files with 36 additions and 11 deletions.
diff --git a/src/lib/pages/workflows-with-new-search.svelte b/src/lib/pages/workflows-with-new-search.svelte
@@ -82,18 +82,13 @@
   import { toListWorkflowFilters } from '$lib/utilities/query/to-list-workflow-filters';
 
   $: query = $page.url.searchParams.get('query');
-  $: query && ($workflowsQuery = query);
+  $: query, ($workflowsQuery = query);
+  $: batchOperationQuery = $workflowsQuery ?? 'ExecutionStatus="Running"';
 
   // For returning to page from 'Back to Workflows' with previous search
   $: searchParams = $page.url.searchParams.toString();
   $: searchParams, ($workflowsSearchParams = searchParams);
 
-  $: {
-    if (!$workflowFilters.length) {
-      $workflowsQuery = '';
-    }
-  }
-
   onMount(() => {
     $lastUsedNamespace = $page.params.namespace;
     if (query) {
@@ -158,10 +153,6 @@
     }
   };
 
-  $: batchOperationQuery = !$workflowsQuery
-    ? 'ExecutionStatus="Running"'
-    : $workflowsQuery;
-
   $: {
     if ($updating) {
       resetSelection();

diff --git a/tests/integration/workflow-bulk-actions.spec.ts b/tests/integration/workflow-bulk-actions.spec.ts
@@ -93,5 +93,39 @@ test.describe('Batch and Bulk Workflow Actions', () => {
         .click();
       await expect(page.locator('#batch-cancel-success-toast')).toBeVisible();
     });
+
+    test('works when visiting a URL directly that has an existing query in it', async ({
+      page,
+    }) => {
+      await page.goto(
+        '/namespaces/default/workflows?query=WorkflowId%3D"test"',
+      );
+
+      await waitForWorkflowsApis(page);
+
+      await page.getByTestId('batch-actions-checkbox').click();
+      await page.getByTestId('select-all-workflows').click();
+      await page.getByTestId('bulk-cancel-button').click();
+
+      const cancelQueryValue = await page
+        .getByTestId('batch-Cancel-confirmation')
+        .getByTestId('batch-action-workflows-query')
+        .innerText();
+
+      expect(cancelQueryValue).toBe('WorkflowId="test"');
+
+      await page
+        .getByTestId('batch-Cancel-confirmation')
+        .getByLabel('Cancel')
+        .click();
+      await page.getByTestId('bulk-terminate-button').click();
+
+      const terminateQueryValue = await page
+        .getByTestId('batch-Terminate-confirmation')
+        .getByTestId('batch-action-workflows-query')
+        .innerText();
+
+      expect(terminateQueryValue).toBe('WorkflowId="test"');
+    });
   });
 });