[PR #5024] [MERGED] chore: improve link between folder and database #6586

New issue

Closed

opened 2026-03-23 23:15:34 +00:00 by mirror · 0 comments

mirror commented

2026-03-23 23:15:34 +00:00

Owner

📋 Pull Request Information

Original PR: https://github.com/AppFlowy-IO/AppFlowy/pull/5024
Author: @richardshiue
Created: 4/1/2024
Status: ✅ Merged
Merged: 4/19/2024
Merged by: @appflowy

Base: main ← Head: chore/folder-database-link

📝 Commits (7)

172f82f chore: improve link between folder and database
8d12b1b chore: fix tests
d140675 Merge branch 'main' into chore/folder-database-link
d11048e chore: update collab rev
a1fc8fb chore: merge remote-tracking branch 'upstream/main' into chore/folder-database-link
31fa743 chore: merge remote-tracking branch 'upstream/main' into chore/folder-database-link
f8458cc chore: merge remote-tracking branch 'upstream/main' into chore/folder-database-link

📊 Changes

15 files changed (+209 additions, -122 deletions)

View changed files

📝 frontend/appflowy_tauri/src-tauri/Cargo.lock (+7 -7)
📝 frontend/appflowy_tauri/src-tauri/Cargo.toml (+7 -7)
📝 frontend/appflowy_web/wasm-libs/Cargo.toml (+7 -7)
📝 frontend/appflowy_web_app/src-tauri/Cargo.lock (+7 -7)
📝 frontend/appflowy_web_app/src-tauri/Cargo.toml (+7 -7)
📝 frontend/rust-lib/Cargo.lock (+7 -7)
📝 frontend/rust-lib/Cargo.toml (+7 -7)
📝 frontend/rust-lib/flowy-database2/src/manager.rs (+16 -5)
📝 frontend/rust-lib/flowy-database2/src/services/database_view/view_editor.rs (+3 -1)
📝 frontend/rust-lib/flowy-database2/src/services/share/csv/import.rs (+22 -17)
📝 frontend/rust-lib/flowy-database2/src/template.rs (+64 -32)
📝 frontend/rust-lib/flowy-database2/tests/database/database_editor.rs (+6 -6)
📝 frontend/rust-lib/flowy-database2/tests/database/mock_data/board_mock_data.rs (+13 -3)
📝 frontend/rust-lib/flowy-database2/tests/database/mock_data/calendar_mock_data.rs (+12 -3)
📝 frontend/rust-lib/flowy-database2/tests/database/mock_data/grid_mock_data.rs (+24 -6)

📄 Description

requires https://github.com/AppFlowy-IO/AppFlowy-Collab/pull/182

Feature Preview

PR Checklist

My code adheres to AppFlowy's Conventions
I've listed at least one issue that this PR fixes in the description above.
I've added a test(s) to validate changes in this PR, or this PR only contains semantic changes.
All existing tests are passing.

_{🔄 This issue represents a GitHub Pull Request. It cannot be merged through Gitea due to API limitations.}

## 📋 Pull Request Information **Original PR:** https://github.com/AppFlowy-IO/AppFlowy/pull/5024 **Author:** [@richardshiue](https://github.com/richardshiue) **Created:** 4/1/2024 **Status:** ✅ Merged **Merged:** 4/19/2024 **Merged by:** [@appflowy](https://github.com/appflowy) **Base:** `main` ← **Head:** `chore/folder-database-link` --- ### 📝 Commits (7) - [`172f82f`](https://github.com/AppFlowy-IO/AppFlowy/commit/172f82f10140139725a0ae9b7070ab35fe730feb) chore: improve link between folder and database - [`8d12b1b`](https://github.com/AppFlowy-IO/AppFlowy/commit/8d12b1bea25628d39823f8dbf6137b4d8867995f) chore: fix tests - [`d140675`](https://github.com/AppFlowy-IO/AppFlowy/commit/d1406752a69a57db7e45843d52917179416f8c3e) Merge branch 'main' into chore/folder-database-link - [`d11048e`](https://github.com/AppFlowy-IO/AppFlowy/commit/d11048e68c8e43a20ffdb459bfba2afc82a1105d) chore: update collab rev - [`a1fc8fb`](https://github.com/AppFlowy-IO/AppFlowy/commit/a1fc8fba6ce62eca7f1a2bf6c52fd8c40563adff) chore: merge remote-tracking branch 'upstream/main' into chore/folder-database-link - [`31fa743`](https://github.com/AppFlowy-IO/AppFlowy/commit/31fa743b01b0f123fc890326beacddcbd4bef31f) chore: merge remote-tracking branch 'upstream/main' into chore/folder-database-link - [`f8458cc`](https://github.com/AppFlowy-IO/AppFlowy/commit/f8458ccdeffeb00d02c7fc7b5dcae2eeb8bac3fa) chore: merge remote-tracking branch 'upstream/main' into chore/folder-database-link ### 📊 Changes **15 files changed** (+209 additions, -122 deletions) <details> <summary>View changed files</summary> 📝 `frontend/appflowy_tauri/src-tauri/Cargo.lock` (+7 -7) 📝 `frontend/appflowy_tauri/src-tauri/Cargo.toml` (+7 -7) 📝 `frontend/appflowy_web/wasm-libs/Cargo.toml` (+7 -7) 📝 `frontend/appflowy_web_app/src-tauri/Cargo.lock` (+7 -7) 📝 `frontend/appflowy_web_app/src-tauri/Cargo.toml` (+7 -7) 📝 `frontend/rust-lib/Cargo.lock` (+7 -7) 📝 `frontend/rust-lib/Cargo.toml` (+7 -7) 📝 `frontend/rust-lib/flowy-database2/src/manager.rs` (+16 -5) 📝 `frontend/rust-lib/flowy-database2/src/services/database_view/view_editor.rs` (+3 -1) 📝 `frontend/rust-lib/flowy-database2/src/services/share/csv/import.rs` (+22 -17) 📝 `frontend/rust-lib/flowy-database2/src/template.rs` (+64 -32) 📝 `frontend/rust-lib/flowy-database2/tests/database/database_editor.rs` (+6 -6) 📝 `frontend/rust-lib/flowy-database2/tests/database/mock_data/board_mock_data.rs` (+13 -3) 📝 `frontend/rust-lib/flowy-database2/tests/database/mock_data/calendar_mock_data.rs` (+12 -3) 📝 `frontend/rust-lib/flowy-database2/tests/database/mock_data/grid_mock_data.rs` (+24 -6) </details> ### 📄 Description requires https://github.com/AppFlowy-IO/AppFlowy-Collab/pull/182  ### Feature Preview  ---  #### PR Checklist - [ ] My code adheres to [AppFlowy's Conventions](https://docs.appflowy.io/docs/documentation/software-contributions/conventions) - [ ] I've listed at least one issue that this PR fixes in the description above. - [ ] I've added a test(s) to validate changes in this PR, or this PR only contains semantic changes. - [ ] All existing tests are passing. --- <sub>🔄 This issue represents a GitHub Pull Request. It cannot be merged through Gitea due to API limitations.</sub>