Merge pull request #148 from rambit-systems/push-qplwulqykytp

Incremental UI Push #28

Author: johnbchron

crates/models/src/org.rs

@@ -1,6 +1,6 @@
 use std::fmt;
 
-use dvf::{EitherSlug, RecordId};
+use dvf::{EitherSlug, RecordId, StrictSlug};
 use model::{Model, SlugFieldGetter};
 use serde::{Deserialize, Serialize};
 
@@ -18,12 +18,7 @@ pub struct Org {
 impl Org {
   /// Generates the value of the unique [`Org`] index `ident`.
   pub fn unique_index_ident(&self) -> Vec<EitherSlug> {
-    match self.org_ident {
-      OrgIdent::Named(ref entity_name) => {
-        vec![entity_name.clone().into_inner().into()]
-      }
-      OrgIdent::UserOrg(_) => Vec::new(),
-    }
+    vec![self.org_ident.index_value().into()]
   }
 }
 
@@ -83,6 +78,18 @@ pub enum OrgIdent {
   UserOrg(RecordId<User>),
 }
 
+impl OrgIdent {
+  /// Calculates the unique index value for this org ident.
+  pub fn index_value(&self) -> StrictSlug {
+    match self {
+      OrgIdent::Named(entity_name) => {
+        StrictSlug::new(format!("named-{}", entity_name))
+      }
+      OrgIdent::UserOrg(u) => StrictSlug::new(format!("user-{}", u)),
+    }
+  }
+}
+
 impl Model for Org {
   type IndexSelector = !;
   type UniqueIndexSelector = OrgUniqueIndexSelector;

crates/prime-domain/src/create.rs

@@ -46,4 +46,19 @@ impl PrimeDomainService {
       .await
       .map(|s| s.id)
   }
+
+  /// Creates an [`Org`].
+  pub async fn create_org(
+    &self,
+    name: EntityName,
+  ) -> Result<RecordId<Org>, CreateModelError> {
+    self
+      .org_repo
+      .create_model(Org {
+        id:        RecordId::new(),
+        org_ident: models::OrgIdent::Named(name),
+      })
+      .await
+      .map(|s| s.id)
+  }
 }

crates/prime-domain/src/fetch_by_name.rs

@@ -1,6 +1,7 @@
 use db::{FetchModelByIndexError, kv::LaxSlug};
 use models::{
-  Cache, CacheUniqueIndexSelector, Org, Store, StoreUniqueIndexSelector,
+  Cache, CacheUniqueIndexSelector, Org, OrgIdent, OrgUniqueIndexSelector,
+  Store, StoreUniqueIndexSelector,
   dvf::{EntityName, RecordId},
 };
 
@@ -35,4 +36,18 @@ impl PrimeDomainService {
       )
       .await
   }
+
+  /// Fetches an [`Org`] by its [`OrgIdent`].
+  pub async fn fetch_org_by_ident(
+    &self,
+    org_ident: OrgIdent,
+  ) -> Result<Option<Org>, FetchModelByIndexError> {
+    self
+      .org_repo
+      .fetch_model_by_unique_index(
+        OrgUniqueIndexSelector::Ident,
+        org_ident.index_value().into(),
+      )
+      .await
+  }
 }

crates/prime-domain/src/lib.rs

@@ -7,6 +7,7 @@ mod fetch_by_id;
 mod fetch_by_name;
 mod fetch_by_org;
 mod migrate;
+pub mod mutate_user;
 pub mod narinfo;
 mod search_by_user;
 pub mod upload;

crates/prime-domain/src/mutate_user.rs

