Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
31 commits
Select commit Hold shift + click to select a range
7a971eb
feat(linux-sidebar): add a Favorites scope listing the connection's s…
sedax90 Nov 8, 2026
d732f38
docs(linux-sidebar): add the changelog entry
sedax90 Nov 8, 2026
9dc6e68
test(linux-sidebar): drop an unused import
sedax90 Nov 8, 2026
b1f892e
feat(linux-sidebar): rename and delete a favorite from the list
sedax90 Nov 8, 2026
b9a82bc
refactor(linux-sidebar): let the window's tests ask the favorites' ac…
sedax90 Nov 8, 2026
ea788ec
docs(linux-sidebar): add the changelog entry
sedax90 Nov 8, 2026
26f7bcd
feat(core-storage): keep folders, keywords and favourite tables and d…
sedax90 Nov 8, 2026
7834b7a
fix(core-storage): remove a deleted folder or favourite from the upgr…
sedax90 Nov 8, 2026
ef4887d
fix(linux-sidebar): share saved query changes across favorites views
datlechin Nov 8, 2026
5eaa871
fix(linux-sidebar): confirm saved query replacement
datlechin Nov 8, 2026
4ab9e08
Merge branch 'feat/core-favorites-storage' into feat/linux-favorites-…
sedax90 Nov 8, 2026
eccf8c7
feat(linux-sidebar): file favorites in folders
sedax90 Nov 8, 2026
b410095
fix(linux-sidebar): name the New Folder button
sedax90 Nov 8, 2026
33fcedc
docs(linux-sidebar): add the changelog entry
sedax90 Nov 8, 2026
8f1cf1a
fix(linux-sidebar): account for workspace dispatcher size
datlechin Nov 8, 2026
60415ce
fix(linux-sidebar): include stable identity dependency notices
datlechin Nov 8, 2026
79318bb
fix(linux-sidebar): keep favorite actions in step with shared queries
datlechin Nov 8, 2026
d116651
test(linux-sidebar): wait for window teardown before counting query h…
datlechin Nov 8, 2026
8dc5815
test(linux-sidebar): track the favorite write hold independently
datlechin Nov 8, 2026
eb97aa4
fix(core-storage): keep favorite mutations and recovery copies consis…
datlechin Nov 8, 2026
0faaafe
test(core-storage): separate the favorites migration fixture
datlechin Nov 8, 2026
34ad60b
merge: carry the reviewed favorites sidebar into folders
datlechin Nov 8, 2026
7d2c4fc
merge: build favorites folders on the reviewed shared storage
datlechin Nov 8, 2026
5260c4a
fix(core-storage): assign query folders without changing their order
datlechin Nov 8, 2026
7883c54
test(linux-sidebar): retain saved query concurrency coverage in the s…
datlechin Nov 8, 2026
e4cd8cd
Merge branch 'feat/core-favorites-storage' into feat/linux-favorites-…
datlechin Nov 8, 2026
e7e71d6
fix(linux-sidebar): keep favorite folders coherent and accessible
datlechin Nov 8, 2026
0a56e20
fix(linux-sidebar): preserve nested expansion and selection positions
datlechin Nov 8, 2026
cd8d1e2
Merge branch 'main' into feat/linux-favorites-folders
datlechin Nov 9, 2026
7220f57
Merge remote-tracking branch 'origin/main' into feat/linux-favorites-…
datlechin Nov 10, 2026
b65acac
Merge remote-tracking branch 'origin/main' into feat/linux-favorites-…
datlechin Nov 10, 2026
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions linux/changelog.d/4130.added.md
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Organize saved queries in folders in the Favorites sidebar.
438 changes: 438 additions & 0 deletions linux/crates/app/src/ui/workspace/favorite_folders.rs

Large diffs are not rendered by default.

1 change: 1 addition & 0 deletions linux/crates/app/src/ui/workspace/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@ mod database_transfer;
mod definitions;
mod diagram;
mod editor_label;
mod favorite_folders;
mod finished_work;
mod health_banner;
mod imp;
Expand Down
229 changes: 229 additions & 0 deletions linux/crates/app/src/ui/workspace/sidebar/favorites_index.rs
Original file line number Diff line number Diff line change
@@ -0,0 +1,229 @@
use std::collections::{HashMap, HashSet};

use tablepro_storage::saved_queries::{SavedQueriesSnapshot, SavedQuery, SavedQueryFolder};

#[derive(Debug, Clone, Copy, PartialEq, Eq, Hash)]
pub(super) enum Key {
Folder(i64),
Query(i64),
}

impl Key {
pub(super) fn target(self) -> String {
match self {
Self::Folder(id) => format!("f{id}"),
Self::Query(id) => format!("q{id}"),
}
}

pub(super) fn parse(target: &str) -> Option<Self> {
let (kind, id) = target.split_at_checked(1)?;
let id = id.parse().ok()?;
match kind {
"f" => Some(Self::Folder(id)),
"q" => Some(Self::Query(id)),
_ => None,
}
}
}

#[derive(Debug, Clone)]
pub(super) enum Node {
Folder(SavedQueryFolder),
Query(SavedQuery),
}

