Improve moderation capabilities (#238)

Closes #235

Signed-off-by: Sergio Castaño Arteaga <[email protected]>
Signed-off-by: Cintia Sánchez García <[email protected]>
Co-authored-by: Cintia Sánchez García <[email protected]>

Author: tegioz

gitjobs-server/src/db/dashboard/moderator.rs

@@ -6,7 +6,10 @@ use async_trait::async_trait;
 use tracing::{instrument, trace};
 use uuid::Uuid;
 
-use crate::{PgDB, templates::dashboard::moderator::jobs::JobSummary};
+use crate::{
+    PgDB,
+    templates::dashboard::{employer::jobs::JobStatus, moderator::jobs::JobSummary},
+};
 
 /// Trait that defines some database operations used in the moderator
 /// dashboard.
@@ -15,8 +18,8 @@ pub(crate) trait DBDashBoardModerator {
     /// Approve job.
     async fn approve_job(&self, job_id: &Uuid, reviewer: &Uuid) -> Result<()>;
 
-    /// List moderation pending jobs.
-    async fn list_moderation_pending_jobs(&self) -> Result<Vec<JobSummary>>;
+    /// List jobs that match the given status.
+    async fn list_jobs_for_moderation(&self, status: JobStatus) -> Result<Vec<JobSummary>>;
 
     /// Reject job.
     async fn reject_job(&self, job_id: &Uuid, reviewer: &Uuid, review_notes: Option<&String>) -> Result<()>;
@@ -47,8 +50,8 @@ impl DBDashBoardModerator for PgDB {
     }
 
     #[instrument(skip(self), err)]
-    async fn list_moderation_pending_jobs(&self) -> Result<Vec<JobSummary>> {
-        trace!("db: list moderation pending jobs");
+    async fn list_jobs_for_moderation(&self, status: JobStatus) -> Result<Vec<JobSummary>> {
+        trace!("db: list jobs for moderation");
 
         let db = self.pool.get().await?;
         let jobs = db
@@ -78,10 +81,10 @@ impl DBDashBoardModerator for PgDB {
                 from job j
                 join employer e on j.employer_id = e.employer_id
                 left join member m on e.member_id = m.member_id
-                where j.status = 'pending-approval'
+                where j.status = $1
                 order by j.created_at desc;
                 ",
-                &[],
+                &[&status.to_string()],
             )
             .await?
             .into_iter()

gitjobs-server/src/handlers/dashboard/moderator/home.rs

@@ -19,9 +19,12 @@ use crate::{
     handlers::error::HandlerError,
     templates::{
         PageId,
-        dashboard::moderator::{
-            home::{self, Content, Tab},
-            jobs,
+        dashboard::{
+            employer::jobs::JobStatus,
+            moderator::{
+                home::{self, Content, Tab},
+                jobs,
+            },
         },
     },
 };
@@ -44,8 +47,12 @@ pub(crate) async fn page(
     // Prepare content for the selected tab
     let tab: Tab = query.get("tab").unwrap_or(&String::new()).parse().unwrap_or_default();
     let content = match tab {
+        Tab::LiveJobs => {
+            let jobs = db.list_jobs_for_moderation(JobStatus::Published).await?;
+            Content::LiveJobs(jobs::LivePage { jobs })
+        }
         Tab::PendingJobs => {
-            let jobs = db.list_moderation_pending_jobs().await?;
+            let jobs = db.list_jobs_for_moderation(JobStatus::PendingApproval).await?;
             Content::PendingJobs(jobs::PendingPage { jobs })
         }
     };

gitjobs-server/src/handlers/dashboard/moderator/jobs.rs

@@ -16,17 +16,29 @@ use crate::{
     db::DynDB,
     handlers::error::HandlerError,
     templates::{
-        dashboard::{employer, moderator::jobs},
+        dashboard::{
+            employer::{self, jobs::JobStatus},
+            moderator::jobs,
+        },
         helpers::option_is_none_or_default,
     },
 };
 
 // Pages handlers.
 
+/// Handler that returns the live jobs page.
+#[instrument(skip_all, err)]
+pub(crate) async fn live_page(State(db): State<DynDB>) -> Result<impl IntoResponse, HandlerError> {
+    let jobs = db.list_jobs_for_moderation(JobStatus::Published).await?;
+    let template = jobs::LivePage { jobs };
+
+    Ok(Html(template.render()?))
+}
+
 /// Handler that returns the pending jobs page.
 #[instrument(skip_all, err)]
 pub(crate) async fn pending_page(State(db): State<DynDB>) -> Result<impl IntoResponse, HandlerError> {
-    let jobs = db.list_moderation_pending_jobs().await?;
+    let jobs = db.list_jobs_for_moderation(JobStatus::PendingApproval).await?;
     let template = jobs::PendingPage { jobs };
 
     Ok(Html(template.render()?))
@@ -63,7 +75,7 @@ pub(crate) async fn approve(
 
     Ok((
         StatusCode::NO_CONTENT,
-        [("HX-Trigger", "refresh-pending-jobs-table")],
+        [("HX-Trigger", "refresh-moderator-table")],
     )
         .into_response())
 }
@@ -87,7 +99,7 @@ pub(crate) async fn reject(
 
     Ok((
         StatusCode::NO_CONTENT,
-        [("HX-Trigger", "refresh-pending-jobs-table")],
+        [("HX-Trigger", "refresh-moderator-table")],
     )
         .into_response())
 }

gitjobs-server/src/router.rs

@@ -255,6 +255,7 @@ fn setup_moderator_dashboard_router(state: &State) -> Router<State> {
     // Setup router
     Router::new()
         .route("/", get(dashboard::moderator::home::page))
+        .route("/jobs/live", get(dashboard::moderator::jobs::live_page))
         .route("/jobs/pending", get(dashboard::moderator::jobs::pending_page))
         .route("/jobs/{job_id}/approve", put(dashboard::moderator::jobs::approve))
         .route("/jobs/{job_id}/reject", put(dashboard::moderator::jobs::reject))

gitjobs-server/src/templates/dashboard/moderator/home.rs

@@ -24,10 +24,16 @@ pub(crate) struct Page {
 /// Content section.
 #[derive(Debug, Clone, Serialize, Deserialize)]
 pub(crate) enum Content {
+    LiveJobs(jobs::LivePage),
     PendingJobs(jobs::PendingPage),
 }
 
 impl Content {
+    /// Check if the content is the live jobs page.
+    fn is_live_jobs(&self) -> bool {
+        matches!(self, Content::LiveJobs(_))
+    }
+
     /// Check if the content is the pending jobs page.
     fn is_pending_jobs(&self) -> bool {
         matches!(self, Content::PendingJobs(_))
@@ -37,6 +43,7 @@ impl Content {
 impl std::fmt::Display for Content {
     fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
         match self {
+            Content::LiveJobs(template) => write!(f, "{}", template.render()?),
             Content::PendingJobs(template) => write!(f, "{}", template.render()?),
         }
     }
@@ -46,6 +53,7 @@ impl std::fmt::Display for Content {
 #[derive(Debug, Clone, Default, PartialEq, Serialize, Deserialize, strum::Display, strum::EnumString)]
 #[strum(serialize_all = "kebab-case")]
 pub(crate) enum Tab {
+    LiveJobs,
     #[default]
     PendingJobs,
 }

gitjobs-server/src/templates/dashboard/moderator/jobs.rs

@@ -14,6 +14,13 @@ use crate::templates::{
 
 // Pages templates.
 
+/// Live jobs page template.
+#[derive(Debug, Clone, Template, Serialize, Deserialize)]
+#[template(path = "dashboard/moderator/live_jobs.html")]
+pub(crate) struct LivePage {
+    pub jobs: Vec<JobSummary>,
+}
+
 /// Pending jobs page template.
 #[derive(Debug, Clone, Template, Serialize, Deserialize)]
 #[template(path = "dashboard/moderator/pending_jobs.html")]

gitjobs-server/templates/dashboard/moderator/home.html

@@ -13,15 +13,16 @@
   <div class="max-h-full w-full flex flex-col space-y-5 mb-5 overflow-y-auto px-3 lg:px-5">
     <div class="leading-10 grid gap-y-0.5">
       {% call dashboard_macros::menu_title(text = "Jobs", extra_styles = "py-1.5") %}
-      {% call dashboard_macros::menu_item(name = "Pending", icon = "tasks", is_active = content.is_pending_jobs(), href = "/dashboard/moderator?tab=jobs") -%}
+      {% call dashboard_macros::menu_item(name = "Pending", icon = "tasks", is_active = content.is_pending_jobs(), href = "/dashboard/moderator?tab=pending-jobs") -%}
+      {% call dashboard_macros::menu_item(name = "Live", icon = "live", is_active = content.is_live_jobs(), href = "/dashboard/moderator?tab=live-jobs") -%}
     </div>
   </div>
 {% endblock menu -%}
 
 {% block dashboard_main -%}
   <div id="dashboard-content"
-       hx-get="/dashboard/moderator/jobs/pending"
-       hx-trigger="refresh-pending-jobs-table"
+       hx-get="{%- if content.is_pending_jobs() -%}/dashboard/moderator/jobs/pending{%- else -%}/dashboard/moderator/jobs/live{%- endif -%}"
+       hx-trigger="refresh-moderator-table"
        class="p-4 sm:p-6 lg:p-12">
     {# Content -#}
     {{ content|safe }}

gitjobs-server/templates/dashboard/moderator/live_jobs.html

@@ -0,0 +1,52 @@
+{% import "macros.html" as macros -%}
+{% import "dashboard/moderator/moderator_macros.html" as moderator_macros -%}
+
+<div class="flex items-center">
+  {# Mobile filters button -#}
+  <div class="flex shrink-0 me-3 md:me-6 lg:hidden">
+    <button id="open-menu-button"
+            class="btn-primary-outline group size-[40px] p-0 items-center flex justify-center">
+      <div class="svg-icon size-4 icon-menu group-hover:bg-white shrink-0"></div>
+    </button>
+    <script type="module">
+      import {
+        open
+      } from '/static/js/dashboard/base.js';
+
+      const openMenuButton = document.getElementById('open-menu-button');
+      openMenuButton.addEventListener('click', open);
+    </script>
+  </div>
+  {# End mobile filters button -#}
+  {% call macros::form_title(title = "Live jobs") -%}
+</div>
+
+{# Live jobs Table -#}
+{% call moderator_macros::jobs_table(jobs = jobs) -%}
+{# End live jobs Table -#}
+
+{# Mobile live jobs cards -#}
+<div class="flex flex-col space-y-4 md:hidden mt-6">
+  {% if jobs.is_empty() -%}
+    <div class="border border-primary-500 rounded-lg mt-10 p-5 bg-primary-50/20"
+         role="alert">
+      <div class="text-lg mb-6">
+        <div>There are no live jobs at the moment.</div>
+      </div>
+      <p class="text-stone-700">Thanks for checking, please come back later :)</p>
+    </div>
+  {% else -%}
+    {% for job in jobs -%}
+      {% call moderator_macros::mobile_job_card(job = job) -%}
+    {% endfor -%}
+  {% endif -%}
+</div>
+{# End mobile live jobs cards -#}
+
+{# Preview modal -#}
+{% call moderator_macros::preview_modal() -%}
+{# End preview modal -#}
+
+{# Reject modal -#}
+{% call moderator_macros::reject_modal() -%}
+{# End reject modal -#}