add a visual for the diff in format

nasa-gcn · Mar 11, 2024 · 460dd8c · 460dd8c
1 parent 674d8fb
commit 460dd8c
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 0 deletions.
diff --git a/app/routes/_gcn.circulars.moderation.$circularId.$requestor.tsx b/app/routes/_gcn.circulars.moderation.$circularId.$requestor.tsx
@@ -79,6 +79,11 @@ export default function () {
         oldString={circular.subject}
         newString={correction.subject}
       />
+      <h3>Format</h3>
+      <DiffedContent
+        oldString={circular.format ?? 'text/plain'}
+        newString={correction.format}
+      />
       <h3>Body</h3>
       <DiffedContent oldString={circular.body} newString={correction.body} />
       <Form method="POST">

diff --git a/app/routes/_gcn.circulars/circulars.lib.ts b/app/routes/_gcn.circulars/circulars.lib.ts
@@ -35,6 +35,7 @@ export interface CircularChangeRequest extends CircularMetadata {
   body: string
   requestor: string
   requestorSub: string
+  format: CircularFormat
 }
 
 type SubjectMatcher = [RegExp, (match: RegExpMatchArray) => string]

diff --git a/app/routes/_gcn.circulars/circulars.server.ts b/app/routes/_gcn.circulars/circulars.server.ts
@@ -481,6 +481,7 @@ export async function approveChangeRequest(
     subject: changeRequest.subject,
     editedBy: `${formatAuthor(user)} on behalf of ${changeRequest.requestor}`,
     editedOn: Date.now(),
+    format: changeRequest.format,
   })
 
   await deleteChangeRequestRaw(circularId, requestorSub)