impl Node {
pub(super) fn key(&self) -> Key {
match self {
Self::Folder(folder) => Key::Folder(folder.id),
Self::Query(query) => Key::Query(query.id),
}
}

pub(super) fn name(&self) -> &str {
match self {
Self::Folder(folder) => &folder.name,
Self::Query(query) => &query.name,
}
}

pub(super) fn parent(&self) -> Option<i64> {
match self {
Self::Folder(folder) => folder.parent_id,
Self::Query(query) => query.folder_id,
}
}

fn order(&self) -> (u8, i64, String, i64) {
match self {
Self::Folder(folder) => (0, folder.order, folder.name.to_lowercase(), folder.id),
Self::Query(query) => (1, query.order, query.name.to_lowercase(), query.id),
}
}
}

#[derive(Default)]
pub(super) struct Index {
pub(super) nodes: HashMap<Key, Node>,
children: HashMap<Option<i64>, Vec<Key>>,
paths: HashMap<i64, String>,
}

impl Index {
pub(super) fn new(snapshot: SavedQueriesSnapshot) -> Option<Self> {
let mut index = Self::default();
let mut owners = HashSet::new();
for node in snapshot
.folders
.into_iter()
.map(Node::Folder)
.chain(snapshot.queries.into_iter().map(Node::Query))
{
owners.insert(match &node {
Node::Folder(folder) => folder.connection_id,
Node::Query(query) => query.connection_id,
});
index.children.entry(node.parent()).or_default().push(node.key());
if index.nodes.insert(node.key(), node).is_some() {
return None;
}
}
if owners.len() > 1 {
return None;
}
for keys in index.children.values_mut() {
keys.sort_by_cached_key(|key| index.nodes[key].order());
}
let mut pending = vec![(None, String::new())];
let mut visited = HashSet::new();
while let Some((parent, path)) = pending.pop() {
for key in index.children.get(&parent).into_iter().flatten() {
if !visited.insert(*key) {
return None;
}
if let Key::Folder(id) = key {
let name = index.nodes[key].name().replace('\\', "\\\\").replace('/', "\\/");
let path = format!("{path}/{name}");
index.paths.insert(*id, path.clone());
pending.push((Some(*id), path));
}
}
}
(visited.len() == index.nodes.len()).then_some(index)
}

pub(super) fn children(&self, parent: Option<i64>) -> &[Key] {
self.children.get(&parent).map_or(&[], Vec::as_slice)
}

pub(super) fn path(&self, id: i64) -> Option<&str> {
self.paths.get(&id).map(String::as_str)
}

pub(super) fn destinations(&self) -> Vec<(i64, String)> {
let mut folders: Vec<_> = self.paths.iter().map(|(id, path)| (*id, path.clone())).collect();
folders.sort_by_cached_key(|(id, path)| (path.to_lowercase(), path.clone(), *id));
folders
}

#[cfg(test)]
pub(super) fn queries(&self) -> Vec<SavedQuery> {
let mut queries: Vec<_> = self
.nodes
.values()
.filter_map(|node| match node {
Node::Query(query) => Some(query.clone()),
Node::Folder(_) => None,
})
.collect();
queries.sort_by_key(|query| (query.folder_id, query.order, query.name.to_lowercase(), query.id));
queries
}
}

#[cfg(test)]
mod tests {
use super::*;
use std::time::SystemTime;
use uuid::Uuid;

fn folder(id: i64, name: &str, parent_id: Option<i64>) -> SavedQueryFolder {
SavedQueryFolder {
id,
name: name.to_owned(),
parent_id,
connection_id: Uuid::nil(),
order: 0,
created_at: SystemTime::UNIX_EPOCH,
updated_at: SystemTime::UNIX_EPOCH,
}
}

#[test]
fn folder_destinations_distinguish_ancestry_separators_and_the_root_label() {
let index = Index::new(SavedQueriesSnapshot {
queries: vec![],
folders: vec![
folder(1, "Reports", None),
folder(2, "Monthly", Some(1)),
folder(3, "Archive", None),
folder(4, "Monthly", Some(3)),
folder(5, "Reports/Monthly", None),
folder(6, "No Folder", None),
folder(7, "a\\/b", None),
],
})
.expect("valid hierarchy");
assert_eq!(
index.destinations(),
vec![
(7, "/a\\\\\\/b".to_owned()),
(3, "/Archive".to_owned()),
(4, "/Archive/Monthly".to_owned()),
(6, "/No Folder".to_owned()),
(1, "/Reports".to_owned()),
(2, "/Reports/Monthly".to_owned()),
(5, "/Reports\\/Monthly".to_owned()),
]
);
}

#[test]
fn malformed_hierarchies_are_refused_instead_of_hiding_queries_or_recursing() {
for folders in [
vec![folder(1, "Orphan", Some(99))],
vec![folder(1, "Cycle", Some(2)), folder(2, "Cycle", Some(1))],
vec![folder(1, "Duplicate", None), folder(1, "Duplicate", None)],
] {
assert!(
Index::new(SavedQueriesSnapshot {
queries: vec![],
folders
})
.is_none()
);
}
}

#[test]
fn typed_keys_and_sibling_order_are_stable() {
let mut first = folder(8, "Z", None);
first.order = 0;
let mut second = folder(3, "A", None);
second.order = 1;
let index = Index::new(SavedQueriesSnapshot {
queries: vec![],
folders: vec![second, first],
})
.expect("index");
assert_eq!(index.children(None), [Key::Folder(8), Key::Folder(3)]);
assert_ne!(Key::Folder(3), Key::Query(3));
for key in [Key::Folder(3), Key::Query(3)] {
assert_eq!(Key::parse(&key.target()), Some(key));
}
for text in ["", "😀", "qabc", "x3"] {
assert_eq!(Key::parse(text), None);
}
}
}
Loading
Loading