Skip to content

fix: load a menu item's page whenever its slug is selected #259

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We鈥檒l occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
TwoDCube wants to merge 1 commit into
base: fix/soft-deleted-menu-items
Choose a base branch
from
Draft

fix: load a menu item's page whenever its slug is selected #259

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
4 changes: 2 additions & 2 deletions src/graphql/resolvers/menu.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ impl MenuItem {
select_columns!(ctx, query, Column);
select_columns!(ctx, query,
"link" => Column::Type,
"link" => Column::PageId,
"slug" => Column::PageId,
"children" => Column::Id);

query
Expand Down Expand Up @@ -91,7 +91,7 @@ impl MenuQuery {
select_columns!(ctx, query, Column);
select_columns!(ctx, query,
"link" => Column::Type,
"link" => Column::PageId,
"slug" => Column::PageId,
"children" => Column::Id);

query
Expand Down
30 changes: 20 additions & 10 deletions tests/content.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,20 +59,30 @@ async fn menu_is_a_tree_in_position_order() {
}

#[tokio::test]
#[ignore = "bug: a menu item's slug is null unless its link is selected too"]
async fn menu_slug_does_not_depend_on_selecting_link() {
// "Kapcsolat" links to the page with the slug "kapcsolat".
fn item<'a>(items: &'a Value, name: &str) -> &'a Value {
items
.as_array()
.expect("menu items")
.iter()
.find(|item| item["name"] == name)
.unwrap_or_else(|| panic!("no menu item {name:?} in {items:#}"))
}

// "Kapcsolat" links to the page "kapcsolat"; "R贸lunk", a child of
// "Iskol谩nk", links to the page "rolunk".
let app = TestApp::seeded().await;

let response = app.graphql("{ menu { name slug } }").await;
let response = app
.graphql("{ menu { name slug children { name slug } } }")
.await;

let contact = expect_data(&response)["menu"]
.as_array()
.expect("menu")
.iter()
.find(|item| item["name"] == "Kapcsolat")
.expect("seeded menu item");
assert_eq!(contact["slug"], "kapcsolat");
let menu = &expect_data(&response)["menu"];
assert_eq!(item(menu, "Kapcsolat")["slug"], "kapcsolat");
assert_eq!(
item(&item(menu, "Iskol谩nk")["children"], "R贸lunk")["slug"],
"rolunk"
);
}

#[tokio::test]
Expand Down