Skip to content

Commit 2418465

Browse files
committed
remove deployment dropdown from top nav
1 parent ec845db commit 2418465

File tree

5 files changed

+50
-55
lines changed

5 files changed

+50
-55
lines changed

pgml-dashboard/Cargo.lock

Lines changed: 38 additions & 36 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

pgml-dashboard/src/components/breadcrumbs/template.html

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2,12 +2,6 @@
22
use crate::utils::config;
33
use crate::utils::urls;
44
use crate::components::dropdown::Dropdown;
5-
6-
let home_uri = if config::standalone_dashboard() {
7-
urls::deployment_notebooks()
8-
} else {
9-
"/deployments".to_string()
10-
};
115
%>
126

137
<nav>

pgml-dashboard/src/components/navigation/navbar/web_app/template.html

Lines changed: 1 addition & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -38,15 +38,7 @@
3838
<!-- Top Nav menu items for all sized screens -->
3939
<div class="collapse navbar-collapse drawer-submenu-container" id="navbarSupportedContent">
4040
<!-- Main Menu -->
41-
<div class="nav-item w-100 d-flex flex-column flex-lg-row align-items-lg-center collapse collapse-horizontal horizontal-collapse show drawer-submenu">
42-
<ul class="navbar-nav flex-grow-1 ps-4 p-lg-0 d-none d-lg-block">
43-
<li class="nav-item d-flex align-items-center">
44-
<div class="deployment_controls">
45-
<%+ Dropdown::nav(deployment_controls.links) %>
46-
</div>
47-
</li>
48-
</ul>
49-
41+
<div class="nav-item w-100 d-flex flex-column flex-lg-row align-items-lg-center collapse collapse-horizontal horizontal-collapse show drawer-submenu justify-content-lg-end">
5042
<!-- Main nav links for lg screens -->
5143
<ul class="navbar-nav gap-3 mb-0 d-none d-lg-flex">
5244
<li class="align-items-center d-none d-lg-flex">

pgml-dashboard/src/lib.rs

Lines changed: 10 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@ use components::notifications::product::ProductBanner;
2525
use guards::Cluster;
2626
use responses::{Error, Response, ResponseOk};
2727
use templates::{components::StaticNav, *};
28+
use crate::components::navigation::left_nav;
2829

2930
use crate::components::tables::serverless_models::{ServerlessModels, ServerlessModelsTurbo};
3031
use crate::components::tables::serverless_pricing::{ServerlessPricing, ServerlessPricingTurbo};
@@ -53,7 +54,7 @@ pub struct Context {
5354
pub deployment_dropdown: StaticNav,
5455
pub marketing_footer: String,
5556
pub head_items: Option<String>,
56-
pub product_left_nav: crate::components::navigation::left_nav::web_app::Menu,
57+
pub product_left_nav: left_nav::web_app::Menu,
5758
}
5859

5960
#[derive(Debug, Clone, Default)]
@@ -649,7 +650,10 @@ mod test {
649650
cluster: models::Cluster::default(),
650651
deployment_dropdown: StaticNav { links: vec![] },
651652
organization_dropdown: StaticNav { links: vec![] },
652-
product_left_nav: StaticNav { links: vec![] },
653+
product_left_nav: left_nav::web_app::Menu {
654+
back: None,
655+
items: StaticNav { links: vec![] }
656+
},
653657
marketing_footer: MarketingFooter::new().render_once().unwrap(),
654658
head_items: None,
655659
},
@@ -723,7 +727,10 @@ mod test {
723727
cluster: models::Cluster::default(),
724728
deployment_dropdown: StaticNav { links: vec![] },
725729
organization_dropdown: StaticNav { links: vec![] },
726-
product_left_nav: StaticNav { links: vec![] },
730+
product_left_nav: left_nav::web_app::Menu {
731+
back: None,
732+
items: StaticNav { links: vec![] }
733+
},
727734
marketing_footer: MarketingFooter::new().render_once().unwrap(),
728735
head_items: None,
729736
},

pgml-dashboard/src/main.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -275,7 +275,7 @@ mod test {
275275

276276
#[rocket::async_test]
277277
async fn test_deployment_entries() {
278-
let deployments_endpoint = "/deployments";
278+
let deployments_endpoint = uri!(crate::api::deployment::deployments_index());
279279
let client = Client::tracked(rocket().await).await.unwrap();
280280
let response = client.get(deployments_endpoint).dispatch().await;
281281

0 commit comments

Comments
 (0)