chore: add collab version to view

Author: Horusiath

collab-folder/src/folder.rs

@@ -909,6 +909,7 @@ mod tests {
     let view_2_id = view_2.id;
     let space_view = View {
       id: Uuid::parse_str("00000000-0000-0000-0000-000000000001").unwrap(),
+      version: None,
       parent_view_id: workspace_id.to_string(),
       name: "Space 1".to_string(),
       children: RepeatedViewIdentifier::new(vec![
@@ -978,6 +979,7 @@ mod tests {
       .collect();
     let space_view = View {
       id: space_view_id,
+      version: None,
       parent_view_id: "".to_string(),
       name: "Space".to_string(),
       children: RepeatedViewIdentifier::new(

collab-folder/src/hierarchy_builder.rs

@@ -5,6 +5,7 @@ use crate::{
   ViewLayout, timestamp,
 };
 
+use collab::core::collab::CollabVersion;
 use serde_json::json;
 use std::fmt::{Display, Formatter};
 use std::future::Future;
@@ -109,6 +110,7 @@ impl DerefMut for NestedViews {
 pub struct NestedChildViewBuilder {
   uid: i64,
   parent_view_id: ViewId,
+  version: Option<CollabVersion>,
   view_id: ViewId,
   name: String,
   desc: String,
@@ -127,6 +129,7 @@ impl NestedChildViewBuilder {
     Self {
       uid,
       parent_view_id,
+      version: None,
       view_id: uuid::Uuid::new_v4(),
       name: Default::default(),
       desc: Default::default(),
@@ -148,6 +151,11 @@ impl NestedChildViewBuilder {
     self
   }
 
+  pub fn with_collab_version(mut self, version: CollabVersion) -> Self {
+    self.version = Some(version);
+    self
+  }
+
   pub fn with_children(mut self, mut views: Vec<ParentChildViews>) -> Self {
     self.children.append(&mut views);
     self
@@ -203,6 +211,7 @@ impl NestedChildViewBuilder {
   pub fn build(self) -> ParentChildViews {
     let view = View {
       id: self.view_id,
+      version: self.version,
       parent_view_id: self.parent_view_id.to_string(),
       name: self.name,
       created_at: timestamp(),

collab-folder/src/view.rs

@@ -1,7 +1,10 @@
 use std::collections::{HashMap, HashSet};
+use std::str::FromStr;
 use std::sync::Arc;
 
+use crate::folder_observe::ViewChangeSender;
 use anyhow::bail;
+use collab::core::collab::CollabVersion;
 use collab::preclude::{
   Any, Map, MapExt, MapPrelim, MapRef, ReadTxn, Subscription, TransactionMut,
 };
@@ -12,8 +15,6 @@ use tokio::sync::Mutex;
 use tracing::{instrument, trace};
 use uuid::Uuid;
 
-use crate::folder_observe::ViewChangeSender;
-
 use crate::revision::RevisionMapping;
 use crate::section::{Section, SectionItem, SectionMap};
 use crate::space_info::SpaceInfo;
@@ -33,6 +34,7 @@ const VIEW_LAST_EDITED_TIME: &str = "last_edited_time";
 const VIEW_LAST_EDITED_BY: &str = "last_edited_by";
 const VIEW_IS_LOCKED: &str = "is_locked";
 const VIEW_EXTRA: &str = "extra";
+const COLLAB_VERSION: &str = "version";
 // const VIEW_LAST_VIEWED_TIME: &str = "last_viewed_time";
 
 pub fn timestamp() -> i64 {
@@ -556,8 +558,12 @@ pub(crate) fn view_from_map_ref<T: ReadTxn>(
   let is_locked = map_ref.get_with_txn(txn, VIEW_IS_LOCKED);
   let extra = map_ref.get_with_txn(txn, VIEW_EXTRA);
 
+  let version: Option<String> = map_ref.get_with_txn(txn, COLLAB_VERSION);
+  let version = version.and_then(|v| Uuid::from_str(&v).ok());
+
   Some(View {
     id,
+    version,
     parent_view_id,
     name,
     children,
@@ -783,6 +789,8 @@ impl<'a, 'b, 'c> ViewUpdate<'a, 'b, 'c> {
 pub struct View {
   /// The id of the view
   pub id: collab_entity::uuid_validation::ViewId,
+  /// The version of the view, used when corresponding page has been reverted to past state.
+  pub version: Option<CollabVersion>,
   /// The id for given parent view  
   pub parent_view_id: String,
   /// The name that display on the left sidebar
@@ -822,6 +830,7 @@ impl View {
   ) -> Self {
     Self {
       id: view_id,
+      version: None,
       parent_view_id,
       name,
       children: Default::default(),

collab-folder/src/workspace.rs

@@ -46,6 +46,7 @@ impl From<Workspace> for View {
   fn from(value: Workspace) -> Self {
     Self {
       id: value.id,
+      version: None,
       parent_view_id: "".to_string(),
       name: value.name,
       children: value.child_views,

collab-folder/tests/folder_test/util.rs

@@ -101,6 +101,7 @@ pub fn make_test_view(view_id: &str, parent_view_id: &str, belongings: Vec<ViewI
     id: collab_entity::uuid_validation::view_id_from_any_string(view_id),
     parent_view_id: collab_entity::uuid_validation::view_id_from_any_string(parent_view_id)
       .to_string(),
+    version: None,
     name: "".to_string(),
     children: RepeatedViewIdentifier::new(belongings),
     created_at: 0,