Make sure dropdown works

levkk · levkk · commit e95e7fc406a3 · 2023-09-04T15:50:07.000-07:00
diff --git a/pgml-dashboard/src/components/dropdown/dropdown.scss b/pgml-dashboard/src/components/dropdown/dropdown.scss
@@ -20,6 +20,13 @@
         width: 100%;
     }
 
+    &.expandable {
+        .dropdown-menu {
+            width: auto;
+            min-width: 100%;
+        }
+    }
+
     .dropdown-item {
         overflow: hidden;
         text-overflow: ellipsis;
diff --git a/pgml-dashboard/src/components/dropdown/mod.rs b/pgml-dashboard/src/components/dropdown/mod.rs
@@ -33,6 +33,7 @@ pub struct Dropdown {
 
     /// Where the dropdown menu should appear
     menu_position: String,
+    expandable: bool,
 }
 
 impl Dropdown {
@@ -91,6 +92,11 @@ impl Dropdown {
         self.offset_collapsed = offset.to_owned();
         self
     }
+
+    pub fn expandable(mut self) -> Self {
+        self.expandable = true;
+        self
+    }
 }
 
 component!(Dropdown);
diff --git a/pgml-dashboard/src/components/dropdown/template.html b/pgml-dashboard/src/components/dropdown/template.html
@@ -2,10 +2,10 @@
 <% use crate::components::dropdown::DropdownValue; %>
 
 <!-- Dropdown component -->
-<div class="dropdown">
+<div class="dropdown <% if expandable { %>expandable<% } %>">
   <% if let DropdownValue::Icon(icon) = value { %>
   <a
-    class="horizontal-hide topnav-controlls dropdown-toggle expanded"
+    class="topnav-controlls dropdown-toggle"
     role="button"
     data-bs-toggle="dropdown"
     data-bs-offset="<%= offset %>"
@@ -15,7 +15,7 @@
   </a>
   <% } else if let DropdownValue::Text(text) = value { %>
   <button
-    class="horizontal-hide btn btn-dropdown dropdown-toggle expanded <% if collapsable { %> leftnav-collapse-affect <% } %>"
+    class="horizontal-hide btn btn-dropdown dropdown-toggle <% if collapsable { %> leftnav-collapse-affect <% } %>"
     role="button"
     data-bs-toggle="dropdown"
     data-bs-offset="<%= offset %>"
diff --git a/pgml-dashboard/src/components/navbar_web_app/template.html b/pgml-dashboard/src/components/navbar_web_app/template.html
@@ -59,8 +59,11 @@
   
             <% if !account_management_nav.links.is_empty() { %>
             <li class="d-none d-lg-flex nav-item align-items-center">
-              <%+ Dropdown::new(account_management_nav.links.clone())
-              .icon(ProfileIcon::new().into()) %>
+              <%+
+                  Dropdown::new(account_management_nav.links.clone())
+                    .icon(ProfileIcon::new().into())
+                    .expandable()
+                %>
             </li>
             <li class="nav-item d-flex d-lg-none align-items-center">
               <a class="nav-link p-lg-0" data-bs-toggle="collapse" data-bs-target=".horizontal-collapse">Account Management</a>
diff --git a/pgml-dashboard/src/guards.rs b/pgml-dashboard/src/guards.rs
@@ -59,7 +59,31 @@ impl Default for Cluster {
                             .active(true),
                     ],
                 },
-                account_management_nav: StaticNav::default(),
+                account_management_nav: StaticNav {
+                    links: vec![
+                        StaticNavLink::new("Notebooks".to_string(), "/dashboard".to_string()),
+                        StaticNavLink::new(
+                            "Projects".to_string(),
+                            "/dashboard?tab=Projects".to_string(),
+                        ),
+                        StaticNavLink::new(
+                            "Models".to_string(),
+                            "/dashboard?tab=Models".to_string(),
+                        ),
+                        StaticNavLink::new(
+                            "Snapshots".to_string(),
+                            "/dashboard?tab=Snapshots".to_string(),
+                        ),
+                        StaticNavLink::new(
+                            "Upload data".to_string(),
+                            "/dashboard?tab=Upload_Data".to_string(),
+                        ),
+                        StaticNavLink::new(
+                            "PostgresML.org".to_string(),
+                            "https://postgresml.org".to_string(),
+                        ),
+                    ],
+                },
                 upper_left_nav: StaticNav {
                     links: vec![
                         StaticNavLink::new(

Original file line number	Diff line number	Diff line change
`@@ -33,6 +33,7 @@ pub struct Dropdown {`
`33`	`33`
`34`	`34`	`/// Where the dropdown menu should appear`
`35`	`35`	`menu_position: String,`
	`36`	`+ expandable: bool,`
`36`	`37`	`}`
`37`	`38`
`38`	`39`	`impl Dropdown {`
`@@ -91,6 +92,11 @@ impl Dropdown {`
`91`	`92`	`self.offset_collapsed = offset.to_owned();`
`92`	`93`	`self`
`93`	`94`	`}`
	`95`	`+`
	`96`	`+ pub fn expandable(mut self) -> Self {`
	`97`	`+ self.expandable = true;`
	`98`	`+ self`
	`99`	`+ }`
`94`	`100`	`}`
`95`	`101`
`96`	`102`	`component!(Dropdown);`