Optimize local folder file tree lazy loading
This commit is contained in:
@@ -67,6 +67,7 @@ pub(crate) struct RootEntryQuery {
|
||||
workspace_id: Option<String>,
|
||||
source_kind: Option<String>,
|
||||
root_uri: Option<String>,
|
||||
tree_view: Option<String>,
|
||||
restore_focus_row_id: Option<String>,
|
||||
}
|
||||
|
||||
@@ -294,6 +295,11 @@ pub async fn root_entry(
|
||||
.filter(|value| !value.is_empty())
|
||||
.is_none()
|
||||
&& requested_page_id.is_none();
|
||||
let requests_filetree_first = query
|
||||
.tree_view
|
||||
.as_deref()
|
||||
.map(str::trim)
|
||||
.is_some_and(|value| value == "filetree");
|
||||
let (
|
||||
workspace_id,
|
||||
workspace_projection,
|
||||
@@ -312,7 +318,14 @@ pub async fn root_entry(
|
||||
WebError::bad_request_code("local_folder_root_required", "缺少本地文件夹 rootUri")
|
||||
})?;
|
||||
ensure_local_workspace_read_access_with_state(&state, &context, root_uri)?;
|
||||
let snapshot = load_local_folder_page_tree_snapshot(root_uri)?;
|
||||
let snapshot = if requests_filetree_first {
|
||||
crate::routes::local_folder_source::load_local_folder_file_tree_snapshot_with_reveal(
|
||||
root_uri,
|
||||
requested_page_id.as_deref(),
|
||||
)?
|
||||
} else {
|
||||
load_local_folder_page_tree_snapshot(root_uri)?
|
||||
};
|
||||
let workspace_id = snapshot
|
||||
.dataset
|
||||
.get("workspace")
|
||||
@@ -339,8 +352,11 @@ pub async fn root_entry(
|
||||
.first()
|
||||
.map(|item| item.id.as_str()),
|
||||
);
|
||||
let sidebar_tree_html =
|
||||
render_local_sidebar_tree_html(root_uri, selected_active_page_id.as_deref())?;
|
||||
let sidebar_tree_html = if requests_filetree_first {
|
||||
String::new()
|
||||
} else {
|
||||
render_local_sidebar_tree_html(root_uri, selected_active_page_id.as_deref())?
|
||||
};
|
||||
let restore_focus_row_id = query
|
||||
.restore_focus_row_id
|
||||
.as_deref()
|
||||
@@ -2755,8 +2771,9 @@ mod tests {
|
||||
let html = String::from_utf8(body.to_vec()).expect("utf8");
|
||||
assert!(html.contains(r#"data-mnote-shell="workspace""#));
|
||||
assert!(html.contains("local_folder"));
|
||||
assert!(html.contains("Local Root"));
|
||||
assert!(html.contains("README.md"));
|
||||
assert!(html.contains(r#"data-row-id="local:folder:docs""#));
|
||||
assert!(!html.contains(r#"data-row-id="local:markdown:docs/child.md""#));
|
||||
assert!(html.contains(r#"data-row-id="local:asset:plain.txt""#));
|
||||
assert!(!html.contains("legacy_next_compat_disabled"));
|
||||
assert!(!html.contains(r#"href="/tree"#));
|
||||
@@ -2798,7 +2815,8 @@ mod tests {
|
||||
.expect("body");
|
||||
let html = String::from_utf8(body.to_vec()).expect("utf8");
|
||||
assert!(html.contains(r#"data-mnote-shell="workspace""#));
|
||||
assert!(html.contains(r#"data-row-id="local:asset:attachments/report-a.pdf""#));
|
||||
assert!(html.contains(r#"data-row-id="local:folder:attachments""#));
|
||||
assert!(!html.contains(r#"data-row-id="local:asset:attachments/report-a.pdf""#));
|
||||
assert!(html.contains(r#"data-testid="mnote-document-workspace""#));
|
||||
assert!(html.contains(r#"data-mnote-resource-tab-host="true""#));
|
||||
assert!(html.contains("__MNOTE_DOCUMENT_PANES_BOOTSTRAP__"));
|
||||
|
||||
Reference in New Issue
Block a user