feat: ingress form in modal & delete relationship

src/bin/server.rs

@@ -34,10 +34,10 @@ use zettle_db::{
                     show_privacy_policy,
                 },
                 gdpr::{accept_gdpr, deny_gdpr},
-                index::{delete_job, delete_text_content, index_handler},
+                index::{delete_job, delete_text_content, index_handler, show_active_jobs},
                 ingress_form::{hide_ingress_form, process_ingress_form, show_ingress_form},
                 knowledge::{
-                    delete_knowledge_entity, patch_knowledge_entity,
+                    delete_knowledge_entity, delete_knowledge_relationship, patch_knowledge_entity,
                     show_edit_knowledge_entity_form, show_knowledge_page,
                 },
                 search_result::search_result_handler,
@@ -176,6 +176,7 @@ fn html_routes(
         .route("/hide-ingress-form", get(hide_ingress_form))
         .route("/text-content/:id", delete(delete_text_content))
         .route("/jobs/:job_id", delete(delete_job))
+        .route("/active-jobs", get(show_active_jobs))
         .route("/knowledge", get(show_knowledge_page))
         .route(
             "/knowledge-entity/:id",
@@ -183,6 +184,10 @@ fn html_routes(
                 .delete(delete_knowledge_entity)
                 .patch(patch_knowledge_entity),
         )
+        .route(
+            "/knowledge-relationship/:id",
+            delete(delete_knowledge_relationship),
+        )
         .route("/account", get(show_account_page))
         .route("/admin", get(show_admin_panel))
         .route("/toggle-registrations", patch(toggle_registration_status))

src/server/routes/html/index.rs

@@ -179,8 +179,8 @@ async fn get_and_validate_text_content(
 
 #[derive(Serialize)]
 pub struct ActiveJobsData {
-    active_jobs: Vec<Job>,
-    user: User,
+    pub active_jobs: Vec<Job>,
+    pub user: User,
 }
 
 pub async fn delete_job(
@@ -217,3 +217,31 @@ pub async fn delete_job(
 
     Ok(output.into_response())
 }
+
+pub async fn show_active_jobs(
+    State(state): State<AppState>,
+    auth: AuthSession<User, String, SessionSurrealPool<Any>, Surreal<Any>>,
+) -> Result<impl IntoResponse, HtmlError> {
+    let user = match auth.current_user {
+        Some(user) => user,
+        None => return Ok(Redirect::to("/signin").into_response()),
+    };
+
+    let active_jobs = state
+        .job_queue
+        .get_unfinished_user_jobs(&user.id)
+        .await
+        .map_err(|e| HtmlError::new(e, state.templates.clone()))?;
+
+    let output = render_block(
+        "index/signed_in/active_jobs.html",
+        "active_jobs_section",
+        ActiveJobsData {
+            user: user.clone(),
+            active_jobs,
+        },
+        state.templates.clone(),
+    )?;
+
+    Ok(output.into_response())
+}

src/server/routes/html/ingress_form.rs

@@ -14,7 +14,10 @@ use crate::{
     error::{AppError, HtmlError, IntoHtmlError},
     ingress::types::ingress_input::{create_ingress_objects, IngressInput},
     page_data,
-    server::AppState,
+    server::{
+        routes::html::{index::ActiveJobsData, render_block},
+        AppState,
+    },
     storage::types::{file_info::FileInfo, user::User},
 };
 
@@ -38,7 +41,7 @@ pub async fn show_ingress_form(
         .map_err(|e| HtmlError::new(e, state.templates.clone()))?;
 
     let output = render_template(
-        "ingress_form.html",
+        "index/signed_in/ingress_modal.html",
         ShowIngressFormData { user_categories },
         state.templates.clone(),
     )?;
@@ -129,8 +132,22 @@ pub async fn process_ingress_form(
         .map_err(AppError::from)
         .map_err(|e| HtmlError::new(e, state.templates.clone()))?;
 
-    Ok(Html(
-        "<a class='btn btn-primary' hx-get='/ingress-form' hx-swap='outerHTML'>Add Content</a>",
-    )
-    .into_response())
+    // Update the active jobs page with the newly created job
+    let active_jobs = state
+        .job_queue
+        .get_unfinished_user_jobs(&user.id)
+        .await
+        .map_err(|e| HtmlError::new(e, state.templates.clone()))?;
+
+    let output = render_block(
+        "index/signed_in/active_jobs.html",
+        "active_jobs_section",
+        ActiveJobsData {
+            user: user.clone(),
+            active_jobs,
+        },
+        state.templates.clone(),
+    )?;
+
+    Ok(output.into_response())
 }

src/server/routes/html/knowledge/mod.rs

@@ -263,3 +263,45 @@ pub async fn delete_knowledge_entity(
 
     Ok(output.into_response())
 }
+
+#[derive(Serialize)]
+pub struct RelationshipTableData {
+    entities: Vec<KnowledgeEntity>,
+    relationships: Vec<KnowledgeRelationship>,
+}
+
+pub async fn delete_knowledge_relationship(
+    State(state): State<AppState>,
+    auth: AuthSession<User, String, SessionSurrealPool<Any>, Surreal<Any>>,
+    Path(id): Path<String>,
+) -> Result<impl IntoResponse, HtmlError> {
+    // Early return if the user is not authenticated
+    let user = match auth.current_user {
+        Some(user) => user,
+        None => return Ok(Redirect::to("/signin").into_response()),
+    };
+
+    KnowledgeRelationship::delete_relationship_by_id(&id, &state.surreal_db_client)
+        .await
+        .map_err(|e| HtmlError::new(e, state.templates.clone()))?;
+
+    let entities = User::get_knowledge_entities(&user.id, &state.surreal_db_client)
+        .await
+        .map_err(|e| HtmlError::new(e, state.templates.clone()))?;
+
+    let relationships = User::get_knowledge_relationships(&user.id, &state.surreal_db_client)
+        .await
+        .map_err(|e| HtmlError::new(e, state.templates.clone()))?;
+
+    // Render updated list
+    let output = render_template(
+        "knowledge/relationship_table.html",
+        RelationshipTableData {
+            entities,
+            relationships,
+        },
+        state.templates,
+    )?;
+
+    Ok(output.into_response())
+}

src/storage/types/knowledge_relationship.rs

@@ -73,4 +73,15 @@ impl KnowledgeRelationship {
 
         Ok(())
     }
+
+    pub async fn delete_relationship_by_id(
+        id: &str,
+        db_client: &SurrealDbClient,
+    ) -> Result<(), AppError> {
+        let query = format!("DELETE relates_to:`{}`", id);
+
+        db_client.query(query).await?;
+
+        Ok(())
+    }
 }