From 6309d02ab508b4fe3a4fe9a0dee7e4aa0bc4447a Mon Sep 17 00:00:00 2001
From: Frank Pigeon Jr <fpigeon@flexion.us>
Date: Fri, 20 Sep 2024 15:28:10 -0500
Subject: [PATCH] fix: fixes validation issues

---
 .../Agreements/AgreementEditor/AgreementEditForm.jsx        | 2 --
 .../Agreements/AgreementEditor/AgreementEditFormSuite.js    | 1 +
 .../BudgetLineItems/CreateBLIsAndSCs/CreateBLIsAndSCs.jsx   | 5 +----
 .../components/BudgetLineItems/CreateBLIsAndSCs/suite.js    | 4 ++--
 frontend/src/pages/agreements/approve/ApproveAgreement.jsx  | 6 ++++++
 frontend/src/pages/agreements/review/suite.js               | 3 ++-
 6 files changed, 12 insertions(+), 9 deletions(-)

diff --git a/frontend/src/components/Agreements/AgreementEditor/AgreementEditForm.jsx b/frontend/src/components/Agreements/AgreementEditor/AgreementEditForm.jsx
index 4be4683832..a6d9470727 100644
--- a/frontend/src/components/Agreements/AgreementEditor/AgreementEditForm.jsx
+++ b/frontend/src/components/Agreements/AgreementEditor/AgreementEditForm.jsx
@@ -328,8 +328,6 @@ export const AgreementEditForm = ({
                     handleConfirm={modalProps.handleConfirm}
                 />
             )}
-            <h2 className="font-sans-lg margin-top-3 margin-bottom-0">Agreement Type</h2>
-            <p className="margin-top-1">Select the agreement type to get started.</p>
             <AgreementTypeSelect
                 messages={res.getErrors("agreement_type")}
                 className={cn("agreement_type")}
diff --git a/frontend/src/components/Agreements/AgreementEditor/AgreementEditFormSuite.js b/frontend/src/components/Agreements/AgreementEditor/AgreementEditFormSuite.js
index 45068623a3..ca2a192acc 100644
--- a/frontend/src/components/Agreements/AgreementEditor/AgreementEditFormSuite.js
+++ b/frontend/src/components/Agreements/AgreementEditor/AgreementEditFormSuite.js
@@ -37,6 +37,7 @@ const suite = create((data = {}, fieldName) => {
     });
     test("contract-type", "This is required information", () => {
         enforce(data.contract_type).notEquals("-Select an option-");
+        enforce(data.contract_type).isNotEmpty();
     });
     test("team-members", "This is required information", () => {
         enforce(data.team_members).lengthNotEquals(0);
diff --git a/frontend/src/components/BudgetLineItems/CreateBLIsAndSCs/CreateBLIsAndSCs.jsx b/frontend/src/components/BudgetLineItems/CreateBLIsAndSCs/CreateBLIsAndSCs.jsx
index e68b66f7c9..274c8a7d98 100644
--- a/frontend/src/components/BudgetLineItems/CreateBLIsAndSCs/CreateBLIsAndSCs.jsx
+++ b/frontend/src/components/BudgetLineItems/CreateBLIsAndSCs/CreateBLIsAndSCs.jsx
@@ -1,6 +1,5 @@
 import PropTypes from "prop-types";
 import React from "react";
-import { convertCodeForDisplay } from "../../../helpers/utils";
 import EditModeTitle from "../../../pages/agreements/EditModeTitle";
 import AgreementBudgetLinesHeader from "../../Agreements/AgreementBudgetLinesHeader";
 import AgreementTotalCard from "../../Agreements/AgreementDetailsCards/AgreementTotalCard";
@@ -61,7 +60,6 @@ export const CreateBLIsAndSCs = ({
     setIncludeDrafts
 }) => {
     const {
-        budgetLinePageErrorsExist,
         handleDeleteBudgetLine,
         handleDuplicateBudgetLine,
         handleEditBLI,
@@ -210,7 +208,7 @@ export const CreateBLIsAndSCs = ({
                 />
             )}
 
-            {budgetLinePageErrorsExist && (
+            {pageErrors && (
                 <ul
                     className="usa-list--unstyled font-12px text-error"
                     data-cy="error-list"
@@ -221,7 +219,6 @@ export const CreateBLIsAndSCs = ({
                             className="border-left-2px padding-left-1"
                             data-cy="error-item"
                         >
-                            <strong>{convertCodeForDisplay("validation", key)}: </strong>
                             {
                                 <span>
                                     {value.map((message, index) => (
diff --git a/frontend/src/components/BudgetLineItems/CreateBLIsAndSCs/suite.js b/frontend/src/components/BudgetLineItems/CreateBLIsAndSCs/suite.js
index a8cfb7a72b..904bc9851d 100644
--- a/frontend/src/components/BudgetLineItems/CreateBLIsAndSCs/suite.js
+++ b/frontend/src/components/BudgetLineItems/CreateBLIsAndSCs/suite.js
@@ -4,8 +4,8 @@ const suite = create((data) => {
     only(data);
 
     // test to ensure at least one budget line item exists
-    test("data", "Must have at least one budget line item", () => {
-        enforce(data.budgetLines).longerThan(0);
+    test("data", "Must have at least one budget line", () => {
+        enforce(data.budgetLines.length).greaterThan(0);
     });
     // test budget_line_items array
     each(data.budgetLines, (item) => {
diff --git a/frontend/src/pages/agreements/approve/ApproveAgreement.jsx b/frontend/src/pages/agreements/approve/ApproveAgreement.jsx
index cbc145e05b..8799f37160 100644
--- a/frontend/src/pages/agreements/approve/ApproveAgreement.jsx
+++ b/frontend/src/pages/agreements/approve/ApproveAgreement.jsx
@@ -58,6 +58,12 @@ const ApproveAgreement = () => {
     if (!agreement) {
         return <div>No agreement data available.</div>;
     }
+
+    /*
+      TODO: Add FE validation to ensure that the user is authorized to approve the agreement
+      and if not, display an error page
+      to prevent unauthorized users from accessing this page
+    */
     const BeforeApprovalContent = React.memo(
         ({ groupedBudgetLinesByServicesComponent, servicesComponents, changeRequestTitle, urlChangeToStatus }) => (
             <>
diff --git a/frontend/src/pages/agreements/review/suite.js b/frontend/src/pages/agreements/review/suite.js
index dd3eee1e04..1266832ed3 100644
--- a/frontend/src/pages/agreements/review/suite.js
+++ b/frontend/src/pages/agreements/review/suite.js
@@ -32,7 +32,8 @@ const suite = create((fieldName) => {
         enforce(fieldName.project_officer_id).isNotBlank();
     });
     test("contract-type", "This is required information", () => {
-        enforce(fieldName.contract_type).isNotBlank();
+        enforce(fieldName.contract_type).notEquals("-Select an option-");
+        enforce(fieldName.contract_type).isNotEmpty();
     });
     test("team-members", "This is required information", () => {
         enforce(fieldName.team_members).longerThan(0);