Skip to content

Commit 372ac6a

Browse files
levkklevkk
authored
New Rocket slashes not the same (#919)
1 parent c2dca1a commit 372ac6a

File tree

14 files changed

+37
-36
lines changed

14 files changed

+37
-36
lines changed

‎pgml-dashboard/src/api/docs.rs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -261,7 +261,8 @@ SELECT * FROM test;
261261

262262
// Style headings like we like them
263263
let mut plugins = ComrakPlugins::default();
264-
plugins.render.heading_adapter = Some(&MarkdownHeadings {});
264+
let binding = MarkdownHeadings::new();
265+
plugins.render.heading_adapter = Some(&binding);
265266
plugins.render.codefence_syntax_highlighter = Some(&SyntaxHighlighter {});
266267

267268
let mut html = vec![];

‎pgml-dashboard/src/guards.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
use std::env::var;
22

33
use crate::templates::components::{StaticNav, StaticNavLink};
4-
use rocket::request::{self, FromRequest, Request};
54
use rocket::http::Status;
5+
use rocket::request::{self, FromRequest, Request};
66
use sqlx::{postgres::PgPoolOptions, Executor, PgPool};
77

88
use crate::models;

‎pgml-dashboard/src/lib.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,7 @@ pub async fn notebook_create(
8888
let notebook = crate::models::Notebook::create(cluster.pool(), data.name).await?;
8989

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

141141
Ok(Redirect::to(format!(
142-
"/dashboard/notebooks/{}/",
142+
"/dashboard/notebooks/{}",
143143
notebook_id
144144
)))
145145
}
@@ -440,7 +440,7 @@ pub async fn uploader_upload(
440440
.await
441441
{
442442
Ok(()) => Ok(Redirect::to(format!(
443-
"/dashboard/?tab=Upload_Data&table_name={}",
443+
"/dashboard?tab=Upload_Data&table_name={}",
444444
uploaded_file.table_name()
445445
))),
446446
Err(err) => Err(BadRequest(Layout::new("Uploader").render(

‎pgml-dashboard/src/main.rs

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -183,48 +183,48 @@ mod test {
183183
#[rocket::async_test]
184184
async fn test_notebooks_index() {
185185
let client = Client::tracked(rocket().await).await.unwrap();
186-
let response = client.get("/dashboard/notebooks/").dispatch().await;
186+
let response = client.get("/dashboard/notebooks").dispatch().await;
187187
assert_eq!(response.status().code, 200);
188188
}
189189

190190
#[rocket::async_test]
191191
async fn test_projects_index() {
192192
let client = Client::tracked(rocket().await).await.unwrap();
193-
let response = client.get("/dashboard/projects/").dispatch().await;
193+
let response = client.get("/dashboard/projects").dispatch().await;
194194
assert_eq!(response.status().code, 200);
195195
}
196196

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

204204
#[rocket::async_test]
205205
async fn test_deployments_index() {
206206
let client = Client::tracked(rocket().await).await.unwrap();
207-
let response = client.get("/dashboard/deployments/").dispatch().await;
207+
let response = client.get("/dashboard/deployments").dispatch().await;
208208
assert_eq!(response.status().code, 200);
209209
}
210210

211211
#[rocket::async_test]
212212
async fn test_uploader() {
213213
let client = Client::tracked(rocket().await).await.unwrap();
214-
let response = client.get("/dashboard/uploader/").dispatch().await;
214+
let response = client.get("/dashboard/uploader").dispatch().await;
215215
assert_eq!(response.status().code, 200);
216216
}
217217

218218
#[rocket::async_test]
219219
async fn test_snapshots_index() {
220220
let client = Client::tracked(rocket().await).await.unwrap();
221-
let response = client.get("/dashboard/snapshots/").dispatch().await;
221+
let response = client.get("/dashboard/snapshots").dispatch().await;
222222
assert_eq!(response.status().code, 200);
223223
}
224224

225225
#[rocket::async_test]
226226
async fn test_snapshot_entries() {
227-
let snapshots_endpoint = "/dashboard/snapshots/";
227+
let snapshots_endpoint = "/dashboard/snapshots";
228228
let client = Client::tracked(rocket().await).await.unwrap();
229229
let response = client.get(snapshots_endpoint).dispatch().await;
230230

@@ -239,7 +239,7 @@ mod test {
239239

240240
#[rocket::async_test]
241241
async fn test_notebook_entries() {
242-
let notebooks_endpoint = "/dashboard/notebooks/";
242+
let notebooks_endpoint = "/dashboard/notebooks";
243243
let client = Client::tracked(rocket().await).await.unwrap();
244244
let response = client.get(notebooks_endpoint).dispatch().await;
245245

@@ -254,7 +254,7 @@ mod test {
254254

255255
#[rocket::async_test]
256256
async fn test_project_entries() {
257-
let projects_endpoint = "/dashboard/projects/";
257+
let projects_endpoint = "/dashboard/projects";
258258
let client = Client::tracked(rocket().await).await.unwrap();
259259
let response = client.get(projects_endpoint).dispatch().await;
260260

@@ -269,7 +269,7 @@ mod test {
269269

270270
#[rocket::async_test]
271271
async fn test_model_entries() {
272-
let models_endpoint = "/dashboard/models/";
272+
let models_endpoint = "/dashboard/models";
273273
let client = Client::tracked(rocket().await).await.unwrap();
274274
let response = client.get(models_endpoint).dispatch().await;
275275

@@ -284,7 +284,7 @@ mod test {
284284

285285
#[rocket::async_test]
286286
async fn test_deployment_entries() {
287-
let deployments_endpoint = "/deployments/";
287+
let deployments_endpoint = "/deployments";
288288
let client = Client::tracked(rocket().await).await.unwrap();
289289
let response = client.get(deployments_endpoint).dispatch().await;
290290

@@ -301,7 +301,7 @@ mod test {
301301
async fn test_docs() {
302302
let client = Client::tracked(rocket().await).await.unwrap();
303303
let response = client
304-
.get("/docs/guides/setup/quick_start_with_docker/")
304+
.get("/docs/guides/setup/quick_start_with_docker")
305305
.dispatch()
306306
.await;
307307
assert_eq!(response.status().code, 200);
@@ -310,7 +310,7 @@ mod test {
310310
#[rocket::async_test]
311311
async fn test_blogs() {
312312
let client = Client::tracked(rocket().await).await.unwrap();
313-
let response = client.get("/blog/postgresml-raises-4.7M-to-launch-serverless-ai-application-databases-based-on-postgres/").dispatch().await;
313+
let response = client.get("/blog/postgresml-raises-4.7M-to-launch-serverless-ai-application-databases-based-on-postgres").dispatch().await;
314314
assert_eq!(response.status().code, 200);
315315
}
316316
}

‎pgml-dashboard/templates/content/dashboard/dashboard.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ <h1>Dashboard</h1>
1313
<ul class="nav nav-tabs" role="tablist" >
1414
<% for (i, tab) in tabs.tabs.iter().enumerate() { %>
1515
<li class="nav-item" role="presentation">
16-
<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" >
16+
<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" >
1717
<%- tab.name.replace("_", " ") %>
1818
</a>
1919
</li>

‎pgml-dashboard/templates/content/dashboard/panels/deployment.html

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,9 @@ <h1><span class="material-symbols-outlined">inventory</span>Deployment
1010

1111
<dl>
1212
<dt>Project</dt>
13-
<dd><a href="/dashboard/?tab=Projects&project_id=<%= project.id %>" data-turbo="false"><%= project.name %></a></dd>
13+
<dd><a href="/dashboard?tab=Projects&project_id=<%= project.id %>" data-turbo="false"><%= project.name %></a></dd>
1414
<dt>Model</dt>
15-
<dd><a href="/dashboard/?tab=Models&model_id=<%= model.id %>" data-turbo="false"><%= model.algorithm %></a></dd>
15+
<dd><a href="/dashboard?tab=Models&model_id=<%= model.id %>" data-turbo="false"><%= model.algorithm %></a></dd>
1616
<dt>Reason</dt>
1717
<dd><%= deployment.human_readable_strategy() %></dd>
1818
<dt>Deployed</dt>

‎pgml-dashboard/templates/content/dashboard/panels/model.html

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,9 @@ <h1><span class="material-symbols-outlined">model_training</span><%= model.algor
1010

1111
<dl>
1212
<dt>Project</dt>
13-
<dd><a href="/dashboard/?tab=Projects&project_id=<%= project.id %>" data-turbo="false"><%= project.name %></a></dd>
13+
<dd><a href="/dashboard?tab=Projects&project_id=<%= project.id %>" data-turbo="false"><%= project.name %></a></dd>
1414
<dt>Snapshot</dt>
15-
<dd><a href="/dashboard/?tab=Snapshots&snapshot_id=<%= snapshot.id %>" data-turbo="false"><%= snapshot.relation_name %></a></dd>
15+
<dd><a href="/dashboard?tab=Snapshots&snapshot_id=<%= snapshot.id %>" data-turbo="false"><%= snapshot.relation_name %></a></dd>
1616
<dt>Created</dt>
1717
<dd><time datetime="<% model.created_at; %>"><% model.created_at; %></time></dd>
1818
</dl>

‎pgml-dashboard/templates/content/dashboard/panels/models.html

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ <h2><%= project.name %> </h2>
1313
<% for model in &models[&project.id] { %>
1414
<li>
1515
<a href="/dashboard/models/<%= model.id %>" data-turbo-frame="model">
16-
<span class="material-symbols-outlined">
16+
<span class="material-symbols-outlined d-flex justify-content-center align-items-center">
1717
<% if model.search.is_some() { %>
1818
<% if model.search.as_ref().unwrap().as_str() == "grid" { %>
1919
grid_on
@@ -25,7 +25,7 @@ <h2><%= project.name %> </h2>
2525
check_circle
2626
<% } %>
2727
</span>
28-
<span><%= model.algorithm %></span>
28+
<span class="ps-2"><%= model.algorithm %></span>
2929
<span><%= format!("{:.4}", model.key_metric(&project).unwrap()) %></span>
3030
<figure id="model_<%= model.id %>"></figure>
3131
</a>

‎pgml-dashboard/templates/content/dashboard/panels/notebooks.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ <h1 class="d-flex align-items-center">
88
<ol class="object_list">
99
<% for notebook in notebooks { %>
1010
<li>
11-
<a href="/dashboard/notebooks/<%= notebook.id %>/" data-turbo-frame="notebook">
11+
<a href="/dashboard/notebooks/<%= notebook.id %>" data-turbo-frame="notebook">
1212
<span>
1313
<%= notebook.name %>
1414
</span>

‎pgml-dashboard/templates/content/dashboard/panels/project.html

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,8 @@ <h2><span class="material-symbols-outlined">model_training</span>Models</h2>
1616
</li>
1717
<% for model in models.iter() { %>
1818
<li>
19-
<a href="/dashboard/?tab=Models&model_id=<%= model.id %>" data-turbo="false">
20-
<span class="material-symbols-outlined">
19+
<a href="/dashboard?tab=Models&model_id=<%= model.id %>" data-turbo="false">
20+
<span class="material-symbols-outlined d-flex justify-content-center align-items-center">
2121
<% if model.search.is_some() { %>
2222
<% if model.search.as_ref().unwrap().as_str() == "grid" { %>
2323
grid_on
@@ -29,7 +29,7 @@ <h2><span class="material-symbols-outlined">model_training</span>Models</h2>
2929
check_circle
3030
<% } %>
3131
</span>
32-
<span><%= model.algorithm %></span>
32+
<span class="ps-2"><%= model.algorithm %></span>
3333
<span><%= format!("{:.4}", model.key_metric(&project).unwrap()) %></span>
3434
<figure id="model_<%= model.id %>"></figure>
3535
</a>

0 commit comments

Comments
 (0)