Merge pull request #353 from IFRCGo/fix/export-margin

Fix export margin

Author: samshara

src/components/domain/AppealsTable/index.tsx

@@ -125,7 +125,7 @@ function AppealsTable(props: Props) {
             createStringColumn<AppealListItem, string>(
                 'dtype',
                 strings.appealsTableDisastertype,
-                (item) => item.dtype.name,
+                (item) => item.dtype?.name,
                 { sortable: true },
             ),
             createNumberColumn<AppealListItem, string>(
@@ -152,7 +152,7 @@ function AppealsTable(props: Props) {
             createLinkColumn<AppealListItem, string>(
                 'country',
                 strings.appealsTableCountry,
-                (item) => item.country.name,
+                (item) => item.country?.name,
                 (item) => ({
                     to: 'countriesLayout',
                     urlParams: { countryId: item.country.id },

src/components/domain/RiskImminentEventMap/i18n.json

@@ -2,6 +2,7 @@
     "namespace": "common",
     "strings": {
         "riskImminentEventsMap": "Risk Imminent Events Map",
-        "backToEventsLabel": "Back to events"
+        "backToEventsLabel": "Back to events",
+        "emptyImminentEventMessage": "No imminent event forecasted"
     }
 }

src/components/domain/RiskImminentEventMap/index.tsx

@@ -339,6 +339,7 @@ function RiskImminentEventMap<
                         keySelector={keySelector}
                         renderer={listItemRenderer}
                         rendererParams={eventListRendererParams}
+                        emptyMessage={strings.emptyImminentEventMessage}
                     />
                 )}
                 {isDefined(activeEvent) && (

src/index.css

@@ -5,7 +5,6 @@
 
     --base-font-size: 0.875rem;
     --go-ui-font-size-export: 0.6875rem;
-    --go-ui-export-page-margin: 10mm 10mm 16mm 10mm;
 
     --go-ui-font-size-2xs: calc(var(--base-font-size) * 0.625);
     --go-ui-font-size-xs: calc(var(--base-font-size) * 0.75);
@@ -227,6 +226,8 @@
     --go-ui-page-header-description-width-max: var(--go-ui-width-content-max);
     --go-ui-page-width-max: 90rem;
     --mapbox-icon-width: 88px;
+
+    --go-ui-export-page-margin: 10mm 10mm 16mm 10mm;
 }
 
 * {
@@ -262,7 +263,7 @@ ul, ol, p {
 @media print {
     @page {
         size: portrait A4;
-        margin: var(--go-ui-export-page-margin);
+        margin: 10mm 10mm 16mm 10mm;
     }
 
     body {

src/utils/domain/risk.ts

@@ -228,7 +228,7 @@ export function getAverageIpcData(uniqueData: IpcData) {
     );
 
     const monthlyValueList = Object.values(ipcRiskDataItem ?? {});
-    const annual_average = avgSafe(monthlyValueList);
+    const annual_average = sumSafe(monthlyValueList);
 
     return {
         ...ipcRiskDataItem,