Merge remote-tracking branch 'origin/main' into export-feature

brimdata · Jan 26, 2024 · 892e786 · 892e786
2 parents c698a71 + 7dd553b
commit 892e786
Show file tree

Hide file tree

Showing 6 changed files with 14 additions and 26 deletions.
diff --git a/apps/zui/package.json b/apps/zui/package.json
@@ -154,7 +154,7 @@
     "use-resize-observer": "^8.0.0",
     "web-file-polyfill": "^1.0.4",
     "web-streams-polyfill": "^3.2.0",
-    "zed": "brimdata/zed#9e952f367d23888777f078784c4dd0a28e188b91",
+    "zed": "brimdata/zed#828a2dd89298d6b1846e51f89b79dccab94f8545",
     "zui-test-data": "workspace:*"
   },
   "peerDependencies": {

diff --git a/apps/zui/src/domain/loads/operations/create.ts b/apps/zui/src/domain/loads/operations/create.ts
@@ -15,7 +15,8 @@ export const submit = createOperation(
     const pool = await createPool(data)
     const script = new ZedScript(data.shaper || "")
     // Async so that we can return this and subscribe to updates on the load.
-    const promise = zui.pools
+    // Do not wait for the load to finish in this operation.
+    zui.pools
       .load({
         windowId: data.windowId,
         format: data.format,
@@ -36,8 +37,6 @@ export const submit = createOperation(
       })
 
     zui.window.openTab(poolPath(pool.id))
-
-    return promise
   }
 )
 

diff --git a/packages/zui-player/tests/bad-pcap.spec.ts b/packages/zui-player/tests/bad-pcap.spec.ts
diff --git a/packages/zui-player/tests/packets.spec.ts b/packages/zui-player/tests/packets.spec.ts
@@ -7,8 +7,8 @@ import { isCI } from '../helpers/env';
 play('packets.spec', (app, test) => {
   test('dropping a pcap does not pop up preview and load', async () => {
     if (isCI()) {
-      test.setTimeout(120000);
-      app.page.setDefaultTimeout(120000);
+      test.setTimeout(2 * 60_000);
+      app.page.setDefaultTimeout(2 * 60_000);
     }
     await app.dropFile(getPath('sample.pcap'));
     await app.attached(/Successfully loaded into sample.pcap/);
@@ -23,12 +23,13 @@ play('packets.spec', (app, test) => {
     await app.attached(/Packets extracted. Opening.../);
   });
 
-  test('loading a bad pcap displays an error message', async () => {
+  test('loading a bad (Wireshark-unreadable) pcap displays an error message', async () => {
     if (isCI()) {
-      test.setTimeout(120000);
-      app.page.setDefaultTimeout(120000);
+      test.setTimeout(2 * 60_000);
+      app.page.setDefaultTimeout(2 * 60_000);
     }
     await app.dropFile(getPath('bad.pcapng'));
-    await app.attached(/Unable to generate full summary logs from PCAP/);
+    await app.attached(/with 1 error/);
   });
+
 });
diff --git a/packages/zui-test-data/data/vanspy.pcapng b/packages/zui-test-data/data/vanspy.pcapng
diff --git a/yarn.lock b/yarn.lock
@@ -19093,10 +19093,10 @@ __metadata:
   languageName: node
   linkType: hard
 
-"zed@brimdata/zed#9e952f367d23888777f078784c4dd0a28e188b91":
+"zed@brimdata/zed#828a2dd89298d6b1846e51f89b79dccab94f8545":
   version: 0.33.0-dev
-  resolution: "zed@https://github.com/brimdata/zed.git#commit=9e952f367d23888777f078784c4dd0a28e188b91"
-  checksum: cf05411539ce572624891e667b933e63f6637eeea8288ac385083898a4f27681497a2e52d3cc2898916ba66ee187798c624e72b8df20f013538b8ab7c552bb6a
+  resolution: "zed@https://github.com/brimdata/zed.git#commit=828a2dd89298d6b1846e51f89b79dccab94f8545"
+  checksum: f338227ff8bc04e4d2a67f19cad0b6fc9039e082e2d38dc8668a5d4a827757d961ac82debb230bd3f4dde304bc5942028e78d6dfeadd3a02fe6786d593ba9336
   languageName: node
   linkType: hard
 
@@ -19290,7 +19290,7 @@ __metadata:
     use-resize-observer: ^8.0.0
     web-file-polyfill: ^1.0.4
     web-streams-polyfill: ^3.2.0
-    zed: "brimdata/zed#9e952f367d23888777f078784c4dd0a28e188b91"
+    zed: "brimdata/zed#828a2dd89298d6b1846e51f89b79dccab94f8545"
     zui-test-data: "workspace:*"
   peerDependencies:
     react: ^18.0.0