Skip to content

Commit d38a5f3

Browse files
authored
chore: update dep (#6727)
1 parent fe4f85a commit d38a5f3

File tree

8 files changed

+38
-39
lines changed

8 files changed

+38
-39
lines changed

frontend/rust-lib/Cargo.lock

Lines changed: 20 additions & 20 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

frontend/rust-lib/Cargo.toml

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -106,8 +106,8 @@ dashmap = "6.0.1"
106106
# Run the script.add_workspace_members:
107107
# scripts/tool/update_client_api_rev.sh new_rev_id
108108
# ⚠️⚠️⚠️️
109-
client-api = { git = "https://github.com/AppFlowy-IO/AppFlowy-Cloud", rev = "4643e568d2d9b725b0d06dfbbf351317cf9a2c9f" }
110-
client-api-entity = { git = "https://github.com/AppFlowy-IO/AppFlowy-Cloud", rev = "4643e568d2d9b725b0d06dfbbf351317cf9a2c9f" }
109+
client-api = { git = "https://github.com/AppFlowy-IO/AppFlowy-Cloud", rev = "e31e541d07b8ef5e3f33b0b3dd54ebc22a79f86a" }
110+
client-api-entity = { git = "https://github.com/AppFlowy-IO/AppFlowy-Cloud", rev = "e31e541d07b8ef5e3f33b0b3dd54ebc22a79f86a" }
111111

112112
[profile.dev]
113113
opt-level = 0
@@ -142,14 +142,14 @@ rocksdb = { git = "https://github.com/rust-rocksdb/rust-rocksdb", rev = "1710120
142142
# To switch to the local path, run:
143143
# scripts/tool/update_collab_source.sh
144144
# ⚠️⚠️⚠️️
145-
collab = { version = "0.2", git = "https://github.com/AppFlowy-IO/AppFlowy-Collab", rev = "4175465382020f1bd9cd9aa0e0766178eac7b4e5" }
146-
collab-entity = { version = "0.2", git = "https://github.com/AppFlowy-IO/AppFlowy-Collab", rev = "4175465382020f1bd9cd9aa0e0766178eac7b4e5" }
147-
collab-folder = { version = "0.2", git = "https://github.com/AppFlowy-IO/AppFlowy-Collab", rev = "4175465382020f1bd9cd9aa0e0766178eac7b4e5" }
148-
collab-document = { version = "0.2", git = "https://github.com/AppFlowy-IO/AppFlowy-Collab", rev = "4175465382020f1bd9cd9aa0e0766178eac7b4e5" }
149-
collab-database = { version = "0.2", git = "https://github.com/AppFlowy-IO/AppFlowy-Collab", rev = "4175465382020f1bd9cd9aa0e0766178eac7b4e5" }
150-
collab-plugins = { version = "0.2", git = "https://github.com/AppFlowy-IO/AppFlowy-Collab", rev = "4175465382020f1bd9cd9aa0e0766178eac7b4e5" }
151-
collab-user = { version = "0.2", git = "https://github.com/AppFlowy-IO/AppFlowy-Collab", rev = "4175465382020f1bd9cd9aa0e0766178eac7b4e5" }
152-
collab-importer = { version = "0.1", git = "https://github.com/AppFlowy-IO/AppFlowy-Collab", rev = "4175465382020f1bd9cd9aa0e0766178eac7b4e5" }
145+
collab = { version = "0.2", git = "https://github.com/AppFlowy-IO/AppFlowy-Collab", rev = "be6bb90faac22ca8443a950ea3deafc7ec99b3a8" }
146+
collab-entity = { version = "0.2", git = "https://github.com/AppFlowy-IO/AppFlowy-Collab", rev = "be6bb90faac22ca8443a950ea3deafc7ec99b3a8" }
147+
collab-folder = { version = "0.2", git = "https://github.com/AppFlowy-IO/AppFlowy-Collab", rev = "be6bb90faac22ca8443a950ea3deafc7ec99b3a8" }
148+
collab-document = { version = "0.2", git = "https://github.com/AppFlowy-IO/AppFlowy-Collab", rev = "be6bb90faac22ca8443a950ea3deafc7ec99b3a8" }
149+
collab-database = { version = "0.2", git = "https://github.com/AppFlowy-IO/AppFlowy-Collab", rev = "be6bb90faac22ca8443a950ea3deafc7ec99b3a8" }
150+
collab-plugins = { version = "0.2", git = "https://github.com/AppFlowy-IO/AppFlowy-Collab", rev = "be6bb90faac22ca8443a950ea3deafc7ec99b3a8" }
151+
collab-user = { version = "0.2", git = "https://github.com/AppFlowy-IO/AppFlowy-Collab", rev = "be6bb90faac22ca8443a950ea3deafc7ec99b3a8" }
152+
collab-importer = { version = "0.1", git = "https://github.com/AppFlowy-IO/AppFlowy-Collab", rev = "be6bb90faac22ca8443a950ea3deafc7ec99b3a8" }
153153

154154
# Working directory: frontend
155155
# To update the commit ID, run:

frontend/rust-lib/flowy-core/src/integrate/trait_impls.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -348,7 +348,7 @@ impl FolderCloudService for ServerProvider {
348348
async fn set_publish_namespace(
349349
&self,
350350
workspace_id: &str,
351-
new_namespace: &str,
351+
new_namespace: String,
352352
) -> Result<(), FlowyError> {
353353
let server = self.get_server()?;
354354
server

frontend/rust-lib/flowy-folder-pub/src/cloud.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@ pub trait FolderCloudService: Send + Sync + 'static {
7272
async fn set_publish_namespace(
7373
&self,
7474
workspace_id: &str,
75-
new_namespace: &str,
75+
new_namespace: String,
7676
) -> Result<(), FlowyError>;
7777

7878
async fn list_published_views(

frontend/rust-lib/flowy-folder/src/entities/publish.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,7 @@ impl From<PublishInfo> for PublishInfoResponsePB {
8181
Self {
8282
view_id: info.view_id.to_string(),
8383
publish_name: info.publish_name,
84-
namespace: info.namespace,
84+
namespace: Some(info.namespace),
8585
publisher_email: info.publisher_email,
8686
publish_timestamp_sec: info.publish_timestamp.timestamp(),
8787
}

frontend/rust-lib/flowy-folder/src/manager.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1298,11 +1298,11 @@ impl FolderManager {
12981298
/// Get the namespace of the current workspace.
12991299
/// The namespace is used to generate the URL of the published view.
13001300
#[tracing::instrument(level = "debug", skip(self), err)]
1301-
pub async fn set_publish_namespace(&self, namespace: String) -> FlowyResult<()> {
1301+
pub async fn set_publish_namespace(&self, new_namespace: String) -> FlowyResult<()> {
13021302
let workspace_id = self.user.workspace_id()?;
13031303
self
13041304
.cloud_service
1305-
.set_publish_namespace(workspace_id.as_str(), namespace.as_str())
1305+
.set_publish_namespace(workspace_id.as_str(), new_namespace)
13061306
.await?;
13071307
Ok(())
13081308
}

frontend/rust-lib/flowy-server/src/af_cloud/impls/folder.rs

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -268,13 +268,12 @@ where
268268
async fn set_publish_namespace(
269269
&self,
270270
workspace_id: &str,
271-
new_namespace: &str,
271+
new_namespace: String,
272272
) -> Result<(), FlowyError> {
273273
let workspace_id = workspace_id.to_string();
274-
let namespace = new_namespace.to_string();
275274
let try_get_client = self.inner.try_get_client();
276275
try_get_client?
277-
.set_workspace_publish_namespace(&workspace_id, &namespace)
276+
.set_workspace_publish_namespace(&workspace_id, new_namespace)
278277
.await?;
279278
Ok(())
280279
}

frontend/rust-lib/flowy-server/src/local_server/impls/folder.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -98,7 +98,7 @@ impl FolderCloudService for LocalServerFolderCloudServiceImpl {
9898
async fn set_publish_namespace(
9999
&self,
100100
_workspace_id: &str,
101-
_new_namespace: &str,
101+
_new_namespace: String,
102102
) -> Result<(), FlowyError> {
103103
Err(FlowyError::local_version_not_support())
104104
}

0 commit comments

Comments
 (0)