Sort components (#970)

levkk · web-flow · commit d115147fea9e · 2023-08-31T10:57:27.000-07:00
diff --git a/pgml-apps/cargo-pgml-components/Cargo.toml b/pgml-apps/cargo-pgml-components/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "cargo-pgml-components"
-version = "0.1.8"
+version = "0.1.9"
 edition = "2021"
 authors = ["PostgresML <team@postgresml.org>"]
 license = "MIT"
diff --git a/pgml-apps/cargo-pgml-components/src/frontend/components.rs b/pgml-apps/cargo-pgml-components/src/frontend/components.rs
@@ -115,10 +115,13 @@ pub fn add(name: &str, overwrite: bool) {
 /// Update `mod.rs` with all the components in `src/components`.
 pub fn update_modules() {
     let mut modules = Vec::new();
+    let mut paths: Vec<_> = unwrap_or_exit!(read_dir(COMPONENT_DIRECTORY))
+        .map(|p| p.unwrap())
+        .collect();
+    paths.sort_by_key(|dir| dir.path());
 
-    for path in unwrap_or_exit!(read_dir(COMPONENT_DIRECTORY)) {
-        let path = unwrap_or_exit!(path).path();
-
+    for path in paths {
+        let path = path.path();
         if path.is_file() {
             continue;
         }
diff --git a/pgml-dashboard/src/components/mod.rs b/pgml-dashboard/src/components/mod.rs
@@ -5,58 +5,58 @@ mod component;
 pub(crate) use component::{component, Component};
 
 
-// src/components/navbar_web_app
-pub mod navbar_web_app;
-pub use navbar_web_app::NavbarWebApp;
+// src/components/breadcrumbs
+pub mod breadcrumbs;
+pub use breadcrumbs::Breadcrumbs;
 
-// src/components/navbar
-pub mod navbar;
-pub use navbar::Navbar;
+// src/components/confirm_modal
+pub mod confirm_modal;
+pub use confirm_modal::ConfirmModal;
 
-// src/components/postgres_logo
-pub mod postgres_logo;
-pub use postgres_logo::PostgresLogo;
+// src/components/github_icon
+pub mod github_icon;
+pub use github_icon::GithubIcon;
 
-// src/components/static_nav_link
-pub mod static_nav_link;
-pub use static_nav_link::StaticNavLink;
+// src/components/left_nav_menu
+pub mod left_nav_menu;
+pub use left_nav_menu::LeftNavMenu;
+
+// src/components/left_nav_web_app
+pub mod left_nav_web_app;
+pub use left_nav_web_app::LeftNavWebApp;
 
 // src/components/modal
 pub mod modal;
 pub use modal::Modal;
 
-// src/components/static_nav
-pub mod static_nav;
-pub use static_nav::StaticNav;
-
-// src/components/test_component
-pub mod test_component;
-pub use test_component::TestComponent;
-
 // src/components/nav
 pub mod nav;
 pub use nav::Nav;
 
-// src/components/left_nav_web_app
-pub mod left_nav_web_app;
-pub use left_nav_web_app::LeftNavWebApp;
+// src/components/nav_link
+pub mod nav_link;
+pub use nav_link::NavLink;
 
-// src/components/github_icon
-pub mod github_icon;
-pub use github_icon::GithubIcon;
+// src/components/navbar
+pub mod navbar;
+pub use navbar::Navbar;
 
-// src/components/confirm_modal
-pub mod confirm_modal;
-pub use confirm_modal::ConfirmModal;
+// src/components/navbar_web_app
+pub mod navbar_web_app;
+pub use navbar_web_app::NavbarWebApp;
 
-// src/components/left_nav_menu
-pub mod left_nav_menu;
-pub use left_nav_menu::LeftNavMenu;
+// src/components/postgres_logo
+pub mod postgres_logo;
+pub use postgres_logo::PostgresLogo;
 
-// src/components/nav_link
-pub mod nav_link;
-pub use nav_link::NavLink;
+// src/components/static_nav
+pub mod static_nav;
+pub use static_nav::StaticNav;
 
-// src/components/breadcrumbs
-pub mod breadcrumbs;
-pub use breadcrumbs::Breadcrumbs;
+// src/components/static_nav_link
+pub mod static_nav_link;
+pub use static_nav_link::StaticNavLink;
+
+// src/components/test_component
+pub mod test_component;
+pub use test_component::TestComponent;
