feat: use GDACS as the primary source for Imminent Risk Watch

IFRCGo · Nov 26, 2024 · 7cf2514 · 7cf2514
1 parent 8485076
commit 7cf2514
Show file tree

Hide file tree

Showing 3 changed files with 35 additions and 29 deletions.
diff --git a/.changeset/pink-beans-develop.md b/.changeset/pink-beans-develop.md
@@ -0,0 +1,5 @@
+---
+"go-web-app": patch
+---
+
+Prioritize GDACS as the Primary Source for Imminent Risk Watch in [#1547](https://github.com/IFRCGo/go-web-app/issues/1547)
diff --git a/.changeset/slimy-eggs-peel.md b/.changeset/slimy-eggs-peel.md
@@ -2,4 +2,5 @@
 "go-web-app": patch
 ---
 
-Add Organization type and Learning type filter in Operational learning
+Add Organization type and Learning type filter in Operational learning in [#1469](https://github.com/IFRCGo/go-web-app/issues/1469)
+
diff --git a/app/src/components/domain/RiskImminentEvents/index.tsx b/app/src/components/domain/RiskImminentEvents/index.tsx
@@ -57,7 +57,7 @@ type Props = BaseProps & ({
 function RiskImminentEvents(props: Props) {
     const {
         className,
-        defaultSource = 'pdc',
+        defaultSource = 'gdacs',
         ...otherProps
     } = props;
     const [activeView, setActiveView] = useState<ImminentEventSource>(defaultSource);
@@ -168,6 +168,33 @@ function RiskImminentEvents(props: Props) {
             footerActionsContainerClassName={styles.footerActions}
             footerActions={(
                 <>
+                    <Radio
+                        name="gdacs"
+                        value={activeView === 'gdacs'}
+                        onClick={handleRadioClick}
+                        label={strings.imminentEventsSourceGdacsLabel}
+                        actions={(
+                            <InfoPopup
+                                title={strings.gdacsTitle}
+                                popupClassName={styles.popup}
+                                descriptionClassName={styles.description}
+                                description={resolveToComponent(
+                                    strings.gdacsDescription,
+                                    {
+                                        here: (
+                                            <Link
+                                                href="https://www.gdacs.org/default.aspx"
+                                                variant="tertiary"
+                                                external
+                                            >
+                                                {strings.here}
+                                            </Link>
+                                        ),
+                                    },
+                                )}
+                            />
+                        )}
+                    />
                     <Radio
                         name="pdc"
                         value={activeView === 'pdc'}
@@ -224,33 +251,6 @@ function RiskImminentEvents(props: Props) {
                             )}
                         />
                     )}
-                    <Radio
-                        name="gdacs"
-                        value={activeView === 'gdacs'}
-                        onClick={handleRadioClick}
-                        label={strings.imminentEventsSourceGdacsLabel}
-                        actions={(
-                            <InfoPopup
-                                title={strings.gdacsTitle}
-                                popupClassName={styles.popup}
-                                descriptionClassName={styles.description}
-                                description={resolveToComponent(
-                                    strings.gdacsDescription,
-                                    {
-                                        here: (
-                                            <Link
-                                                href="https://www.gdacs.org/default.aspx"
-                                                variant="tertiary"
-                                                external
-                                            >
-                                                {strings.here}
-                                            </Link>
-                                        ),
-                                    },
-                                )}
-                            />
-                        )}
-                    />
                     {environment !== 'production' && (
                         <Radio
                             name="meteoSwiss"