Merge pull request #33 from TID-Lab/batch-mode

Batch mode

backend/api/controllers/reportController.js

@@ -210,13 +210,13 @@ exports.reports_irrelevant_update = (req, res) => {
     let remaining = reports.length;
     reports.forEach((report) => {
       // Mark each report as escalated to catch it in model
-      report.setIrrelevant(req.body.irrelevant);
+      report.setIrrelevant(req.body.irrelevance);
       report.save((err) => {
         if (err) {
           if (!res.headersSent) res.status(err.status).send(err.message)
           return;
         }
-        writelog.writeReport(req, report, 'escalatedReport');
+        writelog.writeReport(req, report, 'irreleventReport');
         if (--remaining === 0) return res.sendStatus(200);
       });
     });

backend/api/routes/reportRoutes.js

@@ -36,7 +36,7 @@ router.patch('/_read', User.can('edit data'), reportController.reports_read_upda
 router.patch('/_escalated', User.can('edit data'), reportController.reports_escalated_update);
 
 // Update reports escalation
-router.patch('/_irrelevant', User.can('edit data'), reportController.reports_irrelevant_update);
+router.patch('/_irrelevance', User.can('edit data'), reportController.reports_irrelevant_update);
 
 // Add reports group
 router.patch('/_group', User.can('edit data'), reportController.reports_group_update);

backend/models/report.js

@@ -32,7 +32,7 @@ let schema = new Schema({
   notes: { type: String },
   escalated: { type: Boolean, default: false, required: true, index: true },
   content_lang: { type: String },
-  irrelevant: { type: Boolean, default: false, required: false }
+  irrelevant: { type: String, default: 'false', required: false, enum: ['false', 'true', 'maybe'] }
 });
 
 schema.index({ 'metadata.ct_tag': 1 }, { background: true });

package.json

@@ -101,6 +101,7 @@
     "react-scripts": "^5.0.1",
     "react-tagcloud": "^2.2.0",
     "react-twitter-widgets": "^1.10.0",
+    "react-youtube": "^10.1.0",
     "readline-sync": "^1.4.10",
     "recharts": "^2.1.9",
     "reparse": "^0.1.2",

src/App.tsx

@@ -1,15 +1,22 @@
 import React, { useEffect, useState } from "react";
-import "./App.css";
-import "@yaireo/tagify/dist/tagify.css";
-import AggieNavbar from "./components/AggieNavbar";
-import AlertService, { AlertContent } from "./components/AlertService";
 import {
   Navigate,
   Route,
   Routes,
   useLocation,
   useNavigate,
 } from "react-router-dom";
+import AggieNavbar from "./components/AggieNavbar";
+import AlertService, { AlertContent } from "./components/AlertService";
+import { Modal } from "react-bootstrap";
+import { getSession } from "./api/session";
+
+import type { AxiosError } from "axios";
+import type { Session } from "./objectTypes";
+
+import "./App.css";
+import "@yaireo/tagify/dist/tagify.css";
+
 import ReportsIndex from "./pages/report/ReportsIndex";
 import ReportDetails from "./pages/report/ReportDetails";
 import GroupsIndex from "./pages/group/GroupsIndex";
@@ -25,20 +32,15 @@ import Login from "./pages/Login";
 import Analysis from "./pages/Analysis";
 import NotFound from "./pages/NotFound";
 import ResetPassword from "./pages/ResetPassword";
-import { useQuery, useQueryClient } from "@tanstack/react-query";
-import { getSession } from "./api/session";
-import { Axios, AxiosError } from "axios";
-import { Session } from "./objectTypes";
 import RelevantReportsIndex from "./pages/report/RelevantReportsIndex";
-import { getAllGroups } from "./api/groups";
-import { Button, Modal } from "react-bootstrap";
 import Incidents from "./pages/incidents";
 import Incident from "./pages/incidents/Incident";
 import Reports from "./pages/Reports";
 import Report from "./pages/Reports/Report";
 import NewIncident from "./pages/incidents/NewIncident";
 import FetchIndicator from "./components/FetchIndicator";
 
+// im currently working on this
 //TODO: BIG TODO is to correctly type all of react-query usage. Its not critical for function, but it is good for clarity in development.
 //TODO: Also BIG TODO is to ensure EVERY API call has a way of surfacing an error message. I want readble UI alerts but at least console.errors.
 const isSafari = () =>
@@ -98,7 +100,6 @@ const PrivateRoutes = ({ sessionData, setGlobalAlert }: IPrivateRouteProps) => {
   );
 };
 const App = () => {
-  const queryClient = useQueryClient();
   const [isLoggedIn, setIsLoggedIn] = useState(true);
   const [userData, setUserData] = useState<Session | undefined>(undefined);
 

src/api/enums.ts → src/api/common.ts

@@ -1,23 +1,31 @@
+export interface hasId {
+  _id: string;
+}
+
 export const VERACITY_OPTIONS = [
   "Unconfirmed",
   "Confirmed False",
   "Confirmed True",
 ] as const;
 export type VeracityOptions = (typeof VERACITY_OPTIONS)[number];
 
-export const ESCALATED_OPTIONS = ["true", "false"] as const;
-export type EscalatedOptions = (typeof ESCALATED_OPTIONS)[number];
-
-export const CLOSED_OPTIONS = ["true", "false"] as const;
-export type ClosedOptions = (typeof CLOSED_OPTIONS)[number];
-
 export const MEDIA_OPTIONS = [
   "twitter",
   "tiktok",
   "instagram",
   "RSS",
   "elmo",
   "SMS GH",
+  "youtube",
   "facebook",
-];
+] as const;
 export type MediaOptions = (typeof MEDIA_OPTIONS)[number];
+
+export const ESCALATED_OPTIONS = ["true", "false"] as const;
+export type EscalatedOptions = (typeof ESCALATED_OPTIONS)[number];
+
+export const CLOSED_OPTIONS = ["true", "false"] as const;
+export type ClosedOptions = (typeof CLOSED_OPTIONS)[number];
+
+export const IRRELEVANCE_OPTIONS = ["true", "maybe", "false"] as const;
+export type IrrelevanceOptions = (typeof IRRELEVANCE_OPTIONS)[number];

src/api/groups.ts

@@ -6,10 +6,10 @@ import {
   Groups,
   GroupSearchState,
   GroupQueryState,
-  hasId,
-  Reports,
 } from "../objectTypes";
-import { VeracityOptions } from "./enums";
+
+import type { Reports } from "./reports/types";
+import { hasId, VeracityOptions } from "./common";
 
 export const getGroups = async (
   searchState: GroupQueryState = {},

src/api/reports.ts → src/api/reports/index.ts

@@ -1,12 +1,10 @@
 import axios from "axios";
-import {
-  hasId,
-  Report,
-  ReportQueryState,
+import type { Report, ReportQueryState, Reports } from "./types";
+import type {
   ReportQueryState_old,
-  Reports,
-} from "../objectTypes";
-import { VeracityOptions } from "./enums";
+  Report as Report_old,
+} from "../../objectTypes";
+import type { hasId, IrrelevanceOptions, VeracityOptions } from "../common";
 
 export const getReports = async (
   searchState: ReportQueryState,
@@ -60,8 +58,14 @@ export const editReport = async (report: Report) => {
   return data;
 };
 
+//TODO: deprecate, same thing using old types
+export const editReport_old = async (report: Report_old) => {
+  const { data } = await axios.put("/api/report/" + report._id, report);
+  return data;
+};
+
 export const getBatch = async () => {
-  const { data } = await axios.get("/api/report/batch");
+  const { data } = await axios.get<Reports>("/api/report/batch");
   return data;
 };
 
@@ -94,6 +98,17 @@ export const setSelectedVeracity = async (
   return data;
 };
 
+export const setSelectedIrrelevance = async (
+  reportIds: string[],
+  irrelevance: IrrelevanceOptions | string
+) => {
+  const { data } = await axios.patch("/api/report/_irrelevance", {
+    ids: reportIds,
+    irrelevance: irrelevance,
+  });
+  return data;
+};
+
 export const setSelectedNotes = async (reportIds: string[], notes: string) => {
   const { data } = await axios.patch("/api/report/_notes", {
     ids: reportIds,

src/types/metadata.ts → src/api/reports/types.ts

@@ -1,9 +1,55 @@
-interface RawApiResponse {
-  id: string;
-  type: string;
-  attributes: unknown;
+import type {
+  hasId,
+  VeracityOptions,
+  MediaOptions,
+  IrrelevanceOptions,
+} from "../common";
+
+export interface Report extends hasId {
+  veracity: VeracityOptions;
+  tags: string[];
+  smtcTags: string[];
+  hasSMTCTags: boolean;
+  read: boolean;
+  _sources: string[];
+  _media: MediaOptions[];
+  _sourceNicknames: string[];
+  escalated: boolean;
+  _group?: string;
+  authoredAt: string;
+  fetchedAt: string;
+  content: string;
+  author: string;
+  metadata: BaseMetadata;
+  url: string;
+  storedAt: string;
+  commentTo: string;
+  notes: string;
+  originalPost: string;
+  irrelevant?: IrrelevanceOptions;
+  __v: number;
+}
+
+export interface Reports {
+  total: number;
+  results: Report[];
 }
 
+export interface ReportQueryState {
+  keywords?: string;
+  author?: string;
+  groupId?: string;
+  media?: string;
+  sourceId?: string;
+  list?: string;
+  before?: Date | string;
+  after?: Date | string;
+  tags?: string[];
+  page?: number;
+  batch?: boolean;
+}
+
+// metadata typed
 export interface BaseMetadata {
   imageText: any;
   junkipediaId: number;
@@ -15,6 +61,14 @@ export interface BaseMetadata {
   rawAPIResponse: RawApiResponse;
   testingFlagForPotentialDeletion: boolean;
 }
+
+interface RawApiResponse {
+  id: string;
+  type: string;
+  attributes: unknown;
+  [key: string]: any;
+}
+// i need to redo this...
 export interface Statistics
   extends TwitterStatistics,
     TiktokStatistics,

src/components/AggieButton.tsx

@@ -1,9 +1,12 @@
+import { faSpinner } from "@fortawesome/free-solid-svg-icons";
+import { FontAwesomeIcon } from "@fortawesome/react-fontawesome";
+
 const defaultCSS =
-  "disabled:pointer-events-none disabled:opacity-50 inline-flex gap-1 items-center text-nowrap focus-theme";
+  "disabled:pointer-events-none disabled:opacity-50 inline-flex gap-1 items-center text-nowrap focus-theme font-medium";
 
 const variantCSS = {
   primary:
-    "bg-green-800 text-slate-100 hover:bg-green-700 rounded-lg px-2 py-1 font-medium",
+    "bg-green-800 text-slate-100 hover:bg-green-700 rounded-lg px-2 py-1 ",
   secondary:
     "bg-slate-100 px-2 py-1 hover:bg-slate-200 border border-slate-200 rounded-lg",
   outline: "",
@@ -13,12 +16,15 @@ interface IProps extends React.ButtonHTMLAttributes<HTMLButtonElement> {
   className?: string;
   override?: boolean;
   variant?: keyof typeof variantCSS;
+  loading?: boolean;
 }
 
 const AggieButton = ({
   className,
   override = false,
+  loading = false,
   variant,
+  children,
   ...props
 }: IProps) => {
   return (
@@ -29,7 +35,10 @@ const AggieButton = ({
           : `${defaultCSS} ${className} ${variant ? variantCSS[variant] : ""}`
       }
       {...props}
-    />
+    >
+      {loading && <FontAwesomeIcon icon={faSpinner} className='animate-spin' />}
+      {children}
+    </button>
   );
 };