Merge pull request #38 from datum-cloud/feat/ui-org-project

feat: add org/project selection flow and selected context plumbing

Author: zachsmith1

Cargo.lock

@@ -39,6 +39,7 @@ tokio-util = "0.7.10"
 tower = "0.5"
 tracing = "0.1.40"
 tracing-subscriber = { version = "0.3.20", features = ["env-filter"] }
+tracing-appender = "0.2"
 data-encoding = "2.9.0"
 n0-error = { version = "0.1", features = ["anyhow"] }
 n0-future = "0.3"

Cargo.toml

@@ -170,6 +170,7 @@ pub struct Organization {
     pub r#type: String,
 }
 
+#[derive(Debug, Clone)]
 pub struct OrganizationWithProjects {
     pub org: Organization,
     pub projects: Vec<Project>,

lib/src/datum_cloud.rs

@@ -24,8 +24,8 @@ use tracing::{Instrument, debug, error, error_span, info, instrument, warn};
 use ttl_cache::TtlCache;
 
 use crate::{
-    Advertisment, ProxyState, Repo, StateWrapper, TcpProxyData, config::Config,
-    state::AdvertismentTicket,
+    Advertisment, ProxyState, Repo, SelectedContext, StateWrapper, TcpProxyData, config::Config,
+    datum_cloud::DatumCloudClient, state::AdvertismentTicket,
 };
 
 const TICKET_TTL: Duration = Duration::from_secs(30);
@@ -135,6 +135,55 @@ impl ListenNode {
         self.state.get().proxies.iter().cloned().collect()
     }
 
+    pub fn selected_context(&self) -> Option<SelectedContext> {
+        self.state.get().selected_context.clone()
+    }
+
+    pub async fn set_selected_context(
+        &self,
+        selected_context: Option<SelectedContext>,
+    ) -> Result<()> {
+        info!(
+            selected = %selected_context
+                .as_ref()
+                .map_or("<none>".to_string(), SelectedContext::label),
+            "node: updating selected context"
+        );
+        self.state
+            .update(&self.repo, |state| {
+                state.selected_context = selected_context;
+            })
+            .await?;
+        Ok(())
+    }
+
+    pub async fn validate_selected_context(
+        &self,
+        datum: &DatumCloudClient,
+    ) -> Result<Option<SelectedContext>> {
+        let selected = self.selected_context();
+        let Some(selected) = selected else {
+            return Ok(None);
+        };
+
+        let orgs = datum.orgs_and_projects().await?;
+        let is_valid = orgs.iter().any(|org| {
+            if org.org.resource_id != selected.org_id {
+                return false;
+            }
+            org.projects
+                .iter()
+                .any(|project| project.resource_id == selected.project_id)
+        });
+
+        if is_valid {
+            Ok(Some(selected))
+        } else {
+            self.set_selected_context(None).await?;
+            Ok(None)
+        }
+    }
+
     pub fn proxy_by_id(&self, id: &str) -> Option<ProxyState> {
         self.state
             .get()

lib/src/node.rs

@@ -15,6 +15,8 @@ use crate::{DATUM_CONNECT_GATEWAY_DOMAIN_NAME, Repo};
 #[derive(Debug, Default, Serialize, Deserialize, Clone)]
 pub struct State {
     pub proxies: Vec<ProxyState>,
+    #[serde(default)]
+    pub selected_context: Option<SelectedContext>,
 }
 
 impl State {
@@ -43,6 +45,20 @@ impl State {
     }
 }
 
+#[derive(Debug, Serialize, Deserialize, Clone, Eq, PartialEq)]
+pub struct SelectedContext {
+    pub org_id: String,
+    pub org_name: String,
+    pub project_id: String,
+    pub project_name: String,
+}
+
+impl SelectedContext {
+    pub fn label(&self) -> String {
+        format!("{} / {}", self.org_name, self.project_name)
+    }
+}
+
 #[derive(Debug, Clone)]
 pub struct StateWrapper {
     inner: Arc<ArcSwap<State>>,

lib/src/state.rs

@@ -27,6 +27,7 @@ tokio.workspace = true
 tokio-util.workspace = true
 tracing.workspace = true
 tracing-subscriber.workspace = true
+tracing-appender.workspace = true
 data-encoding.workspace = true
 uuid.workspace = true
 n0-error.workspace = true

ui/Cargo.toml

@@ -7,12 +7,14 @@ mod hero;
 mod bandwidth_timeseries_chart;
 mod button;
 mod head;
+mod select_dropdown;
 mod splash;
 mod typography;
 
 pub use button::Button;
 pub use button::ButtonKind;
 pub use head::Head;
+pub use select_dropdown::{SelectDropdown, SelectItem};
 pub use splash::Splash;
 #[allow(unused)]
 pub use typography::Subhead;