Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
54 commits
Select commit Hold shift + click to select a range
33813ba
feat(linux-browse): switch a table tab between Data and Structure fro…
sedax90 Nov 8, 2026
340e9ca
docs(linux-browse): add the changelog entry
sedax90 Nov 8, 2026
d0aca39
feat(linux-browse): one bottom bar for a table tab's Structure view
sedax90 Nov 8, 2026
ef44adb
docs(linux-browse): add the changelog entry
sedax90 Nov 8, 2026
57645d6
feat(linux-browse): show a table tab's rows as JSON from the bottom bar
sedax90 Nov 8, 2026
3fd5e0c
docs(linux-browse): add the changelog entry
sedax90 Nov 8, 2026
6d73a7c
fix(linux-browse): route table commands by selected view
datlechin Nov 8, 2026
4c31e38
fix(linux-browse): protect structure drafts during reloads
datlechin Nov 8, 2026
4ee4c26
fix(linux-browse): keep table commands reachable in narrow tabs
datlechin Nov 8, 2026
2816b11
refactor(linux-browse): group workspace save requests
datlechin Nov 8, 2026
9fb78f6
test(linux-browse): exercise refresh guards during valid saves
datlechin Nov 8, 2026
e703e58
test(linux-browse): bound structure save frame waits
datlechin Nov 8, 2026
bcc5d79
test(linux-browse): pass the owned window to the frame wait
datlechin Nov 8, 2026
6bd9152
test(linux-browse): report refresh save wait state
datlechin Nov 8, 2026
560c913
test(linux-browse): use typed columns in row save fixtures
datlechin Nov 8, 2026
054cf47
fix(linux-browse): merge selected-view routing into the shared bar
datlechin Nov 8, 2026
06f07fc
fix(linux-browse): keep shared structure commands accessible in compa…
datlechin Nov 8, 2026
563d2ee
fix(linux-browse): add access keys to compact structure commands
datlechin Nov 8, 2026
8da33cd
fix(linux-browse): merge the shared native bar into the JSON view
datlechin Nov 8, 2026
12de044
fix(linux-browse): render current JSON previews through the selected …
datlechin Nov 8, 2026
24c0af0
test(linux-browse): complete the JSON retry request in its harness
datlechin Nov 8, 2026
da3a215
fix(linux-browse): construct the JSON toast overlay with the supporte…
datlechin Nov 9, 2026
e990da5
fix(linux-browse): keep JSON copy notifications as plain text
datlechin Nov 9, 2026
592ddc3
test(linux-browse): assert JSON previews without unordered maps
datlechin Nov 9, 2026
bc0e6d8
Merge remote-tracking branch 'origin/main' into feat/linux-browse-str…
datlechin Nov 9, 2026
3fb1996
fix(linux-workspace): drop the line-count expectation the shorter upd…
datlechin Nov 9, 2026
75d7a53
Merge remote-tracking branch 'origin/main' into feat/linux-browse-str…
datlechin Nov 9, 2026
1d29b84
Merge remote-tracking branch 'origin/main' into feat/linux-browse-str…
datlechin Nov 9, 2026
eb4f801
Merge remote-tracking branch 'origin/main' into feat/linux-browse-str…
datlechin Nov 9, 2026
6f8ac50
fix(linux-grid): pass the NULL text to the row details field search
datlechin Nov 9, 2026
df29b33
Merge commit '6f8ac5096e5504f6ac7dd2178b7d84feadf0751c' into feat/lin…
datlechin Nov 9, 2026
67da9d0
Merge commit 'df29b33af7bfb005c7c5f5e38390a7a23d96670e' into feat/lin…
datlechin Nov 9, 2026
3915d08
fix(linux-browse): keep the view switch's names whole by moving Colum…
datlechin Nov 9, 2026
492f499
Merge branch 'main' into feat/linux-browse-structure-one-bar
datlechin Nov 9, 2026
4f27513
fix(linux-browse): keep the view switch's names whole by moving Colum…
datlechin Nov 9, 2026
0dc2b79
Merge commit '4f2751301' into feat/linux-json-view
datlechin Nov 9, 2026
4d720b7
Merge remote-tracking branch 'origin/main' into feat/linux-browse-str…
datlechin Nov 10, 2026
90631ad
Merge commit '4d720b72c35ba8e59994edf09f278b6014a87190' into feat/lin…
datlechin Nov 10, 2026
6b92b49
Merge remote-tracking branch 'origin/main' into feat/linux-browse-str…
datlechin Nov 10, 2026
34c6e1b
Merge commit '6b92b498a4e5b27dbdf060a2c6958bb333d6dea2' into feat/lin…
datlechin Nov 10, 2026
5f50e7a
test(linux-browse): hold the test windows' widths with a size request…
datlechin Nov 10, 2026
67d975c
Merge commit '5f50e7aa4' into feat/linux-json-view
datlechin Nov 10, 2026
417cb1c
test(linux-browse): upcast to GtkWindow before sizing it
datlechin Nov 10, 2026
38a94bb
Merge commit '417cb1c68' into feat/linux-json-view
datlechin Nov 10, 2026
1929e2c
test(linux-browse): give the tab its width, since the window's reques…
datlechin Nov 10, 2026
340afa5
Merge commit '1929e2c4e' into feat/linux-json-view
datlechin Nov 10, 2026
5228636
test(linux-browse): check Insert's own flag after leaving JSON, since…
datlechin Nov 10, 2026
926ef81
Merge remote-tracking branch 'origin/main' into feat/linux-json-view
datlechin Nov 10, 2026
df75c36
Merge remote-tracking branch 'origin/main' into feat/linux-browse-str…
datlechin Nov 10, 2026
2475d80
Merge commit 'df75c3672' into feat/linux-json-view
datlechin Nov 10, 2026
18e4191
style(linux-browse): format the JSON Save assertion
datlechin Nov 10, 2026
4062ff5
Merge remote-tracking branch 'origin/main' into feat/linux-browse-str…
datlechin Nov 10, 2026
a0aa758
Merge commit '4062ff550' into feat/linux-json-view
datlechin Nov 10, 2026
fd2d81d
Merge remote-tracking branch 'origin/main' into feat/linux-json-view
datlechin Nov 11, 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/4122.added.md
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
A table tab's bottom bar has a JSON view of the rows on screen.
25 changes: 25 additions & 0 deletions linux/crates/app/src/ui/browse_tab/browse_actions.rs
Original file line number Diff line number Diff line change
Expand Up @@ -81,6 +81,31 @@ pub(super) fn install_browse_actions(tab: &BrowseTab, page_size: u64) -> BrowseA
}
tab.imp().pending_bar.announce_save_keys("table", &actions.save);
tab.insert_action_group(ACTION_GROUP, Some(&group));
let json_group = gio::SimpleActionGroup::new();
for name in [
"refresh",
"previous-page",
"next-page",
"first-page",
"last-page",
"page-size",
"count-rows",
"export",
] {
if let Some(action) = group.lookup_action(name) {
json_group.add_action(&action);
}
}
let filter = gio::SimpleAction::new("filter", None);
let weak = tab.downgrade();
filter.connect_activate(move |_, _| {
if let Some(tab) = weak.upgrade() {
tab.imp().view_stack.set_visible_child_name("data");
tab.send(PagingInput::ShowFilterStrip);
}
});
json_group.add_action(&filter);
let _ = tab.imp().json_browse_actions.set(json_group);
let _ = tab.imp().browse_actions.set(group);
install_view_actions(tab);
tab.add_controller(local_shortcut_controller(ShortcutOwner::BrowseTab));
Expand Down
2 changes: 1 addition & 1 deletion linux/crates/app/src/ui/browse_tab/data_handlers.rs
Original file line number Diff line number Diff line change
Expand Up @@ -135,7 +135,7 @@ impl BrowseModel {
/// on screen: rows behind the loading or the error page are not what
/// the table holds under the tab's filter.
pub(super) fn show_grid_actions(&mut self) {
let shown = self.load.has_content() && self.this.upgrade().is_some_and(|tab| !tab.shows_structure());
let shown = self.load.has_content() && self.this.upgrade().is_some_and(|tab| tab.shows_data());
if self.grid_actions_shown == shown {
return;
}
Expand Down
14 changes: 14 additions & 0 deletions linux/crates/app/src/ui/browse_tab/imp.rs
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,17 @@ pub struct BrowseTab {
#[template_child]
pub structure_host: TemplateChild<adw::Bin>,
#[template_child]
pub json_host: TemplateChild<adw::Bin>,
pub(super) json_view: RefCell<Option<super::json_view::JsonView>>,
pub(super) json_actions: OnceCell<gtk::gio::SimpleActionGroup>,
pub(super) json_browse_actions: OnceCell<gtk::gio::SimpleActionGroup>,
#[template_child]
pub rows_start: TemplateChild<gtk::Box>,
#[template_child]
pub json_end: TemplateChild<gtk::Box>,
#[template_child]
pub json_more: TemplateChild<gtk::MenuButton>,
#[template_child]
pub view_toggle: TemplateChild<adw::InlineViewSwitcher>,
#[template_child]
pub structure_start: TemplateChild<gtk::Box>,
Expand Down Expand Up @@ -156,6 +167,9 @@ impl ObjectImpl for BrowseTab {
/// finish it for nobody.
fn dispose(&self) {
self.link_watch.take();
if let Some(view) = self.json_view.borrow_mut().take() {
view.shutdown();
}
if let Ok(mut model) = self.model.try_borrow_mut()
&& let Some(mut model) = model.take()
{
Expand Down
Loading
Loading