Merge pull request #3486 from bcgov/NDT-477-Federal-Funding-Source-in…

…-CBC-highlighted-yellow-erroneously fix: federal funding source validation for cbc
bcgov · Aug 15, 2024 · fcfd7bc · fcfd7bc
2 parents 99ff13a + 4e5bbba
commit fcfd7bc
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 16 deletions.
diff --git a/app/formSchema/analyst/cbc/tombstone.ts b/app/formSchema/analyst/cbc/tombstone.ts
@@ -4,11 +4,7 @@ const cbcTombstone: RJSFSchema = {
   title: 'Tombstone',
   description: '',
   type: 'object',
-  required: [
-    'applicantContractualName',
-    'currentOperatingName',
-    'federalFundingSource',
-  ],
+  required: ['applicantContractualName', 'currentOperatingName'],
   properties: {
     originalProjectNumber: {
       type: 'string',

diff --git a/app/utils/cbcCustomValidator.ts b/app/utils/cbcCustomValidator.ts
@@ -13,6 +13,18 @@ const CBC_VALIDATIONS = {
       ],
       color: CBC_WARN_COLOR,
     },
+    federalFundingSource: {
+      rules: [
+        {
+          condition: (data) =>
+            (data.funding?.federalFundingRequested > 0 ||
+              data.tombstone?.federalProjectNumber) &&
+            !data.tombstone?.federalFundingSource,
+          error: 'Missing Federal funding source',
+        },
+      ],
+      color: CBC_WARN_COLOR,
+    },
     federalProjectNumber: {
       rules: [
         {
@@ -155,17 +167,6 @@ const CBC_VALIDATIONS = {
       ],
       color: CBC_WARN_COLOR,
     },
-    federalFundingRequested: {
-      rules: [
-        {
-          condition: (data) =>
-            data.funding?.federalFundingRequested &&
-            !data.tombstone?.federalFundingSource,
-          error: 'Missing Federal funding source',
-        },
-      ],
-      color: CBC_WARN_COLOR,
-    },
   },
   locationsAndCounts: {
     indigenousCommunities: {