From 193fcde123d461f0d0fdb4e7adb2481c2efdcc67 Mon Sep 17 00:00:00 2001 From: Thomas Citharel Date: Mon, 10 Jan 2022 10:17:50 +0100 Subject: [PATCH] Allow to filter reports by domain Signed-off-by: Thomas Citharel --- js/src/graphql/report.ts | 9 ++- js/src/router/settings.ts | 4 +- js/src/views/Admin/Instance.vue | 5 +- js/src/views/Moderation/ReportList.vue | 84 +++++++++++++++++--------- lib/graphql/resolvers/report.ex | 12 +++- lib/graphql/schema/report.ex | 1 + lib/mobilizon/reports/reports.ex | 38 +++++++----- 7 files changed, 104 insertions(+), 49 deletions(-) diff --git a/js/src/graphql/report.ts b/js/src/graphql/report.ts index 3fcffe8e8..d25436182 100644 --- a/js/src/graphql/report.ts +++ b/js/src/graphql/report.ts @@ -2,8 +2,13 @@ import gql from "graphql-tag"; import { ACTOR_FRAGMENT } from "./actor"; export const REPORTS = gql` - query Reports($status: ReportStatus, $page: Int, $limit: Int) { - reports(status: $status, page: $page, limit: $limit) { + query Reports( + $status: ReportStatus + $domain: String + $page: Int + $limit: Int + ) { + reports(status: $status, domain: $domain, page: $page, limit: $limit) { total elements { id diff --git a/js/src/router/settings.ts b/js/src/router/settings.ts index fcd8eeca2..c71730ba0 100644 --- a/js/src/router/settings.ts +++ b/js/src/router/settings.ts @@ -20,7 +20,7 @@ export enum SettingsRouteName { ADMIN_GROUPS = "ADMIN_GROUPS", ADMIN_GROUP_PROFILE = "ADMIN_GROUP_PROFILE", MODERATION = "MODERATION", - REPORTS = "Reports", + REPORTS = "REPORTS", REPORT = "Report", REPORT_LOGS = "Logs", CREATE_IDENTITY = "CreateIdentity", @@ -234,7 +234,7 @@ export const settingsRoutes: RouteConfig[] = [ meta: { requiredAuth: true, announcer: { skip: true } }, }, { - path: "/moderation/reports/:filter?", + path: "/moderation/reports", name: SettingsRouteName.REPORTS, component: (): Promise => import( diff --git a/js/src/views/Admin/Instance.vue b/js/src/views/Admin/Instance.vue index 85233234f..bfb4bd18c 100644 --- a/js/src/views/Admin/Instance.vue +++ b/js/src/views/Admin/Instance.vue @@ -70,7 +70,10 @@ {{ $t("Followers") }}
- + {{ instance.reportsCount }} diff --git a/js/src/views/Moderation/ReportList.vue b/js/src/views/Moderation/ReportList.vue index bce76169d..a1e278b9b 100644 --- a/js/src/views/Moderation/ReportList.vue +++ b/js/src/views/Moderation/ReportList.vue @@ -15,23 +15,37 @@
- - {{ $t("Open") }} + + {{ $t("Open") }} + {{ $t("Resolved") }} + {{ $t("Closed") }} + + - {{ $t("Resolved") }} - {{ $t("Closed") }} - + + +