Code at the speed of thought – Zed is a high-performance, multiplayer code editor from the creators of Atom and Tree-sitter.
client: Use cloud as source of truth for the selected organization (#57140)
Tom Houlé5656f3eb3f43
diff --git a/Cargo.lock b/Cargo.lockindex 877ae7160ff..bfecd88f452 100644--- a/Cargo.lock+++ b/Cargo.lock@@ -3006,7 +3006,6 @@ dependencies = ["cloud_llm_client","collections","credentials_provider",- "db","derive_more","feature_flags","fs",diff --git a/crates/client/Cargo.toml b/crates/client/Cargo.tomlindex 0a3c49d1237..91c35a15bb6 100644--- a/crates/client/Cargo.toml+++ b/crates/client/Cargo.toml@@ -27,7 +27,6 @@ cloud_api_types.workspace = truecloud_llm_client.workspace = truecollections.workspace = truecredentials_provider.workspace = true-db.workspace = truederive_more.workspace = truefeature_flags.workspace = truefs.workspace = truediff --git a/crates/client/src/user.rs b/crates/client/src/user.rsindex 6d3f0efe85e..c05518cdbac 100644--- a/crates/client/src/user.rs+++ b/crates/client/src/user.rs@@ -4,19 +4,19 @@ use chrono::{DateTime, Utc};use cloud_api_client::websocket_protocol::MessageToClient;use cloud_api_client::{GetAuthenticatedUserResponse, KnownOrUnknown, Organization, OrganizationId, Plan, PlanInfo,+ UpdateSystemSettingsBody,};use cloud_api_types::OrganizationConfiguration;use cloud_llm_client::{EDIT_PREDICTIONS_USAGE_AMOUNT_HEADER_NAME, EDIT_PREDICTIONS_USAGE_LIMIT_HEADER_NAME, UsageLimit,};use collections::{HashMap, HashSet, hash_map::Entry};-use db::kvp::KeyValueStore;use derive_more::Deref;use feature_flags::FeatureFlagAppExt;use futures::{Future, StreamExt, channel::mpsc};use gpui::{- App, AsyncApp, Context, Entity, EventEmitter, SharedString, SharedUri, Task, TaskExt,- WeakEntity,+ App, AppContext as _, AsyncApp, Context, Entity, EventEmitter, SharedString, SharedUri, Task,+ TaskExt, WeakEntity,};use http_client::http::{HeaderMap, HeaderValue};use postage::{sink::Sink, watch};@@ -28,8 +28,6 @@ use std::{use text::ReplicaId;use util::{ResultExt, TryFutureExt as _};-const CURRENT_ORGANIZATION_ID_KEY: &str = "current_organization_id";-pub type LegacyUserId = u64;#[derive(@@ -708,24 +706,41 @@ impl UserStore {&mut self,organization: Arc<Organization>,cx: &mut Context<Self>,- ) {+ ) -> Task<Result<()>> {let is_same_organization = self.current_organization.as_ref().is_some_and(|current| current.id == organization.id);- if !is_same_organization {- let organization_id = organization.id.0.to_string();- self.current_organization.replace(organization);- cx.emit(Event::OrganizationChanged);- cx.notify();-- let kvp = KeyValueStore::global(cx);- db::write_and_log(cx, move || async move {- kvp.write_kvp(CURRENT_ORGANIZATION_ID_KEY.into(), organization_id)- .await- });+ if is_same_organization {+ return Task::ready(Ok(()));}++ let organization_id = organization.id.clone();+ self.current_organization.replace(organization);+ cx.emit(Event::OrganizationChanged);+ cx.notify();++ let Some(client) = self.client.upgrade() else {+ return Task::ready(Ok(()));+ };+ let Some(system_id) = client.telemetry().system_id().map(|id| id.to_string()) else {+ // Without a system ID we have no addressable target row on the+ // server, so the selection stays purely session-local.+ return Task::ready(Ok(()));+ };+ let cloud_client = client.cloud_client();++ cx.background_spawn(async move {+ let body = UpdateSystemSettingsBody {+ selected_organization_id: Some(organization_id),+ };+ cloud_client+ .update_system_settings(system_id, body)+ .await+ .context("failed to persist selected organization")?;+ Ok(())+ })}pub fn organizations(&self) -> &Vec<Arc<Organization>> {@@ -861,29 +876,15 @@ impl UserStore {}self.organizations = response.organizations.into_iter().map(Arc::new).collect();- let persisted_org_id = KeyValueStore::global(cx)- .read_kvp(CURRENT_ORGANIZATION_ID_KEY)- .log_err()- .flatten()- .map(|id| OrganizationId(Arc::from(id)));-- self.current_organization = persisted_org_id- .and_then(|persisted_id| {++ self.current_organization = response+ .default_organization_id+ .and_then(|default_organization_id| {self.organizations.iter()- .find(|org| org.id == persisted_id)+ .find(|organization| organization.id == default_organization_id).cloned()})- .or_else(|| {- response- .default_organization_id- .and_then(|default_organization_id| {- self.organizations- .iter()- .find(|organization| organization.id == default_organization_id)- .cloned()- })- }).or_else(|| self.organizations.first().cloned());self.plans_by_organization = response.plans_by_organizationdiff --git a/crates/title_bar/src/title_bar.rs b/crates/title_bar/src/title_bar.rsindex 62d11beec30..b2f2b4f436d 100644--- a/crates/title_bar/src/title_bar.rs+++ b/crates/title_bar/src/title_bar.rs@@ -51,7 +51,8 @@ use ui::{use update_version::UpdateVersion;use util::ResultExt;use workspace::{- MultiWorkspace, ToggleWorktreeSecurity, Workspace, notifications::NotifyResultExt,+ MultiWorkspace, ToggleWorktreeSecurity, Workspace,+ notifications::{NotifyResultExt, NotifyTaskExt as _},};use zed_actions::OpenRemote;@@ -1159,6 +1160,7 @@ impl TitleBar {let show_update_button = self.update_version.read(cx).show_update_in_menu_bar();let user_store = self.user_store.clone();+ let workspace = self.workspace.clone();let user_store_read = user_store.read(cx);let user = user_store_read.current_user();@@ -1225,6 +1227,7 @@ impl TitleBar {let current_organization = current_organization.clone();let organizations = organizations.clone();let user_store = user_store.clone();+ let workspace = workspace.clone();let ai_enabled = !project::DisableAiSettings::get_global(cx).disable_ai;let current_layout = AgentSettings::get_layout(cx);@@ -1316,11 +1319,13 @@ impl TitleBar {{let user_store = user_store.clone();let organization = organization.clone();- move |_window, cx| {- user_store.update(cx, |user_store, cx| {+ let workspace = workspace.clone();+ move |window, cx| {+ let task = user_store.update(cx, |user_store, cx| {user_store- .set_current_organization(organization.clone(), cx);+ .set_current_organization(organization.clone(), cx)});+ task.detach_and_notify_err(workspace.clone(), window, cx);}},);