correct URL when issue is optimistically created

Author: davidatsurge

Cargo.lock

@@ -36,6 +36,7 @@ tracing-subscriber = "0.3.19"
 bon = "3.3.2"
 mockall = "0.13.1"
 maplit = "1.0.2"
+bimap = "0.6.3"
 
 [dev-dependencies]
 wasm-bindgen-test = "0.3.50"

shared/Cargo.toml

@@ -65,4 +65,12 @@ impl<DbStoreMarkers> DbWithOptimisticChanges<DbStoreMarkers> {
             .build()
             .object_store::<S>()
     }
+
+    pub fn get_optimistic_to_realistic_for_creations<S: Store>(
+        &self,
+        optimistic_id: &S::Id,
+    ) -> Option<S::Id> {
+        self.optimistic_updates
+            .get_optimistic_to_realistic_for_creations::<S>(optimistic_id)
+    }
 }

shared/src/sync_engine/optimistic/db/storage.rs

@@ -5,6 +5,7 @@ use std::{
     sync::Arc,
 };
 
+use bimap::BiMap;
 use parking_lot::RwLock;
 pub use status::Status;
 use typesafe_idb::{Store, StoreName};
@@ -68,7 +69,7 @@ mod status {
 struct OptimisticChangeMapInner<T, RealisticId> {
     changes:
         HashMap<StoreName, HashMap<SerializedId, BTreeMap<MonotonicTime, Status<T, RealisticId>>>>,
-    optimistic_to_realistic: HashMap<RealisticId, SerializedId>,
+    optimistic_to_realistic: BiMap<RealisticId, SerializedId>,
 }
 
 impl<T, RealisticId: std::cmp::Eq + std::hash::Hash> Default
@@ -77,7 +78,7 @@ impl<T, RealisticId: std::cmp::Eq + std::hash::Hash> Default
     fn default() -> Self {
         Self {
             changes: Default::default(),
-            optimistic_to_realistic: HashMap::new(),
+            optimistic_to_realistic: BiMap::default(),
         }
     }
 }
@@ -212,7 +213,15 @@ impl<T, RealisticId: Clone + Eq + std::hash::Hash + std::fmt::Debug>
         self.inner
             .read()
             .optimistic_to_realistic
-            .get(realistic_id)
+            .get_by_left(realistic_id)
+            .cloned()
+    }
+
+    pub fn get_optimistic_to_realistic(&self, optimistic_id: &SerializedId) -> Option<RealisticId> {
+        self.inner
+            .read()
+            .optimistic_to_realistic
+            .get_by_right(optimistic_id)
             .cloned()
     }
 }

shared/src/sync_engine/optimistic/optimistic_change_map.rs

@@ -104,4 +104,13 @@ impl OptimisticChanges {
             .get_realistic_to_optimistic(&SerializedId::new_from_id::<S>(realistic_id))
             .map(|id| id.to_unserialized_id::<S>())
     }
+
+    pub fn get_optimistic_to_realistic_for_creations<S: Store>(
+        &self,
+        optimistic_id: &S::Id,
+    ) -> Option<S::Id> {
+        self.creations
+            .get_optimistic_to_realistic(&SerializedId::new_from_id::<S>(optimistic_id))
+            .map(|id| id.to_unserialized_id::<S>())
+    }
 }

shared/src/sync_engine/optimistic/optimistic_changes.rs

@@ -61,7 +61,7 @@ pub fn NewIssue(
                     let owner_login = owner_login.clone();
                     let issue_number = issue_number.to_string();
                     let repo_name = repository.name.clone();
-                    set_pathname(zwang_url!("/owner_name={owner_login}/repo_name={repo_name}/issues/issue_number={issue_number}"));
+                    set_pathname(&zwang_url!("/owner_name={owner_login}/repo_name={repo_name}/issues/issue_number={issue_number}"));
                 }
             });
         };

web/src/app/repository/issues_tab/new_issue.rs

