hotfix(cos, spark): merge commits for temporary hotfix

- feat(all-surge-alerts): add position, keyword filtering
- feat(cos): add risk management page
    - Reword unavailability test in the spark dashboard
- Prepare / Supply Chain / SPARK menu item in navigation
    - Remove Programmatic Partnerships menu from navigation

Author: szabozoltan69

.changeset/four-facts-glow.md

@@ -0,0 +1,6 @@
+---
+"go-web-app": patch
+---
+
+Add Risk Management section in Catalogue of Surge services
+Reword unavailablity message in spark dashboard

.changeset/late-hornets-strive.md

@@ -0,0 +1,5 @@
+---
+"go-web-app": patch
+---
+
+Position and Keywords filter for all Surge Alerts (/alerts/all)

.changeset/twelve-ducks-glow.md

@@ -0,0 +1,7 @@
+---
+"go-web-app": patch
+---
+
+Add Prepare / Supply Chain / SPARK menu item to navigation
+Remove Programmatic Partnerships menu from navigation
+Change aboutHealthMapping PDF URL in /resources

app/src/App/routes/SurgeRoutes.tsx

@@ -1266,6 +1266,20 @@ const surgeCatalogueOtherPreparednessEffectiveResponse = customWrapRoute({
     },
 });
 
+const surgeCatalogueRiskManagement = customWrapRoute({
+    parent: surgeCatalogueLayout,
+    path: 'risk-management',
+    component: {
+        render: () => import('#views/SurgeCatalogueRiskManagement'),
+        props: {},
+    },
+    wrapperComponent: Auth,
+    context: {
+        title: 'Risk Management',
+        visibility: 'anything',
+    },
+});
+
 const surgeCatalogueOtherRecovery = customWrapRoute({
     parent: surgeCatalogueLayout,
     path: 'other/recovery',
@@ -1684,6 +1698,7 @@ export default {
     surgeCatalogueOtherPreparednessEffectiveResponse,
     surgeCatalogueOtherRecovery,
     surgeCatalogueOtherGreenResponse,
+    surgeCatalogueRiskManagement,
     surgeCatalogueOtherUAV,
 
     allDeployedPersonnel,

app/src/App/routes/index.tsx

@@ -400,17 +400,17 @@ const preparednessGlobalCatalogue = customWrapRoute({
     },
 });
 
-const globalThreeW = customWrapRoute({
+const globalLogistics = customWrapRoute({
     parent: rootLayout,
-    path: 'three-w/projects',
+    path: 'spark',
     component: {
-        render: () => import('#views/GlobalThreeW'),
+        render: () => import('#views/Spark'),
         props: {},
     },
     wrapperComponent: Auth,
     context: {
-        title: 'Global 3W',
-        visibility: 'anything',
+        title: 'SPARK',
+        visibility: 'is-authenticated',
     },
 });
 
@@ -742,19 +742,6 @@ const resources = customWrapRoute({
     },
 });
 
-const spark = customWrapRoute({
-    parent: rootLayout,
-    path: 'spark',
-    component: {
-        render: () => import('#views/Spark'),
-        props: {},
-    },
-    wrapperComponent: Auth,
-    context: {
-        title: 'SPARK',
-        visibility: 'is-authenticated',
-    },
-});
 const operationalLearning = customWrapRoute({
     parent: rootLayout,
     path: 'operational-learning',
@@ -1314,7 +1301,7 @@ const wrappedRoutes = {
     preparednessGlobalCatalogue,
     preparednessIndex,
     perProcessFormIndex,
-    globalThreeW,
+    globalLogistics,
     newThreeWProject,
     threeWProjectEdit,
     threeWActivityEdit,
@@ -1331,7 +1318,6 @@ const wrappedRoutes = {
     accountMyFormsDref,
     accountMyFormsThreeW,
     resources,
-    spark,
     search,
     allThreeWProject,
     allThreeWActivity,

app/src/components/Navbar/i18n.json

@@ -7,15 +7,14 @@
         "headerDropdownNew3WActivity":"New 3W Activity",
         "headerDropdownNewFlashUpdate":"New Flash Update",
         "headerMenuHome":"Home",
-        "headerMenuThreeW":"Programmatic Partnerships",
         "headerMenuRiskWatch":"Risk Watch",
         "headerLogoAltText":"IFRC GO logo",
         "userMenuLogin":"Login",
         "userMenuRegister":"Register",
         "userMenuPrepare":"Prepare",
         "userMenuRiskAnalysisLabel":"Risk Analysis",
         "userMenuPERLabel":"Preparedness for Effective Response (PER)",
-        "userMenuGlobal3WProjects": "Programmatic Partnerships",
+        "userMenuGlobalLogistics": "Supply Chain",
         "userMenuGlobalRiskDescription":"The global risk overview presents information about the magnitude of risks per country, per month based on historical events and risk analysis.",
         "userMenuPERDescription":"The PER Approach is a continuous and flexible process that enables National Societies to assess, measure and analyse the strengths and gaps of its preparedness and response mechanism.",
         "userMenuGlobalSummary":"Global Summary",
@@ -24,7 +23,8 @@
         "userMenuMontandonItemDescription":"Montandon - the world's largest disaster database, containing data on hazards, impacts, and what actions were taken to address them.",
         "userMenuCatalogueResources":"Catalogue of Resources",
         "userMenuStartPER":"Start PER Process",
-        "userMenuGlobal3WProjectDescription":"The Programmatic Partnership is an innovative and ambitious three-year partnership between the IFRC, many of our member National Societies, and the European Union.",
+        "userMenuGlobalLogisticsDescription":"Supply chain Preparedness Analysis and Response Knowledge – dashboard",
+        "userMenuSpark": "SPARK",
         "userMenuRespondLabel":"Respond",
         "userMenuEmergencies":"Emergencies",
         "userMenuEmergenciesDescription": "Follow currently ongoing emergencies, as well as access the list of previous emergencies or IFRC-led operations.",

app/src/components/Navbar/index.tsx

@@ -44,7 +44,7 @@ function Navbar(props: Props) {
     const { isAuthenticated } = useAuth();
     const strings = useTranslation(i18n);
 
-    type PrepareOptionKey = 'risk-analysis' | 'per' | 'global-3w-projects';
+    type PrepareOptionKey = 'risk-analysis' | 'per' | 'global-logistics';
     const [activePrepareOption, setActivePrepareOption] = useState<PrepareOptionKey>('risk-analysis');
 
     type RespondOptionKey = 'emergencies' | 'early-warning' | 'dref-process' | 'surge';
@@ -168,10 +168,10 @@ function Navbar(props: Props) {
                                     {strings.userMenuPERLabel}
                                 </Tab>
                                 <Tab
-                                    name="global-3w-projects"
+                                    name="global-logistics"
                                     className={styles.option}
                                 >
-                                    {strings.userMenuGlobal3WProjects}
+                                    {strings.userMenuGlobalLogistics}
                                 </Tab>
                             </TabList>
                             <div className={styles.optionBorder} />
@@ -227,18 +227,18 @@ function Navbar(props: Props) {
                                 </DropdownMenuItem>
                             </TabPanel>
                             <TabPanel
-                                name="global-3w-projects"
+                                name="global-logistics"
                                 className={styles.optionDetail}
                             >
                                 <div className={styles.description}>
-                                    {strings.userMenuGlobal3WProjectDescription}
+                                    {strings.userMenuGlobalLogisticsDescription}
                                 </div>
                                 <DropdownMenuItem
                                     type="link"
-                                    to="globalThreeW"
+                                    to="globalLogistics"
                                     variant="tertiary"
                                 >
-                                    {strings.headerMenuThreeW}
+                                    {strings.userMenuSpark}
                                 </DropdownMenuItem>
                             </TabPanel>
                         </Tabs>

app/src/views/AllSurgeAlerts/i18n.json

@@ -5,6 +5,8 @@
         "allSurgeAlertsHeading": "All Surge Alerts ({numSurgeAlerts})",
         "eventFilterLabel": "Emergency",
         "countryFilterLabel": "Country",
+        "positionFilterLabel": "Position",
+        "keywordsFilterLabel": "Keywords",
         "defaultPlaceholder": "All",
         "failedToCreateExport": "Failed to generate export.",
         "surgeAlertDate": "Alert Date",

app/src/views/AllSurgeAlerts/index.tsx

@@ -8,6 +8,7 @@ import {
     NumberOutput,
     Pager,
     Table,
+    TextInput,
 } from '@ifrc-go/ui';
 import { useTranslation } from '@ifrc-go/ui/hooks';
 import {
@@ -20,7 +21,9 @@ import {
 } from '@ifrc-go/ui/utils';
 import {
     isDefined,
+    isFalsyString,
     isNotDefined,
+    isTruthyString,
 } from '@togglecorp/fujs';
 import { saveAs } from 'file-saver';
 import Papa from 'papaparse';
@@ -111,6 +114,36 @@ export function Component() {
         EventItem[] | undefined | null
     >([]);
 
+    const [positionFilter, setPositionFilter] = useUrlSearchState<string | undefined>(
+        'position',
+        (value) => {
+            const trimmedValue = isTruthyString(value) ? value.trim() : undefined;
+
+            if (isFalsyString(trimmedValue)) {
+                return undefined;
+            }
+
+            setPage(0);
+            return trimmedValue;
+        },
+        (position) => position ?? undefined,
+    );
+
+    const [keywordsFilter, setKeywordsFilter] = useUrlSearchState<string | undefined>(
+        'keywords',
+        (value) => {
+            const trimmedValue = isTruthyString(value) ? value.trim() : undefined;
+
+            if (isFalsyString(trimmedValue)) {
+                return undefined;
+            }
+
+            setPage(0);
+            return trimmedValue;
+        },
+        (keywords) => keywords ?? undefined,
+    );
+
     useRequest({
         skip: isNotDefined(eventFilter)
             || (!!eventOptions?.find((event) => event.id === eventFilter)),
@@ -162,8 +195,9 @@ export function Component() {
             offset,
             event: eventFilter,
             country: countryFilter,
-
-            // FIXME: this should come from the useFilterState
+            message__icontains: positionFilter,
+            molnix_tag_name: keywordsFilter,
+            // FIXME: this should come from useFilterState
             ordering: 'molnix_status,-opens',
         },
     });
@@ -290,11 +324,21 @@ export function Component() {
         triggerExportStart(
             '/api/v2/surge_alert/',
             surgeResponse?.count,
-            {},
+            {
+                event: eventFilter,
+                country: countryFilter,
+                message__icontains: positionFilter,
+                molnix_tag_name: keywordsFilter,
+                ordering: 'molnix_status,-opens',
+            },
         );
     }, [
         triggerExportStart,
         surgeResponse?.count,
+        eventFilter,
+        countryFilter,
+        positionFilter,
+        keywordsFilter,
     ]);
 
     const heading = resolveToComponent(
@@ -328,6 +372,20 @@ export function Component() {
                             onOptionsChange={setEventOptions}
                             countryId={countryFilter}
                         />
+                        <TextInput
+                            name="position"
+                            label={strings.positionFilterLabel}
+                            placeholder={strings.defaultPlaceholder}
+                            value={positionFilter}
+                            onChange={setPositionFilter}
+                        />
+                        <TextInput
+                            name="keywords"
+                            label={strings.keywordsFilterLabel}
+                            placeholder={strings.defaultPlaceholder}
+                            value={keywordsFilter}
+                            onChange={setKeywordsFilter}
+                        />
                     </>
                 )}
                 footerActions={(