FIX - update Airtable field

Author: MeMMa137

client/src/components/AdminReviewPage.css

@@ -409,6 +409,24 @@
   overflow-wrap: anywhere;
 }
 
+.admin-review-reship-update {
+  border-color: rgba(255, 214, 120, 0.55);
+  background: rgba(48, 36, 8, 0.35);
+}
+
+.admin-review-reship-update h2 {
+  color: #ffe4a3;
+}
+
+.admin-review-reship-update-body {
+  margin: 0;
+  color: rgba(232, 244, 255, 0.95);
+  font-size: 0.9rem;
+  line-height: 1.5;
+  white-space: pre-wrap;
+  overflow-wrap: anywhere;
+}
+
 @media (max-width: 760px) {
   .admin-review-time-row.has-history {
     flex-direction: column;

client/src/components/AdminReviewPage.jsx

@@ -508,6 +508,13 @@ function AdminReviewDetail({ projectId }) {
           )}
         </section>
 
+        {(project.shipKind === "reship" || project.status === "pending-reship") && project.reshipUpdate ? (
+          <section className="admin-review-panel admin-review-reship-update" aria-label="Re-ship update">
+            <h2>Re-ship update</h2>
+            <p className="admin-review-reship-update-body">{project.reshipUpdate}</p>
+          </section>
+        ) : null}
+
         <label className="admin-review-fraud">
           <input
             type="checkbox"

server/airtableYsws.js

@@ -190,10 +190,18 @@ function buildSubmissionFromContext({ project, user, status }) {
     status,
     source_project_status: project.status || null,
     ship_kind: project.ship_kind || "initial",
-    airtable_record_id: status === YSWS_STATUS.approved ? project.ysws_record_id || null : null,
+    airtable_record_id: resolveAirtableRecordIdForSubmission(project, status),
   };
 }
 
+function resolveAirtableRecordIdForSubmission(project, status) {
+  const linkedRecordId = project.ysws_record_id || null;
+  if (status === YSWS_STATUS.approved || status === YSWS_STATUS.pendingReship) {
+    return linkedRecordId;
+  }
+  return null;
+}
+
 function buildFieldsFromSubmission(submission) {
   const fields = {
     [F.codeUrl]: submission.code_url || undefined,
@@ -215,7 +223,9 @@ function buildFieldsFromSubmission(submission) {
     [F.status]: submission.status,
   };
 
-  if (submission.reship_update) {
+  const isReshipSubmission =
+    submission.ship_kind === "reship" || submission.status === YSWS_STATUS.pendingReship;
+  if (isReshipSubmission && submission.reship_update) {
     fields[F.update] = submission.reship_update;
   }
 
@@ -385,7 +395,33 @@ export async function deleteProjectSubmissionsFromYsws(projectId) {
   return { ok: true, deleted: result.rows.length };
 }
 
+async function resolveSubmissionAirtableRecordId(submission) {
+  if (submission.airtable_record_id) return submission.airtable_record_id;
+
+  const result = await pool.query(
+    `
+      SELECT airtable_record_id
+      FROM ysws_project_submissions
+      WHERE project_id = $1
+        AND airtable_record_id IS NOT NULL
+        AND status = ANY($2::text[])
+      ORDER BY updated_at DESC
+      LIMIT 1
+    `,
+    [submission.project_id, [YSWS_STATUS.approved, YSWS_STATUS.pending, YSWS_STATUS.pendingReship]]
+  );
+
+  return result.rows[0]?.airtable_record_id || null;
+}
+
 async function upsertLocalSubmission(submission) {
+  if (
+    (submission.status === YSWS_STATUS.pendingReship || submission.status === YSWS_STATUS.approved) &&
+    !submission.airtable_record_id
+  ) {
+    submission.airtable_record_id = await resolveSubmissionAirtableRecordId(submission);
+  }
+
   if (submission.status === YSWS_STATUS.approved) {
     const approvedResult = await pool.query(
       "SELECT * FROM ysws_project_submissions WHERE project_id = $1 AND status = $2",

server/projects.js

@@ -1563,6 +1563,7 @@ function toPublicProject(row) {
     fraudFlag: Boolean(row.fraud_flag),
     blocked: Boolean(row.blocked),
     shipKind: row.ship_kind || "initial",
+    reshipUpdate: textOrNull(row.reship_update),
     parentProjectId: row.parent_project_id != null ? Number(row.parent_project_id) : null,
   };
 }