From 436d4b82380e7d8ffe54c2e940a1650437759ba0 Mon Sep 17 00:00:00 2001
From: Phil Rzewski <phil@brimdata.io>
Date: Mon, 23 Sep 2024 18:52:16 +0000
Subject: [PATCH] Update zed and brimcap to v1.18.0 and prep Zui v1.18.0
 (#3156)

https://github.com/brimdata/zui/compare/v1.17.0...bd95fbb
---
 apps/zui/CHANGELOG.md |  9 +++++++++
 apps/zui/package.json |  6 +++---
 yarn.lock             | 16 ++++++++--------
 3 files changed, 20 insertions(+), 11 deletions(-)

diff --git a/apps/zui/CHANGELOG.md b/apps/zui/CHANGELOG.md
index 4af7489b4..9da2217f8 100644
--- a/apps/zui/CHANGELOG.md
+++ b/apps/zui/CHANGELOG.md
@@ -1,3 +1,12 @@
+## v1.18.0
+- Update Zed to [v1.18.0](https://github.com/brimdata/zed/releases/tag/v1.18.0)
+- Update Brimcap to [v1.18.0](https://github.com/brimdata/brimcap/releases/tag/v1.18.0), which includes a new Zeek [v7.0.0-brim1](https://github.com/brimdata/build-zeek/releases/tag/v7.0.0-brim1)
+- Introduce the **Sessions** tab in the left panel to persist Query Session histories (#3132)
+- Update [time display](https://zui.brimdata.io/docs/features/Time-Display) functionality to support local time zones and [strftime directives](https://github.com/samsonjs/strftime?tab=readme-ov-file#supported-specifiers) (#3139)
+- Fix an issue where the Zui window could not be dragged when **Preview & Load** was open (#3146)
+- Fix a crash that would occur when attempting to create a pool with the same name as an existing pool (#3147)
+- Fix an issue where top-level primitive Zed values were incorrectly wrapped in records in the Table view (#3145, #3150)
+
 ## v1.17.0
 - Because Zui is dependent on the [Zed project](https://zed.brimdata.io/), GA Zui release major/minor version numbers are now synchronized to the corresponding [Zed release](https://github.com/brimdata/zed/releases)
 - Update Zed to [v1.17.0](https://github.com/brimdata/zed/releases/tag/v1.17.0)
diff --git a/apps/zui/package.json b/apps/zui/package.json
index 916b9d432..e27df092c 100644
--- a/apps/zui/package.json
+++ b/apps/zui/package.json
@@ -5,7 +5,7 @@
   "description": "Zed User Interface",
   "repository": "https://github.com/brimdata/zui",
   "license": "BSD-3-Clause",
-  "version": "1.17.0",
+  "version": "1.18.0",
   "main": "dist/main.js",
   "author": "Brim Data <support@brimdata.io> (http://www.brimdata.io)",
   "lake": {
@@ -74,7 +74,7 @@
     "acorn": "^7.4.1",
     "ajv": "^6.9.1",
     "animejs": "^3.2.0",
-    "brimcap": "brimdata/brimcap#0c3a564771dd204e9ce93e4600de2dbcf97bd446",
+    "brimcap": "brimdata/brimcap#v1.18.0",
     "bullet": "^0.0.2",
     "chalk": "^4.1.0",
     "chevrotain": "^10.5.0",
@@ -159,7 +159,7 @@
     "utopia-core-scss": "^1.0.1",
     "web-file-polyfill": "^1.0.4",
     "web-streams-polyfill": "^3.2.0",
-    "zed": "brimdata/zed#c1da204ac083642ef4b6aa1bec7e8565eb678730",
+    "zed": "brimdata/zed#v1.18.0",
     "zui-test-data": "workspace:*"
   },
   "peerDependencies": {
diff --git a/yarn.lock b/yarn.lock
index a71686018..132371929 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -7000,12 +7000,12 @@ __metadata:
   languageName: node
   linkType: hard
 
-"brimcap@brimdata/brimcap#0c3a564771dd204e9ce93e4600de2dbcf97bd446":
+"brimcap@brimdata/brimcap#v1.18.0":
   version: 1.1.2
-  resolution: "brimcap@https://github.com/brimdata/brimcap.git#commit=0c3a564771dd204e9ce93e4600de2dbcf97bd446"
+  resolution: "brimcap@https://github.com/brimdata/brimcap.git#commit=d56a90061787dbf55f2aa447bfb642dfce0a61bb"
   bin:
     brimcap: build/dist/brimcap
-  checksum: 3c0f096477a146d7f5e1de82380e32c8c747decae0f9f37ccf2348c6fac54163190c018cecf2670cf82dea63ca3dffa7d7878e136a3bc7812495e89f762e2ec5
+  checksum: 7ca008f65923b0b2d5f1356c7a16a0651a0619a15fb98516f7e53cae914326f252d80e660ff6046d738b5ed602f7d0c217daf6c7d8b490a83b9cc02e1a9457da
   languageName: node
   linkType: hard
 
@@ -18600,10 +18600,10 @@ __metadata:
   languageName: node
   linkType: hard
 
-"zed@brimdata/zed#c1da204ac083642ef4b6aa1bec7e8565eb678730":
+"zed@brimdata/zed#v1.18.0":
   version: 0.33.0-dev
-  resolution: "zed@https://github.com/brimdata/zed.git#commit=c1da204ac083642ef4b6aa1bec7e8565eb678730"
-  checksum: 16a5e5eec014e8b0794b1097f47d2c3cbd1cf586b8681ae966c6f032c5d090464389f8bb47729967f125e5b67b6b2f4a6b89992e70cba84a4fa123ccc7c6dca4
+  resolution: "zed@https://github.com/brimdata/zed.git#commit=6ba8ef507c64f36a73aac4bc6ffccd4f7c80caf7"
+  checksum: 04f52f7663444f370ea958a19c9cd0d7249cfb831558b69591f6e7935f82bd4d7e2b10856638ac2388f219f875acd27e6ec956732a87b68434e9986b429e9ca3
   languageName: node
   linkType: hard
 
@@ -18715,7 +18715,7 @@ __metadata:
     acorn: ^7.4.1
     ajv: ^6.9.1
     animejs: ^3.2.0
-    brimcap: "brimdata/brimcap#0c3a564771dd204e9ce93e4600de2dbcf97bd446"
+    brimcap: "brimdata/brimcap#v1.18.0"
     bullet: ^0.0.2
     chalk: ^4.1.0
     chevrotain: ^10.5.0
@@ -18802,7 +18802,7 @@ __metadata:
     utopia-core-scss: ^1.0.1
     web-file-polyfill: ^1.0.4
     web-streams-polyfill: ^3.2.0
-    zed: "brimdata/zed#c1da204ac083642ef4b6aa1bec7e8565eb678730"
+    zed: "brimdata/zed#v1.18.0"
     zui-test-data: "workspace:*"
   peerDependencies:
     react: ^18.0.0