From 98f919126970181beaf009b7ec48c7a26003cc51 Mon Sep 17 00:00:00 2001 From: Khor Shu Heng <32997938+khorshuheng@users.noreply.github.com> Date: Fri, 10 Jan 2025 11:28:14 +0800 Subject: [PATCH] fix: new workspace direct user to a page that is not supposed to be viewable (#1134) --- libs/workspace-template/src/lib.rs | 17 ++++++++++++++--- 1 file changed, 14 insertions(+), 3 deletions(-) diff --git a/libs/workspace-template/src/lib.rs b/libs/workspace-template/src/lib.rs index c85b94cf..a6cf9e1e 100644 --- a/libs/workspace-template/src/lib.rs +++ b/libs/workspace-template/src/lib.rs @@ -102,9 +102,20 @@ impl WorkspaceTemplateBuilder { } } + // All views directly under the workspace should be space. let views = workspace_view_builder.build(); - // Safe to unwrap because we have at least one view. - let first_view = views.first().unwrap().parent_view.clone(); + // Safe to unwrap because we have at least one space with a document. + let default_current_view_id = views + .iter() + .find(|v| !v.child_views.is_empty()) + .unwrap() + .child_views + .first() + .unwrap() + .parent_view + .id + .clone(); + let first_level_views = views .iter() .map(|value| ViewIdentifier { @@ -127,7 +138,7 @@ impl WorkspaceTemplateBuilder { let folder_template = tokio::task::spawn_blocking(move || { let folder_data = FolderData { workspace, - current_view: first_view.id, + current_view: default_current_view_id, views: FlattedViews::flatten_views(views), favorites: Default::default(), recent: Default::default(),