fix(final-report): add missing translation

barshathakuri · AdityaKhatri · commit b0b08ba602dc · 2025-08-01T16:56:42.000+05:45
diff --git a/app/src/views/DrefFinalReportExport/i18n.json b/app/src/views/DrefFinalReportExport/i18n.json
@@ -116,6 +116,8 @@
         "priorityActionsTotal": "Total",
         "proposedActionsSector": "Sector",
         "mitigationEffortsAndAchievements": "Mitigation efforts and achievements.",
-        "lessonsLearntAndChallenges": "Lessons learnt and challenges"
+        "lessonsLearntAndChallenges": "Lessons learnt and challenges",
+        "expenditure": "Expenditure",
+        "imageIcon": "Icon"
     }
 }
diff --git a/app/src/views/DrefFinalReportExport/index.tsx b/app/src/views/DrefFinalReportExport/index.tsx
@@ -93,7 +93,6 @@ export function Component() {
     const primarySectorOptions = usePrimarySector();
 
     const {
-        // pending: fetchingDref,
         response: drefResponse,
     } = useRequest({
         skip: isFalsyString(finalReportId),
@@ -670,7 +669,6 @@ export function Component() {
                     headingLevel={3}
                     childrenContainerClassName={styles.proposedActions}
                 >
-                    <div className={styles.actionTitleLabel} />
                     <div className={styles.actionTitleLabel}>
                         {strings.proposedActionsSector}
                     </div>
@@ -681,7 +679,7 @@ export function Component() {
                         {strings.priorityActionsBudget}
                     </div>
                     <div className={styles.actionTitleLabel}>
-                        Expenditure
+                        {strings.expenditure}
                     </div>
                     {groupedProposedActions.map((proposedAction) => (
                         <Fragment key={proposedAction.key}>
@@ -694,15 +692,15 @@ export function Component() {
                                 <img
                                     className={styles.icon}
                                     src={proposedAction.icon}
-                                    alt=""
+                                    alt={strings.imageIcon}
                                 />
                                 <div className={styles.title}>
                                     {proposedAction.title}
                                 </div>
                             </div>
                             {proposedAction.actions.map((action) => (
                                 <Fragment key={action.id}>
-                                    {action.activities.map((activity, i) => (
+                                    {action.activities.map((activity, index) => (
                                         <Fragment key={activity.id}>
                                             <SelectOutput
                                                 className={styles.sector}
@@ -715,7 +713,7 @@ export function Component() {
                                             <div className={styles.activity}>
                                                 {activity.activity}
                                             </div>
-                                            {i === 0 && (
+                                            {index === 0 && (
                                                 <div
                                                     className={styles.budget}
                                                     style={{ gridRow: `span ${action.activities.length}` }}
@@ -726,7 +724,7 @@ export function Component() {
                                                     />
                                                 </div>
                                             )}
-                                            {i === 0 && (
+                                            {index === 0 && (
                                                 <div
                                                     className={styles.budget}
                                                     style={{ gridRow: `span ${action.activities.length}` }}
diff --git a/app/src/views/DrefFinalReportForm/Overview/index.tsx b/app/src/views/DrefFinalReportForm/Overview/index.tsx
@@ -313,21 +313,6 @@ function Overview(props: Props) {
                             value?.type_of_dref === TYPE_IMMINENT
                         }
                     />
-                    {/* (value?.disaster_type === DISASTER_FIRE
-                    || value?.disaster_type === DISASTER_FLASH_FLOOD
-                    || value?.disaster_type === DISASTER_FLOOD)
-                    ? (
-                        <BooleanInput
-                            name="is_man_made_event"
-                            label={strings.drefFormManMadeEvent}
-                            value={value?.is_man_made_event}
-                            onChange={setFieldValue}
-                            error={error?.is_man_made_event}
-                            disabled={disabled}
-                        />
-                    ) : (
-                        <div />
-                    ) */}
                     {value?.type_of_dref !== TYPE_IMMINENT && (
                         <SelectInput
                             name="disaster_category"
diff --git a/app/src/views/DrefFinalReportForm/common.tsx b/app/src/views/DrefFinalReportForm/common.tsx
@@ -16,19 +16,12 @@ type TypeOfDrefEnum = components<'read'>['schemas']['DrefDrefDrefTypeEnumKey'];
 type TypeOfOnsetEnum = components<'read'>['schemas']['DrefDrefOnsetTypeEnumKey'];
 type ProposedActionOption = NonNullable<GlobalEnumsResponse['dref_proposed_action']>[number];
 
-// export const ONSET_SLOW = 1 satisfies TypeOfOnsetEnum;
 export const ONSET_SUDDEN = 2 satisfies TypeOfOnsetEnum;
 
 export const TYPE_IMMINENT = 0 satisfies TypeOfDrefEnum;
 export const TYPE_ASSESSMENT = 1 satisfies TypeOfDrefEnum;
-// export const TYPE_RESPONSE = 2 satisfies TypeOfDrefEnum;
 export const TYPE_LOAN = 3 satisfies TypeOfDrefEnum;
 
-// FIXME: identify a way to store disaster
-// const DISASTER_FIRE = 15;
-// const DISASTER_FLASH_FLOOD = 27;
-// const DISASTER_FLOOD = 12;
-
 export const SUB_TOTAL = 75000;
 export const SURGE_DEPLOYMENT_COST = 10000;
 
diff --git a/app/src/views/DrefFinalReportForm/schema.ts b/app/src/views/DrefFinalReportForm/schema.ts
@@ -631,7 +631,6 @@ const schema: FinalReportFormSchema = {
                             required: true,
                             validations: [
                                 (value: Maybe<number>) => (
-                                    // FIXME: use translations
                                     isDefined(value) && value !== SUB_TOTAL
                                         ? 'The sub-total of the budgets should be exactly CHF 75000'
                                         : undefined
diff --git a/app/src/views/OldDrefFinalReportExport/i18n.json b/app/src/views/OldDrefFinalReportExport/i18n.json
@@ -100,6 +100,7 @@
         "nationalSocietyHotlineHeading": "National Society Hotline",
         "sourceInformationSectionHeading": "Source Information",
         "sourceInformationSourceNameTitle": "Source Name",
-        "sourceInformationSourceLinkTitle": "Source Link"
+        "sourceInformationSourceLinkTitle": "Source Link",
+        "imageIcon": "Icon"
     }
 }
diff --git a/app/src/views/OldDrefFinalReportExport/index.tsx b/app/src/views/OldDrefFinalReportExport/index.tsx
@@ -134,15 +134,13 @@ export function Component() {
 
     const sortedPlannedInterventions = useMemo(
         () => filteredPlannedIntervention?.sort(
-
             (a, b) => plannedInterventionOrder[a.title] - plannedInterventionOrder[b.title],
         ),
         [filteredPlannedIntervention],
     );
 
     const sortedIdentifiedNeedsAndGaps = useMemo(
         () => filteredIdentifiedNeedsAndGaps?.sort(
-
             (a, b) => identifiedNeedsAndGapsOrder[a.title] - identifiedNeedsAndGapsOrder[b.title],
         ),
         [filteredIdentifiedNeedsAndGaps],
@@ -648,7 +646,7 @@ export function Component() {
                                     <img
                                         className={styles.icon}
                                         src={identifiedNeed.image_url}
-                                        alt=""
+                                        alt={strings.imageIcon}
                                     />
                                     {identifiedNeed.title_display}
                                 </Heading>
@@ -888,7 +886,7 @@ export function Component() {
                                     <img
                                         className={styles.icon}
                                         src={plannedIntervention.image_url}
-                                        alt=""
+                                        alt={strings.imageIcon}
                                     />
                                     {plannedIntervention.title_display}
                                 </Heading>
diff --git a/app/src/views/OldDrefFinalReportForm/index.tsx b/app/src/views/OldDrefFinalReportForm/index.tsx
@@ -174,15 +174,6 @@ export function Component() {
                     // eslint-disable-next-line max-len
                     newMap[response.financial_report_details.id] = response.financial_report_details.file;
                 }
-                /*
-                if ((response.photos_file?.length ?? 0) > 0) {
-                    response.photos_file?.forEach((img) => {
-                        if (isDefined(img.file)) {
-                            newMap[img.id] = img.file;
-                        }
-                    });
-                }
-                */
                 if ((response.images_file?.length ?? 0) > 0) {
                     response.images_file?.forEach((img) => {
                         if (isDefined(img.file) && isDefined(img.id)) {
diff --git a/translationMigrations/000042-1754038716022.json b/translationMigrations/000042-1754038716022.json
@@ -61,12 +61,24 @@
             "namespace": "drefFinalReportExport",
             "value": "Events impact"
         },
+        {
+            "action": "add",
+            "key": "expenditure",
+            "namespace": "drefFinalReportExport",
+            "value": "Expenditure"
+        },
         {
             "action": "add",
             "key": "financialReportVariancesModificationHeading",
             "namespace": "drefFinalReportExport",
             "value": "Explain any variances or modifications to the implemented activities"
         },
+        {
+            "action": "add",
+            "key": "imageIcon",
+            "namespace": "drefFinalReportExport",
+            "value": "Icon"
+        },
         {
             "action": "add",
             "key": "imminentExportTitle",
@@ -629,6 +641,12 @@
             "namespace": "oldDrefFinalReportExport",
             "value": "ICRC Actions Related To The Current Event"
         },
+        {
+            "action": "add",
+            "key": "imageIcon",
+            "namespace": "oldDrefFinalReportExport",
+            "value": "Icon"
+        },
         {
             "action": "add",
             "key": "imageLogoIFRCAlt",

Original file line number	Diff line number	Diff line change
`@@ -116,6 +116,8 @@`
`116`	`116`	`"priorityActionsTotal": "Total",`
`117`	`117`	`"proposedActionsSector": "Sector",`
`118`	`118`	`"mitigationEffortsAndAchievements": "Mitigation efforts and achievements.",`
`119`		`- "lessonsLearntAndChallenges": "Lessons learnt and challenges"`
	`119`	`+ "lessonsLearntAndChallenges": "Lessons learnt and challenges",`
	`120`	`+ "expenditure": "Expenditure",`
	`121`	`+ "imageIcon": "Icon"`
`120`	`122`	`}`
`121`	`123`	`}`
Original file line number	Diff line number	Diff line change
`@@ -100,6 +100,7 @@`
`100`	`100`	`"nationalSocietyHotlineHeading": "National Society Hotline",`
`101`	`101`	`"sourceInformationSectionHeading": "Source Information",`
`102`	`102`	`"sourceInformationSourceNameTitle": "Source Name",`
`103`		`- "sourceInformationSourceLinkTitle": "Source Link"`
	`103`	`+ "sourceInformationSourceLinkTitle": "Source Link",`
	`104`	`+ "imageIcon": "Icon"`
`104`	`105`	`}`
`105`	`106`	`}`