Skip to content

New Rocket slashes not the same #919

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’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 4 commits into from
Aug 15, 2023
Merged

New Rocket slashes not the same #919

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
1f14f69
New Rocket slashes not the same
levkk Aug 15, 2023
4b2105b
Dashes and dots
levkk Aug 15, 2023
6e19d8d
audit
levkk Aug 15, 2023
4be13e4
fmt
levkk Aug 15, 2023
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
3 changes: 2 additions & 1 deletion pgml-dashboard/src/api/docs.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -261,7 +261,8 @@ SELECT * FROM test;

// Style headings like we like them
let mut plugins = ComrakPlugins::default();
plugins.render.heading_adapter = Some(&MarkdownHeadings {});
let binding = MarkdownHeadings::new();
plugins.render.heading_adapter = Some(&binding);
plugins.render.codefence_syntax_highlighter = Some(&SyntaxHighlighter {});

let mut html = vec![];
Expand Down
2 changes: 1 addition & 1 deletion pgml-dashboard/src/guards.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
use std::env::var;

use crate::templates::components::{StaticNav, StaticNavLink};
use rocket::request::{self, FromRequest, Request};
use rocket::http::Status;
use rocket::request::{self, FromRequest, Request};
use sqlx::{postgres::PgPoolOptions, Executor, PgPool};

