fix: pending citizen logs (#1844)

SnailyCAD · Oct 16, 2023 · 952310d · 952310d
1 parent d91638a
commit 952310d
Show file tree

Hide file tree

Showing 6 changed files with 39 additions and 28 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 handleEditClick(item: GetManagePendingCitizenRecords["pendingCitizenRecords"][number]) {
     setTempRecord(item.records!);
 
     modalState.openModal(ModalIds.ManageRecord, {
@@ -95,6 +95,12 @@ export function PendingCitizenRecordsTab({ arrestReports }: Props) {
     }
   }
 
+  async function handleRecordUpdate() {
+    await refetch();
+    asyncTable.refetch();
+    setTempRecord(null);
+  }
+
   return (
     <TabsContent
       tabName={`${t("pendingCitizenRecords")} ${
@@ -141,8 +147,8 @@ export function PendingCitizenRecordsTab({ arrestReports }: Props) {
               status: <Status fallback="—">{record.status}</Status>,
               actions: (
                 <>
-                  <Button size="xs" className="mr-2" onPress={() => handleViewClick(item)}>
-                    {common("view")}
+                  <Button size="xs" className="mr-2" onPress={() => handleEditClick(item)}>
+                    {common("edit")}
                   </Button>
                   <Button
                     variant="success"
@@ -187,8 +193,8 @@ export function PendingCitizenRecordsTab({ arrestReports }: Props) {
           id={ModalIds.ManageRecord}
           type={tempRecord.type}
           isEdit
+          onUpdate={handleRecordUpdate}
           record={tempRecord}
-          isReadOnly
         />
       ) : null}
     </TabsContent>

diff --git a/apps/client/src/components/leo/modals/manage-record/manage-record-modal.tsx b/apps/client/src/components/leo/modals/manage-record/manage-record-modal.tsx
@@ -287,6 +287,7 @@ export function ManageRecordModal(props: Props) {
         {({ setFieldValue, setValues, errors, values, isValid }) => (
           <Form autoComplete="off">
             <TabList
+              defaultValue="general-information-tab"
               queryState={false}
               tabs={[
                 { name: t("generalInformation"), value: "general-information-tab" },

diff --git a/apps/client/src/hooks/shared/table/use-async-table.ts b/apps/client/src/hooks/shared/table/use-async-table.ts
@@ -42,7 +42,7 @@ export function useAsyncTable<T>(options: Options<T>) {
     pageIndex: options.fetchOptions.pageIndex ?? 0,
   });
 
-  const { isInitialLoading, error } = useQuery({
+  const { isInitialLoading, error, refetch } = useQuery({
     retry: false,
     enabled: !options.disabled,
     initialData: options.initialData ?? undefined,
@@ -131,5 +131,6 @@ export function useAsyncTable<T>(options: Options<T>) {
     setFilters,
     isLoading: loadingState === "loading",
     pagination,
+    refetch,
   };
 }
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 {
@@ -67,7 +67,10 @@ export const getServerSideProps: GetServerSideProps = async ({ req, locale }) =>
       pendingCitizenRecords,
       citizens,
       messages: {
-        ...(await getTranslations(["leo", "common"], user?.locale ?? locale)),
+        ...(await getTranslations(
+          ["leo", "common", "courthouse", "citizen"],
+          user?.locale ?? locale,
+        )),
       },
     },
   };

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"];
 }
 
 /**