Skip to content

Commit 11dee1e

Browse files
szabozoltan69szabozoltan69
authored
Merge pull request #902 from IFRCGo/feature/CoS-updates-892
Catalogue of Surge Services updates
2 parents 4be9d97 + c1ca72c commit 11dee1e

File tree

19 files changed

+111
-241
lines changed

19 files changed

+111
-241
lines changed

‎app/src/App/routes/SurgeRoutes.tsx‎

Lines changed: 0 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -993,20 +993,6 @@ const surgeCatalogueSecurityManagement = customWrapRoute({
993993
},
994994
});
995995

996-
const surgeCatalogueOther = customWrapRoute({
997-
parent: surgeCatalogueLayout,
998-
path: 'other',
999-
component: {
1000-
render: () => import('#views/SurgeCatalogueOther'),
1001-
props: {},
1002-
},
1003-
wrapperComponent: Auth,
1004-
context: {
1005-
title: 'Other',
1006-
visibility: 'anything',
1007-
},
1008-
});
1009-
1010996
const surgeCatalogueOtherCivilMilitaryRelations = customWrapRoute({
1011997
parent: surgeCatalogueLayout,
1012998
path: 'other/civil-military-relations',
@@ -1274,7 +1260,6 @@ function DeploymentCatalogueNavigate() {
12741260
security: surgeCatalogueSecurity,
12751261
shelter: surgeCatalogueShelter,
12761262
water: surgeCatalogueWash,
1277-
other: surgeCatalogueOther,
12781263
};
12791264

12801265
const subCatalogueRouteMap: Record<string, Record<string, WrappedRoute>> = {
@@ -1500,7 +1485,6 @@ export default {
15001485
surgeCatalogueWashKitM40Eru,
15011486
surgeCatalogueWashWaterSupplyRehabilitation,
15021487
surgeCatalogueWashHwts,
1503-
surgeCatalogueOther,
15041488
surgeCatalogueOtherCivilMilitaryRelations,
15051489
surgeCatalogueOtherDisasterRiskReduction,
15061490
surgeCatalogueOtherHumanResources,

‎app/src/views/SurgeCatalogue/i18n.json‎

Lines changed: 12 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
"catalogueHealth": "Health",
1111
"catalogueInformationManagement": "Information Management (IM)",
1212
"catalogueInformationTechnologyTelecom": "Information Technology & Telecom (IT/T)",
13-
"catalogueLivelihoodsAndBasicNeeds": "Livelihoods and Basic Needs",
13+
"catalogueLivelihoodsAndBasicNeeds": "Livelihoods and Basic Needs (LBN)",
1414
"catalogueLogistics": "Logistics",
1515
"catalogueOperations": "Operations Management",
1616
"catalogueProtection": "Protection, Gender and Inclusion (PGI)",
@@ -19,6 +19,16 @@
1919
"catalogueWater": "Water, Sanitation, and Hygiene (WASH)",
2020
"catalogueRelief": "Relief",
2121
"catalogueSecurity": "Security",
22-
"catalogueOther": "Other"
22+
"catalogueCMR": "Civil Military Relations (CMR)",
23+
"catalogueDDR": "Disaster Risk Reduction (DRR)",
24+
"catalogueHR": "Human Resources (HR)",
25+
"catalogueIDRL": "International Disaster Response Law (IDRL)",
26+
"catalogueMigration": "Migration",
27+
"catalogueNSD": "National Society Development (NSD)",
28+
"cataloguePRD": "Partnership and Resource Development (PRD)",
29+
"cataloguePER": "Preparedness for Effective Response (PER)",
30+
"catalogueRecovery": "Recovery",
31+
"catalogueGR": "Green Response (GR)",
32+
"catalogueUAV": "Drones – Uncrewed Aerial Vehicles (UAV)"
2333
}
2434
}

‎app/src/views/SurgeCatalogue/index.tsx‎

Lines changed: 72 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -162,11 +162,81 @@ export function Component() {
162162
{strings.catalogueWater}
163163
</NavigationTab>
164164
<NavigationTab
165-
to="surgeCatalogueOther"
165+
to="surgeCatalogueOtherCivilMilitaryRelations"
166166
parentRoute
167167
>
168168
<MoreOptionsIcon className={styles.icon} />
169-
{strings.catalogueOther}
169+
{strings.catalogueCMR}
170+
</NavigationTab>
171+
<NavigationTab
172+
to="surgeCatalogueOtherDisasterRiskReduction"
173+
parentRoute
174+
>
175+
<MoreOptionsIcon className={styles.icon} />
176+
{strings.catalogueDDR}
177+
</NavigationTab>
178+
<NavigationTab
179+
to="surgeCatalogueOtherHumanResources"
180+
parentRoute
181+
>
182+
<MoreOptionsIcon className={styles.icon} />
183+
{strings.catalogueHR}
184+
</NavigationTab>
185+
<NavigationTab
186+
to="surgeCatalogueOtherInternationalDisasterResponseLaw"
187+
parentRoute
188+
>
189+
<MoreOptionsIcon className={styles.icon} />
190+
{strings.catalogueIDRL}
191+
</NavigationTab>
192+
<NavigationTab
193+
to="surgeCatalogueOtherMigration"
194+
parentRoute
195+
>
196+
<MoreOptionsIcon className={styles.icon} />
197+
{strings.catalogueMigration}
198+
</NavigationTab>
199+
<NavigationTab
200+
to="surgeCatalogueOtherNationalSocietyDevelopment"
201+
parentRoute
202+
>
203+
<MoreOptionsIcon className={styles.icon} />
204+
{strings.catalogueNSD}
205+
</NavigationTab>
206+
<NavigationTab
207+
to="surgeCatalogueOtherPartnershipResourceDevelopment"
208+
parentRoute
209+
>
210+
<MoreOptionsIcon className={styles.icon} />
211+
{strings.cataloguePRD}
212+
</NavigationTab>
213+
<NavigationTab
214+
to="surgeCatalogueOtherPreparednessEffectiveResponse"
215+
parentRoute
216+
>
217+
<MoreOptionsIcon className={styles.icon} />
218+
{strings.cataloguePER}
219+
</NavigationTab>
220+
<NavigationTab
221+
to="surgeCatalogueOtherRecovery"
222+
parentRoute
223+
>
224+
<MoreOptionsIcon className={styles.icon} />
225+
{strings.catalogueRecovery}
226+
</NavigationTab>
227+
<NavigationTab
228+
to="surgeCatalogueOtherGreenResponse"
229+
parentRoute
230+
>
231+
<MoreOptionsIcon className={styles.icon} />
232+
{strings.catalogueGR}
233+
</NavigationTab>
234+
<NavigationTab
235+
to="surgeCatalogueOtherUAV"
236+
parentRoute
237+
>
238+
<MoreOptionsIcon className={styles.icon} />
239+
{strings.catalogueUAV}
170240
</NavigationTab>
171241
</NavigationTabList>
172242
<div className={styles.content}>

‎app/src/views/SurgeCatalogueLivelihood/i18n.json‎

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,15 @@
11
{
22
"namespace": "surgeCatalogueLivelihood",
33
"strings": {
4-
"catalogueLivelihoodTitle": "Livelihoods and Basic Needs",
4+
"catalogueLivelihoodTitle": "Livelihoods and Basic Needs (LBN)",
55
"catalogueLivelihoodDetail": "IFRC operates within the Sustainable Livelihoods Framework and has identified 5 types of Livelihoods assistance: 1. provisioning for lost livelihoods sources (basic needs assistance), 2. livelihoods recovery including replacement of lost Livelihoods assets, 3. livelihoods strengthening, 4. livelihoods diversification and 5. livelihoods protection. In Surge context, interventions will first focus on meeting basic needs through livelihoods provisioning, which includes that immediate food and nutrition needs are met (typically through in-kind support, cash or voucher assistance). Meanwhile other activities can be designed aiming at preventing further erosion of productive assets (livelihoods protection) or supporting the recovery of livelihoods through assets’ replacement and skills strengthening.",
66
"catalogueLivelihoodRoleHeading": "Rapid Response Personnel",
77
"catalogueLivelihoodRoleTitle": "Role Profiles",
88
"catalogueLivelihoodCoordinator": "Livelihoods and Basic Needs Coordinator",
99
"catalogueLivelihoodOfficer": "Livelihoods and Basic Needs Officer",
1010
"catalogueLivelihoodServicesHeading": "Services",
1111
"catalogueLivelihoodServicesRapidResponse": "Rapid Response",
12-
"catalogueLivelihoodServicesTitle": "Livelihoods and Basic needs",
12+
"catalogueLivelihoodServicesTitle": "Livelihoods and Basic Needs (LBN)",
1313
"catalogueLivelihoodAdditionalResources": "Additional Resources",
1414
"catalogueLivelihoodLearnMore": "Learn More",
1515
"catalogueAdditionalResources": "Additional Resources",
@@ -26,6 +26,9 @@
2626
"catalogueLivelihoodsFoodSecurity": "Food security assessment guidelines",
2727
"catalogueLivelihoodsFoodSecurityDescription": "This guide aims to assist National Society staff and volunteers throughout the world in undertaking food security assessments. It does not require prior knowledge or experience.",
2828
"catalogueLivelihoodsResource": "Livelihoods Resource Centre trainings",
29-
"catalogueLivelihoodsResourceDescription": "A number of standard training packages exist and can be taught by the Livelihoods Resource Centre (face-to-face or online)"
29+
"catalogueLivelihoodsResourceDescription": "A number of standard training packages exist and can be taught by the Livelihoods Resource Centre (face-to-face or online)",
30+
"technicalCompetencyFramework": "Technical Competency Framework",
31+
"technicalCompetencyFrameworkDetails": "Tiered competencies describing the knowledge and skills expected of personnel in this sector.",
32+
"technicalCompetencyFrameworkItemTitle": "Livelihoods and Basic Needs Technical Competency Framework"
3033
}
3134
}

‎app/src/views/SurgeCatalogueLivelihood/index.tsx‎

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -96,6 +96,15 @@ export function Component() {
9696
},
9797
];
9898

99+
const frameworkData: LinkData[] = [
100+
{
101+
title: strings.technicalCompetencyFrameworkItemTitle,
102+
href: 'https://ifrcorg.sharepoint.com/:b:/s/IFRCSharing/ETttjfpzsjdDrxWaSf7hP3ABQ4zRPhN1zDrNWS5drKTNJw',
103+
external: true,
104+
withLinkIcon: true,
105+
},
106+
];
107+
99108
return (
100109
<SurgeCatalogueContainer
101110
heading={strings.catalogueLivelihoodTitle}
@@ -108,6 +117,11 @@ export function Component() {
108117
title={strings.catalogueLivelihoodRoleTitle}
109118
data={roleProfiles}
110119
/>
120+
<CatalogueInfoCard
121+
title={strings.technicalCompetencyFramework}
122+
data={frameworkData}
123+
description={strings.technicalCompetencyFrameworkDetails}
124+
/>
111125
</SurgeCardContainer>
112126
<SurgeCardContainer
113127
heading={strings.catalogueLivelihoodServicesHeading}

‎app/src/views/SurgeCatalogueOther/i18n.json‎

Lines changed: 0 additions & 31 deletions
This file was deleted.

0 commit comments

Comments
 (0)