use crate::models;
Expand Down
6 changes: 3 additions & 3 deletions pgml-dashboard/src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -88,7 +88,7 @@ pub async fn notebook_create(
let notebook = crate::models::Notebook::create(cluster.pool(), data.name).await?;

Ok(Redirect::to(format!(
"/dashboard/?tab=Notebooks&notebook_id={}",
"/dashboard?tab=Notebooks&notebook_id={}",
notebook.id
)))
}
Expand Down Expand Up @@ -139,7 +139,7 @@ pub async fn cell_create(
let _ = cell.render(cluster.pool()).await?;

Ok(Redirect::to(format!(
"/dashboard/notebooks/{}/",
"/dashboard/notebooks/{}",
notebook_id
)))
}
Expand Down Expand Up @@ -440,7 +440,7 @@ pub async fn uploader_upload(
.await
{
Ok(()) => Ok(Redirect::to(format!(
"/dashboard/?tab=Upload_Data&table_name={}",
"/dashboard?tab=Upload_Data&table_name={}",
uploaded_file.table_name()
))),
Err(err) => Err(BadRequest(Layout::new("Uploader").render(
Expand Down
26 changes: 13 additions & 13 deletions pgml-dashboard/src/main.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -183,48 +183,48 @@ mod test {
#[rocket::async_test]
async fn test_notebooks_index() {
let client = Client::tracked(rocket().await).await.unwrap();
let response = client.get("/dashboard/notebooks/").dispatch().await;
let response = client.get("/dashboard/notebooks").dispatch().await;
assert_eq!(response.status().code, 200);
}

#[rocket::async_test]
async fn test_projects_index() {
let client = Client::tracked(rocket().await).await.unwrap();
let response = client.get("/dashboard/projects/").dispatch().await;
let response = client.get("/dashboard/projects").dispatch().await;
assert_eq!(response.status().code, 200);
}

#[rocket::async_test]
async fn test_models_index() {
let client = Client::tracked(rocket().await).await.unwrap();
let response = client.get("/dashboard/models/").dispatch().await;
let response = client.get("/dashboard/models").dispatch().await;
assert_eq!(response.status().code, 200);
}

#[rocket::async_test]
async fn test_deployments_index() {
let client = Client::tracked(rocket().await).await.unwrap();
let response = client.get("/dashboard/deployments/").dispatch().await;
let response = client.get("/dashboard/deployments").dispatch().await;
assert_eq!(response.status().code, 200);
}

#[rocket::async_test]
async fn test_uploader() {
let client = Client::tracked(rocket().await).await.unwrap();
let response = client.get("/dashboard/uploader/").dispatch().await;
let response = client.get("/dashboard/uploader").dispatch().await;
assert_eq!(response.status().code, 200);
}

#[rocket::async_test]
async fn test_snapshots_index() {
let client = Client::tracked(rocket().await).await.unwrap();
let response = client.get("/dashboard/snapshots/").dispatch().await;
let response = client.get("/dashboard/snapshots").dispatch().await;
assert_eq!(response.status().code, 200);
}

#[rocket::async_test]
async fn test_snapshot_entries() {
let snapshots_endpoint = "/dashboard/snapshots/";
let snapshots_endpoint = "/dashboard/snapshots";
let client = Client::tracked(rocket().await).await.unwrap();
let response = client.get(snapshots_endpoint).dispatch().await;

Expand All @@ -239,7 +239,7 @@ mod test {

#[rocket::async_test]
async fn test_notebook_entries() {
let notebooks_endpoint = "/dashboard/notebooks/";
let notebooks_endpoint = "/dashboard/notebooks";
let client = Client::tracked(rocket().await).await.unwrap();
let response = client.get(notebooks_endpoint).dispatch().await;

Expand All @@ -254,7 +254,7 @@ mod test {

#[rocket::async_test]
async fn test_project_entries() {
let projects_endpoint = "/dashboard/projects/";
let projects_endpoint = "/dashboard/projects";
let client = Client::tracked(rocket().await).await.unwrap();
let response = client.get(projects_endpoint).dispatch().await;

Expand All @@ -269,7 +269,7 @@ mod test {

#[rocket::async_test]
async fn test_model_entries() {
let models_endpoint = "/dashboard/models/";
let models_endpoint = "/dashboard/models";
let client = Client::tracked(rocket().await).await.unwrap();
let response = client.get(models_endpoint).dispatch().await;

Expand All @@ -284,7 +284,7 @@ mod test {

#[rocket::async_test]
async fn test_deployment_entries() {
let deployments_endpoint = "/deployments/";
let deployments_endpoint = "/deployments";
let client = Client::tracked(rocket().await).await.unwrap();
let response = client.get(deployments_endpoint).dispatch().await;

Expand All @@ -301,7 +301,7 @@ mod test {
async fn test_docs() {
let client = Client::tracked(rocket().await).await.unwrap();
let response = client
.get("/docs/guides/setup/quick_start_with_docker/")
.get("/docs/guides/setup/quick_start_with_docker")
.dispatch()
.await;
assert_eq!(response.status().code, 200);
Expand All @@ -310,7 +310,7 @@ mod test {
#[rocket::async_test]
async fn test_blogs() {
let client = Client::tracked(rocket().await).await.unwrap();
let response = client.get("/blog/postgresml-raises-4.7M-to-launch-serverless-ai-application-databases-based-on-postgres/").dispatch().await;
let response = client.get("/blog/postgresml-raises-4.7M-to-launch-serverless-ai-application-databases-based-on-postgres").dispatch().await;
assert_eq!(response.status().code, 200);
}
}
2 changes: 1 addition & 1 deletion pgml-dashboard/templates/content/dashboard/dashboard.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ <h1>Dashboard</h1>
<ul class="nav nav-tabs" role="tablist" >
<% for (i, tab) in tabs.tabs.iter().enumerate() { %>
<li class="nav-item" role="presentation">
<a class="nav-link <%- check_if_active(tabs.active, tab.name) %>" href="/dashboard/?tab=<%- tab.name %>" type="button" role="tab" aria-controls="tab-<%- tab.name %>" aria-selected="<%= i %>" data-turbo-action="advance" >
<a class="nav-link <%- check_if_active(tabs.active, tab.name) %>" href="/dashboard?tab=<%- tab.name %>" type="button" role="tab" aria-controls="tab-<%- tab.name %>" aria-selected="<%= i %>" data-turbo-action="advance" >
<%- tab.name.replace("_", " ") %>
</a>
</li>
Expand Down
4 changes: 2 additions & 2 deletions pgml-dashboard/templates/content/dashboard/panels/deployment.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,9 @@ <h1><span class="material-symbols-outlined">inventory</span>Deployment

<dl>
<dt>Project</dt>
<dd><a href="/dashboard/?tab=Projects&project_id=<%= project.id %>" data-turbo="false"><%= project.name %></a></dd>
<dd><a href="/dashboard?tab=Projects&project_id=<%= project.id %>" data-turbo="false"><%= project.name %></a></dd>
<dt>Model</dt>
<dd><a href="/dashboard/?tab=Models&model_id=<%= model.id %>" data-turbo="false"><%= model.algorithm %></a></dd>
<dd><a href="/dashboard?tab=Models&model_id=<%= model.id %>" data-turbo="false"><%= model.algorithm %></a></dd>
<dt>Reason</dt>
<dd><%= deployment.human_readable_strategy() %></dd>
<dt>Deployed</dt>
Expand Down
4 changes: 2 additions & 2 deletions pgml-dashboard/templates/content/dashboard/panels/model.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,9 @@ <h1><span class="material-symbols-outlined">model_training</span><%= model.algor

<dl>
<dt>Project</dt>
<dd><a href="/dashboard/?tab=Projects&project_id=<%= project.id %>" data-turbo="false"><%= project.name %></a></dd>
<dd><a href="/dashboard?tab=Projects&project_id=<%= project.id %>" data-turbo="false"><%= project.name %></a></dd>
<dt>Snapshot</dt>
<dd><a href="/dashboard/?tab=Snapshots&snapshot_id=<%= snapshot.id %>" data-turbo="false"><%= snapshot.relation_name %></a></dd>
<dd><a href="/dashboard?tab=Snapshots&snapshot_id=<%= snapshot.id %>" data-turbo="false"><%= snapshot.relation_name %></a></dd>
<dt>Created</dt>
<dd><time datetime="<% model.created_at; %>"><% model.created_at; %></time></dd>
</dl>
Expand Down
4 changes: 2 additions & 2 deletions pgml-dashboard/templates/content/dashboard/panels/models.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ <h2><%= project.name %> </h2>
<% for model in &models[&project.id] { %>
<li>
<a href="/dashboard/models/<%= model.id %>" data-turbo-frame="model">
<span class="material-symbols-outlined">
<span class="material-symbols-outlined d-flex justify-content-center align-items-center">
<% if model.search.is_some() { %>
<% if model.search.as_ref().unwrap().as_str() == "grid" { %>
grid_on
Expand All @@ -25,7 +25,7 @@ <h2><%= project.name %> </h2>
check_circle
<% } %>
</span>
<span><%= model.algorithm %></span>
<span class="ps-2"><%= model.algorithm %></span>
<span><%= format!("{:.4}", model.key_metric(&project).unwrap()) %></span>
<figure id="model_<%= model.id %>"></figure>
</a>
Expand Down
2 changes: 1 addition & 1 deletion pgml-dashboard/templates/content/dashboard/panels/notebooks.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ <h1 class="d-flex align-items-center">
<ol class="object_list">
<% for notebook in notebooks { %>
<li>
<a href="/dashboard/notebooks/<%= notebook.id %>/" data-turbo-frame="notebook">
<a href="/dashboard/notebooks/<%= notebook.id %>" data-turbo-frame="notebook">
<span>
<%= notebook.name %>
</span>
Expand Down
6 changes: 3 additions & 3 deletions pgml-dashboard/templates/content/dashboard/panels/project.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,8 @@ <h2><span class="material-symbols-outlined">model_training</span>Models</h2>
</li>
<% for model in models.iter() { %>
<li>
<a href="/dashboard/?tab=Models&model_id=<%= model.id %>" data-turbo="false">
<span class="material-symbols-outlined">
<a href="/dashboard?tab=Models&model_id=<%= model.id %>" data-turbo="false">
<span class="material-symbols-outlined d-flex justify-content-center align-items-center">
<% if model.search.is_some() { %>
<% if model.search.as_ref().unwrap().as_str() == "grid" { %>
grid_on
Expand All @@ -29,7 +29,7 @@ <h2><span class="material-symbols-outlined">model_training</span>Models</h2>
check_circle
<% } %>
</span>
<span><%= model.algorithm %></span>
<span class="ps-2"><%= model.algorithm %></span>
<span><%= format!("{:.4}", model.key_metric(&project).unwrap()) %></span>
<figure id="model_<%= model.id %>"></figure>
</a>
Expand Down
2 changes: 1 addition & 1 deletion pgml-dashboard/templates/content/dashboard/panels/projects.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ <h1><span class="material-symbols-outlined">apps</span>Projects</h1>
<ol class="object_list project_list">
<% for project in projects { %>
<li>
<a href="/dashboard/projects/<%= project.id %>/" data-turbo-frame="project">
<a href="/dashboard/projects/<%= project.id %>" data-turbo-frame="project">
<span><%= project.name %></span>
<span>
<time datetime="<% project.created_at; %>">
Expand Down
8 changes: 4 additions & 4 deletions pgml-dashboard/templates/content/dashboard/panels/snapshot.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,16 +26,16 @@ <h2><span class="material-symbols-outlined">model_training</span>Models</h2>
<% let project = &projects[&models.iter().next().unwrap().project_id]; %>
<ol class="object_list model_list">
<li>
<a href="/dashboard/?tab=Projects&project_id=<%= project.id %>" data-turbo="false">
<a href="/dashboard?tab=Projects&project_id=<%= project.id %>" data-turbo="false">
<h3 style="padding-right: 20%"><%= project.name %></h3>
<b><%- project.key_metric_display_name().unwrap() %></b>
<figure id="project_<%= project.id %>"></figure>
</a>
</li>
<% for model in models.iter() { %>
<li>
<a href="/dashboard/?tab=Models&model_id=<%= model.id %>" data-turbo="false">
<span class="material-symbols-outlined">
<a href="/dashboard?tab=Models&model_id=<%= model.id %>" data-turbo="false">
<span class="material-symbols-outlined d-flex justify-content-center align-items-center">
<% if model.search.is_some() { %>
<% if model.search.as_ref().unwrap().as_str() == "grid" { %>
grid_on
Expand All @@ -47,7 +47,7 @@ <h3 style="padding-right: 20%"><%= project.name %></h3>
check_circle
<% } %>
</span>
<span><%= model.algorithm %></span>
<span class="ps-2"><%= model.algorithm %></span>
<span><%= format!("{:.4}", model.key_metric(&project).unwrap_or(0.)) %></span>
<figure id="model_<%= model.id %>"></figure>
</a>
Expand Down
2 changes: 1 addition & 1 deletion pgml-dashboard/templates/layout/nav/top.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
<div class="collapse navbar-collapse" id="navbarSupportedContent">
<ul class="navbar-nav flex-grow-1 gap-4 me-auto mb-4 mb-lg-0">
<li class="nav-item d-flex align-items-center">
<a class="nav-link p-0" href="/docs/guides/setup/quick_start_with_docker/">Docs</a>
<a class="nav-link p-0" href="/docs/guides/setup/quick_start_with_docker">Docs</a>
</li>
<% if !standalone_dashboard { %>
<!-- <li class="nav-item d-flex align-items-center">
Expand Down
2 changes: 1 addition & 1 deletion pgml-dashboard/templates/layout/nav/top_web_app.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@
</li>

<li class="nav-item d-flex align-items-center">
<a class="nav-link p-lg-0" href="/docs/guides/setup/quick_start_with_docker/">Docs</a>
<a class="nav-link p-lg-0" href="/docs/guides/setup/quick_start_with_docker">Docs</a>
</li>

<div class="vr my-2 opacity-100 d-lg-block d-none" style="width: 2px"></div>
Expand Down