fix local folder resource lifecycle

2026-05-24 01:49:51 +08:00
parent 5f97800489
commit 97953101a2
16 changed files with 1392 additions and 154 deletions
@@ -322,12 +322,8 @@ pub async fn root_entry(
            .filter(|value| !value.is_empty())
            .unwrap_or("local-folder")
            .to_string();
-        let requested_or_recent_page_id = choose_root_entry_active_page_id(
-            requested_page_id.clone(),
-            recent_page_id.clone(),
-            None,
-            None,
-        );
+        let requested_or_recent_page_id =
+            choose_root_entry_active_page_id(requested_page_id.clone(), None, None, None);
        let workspace_projection = build_workspace_shell_projection(
            &snapshot.dataset,
            &workspace_id,
@@ -336,7 +332,7 @@ pub async fn root_entry(
        );
        let selected_active_page_id = choose_root_entry_active_page_id(
            requested_page_id.clone(),
-            recent_page_id.clone(),
+            None,
            workspace_projection.active_page_id.as_deref(),
            workspace_projection
                .my_page_items
@@ -494,7 +490,24 @@ pub async fn root_entry(
        })
    };
    let (html_title, content, body_extra) = if active_page_id.trim().is_empty() {
-        ("MNOTE".to_string(), render_workspace_entry(), String::new())
+        let body_extra = if active_source_kind.as_deref() == Some("local_folder") {
+            let panes_bootstrap_json = serde_json::to_string(&json!({
+                "schema": "mnote.document_panes_bootstrap.v1",
+                "secondaryRequested": false,
+                "secondaryInvalid": false,
+                "panes": [],
+            }))
+            .unwrap_or_else(|_| "{}".to_string());
+            format!(
+                r#"<script id="__MNOTE_DOCUMENT_PANES_BOOTSTRAP__" type="application/json">{}</script>
+    {}"#,
+                escape_script_json(&panes_bootstrap_json),
+                render_editor_island_adapter_script(),
+            )
+        } else {
+            String::new()
+        };
+        ("MNOTE".to_string(), render_workspace_entry(), body_extra)
    } else {
        match build_page_aggregate_snapshot(
            &state,
@@ -2505,8 +2518,11 @@ mod tests {
        let html = String::from_utf8(body.to_vec()).expect("utf8");
        assert!(!html.contains("初始化的新页面"));
        assert!(html.contains(r#"data-mnote-source-kind="local_folder""#));
-        assert!(html.contains(r#"data-testid="mnote-create-default-local-workspace""#));
-        assert!(html.contains(r#"data-testid="mnote-open-local-folder-empty""#));
+        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__"));
+        assert!(!html.contains(r#"data-testid="mnote-create-default-local-workspace""#));
+        assert!(!html.contains(r#"data-testid="mnote-open-local-folder-empty""#));
        assert!(!html.contains("workspaces:ensureDefaultWorkspace"));
        let _ = std::fs::remove_dir_all(&base);
    }
@@ -2719,6 +2735,7 @@ mod tests {
                    .uri(format!(
                        "/?sourceKind=local_folder&rootUri={root_uri}&treeView=filetree"
                    ))
+                    .header("cookie", "mnote_recent_page_id=local-md:Other~2FOther.md")
                    .header("x-mnote-actor-id", "user_real")
                    .header("x-mnote-actor-type", "user")
                    .body(Body::empty())
@@ -2743,6 +2760,50 @@ mod tests {
        assert!(!html.contains(r#"href="/tree"#));
    }

+    #[tokio::test]
+    async fn root_entry_local_folder_without_active_page_keeps_resource_tab_host() {
+        let root = temp_root("mnote-root-local-folder-no-active-page");
+        std::fs::create_dir_all(root.join("attachments")).expect("create attachments");
+        std::fs::write(root.join("attachments").join("report-a.pdf"), b"%PDF-1.4\n")
+            .expect("write pdf");
+
+        let root_uri = format!("file://{}", root.display());
+        crate::routes::local_folder_source::initialize_local_workspace_for_actor(
+            "user_real",
+            &root_uri,
+        )
+        .expect("init local workspace");
+        let response = app_with_config("http://127.0.0.1:3100".into(), false)
+            .oneshot(
+                Request::builder()
+                    .uri(format!(
+                        "/?sourceKind=local_folder&rootUri={root_uri}&treeView=filetree"
+                    ))
+                    .header("cookie", "mnote_recent_page_id=local-md:Other~2FOther.md")
+                    .header("x-mnote-actor-id", "user_real")
+                    .header("x-mnote-actor-type", "user")
+                    .body(Body::empty())
+                    .expect("request"),
+            )
+            .await
+            .expect("response");
+
+        let _ = std::fs::remove_dir_all(&root);
+
+        assert_eq!(response.status(), StatusCode::OK);
+        let body = to_bytes(response.into_body(), usize::MAX)
+            .await
+            .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-testid="mnote-document-workspace""#));
+        assert!(html.contains(r#"data-mnote-resource-tab-host="true""#));
+        assert!(html.contains("__MNOTE_DOCUMENT_PANES_BOOTSTRAP__"));
+        assert!(html.contains("openResourceInActiveTab"));
+        assert!(!html.contains(r#"<script id="__MNOTE_PAGE_AGGREGATE__""#));
+    }
+
    #[tokio::test]
    async fn root_entry_redirects_anonymous_viewer_to_auth() {
        let response = app_with_config("http://127.0.0.1:3100".into(), false)