@@ -0,0 +1,74 @@
+//! User mutation logic.
+
+use db::{FetchModelError, PatchModelError};
+use models::{Org, User, dvf::RecordId};
+
+use crate::PrimeDomainService;
+
+/// The error enum for the
+/// [`add_org_to_user`](PrimeDomainService::add_org_to_user).
+#[derive(thiserror::Error, Debug)]
+pub enum AddOrgToUserError {
+  /// The user does not exist.
+  #[error("The given user does not exist: {0}")]
+  UserDoesNotExist(RecordId<User>),
+  /// The org does not exist
+  #[error("The given org does not exist: {0}")]
+  OrgDoesNotExist(RecordId<Org>),
+  /// The org is a personal org, which does not belong to the user.
+  #[error(
+    "The given org is a personal org, to which the user cannot be added: {0}"
+  )]
+  PersonalOrg(RecordId<Org>),
+  /// The action has already been completed.
+  #[error("This action has already been completed")]
+  Idempotency,
+  /// A fetch action failed.
+  #[error("Internal error: failed to fetch model: {0}")]
+  InternalFetchError(FetchModelError),
+  /// A patch action failed.
+  #[error("Internal error: failed to patch model: {0}")]
+  InternalPatchError(PatchModelError),
+}
+
+impl PrimeDomainService {
+  /// Adds an [`Org`] to a [`User`]'s org list.
+  pub async fn add_org_to_user(
+    &self,
+    user: RecordId<User>,
+    org: RecordId<Org>,
+  ) -> Result<(), AddOrgToUserError> {
+    let user = self
+      .fetch_user_by_id(user)
+      .await
+      .map_err(AddOrgToUserError::InternalFetchError)?
+      .ok_or(AddOrgToUserError::UserDoesNotExist(user))?;
+
+    if user.belongs_to_org(org) {
+      return Err(AddOrgToUserError::Idempotency);
+    }
+
+    let org = self
+      .fetch_org_by_id(org)
+      .await
+      .map_err(AddOrgToUserError::InternalFetchError)?
+      .ok_or(AddOrgToUserError::OrgDoesNotExist(org))?;
+
+    if matches!(org.org_ident, models::OrgIdent::UserOrg(_)) {
+      return Err(AddOrgToUserError::PersonalOrg(org.id));
+    }
+
+    let new_user = User {
+      orgs: user.orgs.iter().copied().chain(Some(org.id)).collect(),
+      ..user
+    };
+
+    self
+      .user_repo
+      .patch_model(user.id, new_user)
+      .await
+      .map_err(AddOrgToUserError::InternalPatchError)?;
+
+    Ok(())
+  }
+}

crates/site-app/src/components/icons.rs

@@ -20,6 +20,15 @@ pub fn ArrowPathHeroIcon() -> impl IntoView {
   }
 }
 
