Merge pull request #862 from Enterprise-CMCS/main

Release to val
Enterprise-CMCS · Nov 20, 2024 · ff60eb4 · ff60eb4
2 parents 0d7df23 + fe19691
commit ff60eb4
Show file tree

Hide file tree

Showing 4 changed files with 90 additions and 69 deletions.
diff --git a/lib/local-constructs/clamav-scanning/package-lock.json b/lib/local-constructs/clamav-scanning/package-lock.json
diff --git a/lib/local-constructs/clamav-scanning/package.json b/lib/local-constructs/clamav-scanning/package.json
@@ -19,7 +19,7 @@
     "esbuild": "^0.21.5"
   },
   "dependencies": {
-    "@aws-sdk/client-s3": "^3.679.0",
+    "@aws-sdk/client-s3": "^3.682.0",
     "@types/mime-types": "^2.1.4",
     "file-type": "^19.6.0",
     "mime-types": "^2.1.35",

diff --git a/react-app/src/features/forms/waiver/temporary-extension/index.tsx b/react-app/src/features/forms/waiver/temporary-extension/index.tsx
@@ -36,7 +36,7 @@ export const TemporaryExtensionForm = () => {
           {submission ? (
             <div>
               <p>Approved Initial or Renewal Waiver Number</p>
-              <p className="text-xl">{submission._source.authority}</p>
+              <p className="text-xl">{waiverId}</p>
             </div>
           ) : (
             <FormField
@@ -67,7 +67,7 @@ export const TemporaryExtensionForm = () => {
           {waiverId && submission ? (
             <div>
               <p>Temporary Extension Type</p>
-              <p className="text-xl">{waiverId}</p>
+              <p className="text-xl">{submission._source.authority}</p>
             </div>
           ) : (
             <FormField
@@ -146,6 +146,14 @@ export const TemporaryExtensionForm = () => {
           />
         </>
       )}
+      defaultValues={{
+        ids: {
+          validAuthority: {
+            authority: submission?._source?.authority ?? "",
+            waiverNumber: waiverId ?? "",
+          },
+        },
+      }}
       attachments={{
         faqLink: getFAQLinkForAttachments("temporary-extension"),
       }}

diff --git a/react-app/src/features/forms/waiver/temporary-extension/temporary-extension.test.tsx b/react-app/src/features/forms/waiver/temporary-extension/temporary-extension.test.tsx
@@ -19,11 +19,24 @@ describe("Temporary Extension", () => {
     renderFormWithPackageSection(<TemporaryExtensionForm />);
 
     // "Medicaid SPA" comes from `useGetItem` in testing/setup.ts
-    const waiverNumberLabel = screen.getByText("Medicaid SPA");
-    const existentIdLabel = screen.getByText(/Temporary Extension Type/);
+    const temporaryExtensionLabel = screen.getByText(/Temporary Extension Type/);
+    const temporaryExtensionValue = screen.getByText("Medicaid SPA");
 
-    expect(waiverNumberLabel).toBeInTheDocument();
-    expect(existentIdLabel).toBeInTheDocument();
+    // ensure Temporary Extension label and value exist and are in correct order
+    expect(temporaryExtensionLabel.compareDocumentPosition(temporaryExtensionValue)).toBe(
+      Node.DOCUMENT_POSITION_FOLLOWING,
+    );
+
+    const approvedInitialAndRenewalLabel = screen.getByText(
+      "Approved Initial or Renewal Waiver Number",
+    );
+    // grab second 12345 (first one is in the breadcrumbs)
+    const approvedInitialAndRenewalValue = screen.getAllByText(/12345/)[1];
+
+    // ensure Approved Initial and Renewal label and value exist and are in correct order
+    expect(
+      approvedInitialAndRenewalLabel.compareDocumentPosition(approvedInitialAndRenewalValue),
+    ).toBe(Node.DOCUMENT_POSITION_FOLLOWING);
   });
 
   test("TEMPORARY EXTENSION TYPE", async () => {