chore: improved citizen logs

SnailyCAD · Oct 16, 2023 · 3dfeb73 · 3dfeb73
1 parent d91638a
commit 3dfeb73
Show file tree

Hide file tree

Showing 4 changed files with 23 additions and 23 deletions.
diff --git a/apps/api/src/controllers/admin/manage/citizens/records-logs-controller.ts b/apps/api/src/controllers/admin/manage/citizens/records-logs-controller.ts
@@ -75,7 +75,7 @@ export class AdminManageCitizensController {
     return { citizens, totalCount };
   }
 
-  @Get("/pending-arrest-reports")
+  @Get("/pending-citizen-records")
   @Description("Get all the record logs within the CAD")
   @UsePermissions({
     permissions: [
@@ -85,11 +85,11 @@ export class AdminManageCitizensController {
       Permissions.ViewCitizenLogs,
     ],
   })
-  async getPendingArrestReports(
+  async getPendingCitizenRecords(
     @QueryParams("skip", Number) skip = 0,
     @QueryParams("includeAll", Boolean) includeAll = false,
-  ): Promise<APITypes.GetManagePendingArrestReports> {
-    const [totalCount, arrestReports] = await prisma.$transaction([
+  ): Promise<APITypes.GetManagePendingCitizenRecords> {
+    const [totalCount, pendingCitizenRecords] = await prisma.$transaction([
       prisma.recordLog.count({
         where: { records: { status: WhitelistStatus.PENDING } },
       }),
@@ -109,7 +109,7 @@ export class AdminManageCitizensController {
       }),
     ]);
 
-    return { arrestReports, totalCount };
+    return { pendingCitizenRecords, totalCount };
   }
 
   @Get("/records-logs/:citizenId")
@@ -146,7 +146,7 @@ export class AdminManageCitizensController {
   @UsePermissions({
     permissions: [Permissions.ManageCitizens, Permissions.ViewCitizenLogs],
   })
-  async acceptOrDeclineArrestReport(
+  async acceptOrDeclinePendingCitizenLog(
     @PathParams("id") id: string,
     @BodyParams("type") type: AcceptDeclineType | null,
   ): Promise<APITypes.PostCitizenRecordLogsData> {

diff --git a/...s/leo/citizen-logs/arrest-reports-tab.tsx → ...citizen-logs/pending-citizen-logs-tab.tsx b/...s/leo/citizen-logs/arrest-reports-tab.tsx → ...citizen-logs/pending-citizen-logs-tab.tsx
@@ -19,15 +19,15 @@ import { ManageRecordModal } from "../modals/manage-record/manage-record-modal";
 import useFetch from "lib/useFetch";
 import { ViolationsColumn } from "../ViolationsColumn";
 import type {
-  GetManagePendingArrestReports,
+  GetManagePendingCitizenRecords,
   PostCitizenRecordLogsData,
 } from "@snailycad/types/api";
 import { useQuery } from "@tanstack/react-query";
 import { RecordsCaseNumberColumn } from "../records-case-number-column";
 import { RecordsStatsColumn } from "../records-stats-column";
 
 interface Props {
-  arrestReports: GetManagePendingArrestReports;
+  pendingCitizenRecords: GetManagePendingCitizenRecords;
 }
 
 const TYPE_LABELS = {
@@ -36,7 +36,7 @@ const TYPE_LABELS = {
   [RecordType.WRITTEN_WARNING]: "Written Warning",
 };
 
-export function PendingCitizenRecordsTab({ arrestReports }: Props) {
+export function PendingCitizenRecordsTab({ pendingCitizenRecords }: Props) {
   const [tempRecord, setTempRecord] = React.useState<Record | null>(null);
 
   const { data, isLoading, refetch } = useQuery({
@@ -54,14 +54,14 @@ export function PendingCitizenRecordsTab({ arrestReports }: Props) {
   const asyncTable = useAsyncTable({
     getKey: (item) => item.recordId ?? item.warrantId ?? item.id,
     fetchOptions: {
-      onResponse: (data: GetManagePendingArrestReports) => ({
-        data: data.arrestReports,
+      onResponse: (data: GetManagePendingCitizenRecords) => ({
+        data: data.pendingCitizenRecords,
         totalCount: data.totalCount,
       }),
-      path: "/admin/manage/pending-arrest-reports",
+      path: "/admin/manage/pending-citizen-records",
     },
-    totalCount: arrestReports.totalCount,
-    initialData: arrestReports.arrestReports,
+    totalCount: pendingCitizenRecords.totalCount,
+    initialData: pendingCitizenRecords.pendingCitizenRecords,
   });
 
   const modalState = useModal();
@@ -71,7 +71,7 @@ export function PendingCitizenRecordsTab({ arrestReports }: Props) {
   const { state, execute } = useFetch();
   const tableState = useTableState();
 
-  function handleViewClick(item: GetManagePendingArrestReports["arrestReports"][number]) {
+  function handleViewClick(item: GetManagePendingCitizenRecords["pendingCitizenRecords"][number]) {
     setTempRecord(item.records!);
 
     modalState.openModal(ModalIds.ManageRecord, {

diff --git a/apps/client/src/pages/officer/supervisor/citizen-logs/index.tsx b/apps/client/src/pages/officer/supervisor/citizen-logs/index.tsx
@@ -9,14 +9,14 @@ import { Title } from "components/shared/Title";
 import { Permissions } from "@snailycad/permissions";
 import { TabList } from "@snailycad/ui";
 import { CitizenLogsTab } from "components/leo/citizen-logs/citizen-logs-tab";
-import { PendingCitizenRecordsTab } from "components/leo/citizen-logs/arrest-reports-tab";
+import { PendingCitizenRecordsTab } from "components/leo/citizen-logs/pending-citizen-logs-tab";
 import { useFeatureEnabled } from "hooks/useFeatureEnabled";
-import type { GetManagePendingArrestReports, GetManageRecordLogsData } from "@snailycad/types/api";
+import type { GetManagePendingCitizenRecords, GetManageRecordLogsData } from "@snailycad/types/api";
 
 export type CitizenLog = RecordLog & { citizen: Citizen };
 interface Props {
   citizens: GetManageRecordLogsData;
-  pendingCitizenRecords: GetManagePendingArrestReports;
+  pendingCitizenRecords: GetManagePendingCitizenRecords;
 }
 
 export default function CitizenLogs(props: Props) {
@@ -47,7 +47,7 @@ export default function CitizenLogs(props: Props) {
       <TabList tabs={TABS}>
         <CitizenLogsTab citizens={props.citizens} />
         {CITIZEN_RECORD_APPROVAL ? (
-          <PendingCitizenRecordsTab arrestReports={props.pendingCitizenRecords} />
+          <PendingCitizenRecordsTab pendingCitizenRecords={props.pendingCitizenRecords} />
         ) : null}
       </TabList>
     </Layout>
@@ -58,7 +58,7 @@ export const getServerSideProps: GetServerSideProps = async ({ req, locale }) =>
   const user = await getSessionUser(req);
   const [citizens, pendingCitizenRecords] = await requestAll(req, [
     ["/admin/manage/records-logs", { citizens: [], totalCount: 0 }],
-    ["/admin/manage/pending-arrest-reports", { pendingCitizenRecords: [], totalCount: 0 }],
+    ["/admin/manage/pending-citizen-records", { pendingCitizenRecords: [], totalCount: 0 }],
   ]);
 
   return {

diff --git a/packages/types/src/api/admin.ts b/packages/types/src/api/admin.ts
@@ -153,11 +153,11 @@ export interface GetManageRecordLogsData {
 
 /**
  * @method GET
- * @route /admin/manage/citizens/pending-arrest-reports
+ * @route /admin/manage/citizens/pending-citizen-records
  */
-export interface GetManagePendingArrestReports {
+export interface GetManagePendingCitizenRecords {
   totalCount: number;
-  arrestReports: GetManageRecordsLogsCitizenData["recordsLogs"];
+  pendingCitizenRecords: GetManageRecordsLogsCitizenData["recordsLogs"];
 }
 
 /**