")); +} + +#[test] +fn test_add_upper_camel() { + let temp = assert_fs::TempDir::new().unwrap(); + let mut cmd = Command::cargo_bin("cargo-pgml-components").unwrap(); + cmd.arg("pgml-components") + .arg("--project-path") + .arg(temp.path().display().to_string()) + .arg("add") + .arg("component") + .arg("TestComponent"); + + cmd.assert().success(); + + for path in [ + "mod.rs", + "template.html", + "test_component.scss", + "test_component_controller.js", + ] { + temp.child(&format!("src/components/test_component/{}", path)) + .assert(predicate::path::exists()); + } + + let rust = read_to_string(temp.child("src/components/test_component/mod.rs").path()).unwrap(); + assert!(rust.contains("pub struct TestComponent {")); + + let js = read_to_string( + temp.child("src/components/test_component/test_component_controller.js") + .path(), + ) + .unwrap(); + assert!(js.contains("export default class extends Controller")); + assert!(js.contains("console.log('Initialized test-component')")); + + let html = read_to_string( + temp.child("src/components/test_component/template.html") + .path(), + ) + .unwrap(); + assert!(html.contains("

")); + + let mut cmd = Command::cargo_bin("cargo-pgml-components").unwrap(); + cmd.arg("pgml-components") + .arg("--project-path") + .arg(temp.path().display().to_string()) + .arg("add") + .arg("component") + .arg("RandomTest/Hello/snake_path/CamelComponent"); + cmd.assert().success(); + + for path in [ + "mod.rs", + "template.html", + "camel_component.scss", + "camel_component_controller.js", + ] { + temp.child(&format!( + "src/components/random_test/hello/snake_path/camel_component/{}", + path + )) + .assert(predicate::path::exists()); + } + + let js = temp.child( + "src/components/random_test/hello/snake_path/camel_component/camel_component_controller.js", + ); + + let js = read_to_string(js.path()).unwrap(); + assert!(js.contains("export default class extends Controller")); + assert!(js.contains("console.log('Initialized random-test-hello-snake-path-camel-component')")); + + let html = read_to_string( + temp.child("src/components/random_test/hello/snake_path/camel_component/template.html") + .path(), + ) + .unwrap(); + assert!(html.contains("

")); + + let rust = read_to_string( + temp.child("src/components/random_test/hello/snake_path/camel_component/mod.rs") + .path(), + ) + .unwrap(); + assert!(rust.contains("pub struct CamelComponent {")); + assert!(rust.contains("impl CamelComponent {")); +} + +#[test] +fn test_add_subcomponent() { + let mut cmd = Command::cargo_bin("cargo-pgml-components").unwrap(); + let temp = assert_fs::TempDir::new().unwrap(); + + cmd.arg("pgml-components") + .arg("--project-path") + .arg(temp.path().display().to_string()) + .arg("add") + .arg("component") + .arg("test_component/subcomponent/alpha"); + + cmd.assert() + .success() + .stdout(predicate::str::contains("written src/components/mod.rs")) + .stdout(predicate::str::contains( + "written src/components/test_component/mod.rs", + )); + + for path in [ + "mod.rs", + "template.html", + "alpha.scss", + "alpha_controller.js", + ] { + temp.child(&format!( + "src/components/test_component/subcomponent/alpha/{}", + path + )) + .assert(predicate::path::exists()); + } + + // Try to add a component in a folder that already has one. + let mut cmd = Command::cargo_bin("cargo-pgml-components").unwrap(); + cmd.arg("pgml-components") + .arg("--project-path") + .arg(temp.path().display().to_string()) + .arg("add") + .arg("component") + .arg("test_component/subcomponent/alpha/beta"); + + cmd.assert().failure().stdout(predicate::str::contains( + "component cannot be placed into a directory that has a component already", + )); + + // Try one deeper + let mut cmd = Command::cargo_bin("cargo-pgml-components").unwrap(); + cmd.arg("pgml-components") + .arg("--project-path") + .arg(temp.path().display().to_string()) + .arg("add") + .arg("component") + .arg("test_component/subcomponent/alpha/beta/theta"); + + cmd.assert().failure().stdout(predicate::str::contains( + "component cannot be placed into a directory that has a component already", + )); +} + +#[test] +fn test_component_with_dashes() { + let mut cmd = Command::cargo_bin("cargo-pgml-components").unwrap(); + let temp = assert_fs::TempDir::new().unwrap(); + + cmd.arg("pgml-components") + .arg("--project-path") + .arg(temp.path().display().to_string()) + .arg("add") + .arg("component") + .arg("test-component/subcomponent/alpha-beta-gamma"); + + cmd.assert().success(); + + for path in [ + "mod.rs", + "template.html", + "alpha_beta_gamma.scss", + "alpha_beta_gamma_controller.js", + ] { + temp.child(&format!( + "src/components/test_component/subcomponent/alpha_beta_gamma/{}", + path + )) + .assert(predicate::path::exists()); + } + + let rust = read_to_string( + temp.child("src/components/test_component/subcomponent/alpha_beta_gamma/mod.rs") + .path(), + ) + .unwrap(); + + assert!(rust.contains("pub struct AlphaBetaGamma {")); + + let js = read_to_string( + temp.child( + "src/components/test_component/subcomponent/alpha_beta_gamma/alpha_beta_gamma_controller.js", + ) + .path(), + ).unwrap(); + + assert!(js.contains("export default class extends Controller")); + assert!(js.contains("console.log('Initialized test-component-subcomponent-alpha-beta-gamma')")); + + let html = read_to_string( + temp.child("src/components/test_component/subcomponent/alpha_beta_gamma/template.html") + .path(), + ) + .unwrap(); + + assert!(html.contains("

")); + + for path in [ + "test_component/subcomponent/mod.rs", + "test_component/mod.rs", + ] { + temp.child(&format!("src/components/{}", path)) + .assert(predicate::path::exists()); + + let file = read_to_string(temp.child(&format!("src/components/{}", path)).path()).unwrap(); + assert!(file.contains("pub mod")); + } +} + +#[test] +fn test_invalid_component_names() { + let temp = assert_fs::TempDir::new().unwrap(); + for name in ["5_starts_with_a_number", "has%_special_characters"] { + let mut cmd = Command::cargo_bin("cargo-pgml-components").unwrap(); + + cmd.arg("pgml-components") + .arg("--project-path") + .arg(temp.path().display().to_string()) + .arg("add") + .arg("component") + .arg(name); + + cmd.assert() + .failure() + .stdout(predicate::str::contains("component name is not valid")); + } +} diff --git a/pgml-dashboard/build.rs b/pgml-dashboard/build.rs index 9cbc9e68b..d76aa7923 100644 --- a/pgml-dashboard/build.rs +++ b/pgml-dashboard/build.rs @@ -3,8 +3,7 @@ use std::process::Command; fn main() { println!("cargo:rerun-if-changed=migrations"); - println!("cargo:rerun-if-changed=static/css/.pgml-bundle"); - println!("cargo:rerun-if-changed=static/js/.pgml-bundle"); + println!("cargo:rerun-if-changed=src"); let output = Command::new("git") .args(&["rev-parse", "HEAD"]) diff --git a/pgml-dashboard/src/components/mod.rs b/pgml-dashboard/src/components/mod.rs index d8c65199b..8e0a644bf 100644 --- a/pgml-dashboard/src/components/mod.rs +++ b/pgml-dashboard/src/components/mod.rs @@ -4,7 +4,6 @@ mod component; pub(crate) use component::{component, Component}; - // src/components/breadcrumbs pub mod breadcrumbs; pub use breadcrumbs::Breadcrumbs; diff --git a/pgml-dashboard/src/components/nav_link/.component b/pgml-dashboard/src/components/nav_link/.component new file mode 100644 index 000000000..e69de29bb diff --git a/pgml-dashboard/src/components/static_nav_link/.component b/pgml-dashboard/src/components/static_nav_link/.component new file mode 100644 index 000000000..e69de29bb diff --git a/pgml-dashboard/src/utils/config.rs b/pgml-dashboard/src/utils/config.rs index 56dc30e48..a2ad413ae 100644 --- a/pgml-dashboard/src/utils/config.rs +++ b/pgml-dashboard/src/utils/config.rs @@ -63,6 +63,10 @@ pub fn deployment() -> String { } pub fn css_url() -> String { + if dev_mode() { + return "/dashboard/static/css/style.css".to_string(); + } + let filename = format!("style.{}.css", env!("CSS_VERSION")); let path = format!("/dashboard/static/css/{filename}"); @@ -74,6 +78,10 @@ pub fn css_url() -> String { } pub fn js_url(name: &str) -> String { + if dev_mode() { + return format!("/dashboard/static/js/{}", name); + } + let name = name.split(".").collect::>(); let name = name[0..name.len() - 1].join("."); let name = format!("{name}.{}.js", env!("JS_VERSION")); diff --git a/pgml-dashboard/templates/content/dashboard/panels/notebook.html b/pgml-dashboard/templates/content/dashboard/panels/notebook.html index 4bb6ee256..d76a0e92e 100644 --- a/pgml-dashboard/templates/content/dashboard/panels/notebook.html +++ b/pgml-dashboard/templates/content/dashboard/panels/notebook.html @@ -6,7 +6,6 @@ ).confirm_action("notebook#deleteCell").into() ); - %>

+ <%%= value %> +

pFad - (p)hone/(F)rame/(a)nonymizer/(d)eclutterfier! Saves Data!