feat: Allow typed/sourced errors in content folder creation form

Author: angrynode

src/lib.rs

@@ -25,13 +25,17 @@ pub fn router(state: state::AppState) -> Router {
         .route("/categories", post(routes::category::create))
         .route("/categories/new", get(routes::category::new))
         .route("/categories/{id}/delete", get(routes::category::delete))
-        .route("/folders/{category_id}", get(routes::category::show))
+        .route("/folders/{category}", get(routes::category::show))
+        .route("/folders/{category}", post(routes::category::create_folder))
         .route(
             "/folders/{category_name}/{*folder_path}",
             get(routes::content_folder::show),
         )
+        .route(
+            "/folders/{category_name}/{*folder_path}",
+            post(routes::content_folder::create_subfolder),
+        )
         .route("/folders", get(routes::index::index))
-        .route("/folders", post(routes::content_folder::create))
         .route("/logs", get(routes::logs::index))
         // Register static assets routes
         .nest("/assets", static_router())

src/routes/category.rs

@@ -9,6 +9,7 @@ use crate::database::category;
 use crate::database::content_folder::PathBreadcrumb;
 use crate::extractors::category_request::CategoryRequest;
 use crate::filesystem::FileSystemEntry;
+use crate::routes::content_folder::ContentFolderForm;
 use crate::state::AppStateContext;
 use crate::state::flash_message::{
     FallibleTemplate, FlashRedirect, FlashTemplate, OperationStatus, StatusCookie,
@@ -117,3 +118,29 @@ pub async fn show(
 ) -> FlashTemplate<CategoryShowTemplate> {
     status.with_template(CategoryShowTemplate::new(context, category))
 }
+
+pub async fn create_folder(
+    context: AppStateContext,
+    jar: CookieJar,
+    category: CategoryRequest,
+    Form(form): Form<ContentFolderForm>,
+) -> Result<FlashRedirect, CategoryShowTemplate> {
+    match context.db.content_folder().create(&form).await {
+        Ok(created) => {
+            let status = StatusCookie::success(
+                jar,
+                format!(
+                    "The folder {} has been successfully created (ID: {})",
+                    created.name, created.id
+                ),
+            );
+
+            let uri = format!("/folders/{}{}", category.category.name, created.path);
+            Ok(status.redirect(&uri))
+        }
+        Err(error) => {
+            let status = OperationStatus::error(error);
+            Err(status.with_template(CategoryShowTemplate::new(context, category)))
+        }
+    }
+}

src/routes/content_folder.rs

@@ -3,16 +3,15 @@ use askama_web::WebTemplate;
 use axum::Form;
 use axum_extra::extract::CookieJar;
 use serde::{Deserialize, Serialize};
-use snafu::prelude::*;
 
 use crate::database::content_folder::PathBreadcrumb;
 use crate::database::{category, content_folder};
 use crate::extractors::folder_request::FolderRequest;
 use crate::filesystem::FileSystemEntry;
+use crate::state::AppStateContext;
 use crate::state::flash_message::{
     FallibleTemplate, FlashRedirect, FlashTemplate, OperationStatus, StatusCookie,
 };
-use crate::state::{AppStateContext, error::*};
 
 #[derive(Clone, Debug, Deserialize, Serialize)]
 pub struct ContentFolderForm {
@@ -72,19 +71,12 @@ pub async fn show(
     status.with_template(ContentFolderShowTemplate::new(context, folder))
 }
 
-// TODO: currently an error takes us back to /
-pub async fn create(
+pub async fn create_subfolder(
     context: AppStateContext,
     jar: CookieJar,
+    folder: FolderRequest,
     Form(form): Form<ContentFolderForm>,
-) -> Result<FlashRedirect, AppStateError> {
-    let category = context
-        .db
-        .category()
-        .find_by_id(form.category_id)
-        .await
-        .context(CategorySnafu)?;
-
+) -> Result<FlashRedirect, ContentFolderShowTemplate> {
     match context.db.content_folder().create(&form).await {
         Ok(created) => {
             let status = StatusCookie::success(
@@ -95,23 +87,12 @@ pub async fn create(
                 ),
             );
 
-            let uri = format!("/folders/{}{}", category.name, created.path);
+            let uri = format!("/folders/{}{}", folder.category.name, created.path);
             Ok(status.redirect(&uri))
         }
         Err(error) => {
-            let status = StatusCookie::error(jar, error.to_string());
-            let uri = if let Some(parent_id) = form.parent_id {
-                let parent = context
-                    .db
-                    .content_folder()
-                    .find_by_id(parent_id)
-                    .await
-                    .context(ContentFolderSnafu)?;
-                format!("/folders/{}{}", category.name, parent.path)
-            } else {
-                format!("/folders{}", category.name)
-            };
-            Ok(status.redirect(&uri))
+            let status = OperationStatus::error(error);
+            Err(status.with_template(ContentFolderShowTemplate::new(context, folder)))
         }
     }
 }

src/state/flash_message.rs

@@ -76,6 +76,11 @@ impl OperationStatus {
             message: MessageOrError::Message(message),
         }
     }
+
+    pub fn with_template<T: FallibleTemplate>(self, mut template: T) -> T {
+        template.with_optional_flash(Some(self));
+        template
+    }
 }
 
 /// An operation status passed as a cookie.

templates/categories/show.html

@@ -9,7 +9,7 @@
 {% endblock %}
 
 {% block content_folder_form %}
-<form method="POST" action="/folders" accept-charset="utf-8">
+<form method="POST" accept-charset="utf-8">
     <div class="form-group">
       <label for="name" class="form-label">Name</label>
       <input 

templates/content_folders/show.html

@@ -9,7 +9,7 @@
 {% endblock %}
 
 {% block content_folder_form %}
-<form method="POST" action="/folders" accept-charset="utf-8">
+<form method="POST" accept-charset="utf-8">
     <div class="form-group">
       <label for="name" class="form-label">Name</label>
       <input