fix: types

SnailyCAD · Sep 23, 2023 · 6405e55 · 6405e55
1 parent 25b6fc3
commit 6405e55
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 11 deletions.
diff --git a/apps/api/src/controllers/admin/manage/courthouse/pending-name-change-requests-controller.ts b/apps/api/src/controllers/admin/manage/courthouse/pending-name-change-requests-controller.ts
@@ -73,19 +73,24 @@ export class AdminNameChangeController {
       include: { citizen: true },
     });
 
-    const auditLogType =
+    const action =
       type === WhitelistStatus.ACCEPTED
-        ? AuditLogActionType.NameChangeRequestAccepted
-        : AuditLogActionType.NameChangeRequestDeclined;
+        ? ({
+            type: AuditLogActionType.NameChangeRequestAccepted,
+            new: { ...updated, id: updated.citizenId },
+          } as const)
+        : ({
+            type: AuditLogActionType.NameChangeRequestDeclined,
+            new: { ...updated, id: updated.citizenId },
+          } as const);
+
     const translationKey =
       type === WhitelistStatus.ACCEPTED ? "nameChangeRequestAccepted" : "nameChangeRequestDeclined";
 
     await createAuditLogEntry({
       translationKey,
-      action: {
-        type: auditLogType,
-        new: { ...updated, id: updated.citizenId },
-      },
+      // @ts-expect-error this is correct.
+      action,
       prisma,
       executorId: sessionUserId,
     });

diff --git a/apps/client/src/lib/editor/remarkGitHubReferences.ts b/apps/client/src/lib/editor/remarkGitHubReferences.ts
@@ -27,8 +27,8 @@ function replaceMatchLinks(_url: string, _type: string, number: string) {
 
 export function remarkGitHubReferences() {
   return function (tree: any) {
-    findAndReplace(tree, linkRegex, replaceMatch, { ignore: "link" });
-    findAndReplace(tree, linkRegex, replaceMatchLinks, { ignore: "text" });
-    findAndReplace(tree, /What's Changed/);
+    findAndReplace(tree, [linkRegex, replaceMatch], { ignore: "link" });
+    findAndReplace(tree, [linkRegex, replaceMatchLinks], { ignore: "text" });
+    findAndReplace(tree, [/What's Changed/]);
   };
 }
diff --git a/packages/audit-logger/src/server.ts b/packages/audit-logger/src/server.ts
@@ -2,10 +2,13 @@ import superjson from "superjson";
 import type { PrismaClient } from "@prisma/client";
 import type { AuditLogActions } from "./index";
 import { captureException } from "@sentry/node";
-import { AuditLog } from "@snailycad/types";
+import { AuditLog as _AuditLog } from "@snailycad/types";
 
 export * from "./types/action-types";
 export * from "./types/actions";
+type AuditLog = Omit<_AuditLog, "action"> & {
+  action: any;
+};
 
 export type AuditLogMessages =
   keyof (typeof import("../../../apps/client/locales/en/admin.json"))["AuditLogs"];