From 9d05577b3f517c4c5fe2e06fda78557c273ac2d0 Mon Sep 17 00:00:00 2001 From: CodingDoll <34712920+CodingDoll@users.noreply.github.com> Date: Wed, 7 Jan 2026 00:35:26 +0800 Subject: [PATCH] auto_update_ui: Add error fallback for viewing release notes locally (#45900) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Closes https://github.com/zed-industries/zed/issues/42140 Changes: - Add show_view_release_notes_locally_error to prompt users when the operation fails. image Release Notes: - Added a notification with a link to view release notes online when Zed can’t load them locally. --------- Co-authored-by: Smit Barmase --- Cargo.lock | 1 - crates/auto_update/src/auto_update.rs | 26 +++++------ crates/auto_update_ui/Cargo.toml | 1 - crates/auto_update_ui/src/auto_update_ui.rs | 48 ++++++++++++++++----- 4 files changed, 52 insertions(+), 24 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index fce1b6b44a1b67e48f4c49456a933680b27972e5..f0cd1201db2d8d9631c0fc6ea985f923b0636bee 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1400,7 +1400,6 @@ dependencies = [ "client", "editor", "gpui", - "http_client", "markdown_preview", "release_channel", "semver", diff --git a/crates/auto_update/src/auto_update.rs b/crates/auto_update/src/auto_update.rs index 0c122717d7a377e5aa5e8d23cab4de435bd67e33..d9758109a57d3853d008d5a9c03d716fe3cc5e2c 100644 --- a/crates/auto_update/src/auto_update.rs +++ b/crates/auto_update/src/auto_update.rs @@ -250,26 +250,28 @@ pub fn check(_: &Check, window: &mut Window, cx: &mut App) { } } -pub fn view_release_notes(_: &ViewReleaseNotes, cx: &mut App) -> Option<()> { - let auto_updater = AutoUpdater::get(cx)?; +pub fn release_notes_url(cx: &mut App) -> Option { let release_channel = ReleaseChannel::try_global(cx)?; - - match release_channel { + let url = match release_channel { ReleaseChannel::Stable | ReleaseChannel::Preview => { + let auto_updater = AutoUpdater::get(cx)?; let auto_updater = auto_updater.read(cx); - let current_version = auto_updater.current_version.clone(); + let current_version = &auto_updater.current_version; let release_channel = release_channel.dev_name(); let path = format!("/releases/{release_channel}/{current_version}"); - let url = &auto_updater.client.http_client().build_url(&path); - cx.open_url(url); + auto_updater.client.http_client().build_url(&path) } ReleaseChannel::Nightly => { - cx.open_url("https://github.com/zed-industries/zed/commits/nightly/"); + "https://github.com/zed-industries/zed/commits/nightly/".to_string() } - ReleaseChannel::Dev => { - cx.open_url("https://github.com/zed-industries/zed/commits/main/"); - } - } + ReleaseChannel::Dev => "https://github.com/zed-industries/zed/commits/main/".to_string(), + }; + Some(url) +} + +pub fn view_release_notes(_: &ViewReleaseNotes, cx: &mut App) -> Option<()> { + let url = release_notes_url(cx)?; + cx.open_url(&url); None } diff --git a/crates/auto_update_ui/Cargo.toml b/crates/auto_update_ui/Cargo.toml index 2b1421e35dcbcf6fac40cd0e97a3dc839da58d9e..847ea1d441c3e1c5ef30817a964dd113e5d97e42 100644 --- a/crates/auto_update_ui/Cargo.toml +++ b/crates/auto_update_ui/Cargo.toml @@ -17,7 +17,6 @@ auto_update.workspace = true client.workspace = true editor.workspace = true gpui.workspace = true -http_client.workspace = true markdown_preview.workspace = true release_channel.workspace = true semver.workspace = true diff --git a/crates/auto_update_ui/src/auto_update_ui.rs b/crates/auto_update_ui/src/auto_update_ui.rs index 6c32ee3b6c9b9c4974a287ff0e9a988472cecf3b..210951904c733c476582d879f435e4e74e03d15b 100644 --- a/crates/auto_update_ui/src/auto_update_ui.rs +++ b/crates/auto_update_ui/src/auto_update_ui.rs @@ -1,13 +1,13 @@ -use auto_update::AutoUpdater; +use auto_update::{AutoUpdater, release_notes_url}; use editor::{Editor, MultiBuffer}; use gpui::{App, Context, DismissEvent, Entity, Window, actions, prelude::*}; -use http_client::HttpClient; use markdown_preview::markdown_preview_view::{MarkdownPreviewMode, MarkdownPreviewView}; use release_channel::{AppVersion, ReleaseChannel}; use serde::Deserialize; use smol::io::AsyncReadExt; use util::ResultExt as _; use workspace::Workspace; +use workspace::notifications::ErrorMessagePrompt; use workspace::notifications::simple_message_notification::MessageNotification; use workspace::notifications::{NotificationId, show_app_notification}; @@ -39,6 +39,28 @@ struct ReleaseNotesBody { release_notes: String, } +fn notify_release_notes_failed_to_show_locally( + workspace: &mut Workspace, + _window: &mut Window, + cx: &mut Context, +) { + struct ViewReleaseNotesLocallyError; + workspace.show_notification( + NotificationId::unique::(), + cx, + |cx| { + cx.new(move |cx| { + let url = release_notes_url(cx); + let mut prompt = ErrorMessagePrompt::new("Couldn't load release notes", cx); + if let Some(url) = url { + prompt = prompt.with_link_button("View in Browser".to_string(), url); + } + prompt + }) + }, + ); +} + fn view_release_notes_locally( workspace: &mut Workspace, window: &mut Window, @@ -46,14 +68,13 @@ fn view_release_notes_locally( ) { let release_channel = ReleaseChannel::global(cx); - let url = match release_channel { - ReleaseChannel::Nightly => Some("https://github.com/zed-industries/zed/commits/nightly/"), - ReleaseChannel::Dev => Some("https://github.com/zed-industries/zed/commits/main/"), - _ => None, - }; - - if let Some(url) = url { - cx.open_url(url); + if matches!( + release_channel, + ReleaseChannel::Nightly | ReleaseChannel::Dev + ) { + if let Some(url) = release_notes_url(cx) { + cx.open_url(&url); + } return; } @@ -77,6 +98,9 @@ fn view_release_notes_locally( let markdown = markdown.await.log_err(); let response = client.get(&url, Default::default(), true).await; let Some(mut response) = response.log_err() else { + workspace + .update_in(cx, notify_release_notes_failed_to_show_locally) + .log_err(); return; }; @@ -123,6 +147,10 @@ fn view_release_notes_locally( cx.notify(); }) .log_err(); + } else { + workspace + .update_in(cx, notify_release_notes_failed_to_show_locally) + .log_err(); } }) .detach();