Merge pull request #2341 from IFRCGo/fix/eap-key-actors-validation

EAP: Hotfix for full form validation and miss match string

Author: frozenhelium

app/src/views/EapFullForm/FinanceLogistics/i18n.json

@@ -21,12 +21,12 @@
         "financeReadinessCostDescription1": "For each item of readiness costs in the budget, explain why these are necessary for the upkeep of the EAP and how these were calculated.",
         "financeReadinessCostDescription2": "Indicate who will manage these funds and describe how it will be ensured that they are only used for the indicated purposes.",
         "financeReadinessBudgetLabel": "Readiness Budget(CHF)",
-        "financePrePositioningTitle": "Pre-positioning cost(CHF)",
+        "financePrePositioningTitle": "Pre-positioning cost",
         "financePrePositioningExplanatoryNote": "In order to ensure the feasibility of the rapid distribution of items in the short timeframe between forecast and event, pre-positioning of goods might be necessary. They should normally have a lifetime of at least the lifecycle of the EAP and should only be replenished after an activation. The DREF covers these costs, combined with readiness, to a maximum amount of 65% of the EAP budget (combined with the readiness activities). Please note that costs that are not for the procurement of the items but related to the maintenance of the stock, such as warehousing, are part of the readiness costs of an EAP (see section 9.2.)",
         "financePrePositioningDescription1": "If funds for pre-positioning are requested from the DREF, explain for which items and why no other option is possible. Explain why standard response stocks cannot be used.",
         "financePrePositioningDescription2": "Expiry date of the items should not be prior to the end of the lifecycle of the EAP",
         "financePrePositioningDescription3": "Provide information about the location of the storage facilities and costs of storage, etc.",
-        "financePrePositioningBudgetLabel": "Pre-Positioning Budget",
+        "financePrePositioningBudgetLabel": "Pre-Positioning Budget(CHF)",
         "financeEarlyActionCostTitle": "Early action cost",
         "financeEarlyActionBudgetLabel": "Early Actions Budget(CHF)",
         "financeEarlyActionCostDescription1": "In the budget, list all these costs under the section early action costs.",

app/src/views/EapFullForm/index.tsx

@@ -817,7 +817,8 @@ export function Component() {
 
     const isLatestVersion = currentFullEapId === latestFullEapId;
 
-    const fullEapFormAccess = (isNotDefined(eapDetailResponse?.eap_type)
+    const fullEapFormAccess = (fetchingEap
+        || isNotDefined(eapDetailResponse?.eap_type)
         || eapDetailResponse?.eap_type === EAP_TYPE_FULL)
         && isNotDefined(fullEapResponseError);
 

app/src/views/EapFullForm/schema.ts

@@ -637,8 +637,7 @@ export const formSchema: EapFullFormSchema = {
             },
 
             key_actors: {
-                required: isSubmit,
-                validation: requiredListCondition,
+                validation: isSubmit ? requiredListCondition : undefined,
                 keySelector: (item) => item.client_id,
                 member: () => ({
                     fields: (): KeyActorsFormFields => ({
@@ -721,6 +720,7 @@ export const formSchema: EapFullFormSchema = {
             },
             prioritized_impacts: {
                 keySelector: (item) => item.client_id,
+                validation: isSubmit ? requiredListCondition : undefined,
                 member: () => ({
                     fields: (): PrioritizedImpactsFields => ({
                         client_id: {},

translationMigrations/000080-1777541728949.json

@@ -0,0 +1,17 @@
+{
+    "parent": "000079-1777278136025.json",
+    "actions": [
+        {
+            "action": "update",
+            "key": "financePrePositioningBudgetLabel",
+            "namespace": "eapFullForm",
+            "newValue": "Pre-Positioning Budget(CHF)"
+        },
+        {
+            "action": "update",
+            "key": "financePrePositioningTitle",
+            "namespace": "eapFullForm",
+            "newValue": "Pre-positioning cost"
+        }
+    ]
+}