+#[component]
+pub fn BuildingOffice2HeroIcon() -> impl IntoView {
+  view! {
+    <svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24">
+      <path stroke-linecap="round" stroke-linejoin="round" d="M2.25 21h19.5m-18-18v18m10.5-18v18m6-13.5V21M6.75 6.75h.75m-.75 3h.75m-.75 3h.75m3-6h.75m-.75 3h.75m-.75 3h.75M6.75 21v-3.375c0-.621.504-1.125 1.125-1.125h2.25c.621 0 1.125.504 1.125 1.125V21M3 3h12m-.75 4.5H21m-3.75 3.75h.008v.008h-.008v-.008Zm0 3h.008v.008h-.008v-.008Zm0 3h.008v.008h-.008v-.008Z" />
+    </svg>
+  }
+}
+
 #[component]
 pub fn CheckHeroIcon() -> impl IntoView {
   view! {

crates/site-app/src/components/input_field/icon.rs

@@ -1,14 +1,15 @@
-use leptos::{either::EitherOf11, prelude::*};
+use leptos::{either::EitherOf12, prelude::*};
 
 use crate::components::{
   icons::LockClosedHeroIcon, ArchiveBoxHeroIcon, ArrowPathHeroIcon,
-  CheckHeroIcon, EnvelopeHeroIcon, EyeHeroIcon, EyeSlashHeroIcon,
-  GlobeAltHeroIcon, KeyHeroIcon, UserHeroIcon, XMarkHeroIcon,
+  BuildingOffice2HeroIcon, CheckHeroIcon, EnvelopeHeroIcon, EyeHeroIcon,
+  EyeSlashHeroIcon, GlobeAltHeroIcon, KeyHeroIcon, UserHeroIcon, XMarkHeroIcon,
 };
 
 #[derive(Clone, Copy, PartialEq)]
 pub enum InputIcon {
   ArchiveBox,
+  BuildingOffice,
   Check,
   Envelope,
   Eye,
@@ -24,17 +25,20 @@ pub enum InputIcon {
 #[component]
 pub fn InputIconComponent(icon: InputIcon) -> impl IntoView {
   let icon = match icon {
-    InputIcon::ArchiveBox => EitherOf11::A(view! { <ArchiveBoxHeroIcon />}),
-    InputIcon::Check => EitherOf11::B(view! { <CheckHeroIcon /> }),
-    InputIcon::Envelope => EitherOf11::C(view! { <EnvelopeHeroIcon /> }),
-    InputIcon::Eye => EitherOf11::D(view! { <EyeHeroIcon /> }),
-    InputIcon::EyeSlash => EitherOf11::E(view! { <EyeSlashHeroIcon /> }),
-    InputIcon::GlobeAlt => EitherOf11::F(view! { <GlobeAltHeroIcon /> }),
-    InputIcon::Key => EitherOf11::G(view! { <KeyHeroIcon /> }),
-    InputIcon::Loading => EitherOf11::H(view! { <ArrowPathHeroIcon /> }),
-    InputIcon::LockClosed => EitherOf11::I(view! { <LockClosedHeroIcon /> }),
-    InputIcon::User => EitherOf11::J(view! { <UserHeroIcon /> }),
-    InputIcon::XMark => EitherOf11::K(view! { <XMarkHeroIcon /> }),
+    InputIcon::ArchiveBox => EitherOf12::A(view! { <ArchiveBoxHeroIcon />}),
+    InputIcon::BuildingOffice => {
+      EitherOf12::B(view! { <BuildingOffice2HeroIcon /> })
+    }
+    InputIcon::Check => EitherOf12::C(view! { <CheckHeroIcon /> }),
+    InputIcon::Envelope => EitherOf12::D(view! { <EnvelopeHeroIcon /> }),
+    InputIcon::Eye => EitherOf12::E(view! { <EyeHeroIcon /> }),
+    InputIcon::EyeSlash => EitherOf12::F(view! { <EyeSlashHeroIcon /> }),
+    InputIcon::GlobeAlt => EitherOf12::G(view! { <GlobeAltHeroIcon /> }),
+    InputIcon::Key => EitherOf12::H(view! { <KeyHeroIcon /> }),
+    InputIcon::Loading => EitherOf12::I(view! { <ArrowPathHeroIcon /> }),
+    InputIcon::LockClosed => EitherOf12::J(view! { <LockClosedHeroIcon /> }),
+    InputIcon::User => EitherOf12::K(view! { <UserHeroIcon /> }),
+    InputIcon::XMark => EitherOf12::L(view! { <XMarkHeroIcon /> }),
   };
 
   view! {

crates/site-app/src/components/navbar/org_selector.rs

@@ -60,7 +60,8 @@ pub(super) fn OrgSelectorPopover(user: AuthUser) -> impl IntoView {
         user={user}
         {..}
         node_ref={popover_ref}
-        class:hidden=move || !is_open()
+        class:opacity-0=move || !is_open()
+        class:pointer-events-none=move || !is_open()
       />
     </div>
   }
@@ -70,7 +71,7 @@ pub(super) fn OrgSelectorPopover(user: AuthUser) -> impl IntoView {
 fn OrgSelector(user: AuthUser) -> impl IntoView {
   const POPOVER_CLASS: &str =
     "absolute left-0 top-[calc(100%+(var(--spacing)*2))] min-w-56 \
-     elevation-lv1 transition p-2 flex flex-col gap-1";
+     elevation-lv1 transition p-2 flex flex-col gap-1 opacity-0";
 
   let org_hooks = Signal::stored(
     user

crates/site-app/src/hooks.rs

@@ -2,13 +2,14 @@
 
 mod cache_hook;
 mod create_cache_hook;
+mod create_org_hook;
 mod entry_hook;
 mod login_hook;
 mod org_hook;
 mod signup_hook;
 
 // pub use self::cache_hook::*;
 pub use self::{
-  create_cache_hook::*, entry_hook::*, login_hook::*, org_hook::*,
-  signup_hook::*,
+  create_cache_hook::*, create_org_hook::*, entry_hook::*, login_hook::*,
+  org_hook::*, signup_hook::*,
 };