minor: Remove error from AppStateContext

Author: angrynode

src/state/context.rs

@@ -12,7 +12,6 @@ use super::*;
 /// by rendering the AppStateError into an axum Response.
 pub struct AppStateContext {
     pub db: DatabaseOperator,
-    pub errors: Vec<AppStateError>,
     pub free_space: FreeSpace,
     pub state: AppState,
     pub user: Option<User>,
@@ -29,7 +28,6 @@ impl FromRequestParts<AppState> for AppStateContext {
 
         Ok(Self {
             db: DatabaseOperator::new(state.clone(), user.clone()),
-            errors: vec![],
             free_space: state.free_space()?,
             state: state.clone(),
             user,

src/state/error.rs

@@ -61,33 +61,21 @@ impl AppStateError {
 /// Global error page generated from an [AppStateError].
 #[derive(Debug, Template, WebTemplate)]
 #[template(path = "error.html")]
-pub struct AppStateErrorContext {
-    state: AppStateErrorContextInner,
-}
-
-/// Helper struct so we can reuse base.html
-/// with all it's `state.foo` expressions.
-#[derive(Debug)]
-pub struct AppStateErrorContextInner {
-    // TODO: askama doesn't handle recursion well, so we convert
-    // all errors to strings. Maybe related to:
-    // https://github.com/askama-rs/askama/issues/393
+pub struct AppStateErrorTemplate {
     errors: Vec<AppStateError>,
 }
 
-impl From<AppStateError> for AppStateErrorContext {
+impl From<AppStateError> for AppStateErrorTemplate {
     fn from(e: AppStateError) -> Self {
         // An error is being displayed to the user, make sure it's also written in the logs
         e.log();
-        Self {
-            state: AppStateErrorContextInner { errors: vec![e] },
-        }
+        Self { errors: vec![e] }
     }
 }
 
 impl IntoResponse for AppStateError {
     fn into_response(self) -> Response {
-        let error_context = AppStateErrorContext::from(self);
+        let error_context = AppStateErrorTemplate::from(self);
         (StatusCode::INTERNAL_SERVER_ERROR, error_context).into_response()
     }
 }

templates/base.html

@@ -15,21 +15,7 @@
     {% include "menus/header.html" %}
 
     <section class="section" style="padding-top: 100px;">
-      <div class="container">
-        {% for error in state.errors %}
-          <div class="notification is-danger">
-            <details>
-              <summary>{{ error }}</summary>
-              <ul class="ml-5">
-                {% for inner_error in error.inner_errors() %}
-                  <li>→ {{ inner_error }}</li>
-                {% endfor %}
-              </ul>
-            </details>
-          </div>
-        {% endfor %}
-      </div>
-
+      {% block errors %}{% endblock %}
       {% block main %}{% endblock %}
     </section>
 

templates/error.html

@@ -1,7 +1,22 @@
 {% extends "base.html" %}
 
-{% block main %}
+{% block errors %}
+  <div class="container">
+  {% for error in errors %}
+  <div class="notification is-danger">
+    <details>
+      <summary>{{ error }}</summary>
+      <ul class="ml-5">
+        {% for inner_error in error.inner_errors() %}
+          <li>→ {{ inner_error }}</li>
+        {% endfor %}
+      </ul>
+    </details>
+  </div>
+  {% endfor %}
+</div>
 {% endblock %}
 
 {% block footer_extra %}
+{# Maybe we failed to load some of the global state displayed in the footer #}
 {% endblock %}

templates/progress.html

@@ -20,9 +20,7 @@ <h1>Torrents list</h1>
 
     <div class="card mt-4">
       <div class="card-body">
-        {% if state.errors.len() != 0 %}
-          <h2>Could not reach Bittorrent client (see errors above)</h2>
-        {% else if torrent_list.torrents.len() == 0 %}
+        {% if torrent_list.torrents.len() == 0 %}
           {% include "shared/empty_state.html" %}
         {% else %}
           {% include "progress_table.html" %}