Added missing alert type in the event details for GDACS

IFRCGo · Jan 11, 2024 · b37ee3e · b37ee3e
1 parent c5a9b75
commit b37ee3e
Show file tree

Hide file tree

Showing 7 changed files with 14 additions and 6 deletions.
diff --git a/src/components/Alert/i18n.json b/src/components/Alert/i18n.json
@@ -1,7 +1,7 @@
 {
     "namespace": "common",
     "strings": {
-        "alertCopyErrorDetails": "Copy error details",
+        "CopyErrorDetails": "Copy error details",
         "closeButtonTitle": "Close"
     }
 }
diff --git a/src/components/Alert/index.tsx b/src/components/Alert/index.tsx
@@ -107,6 +107,7 @@ function Alert<N extends string>(props: Props<N>) {
                         onClick={handleCopyDebugMessageButtonClick}
                         variant="tertiary-on-dark"
                     >
+                        {/* FIXME: there is string in json file */}
                         {strings.alertCopyErrorDetails}
                     </Button>
                 </div>

diff --git a/src/components/domain/RiskImminentEvents/Gdacs/EventDetails/i18n.json b/src/components/domain/RiskImminentEvents/Gdacs/EventDetails/i18n.json
@@ -9,6 +9,7 @@
         "eventPopulationLabel": "Population exposed",
         "eventPeopleAffectedLabel": "People affected",
         "eventImpactLabel": "Impact",
-        "eventSeverityLabel": "Severity"
+        "eventSeverityLabel": "Severity",
+        "eventAlertType": "Alert Type"
     }
 }
diff --git a/src/components/domain/RiskImminentEvents/Gdacs/EventDetails/index.tsx b/src/components/domain/RiskImminentEvents/Gdacs/EventDetails/index.tsx
@@ -20,6 +20,8 @@ interface GdacsEventDetails {
         iso3: string;
         countryname: string;
     }[];
+    alert_sent?: boolean;
+    alert_level?: 'Red' | 'Orange' | 'Green' | 'Cones' | null;
     alertlevel?: string;
     alertscore?: number;
     country?: string;
@@ -55,7 +57,6 @@ interface GdacsEventDetails {
         geometry?: string;
     },
 }
-
 interface GdacsPopulationExposure {
     death?: number;
     displaced?: number;
@@ -153,6 +154,12 @@ function EventDetails(props: Props) {
                         value={eventDetails?.severitydata?.severitytext}
                     />
                 )}
+                {isDefined(eventDetails?.alertlevel) && (
+                    <TextOutput
+                        label={strings.eventAlertType}
+                        value={eventDetails?.alertlevel}
+                    />
+                )}
             </div>
             {isDefined(eventDetails)
                 && isDefined(eventDetails.url)

diff --git a/src/components/domain/RiskImminentEvents/index.tsx b/src/components/domain/RiskImminentEvents/index.tsx
@@ -35,6 +35,7 @@ type BaseProps = {
     title: React.ReactNode;
     bbox: LngLatBoundsLike | undefined;
     defaultSource?: ImminentEventSource;
+    alertType?:string;
 }
 
 type Props = BaseProps & ({

diff --git a/src/views/Emergencies/index.tsx b/src/views/Emergencies/index.tsx
@@ -101,7 +101,7 @@ export function Component() {
         query: {
             model_type: 'event',
             unit: 'month',
-            start_date: encodeDate(oneYearAgo),
+            start_date: encodeDate(thirtyDaysAgo),
         } as never,
     });
 

diff --git a/src/views/RegionRiskWatchImminent/index.tsx b/src/views/RegionRiskWatchImminent/index.tsx
@@ -4,7 +4,6 @@ import getBbox from '@turf/bbox';
 
 import RiskImminentEvents from '#components/domain/RiskImminentEvents';
 import { RegionOutletContext } from '#utils/outletContext';
-
 import styles from './styles.module.css';
 
 // TODO: Add historic data chart
@@ -17,7 +16,6 @@ export function Component() {
         () => (regionResponse ? getBbox(regionResponse.bbox) : undefined),
         [regionResponse],
     );
-
     return (
         <div className={styles.regionImminentRiskWatch}>
             {regionResponse && (