@@ -13,7 +13,7 @@ pub fn NewIssueButton(
         let on_click = move |_ev| {
             let url =
                 zwang_url!("/owner_name={owner_name.get()}/repo_name={repo_name.get()}/issues/new");
-            set_pathname(url.clone());
+            set_pathname(&url);
         };
         view! {
             <Button on:click=on_click>

web/src/app/repository/issues_tab/new_issue_button.rs

@@ -2,15 +2,18 @@ use futures::future::{join_all, OptionFuture};
 use github_api::models::milestone::OpenOrClosed;
 use jiff::Timestamp;
 use leptos::prelude::*;
+use macros::zwang_url;
+use crate::app::routing::*;
 use shared::{
     avail::Avail,
+    sync_engine::optimistic::db::MaybeOptimistic,
     types::{
         issue::{self, Issue},
         issue_comment::{IssueComment, IssueIdIndex},
         user::User,
     },
 };
-use zwang_router::{ArgFromParent, RouteParams};
+use zwang_router::{set_pathname_untracked, ArgFromParent, RouteParams};
 
 use crate::{
     app::{
@@ -39,34 +42,76 @@ pub fn OneIssue(
         repo_name,
     }): RouteParams<ParamsIssueNumberOwnerNameRepoName>,
 ) -> impl IntoView {
+    let prev_optimistic_id = RwSignal::new(None);
     let issue_number = move || issue_number.get().parse::<i64>();
     move || {
         let sync_engine = use_sync_engine();
         let issue_number = match issue_number() {
             Ok(i) => i,
             Err(_) => return view! { <NotFound /> }.into_any(),
         };
+        let sync_engine2 = sync_engine.clone();
         let issue_and_user = sync_engine.idb_signal(
             move |txn| txn.with_store::<User>().with_store::<Issue>().build(),
-            move |txn| async move {
-                let issue = txn
-                    .object_store::<Issue>()?
-                    .index::<issue::RepositoryIdIndex>()?
-                    .get_all_optimistically(Some(&repository_page_context.read().repository.id))
-                    .await?
-                    .into_iter()
-                    .find(move |i| i.number == issue_number);
+            move |txn| {
+                let sync_engine2 = sync_engine2.clone();
+                async move {
+                    let issue = txn
+                        .object_store::<Issue>()?
+                        .index::<issue::RepositoryIdIndex>()?
+                        .get_all_optimistically(Some(&repository_page_context.read().repository.id))
+                        .await?
+                        .into_iter()
+                        .find(move |i| i.number == issue_number);
 
-                Ok(if let Some(issue) = issue {
-                    let user = if let Avail::Yes(Some(user_id)) = issue.user_id {
-                        txn.object_store::<User>()?.get_optimistically(&user_id).await?
+                    let issue = if let Some(issue) = issue {
+                        Some(issue)
                     } else {
-                        None
+                        if let Some(prev_optimistic_id) = prev_optimistic_id.get_untracked() {
+                            if let Some(realistic_id) = sync_engine2
+                                .db
+                                .get_optimistic_to_realistic_for_creations::<Issue>(
+                                    &prev_optimistic_id,
+                                )
+                            {
+                                let issue = txn.object_store::<Issue>()?
+                                    .get(&realistic_id)
+                                    .await?
+                                    .map(|issue| MaybeOptimistic::new(issue, false));
+
+                                if let Some(issue) = &issue {
+                                    set_pathname_untracked(&zwang_url!("/owner_name={owner_name.get()}/repo_name={repo_name.get()}/issues/issue_number={issue.number.to_string()}"));
+                                }
+
+                                issue
+                            } else {
+                                None
+                            }
+                        } else {
+                            None
+                        }
                     };
-                    Some((issue, user))
-                } else {
-                    None
-                })
+
+                    Ok(if let Some(issue) = issue {
+                        if issue.is_optimistic {
+                            *prev_optimistic_id.write_untracked() = Some(issue.id);
+                        } else {
+                            *prev_optimistic_id.write_untracked() = None;
+                        }
+
+                        let user = if let Avail::Yes(Some(user_id)) = issue.user_id {
+                            txn.object_store::<User>()?
+                                .get_optimistically(&user_id)
+                                .await?
+                        } else {
+                            None
+                        };
+                        Some((issue, user))
+                    } else {
+                        *prev_optimistic_id.write_untracked() = None;
+                        None
+                    })
+                }
             },
         );
 

web/src/app/repository/issues_tab/one_issue.rs

@@ -85,7 +85,7 @@ pub fn RepositoryPage(
     } = params;
 
     let set_active_tab = move |new_active_tab: Tab| {
-        set_pathname(Root::OwnerName {
+        set_pathname(&Root::OwnerName {
             owner_name: owner_name.get_untracked(),
             child: RootOwnerName::RepoName {
                 repo_name: repo_name.get_untracked(),

web/src/app/repository/mod.rs

@@ -7,7 +7,7 @@ use serde::de::DeserializeOwned;
 use std::{fmt::Display, ops::Deref, sync::Arc};
 use wasm_bindgen::{prelude::Closure, JsCast, JsValue};
 
-pub use macros::{zwang_url, zwang_routes};
+pub use macros::{zwang_routes, zwang_url};
 
 pub trait MemoExt<T>
 where
@@ -236,13 +236,17 @@ pub fn use_pathname() -> ArcMemo<String> {
     PATHNAME_MANAGER.with(|i| i.pathname.clone())
 }
 
-pub fn set_pathname(path: impl ToString) {
+pub fn set_pathname(path: &dyn ToString) {
+    set_pathname_untracked(path);
+    PATHNAME_MANAGER.with(|i| (i.set_pathname)(window().location().pathname().expect("")));
+}
+
+pub fn set_pathname_untracked(path: &dyn ToString) {
     window()
         .history()
         .expect("")
         .push_state_with_url(&JsValue::NULL, "", Some(&path.to_string()))
         .expect("");
-    PATHNAME_MANAGER.with(|i| (i.set_pathname)(window().location().pathname().expect("")));
 }
 
 pub fn set_search(search: impl ToString) {
@@ -275,7 +279,7 @@ pub fn A(
             class=class
             href=href.clone()
             on:click=move |ev| {
-                set_pathname(href.clone());
+                set_pathname(&href);
                 ev.prevent_default();
             }
         >
@@ -307,8 +311,7 @@ impl std::fmt::Display for NoPart {
     }
 }
 
-pub fn empty_component<ArgFromParent>(_: ArgFromParent) -> impl IntoView {
-}
+pub fn empty_component<ArgFromParent>(_: ArgFromParent) -> impl IntoView {}
 
 pub fn passthrough_component<A, V>(
     ArgFromParent(arg_from_parent): ArgFromParent<A>,