Skip to content

armgit / zed

Public Imported from GitHub
0

Code at the speed of thought – Zed is a high-performance, multiplayer code editor from the creators of Atom and Tree-sitter.

cloud_api_types: Preserve organization UI permissions (#65699)

Tom Houlédf1ce4fee3f6
diff --git a/crates/client/src/user.rs b/crates/client/src/user.rs
index 3513bd59611..feaeeaf9446 100644
--- a/crates/client/src/user.rs
+++ b/crates/client/src/user.rs
@@ -1139,6 +1139,7 @@ mod tests {
id: OrganizationId(id.into()),
name: id.into(),
is_personal,
+ ui_permissions: Default::default(),
};
assert!(!user_store.read_with(cx, |store, _| {
diff --git a/crates/cloud_api_types/src/cloud_api_types.rs b/crates/cloud_api_types/src/cloud_api_types.rs
index b02f5756cce..b09fd22e548 100644
--- a/crates/cloud_api_types/src/cloud_api_types.rs
+++ b/crates/cloud_api_types/src/cloud_api_types.rs
@@ -56,6 +56,14 @@ pub struct Organization {
pub id: OrganizationId,
pub name: Arc<str>,
pub is_personal: bool,
+ #[serde(default)]
+ pub ui_permissions: OrganizationUiPermissions,
+}
+
+#[derive(Debug, Default, PartialEq, Serialize, Deserialize)]
+pub struct OrganizationUiPermissions {
+ #[serde(default)]
+ pub can_install_github_app: bool,
}
#[derive(Debug, PartialEq, Serialize, Deserialize)]
diff --git a/crates/edit_prediction/src/edit_prediction_tests.rs b/crates/edit_prediction/src/edit_prediction_tests.rs
index 2d05d04f85a..4c2250a527c 100644
--- a/crates/edit_prediction/src/edit_prediction_tests.rs
+++ b/crates/edit_prediction/src/edit_prediction_tests.rs
@@ -2254,6 +2254,7 @@ async fn test_zed_cloud_predictions_skip_organizations_without_subscriptions(
id: OrganizationId(id.into()),
name: id.into(),
is_personal: false,
+ ui_permissions: Default::default(),
};
let mut authenticated_user = make_get_authenticated_user_response(1, "user".into());
authenticated_user.organizations = vec![organization("unsubscribed"), organization("paid")];
@@ -3060,6 +3061,7 @@ fn set_test_organization(user_store: &Entity<UserStore>, cx: &mut TestAppContext
id: OrganizationId("org_1".into()),
name: "Organization 1".into(),
is_personal: false,
+ ui_permissions: Default::default(),
}),
OrganizationConfiguration {
is_zed_model_provider_enabled: true,
@@ -4917,6 +4919,7 @@ async fn test_data_collection_disabled_by_organization_configuration(cx: &mut Te
id: OrganizationId("org-1".into()),
name: "Org 1".into(),
is_personal: false,
+ ui_permissions: Default::default(),
}),
OrganizationConfiguration {
is_zed_model_provider_enabled: true,