fix: keep stale needs_more_info copy out of trader status after resubmit

tnsw/cda/1-export-coconut-certificate-registration/1-application/previous_feedback_jsonform.json

@@ -0,0 +1,4 @@
+{
+  "id": "cda-apply-coconut-cert--previous-feedback",
+  "template": "{{if .}}\n### Review History\n\nComments from the previous review round. Your latest submission is now with the CDA officer.\n\n> **Officer Comments**: {{.}}\n{{end}}"
+}

tnsw/cda/1-export-coconut-certificate-registration/1-application/render.json

@@ -18,7 +18,6 @@
       "templateId": "cda-apply-coconut-cert--submitted-message",
       "title": "Submission Status",
       "projector": "MARKDOWN",
-      "dataKey": "userform",
       "visibleWhen": {
         "states": [
           "QUEUED_EXTERNALLY"
@@ -31,6 +30,21 @@
       "projector": "MARKDOWN",
       "dataKey": "rejection_reason",
       "visibleWhen": {
+        "states": [
+          "PENDING_USER"
+        ],
+        "requireDataKey": "rejection_reason"
+      }
+    },
+    "review_history": {
+      "templateId": "cda-apply-coconut-cert--previous-feedback",
+      "title": "Review History",
+      "projector": "MARKDOWN",
+      "dataKey": "rejection_reason",
+      "visibleWhen": {
+        "states": [
+          "QUEUED_EXTERNALLY"
+        ],
         "requireDataKey": "rejection_reason"
       }
     },

tnsw/cda/1-export-coconut-certificate-registration/1-application/submitted_message_jsonform.json

@@ -1,4 +1,4 @@
 {
   "id": "cda-apply-coconut-cert--submitted-message",
-  "template": "### Application Submitted Successfully\n\nYour CDA Export Coconut Certificate Application has been submitted. The application is now undergoing review/verification by a CDA Quality Assurance Officer.\n\n* **CUSDEC Reference**: `{{.cusdec_number}}`\n* **Status**: Awaiting Officer Verification"
+  "template": "{{if .verificationform}}\n### ✅ Application Resubmitted\n\nYour corrected CDA Export Coconut Certificate Application has been resubmitted for review. A CDA Quality Assurance Officer will verify the updated details.\n\n* **CUSDEC Reference**: `{{.userform.cusdec_number}}`\n* **Status**: Awaiting Officer Verification\n{{else}}\n### Application Submitted Successfully\n\nYour CDA Export Coconut Certificate Application has been submitted. The application is now undergoing review/verification by a CDA Quality Assurance Officer.\n\n* **CUSDEC Reference**: `{{.userform.cusdec_number}}`\n* **Status**: Awaiting Officer Verification\n{{end}}"
 }

tnsw/cda/2-king-coconut-fresh-nuts-recommendation/1-application/previous_feedback_jsonform.json

@@ -0,0 +1,4 @@
+{
+  "id": "cda-kcfn-apply--previous-feedback",
+  "template": "{{if .}}\n### Review History\n\nComments from the previous review round. Your latest submission is now with the CDA inspection officer.\n\n> **Officer Comments**: {{.}}\n{{end}}"
+}

tnsw/cda/2-king-coconut-fresh-nuts-recommendation/1-application/render.json

@@ -18,7 +18,6 @@
       "templateId": "cda-kcfn-apply--submitted-message",
       "title": "Submission Status",
       "projector": "MARKDOWN",
-      "dataKey": "userform",
       "visibleWhen": {
         "states": [
           "QUEUED_EXTERNALLY"
@@ -31,6 +30,21 @@
       "projector": "MARKDOWN",
       "dataKey": "reviewerform.rejection_reason",
       "visibleWhen": {
+        "states": [
+          "PENDING_USER"
+        ],
+        "requireDataKey": "reviewerform.rejection_reason"
+      }
+    },
+    "review_history": {
+      "templateId": "cda-kcfn-apply--previous-feedback",
+      "title": "Review History",
+      "projector": "MARKDOWN",
+      "dataKey": "reviewerform.rejection_reason",
+      "visibleWhen": {
+        "states": [
+          "QUEUED_EXTERNALLY"
+        ],
         "requireDataKey": "reviewerform.rejection_reason"
       }
     },

tnsw/cda/2-king-coconut-fresh-nuts-recommendation/1-application/submitted_message_jsonform.json

@@ -1,4 +1,4 @@
 {
   "id": "cda-kcfn-apply--submitted-message",
-  "template": "### Application Submitted\n\nYour King Coconut / Fresh Nuts export recommendation application has been submitted and is awaiting container inspection.\n\n* **Commercial Invoice No.**: `{{.commercial_invoice_no}}`\n* **Status**: Awaiting Inspection"
+  "template": "{{if .reviewerform}}\n### ✅ Application Resubmitted\n\nYour corrected King Coconut / Fresh Nuts export recommendation application has been resubmitted and is awaiting container inspection.\n\n* **Commercial Invoice No.**: `{{.userform.commercial_invoice_no}}`\n* **Status**: Awaiting Inspection\n{{else}}\n### Application Submitted\n\nYour King Coconut / Fresh Nuts export recommendation application has been submitted and is awaiting container inspection.\n\n* **Commercial Invoice No.**: `{{.userform.commercial_invoice_no}}`\n* **Status**: Awaiting Inspection\n{{end}}"
 }

tnsw/cda/3-kernel-products-asycuda-approval/1-application/previous_feedback_jsonform.json

@@ -0,0 +1,4 @@
+{
+  "id": "cda-kernel-asycuda--previous-feedback",
+  "template": "{{if .}}\n### Review History\n\nComments from the previous review round. Your latest submission is now with the CDA officer.\n\n> **Officer Comments**: {{.}}\n{{end}}"
+}

tnsw/cda/3-kernel-products-asycuda-approval/1-application/render.json

@@ -18,7 +18,6 @@
       "templateId": "cda-kernel-asycuda--submitted-message",
       "title": "Submission Status",
       "projector": "MARKDOWN",
-      "dataKey": "userform",
       "visibleWhen": {
         "states": [
           "QUEUED_EXTERNALLY"
@@ -31,6 +30,21 @@
       "projector": "MARKDOWN",
       "dataKey": "rejection_reason",
       "visibleWhen": {
+        "states": [
+          "PENDING_USER"
+        ],
+        "requireDataKey": "rejection_reason"
+      }
+    },
+    "review_history": {
+      "templateId": "cda-kernel-asycuda--previous-feedback",
+      "title": "Review History",
+      "projector": "MARKDOWN",
+      "dataKey": "rejection_reason",
+      "visibleWhen": {
+        "states": [
+          "QUEUED_EXTERNALLY"
+        ],
         "requireDataKey": "rejection_reason"
       }
     },

tnsw/cda/3-kernel-products-asycuda-approval/1-application/submitted_message_jsonform.json

@@ -1,4 +1,4 @@
 {
   "id": "cda-kernel-asycuda--submitted-message",
-  "template": "### Application Submitted Successfully\n\nYour CDA ASYCUDA Approval Application for Kernel Products has been submitted. The application is now undergoing review by a CDA Officer.\n\n* **CUSDEC Reference**: `{{.cusdec_number}}`\n* **Status**: Awaiting Officer Review"
+  "template": "{{if .reviewerform}}\n### ✅ Application Resubmitted\n\nYour corrected CDA ASYCUDA Approval Application for Kernel Products has been resubmitted for review. A CDA Officer will review the updated details.\n\n* **CUSDEC Reference**: `{{.userform.cusdec_number}}`\n* **Status**: Awaiting Officer Review\n{{else}}\n### Application Submitted Successfully\n\nYour CDA ASYCUDA Approval Application for Kernel Products has been submitted. The application is now undergoing review by a CDA Officer.\n\n* **CUSDEC Reference**: `{{.userform.cusdec_number}}`\n* **Status**: Awaiting Officer Review\n{{end}}"
 }

tnsw/customs/1-cusdec_submission/previous_feedback_jsonform.json

@@ -0,0 +1,4 @@
+{
+  "id": "customs-cusdec--previous-feedback",
+  "template": "{{if .reviewerform.rejection_reason}}\n### Review History\n\nComments from the previous review round. Your latest submission is now with Sri Lanka Customs.\n\n> **Officer Comments**: {{.reviewerform.rejection_reason}}\n{{end}}"
+}

tnsw/customs/1-cusdec_submission/render.json

@@ -21,20 +21,34 @@
       "projector": "MARKDOWN",
       "dataKey": "reviewerform",
       "visibleWhen": {
+        "states": [
+          "PENDING_USER",
+          "COMPLETED"
+        ],
         "requireDataKey": "reviewerform"
       }
     },
     "status_message": {
       "templateId": "customs-cusdec--submitted-message",
       "title": "Submission Status",
       "projector": "MARKDOWN",
-      "dataKey": "userform",
       "visibleWhen": {
         "states": [
           "QUEUED_EXTERNALLY"
         ]
       }
     },
+    "review_history": {
+      "templateId": "customs-cusdec--previous-feedback",
+      "title": "Review History",
+      "projector": "MARKDOWN",
+      "visibleWhen": {
+        "states": [
+          "QUEUED_EXTERNALLY"
+        ],
+        "requireDataKey": "reviewerform"
+      }
+    },
     "user_form": {
       "templateId": "customs-cusdec--user-form",
       "title": "CusDec Application Details",

tnsw/customs/1-cusdec_submission/submitted_message_jsonform.json

@@ -1,4 +1,4 @@
 {
   "id": "customs-cusdec--submitted-message",
-  "template": "### Customs Declaration (CusDec) Submitted Successfully\n\nYour Customs Declaration (CusDec) has been submitted. Customs officers will review the declaration and attached SAD documents.\n\nYou will be notified once the assessment is complete."
+  "template": "{{if .reviewerform}}\n### ✅ CusDec Resubmitted\n\nYour corrected Customs Declaration (CusDec) has been resubmitted for review. Customs officers will assess the updated declaration and attached SAD documents.\n\n* **Status**: Awaiting Officer Review\n{{else}}\n### Customs Declaration (CusDec) Submitted Successfully\n\nYour Customs Declaration (CusDec) has been submitted. Customs officers will review the declaration and attached SAD documents.\n\nYou will be notified once the assessment is complete.\n{{end}}"
 }

tnsw/fcau/1-application/previous_feedback_jsonform.json

@@ -0,0 +1,4 @@
+{
+  "id": "fcau-apply-health-cert--previous-feedback",
+  "template": "{{if .reviewerform.rejection_reason}}\n### Review History\n\nComments from the previous review round. Your latest submission is now with the FCAU officer.\n\n> **Officer Comments**: {{.reviewerform.rejection_reason}}\n{{end}}"
+}

tnsw/fcau/1-application/render.json

@@ -9,20 +9,34 @@
       "projector": "MARKDOWN",
       "dataKey": "reviewerform",
       "visibleWhen": {
+        "states": [
+          "PENDING_USER",
+          "COMPLETED"
+        ],
         "requireDataKey": "reviewerform"
       }
     },
     "status_message": {
       "templateId": "fcau-apply-health-cert--submitted-message",
       "title": "Submission Status",
       "projector": "MARKDOWN",
-      "dataKey": "userform",
       "visibleWhen": {
         "states": [
           "QUEUED_EXTERNALLY"
         ]
       }
     },
+    "review_history": {
+      "templateId": "fcau-apply-health-cert--previous-feedback",
+      "title": "Review History",
+      "projector": "MARKDOWN",
+      "visibleWhen": {
+        "states": [
+          "QUEUED_EXTERNALLY"
+        ],
+        "requireDataKey": "reviewerform"
+      }
+    },
     "user_form": {
       "templateId": "fcau-apply-health-cert--user-form",
       "title": "Health Certificate Application",

tnsw/fcau/1-application/reviewerinput.json

@@ -12,7 +12,7 @@
       "id": "authz",
       "phase": "PRE_RESUME",
       "properties": {
-        "QUEUED_EXTERNALLY": { "approve": ["fcau"], "reject": ["fcau"] }
+        "QUEUED_EXTERNALLY": { "approve": ["fcau"], "reject": ["fcau"], "needs_more_info": ["fcau"] }
       }
     }
   ]

tnsw/fcau/1-application/submitted_message_jsonform.json

@@ -1,4 +1,4 @@
 {
   "id": "fcau-apply-health-cert--submitted-message",
-  "template": "### Application Under Review\n\nYour FCAU Health Certificate Application has been submitted successfully and is currently being reviewed by FCAU officers. Please wait for an update.\n\n* **Status**: Awaiting Officer Review"
+  "template": "{{if .reviewerform}}\n### ✅ Application Resubmitted\n\nYour corrected FCAU Health Certificate Application has been resubmitted for review. An FCAU officer will review the updated details.\n\n* **Status**: Awaiting Officer Review\n{{else}}\n### Application Under Review\n\nYour FCAU Health Certificate Application has been submitted successfully and is currently being reviewed by FCAU officers. Please wait for an update.\n\n* **Status**: Awaiting Officer Review\n{{end}}"
 }

tnsw/fcau/3-3-payment_post_wh_lab_fee/previous_feedback_jsonform.json

@@ -0,0 +1,4 @@
+{
+  "id": "fcau-pay-post-wh-lab-fee--previous-feedback",
+  "template": "{{if .paymentreviewerform.payment_feedback}}\n### Review History\n\nComments from the previous review round. Your latest receipt is now with the FCAU officer.\n\n> **Officer Comments**: {{.paymentreviewerform.payment_feedback}}\n{{end}}"
+}

tnsw/fcau/3-3-payment_post_wh_lab_fee/render.json

@@ -39,10 +39,30 @@
       "projector": "MARKDOWN",
       "visibleWhen": {
         "states": [
-          "QUEUED_EXTERNALLY",
           "COMPLETED"
         ]
       }
+    },
+    "status_awaiting": {
+      "templateId": "fcau-pay-post-wh-lab-fee--status-awaiting",
+      "title": "Verification Status",
+      "projector": "MARKDOWN",
+      "visibleWhen": {
+        "states": [
+          "QUEUED_EXTERNALLY"
+        ]
+      }
+    },
+    "review_history": {
+      "templateId": "fcau-pay-post-wh-lab-fee--previous-feedback",
+      "title": "Review History",
+      "projector": "MARKDOWN",
+      "visibleWhen": {
+        "states": [
+          "QUEUED_EXTERNALLY"
+        ],
+        "requireDataKey": "paymentreviewerform"
+      }
     }
   },
   "states": {

tnsw/fcau/3-3-payment_post_wh_lab_fee/status_awaiting_jsonform.json

@@ -0,0 +1,4 @@
+{
+  "id": "fcau-pay-post-wh-lab-fee--status-awaiting",
+  "template": "{{if .paymentreviewerform}}\n### ✅ Receipt Resubmitted\n\nYour corrected laboratory fee payment receipt has been resubmitted for review. An FCAU officer will verify the updated proof of payment.\n\n**Receipt File**: [View Uploaded Receipt]({{.traderinput.lab_receipt}})\n\n* **Status**: Awaiting Officer Verification\n{{else}}\n### Payment Verification Pending\n\nYour laboratory test payment receipt has been submitted and is currently being reviewed by an FCAU officer.\n\n**Receipt File**: [View Uploaded Receipt]({{.traderinput.lab_receipt}})\n\nThis page will update automatically once the review is completed.\n{{end}}"
+}

tnsw/fcau/4-3-payment_lab_fee/previous_feedback_jsonform.json

@@ -0,0 +1,4 @@
+{
+  "id": "fcau-pay-lab-fee--previous-feedback",
+  "template": "{{if .paymentreviewerform.payment_feedback}}\n### Review History\n\nComments from the previous review round. Your latest receipt is now with the FCAU officer.\n\n> **Officer Comments**: {{.paymentreviewerform.payment_feedback}}\n{{end}}"
+}

tnsw/fcau/4-3-payment_lab_fee/render.json

@@ -38,10 +38,30 @@
       "projector": "MARKDOWN",
       "visibleWhen": {
         "states": [
-          "QUEUED_EXTERNALLY",
           "COMPLETED"
         ]
       }
+    },
+    "status_awaiting": {
+      "templateId": "fcau-pay-lab-fee--status-awaiting",
+      "title": "Verification Status",
+      "projector": "MARKDOWN",
+      "visibleWhen": {
+        "states": [
+          "QUEUED_EXTERNALLY"
+        ]
+      }
+    },
+    "review_history": {
+      "templateId": "fcau-pay-lab-fee--previous-feedback",
+      "title": "Review History",
+      "projector": "MARKDOWN",
+      "visibleWhen": {
+        "states": [
+          "QUEUED_EXTERNALLY"
+        ],
+        "requireDataKey": "paymentreviewerform"
+      }
     }
   },
   "states": {

tnsw/fcau/4-3-payment_lab_fee/status_awaiting_jsonform.json

@@ -0,0 +1,4 @@
+{
+  "id": "fcau-pay-lab-fee--status-awaiting",
+  "template": "{{if .paymentreviewerform}}\n### ✅ Receipt Resubmitted\n\nYour corrected laboratory fee payment receipt has been resubmitted for review. An FCAU officer will verify the updated proof of payment.\n\n**Receipt File**: [View Uploaded Receipt]({{.traderinput.lab_receipt}})\n\n* **Status**: Awaiting Officer Verification\n{{else}}\n### Payment Verification Pending\n\nYour laboratory test payment receipt has been submitted and is currently being reviewed by an FCAU officer.\n\n**Receipt File**: [View Uploaded Receipt]({{.traderinput.lab_receipt}})\n\nThis page will update automatically once the review is completed.\n{{end}}"
+}