Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[Hotfix 3] - cos health updates #1468

Closed
wants to merge 4 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 0 additions & 8 deletions .changeset/cool-eggs-judge.md

This file was deleted.

13 changes: 13 additions & 0 deletions app/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,18 @@
# go-web-app

## 7.6.5

### Patch Changes

- 478e73b: Update labels for severity control in Imminent Risk Map
Update navigation for the events in Imminent Risk Map
Fix issue displayed when opening a DREF import template
Fix submission issue when importing a DREF import file
- f82f846: Update Health Section in Catalogue of Surge Services
- ade84aa: Display ICRC Presence
- Display ICRC presence across partner countries
- Highlight key operational countries

## 7.6.4

### Patch Changes
Expand Down
2 changes: 1 addition & 1 deletion app/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "go-web-app",
"version": "7.6.4",
"version": "7.6.5",
"type": "module",
"private": true,
"license": "MIT",
Expand Down
40 changes: 28 additions & 12 deletions app/src/App/routes/SurgeRoutes.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -416,30 +416,30 @@ const surgeCatalogueHealthEmergencyClinic = customWrapRoute({
},
});

const surgeCatalogueHealthEruChloreaTreatment = customWrapRoute({
const surgeCatalogueHealthEruCholeraTreatment = customWrapRoute({
parent: surgeCatalogueLayout,
path: 'health/eru-chlorea-treatment',
path: 'health/eru-cholera-treatment',
component: {
render: () => import('#views/SurgeCatalogueHealthEruChloreaTreatment'),
render: () => import('#views/SurgeCatalogueHealthEruCholeraTreatment'),
props: {},
},
wrapperComponent: Auth,
context: {
title: 'Emergency Response Unit Chlorea Treatment Center',
title: 'Emergency Response Unit Cholera Treatment Center',
visibility: 'anything',
},
});

const surgeCatalogueHealthCommunityCaseManagementChlorea = customWrapRoute({
const surgeCatalogueHealthCommunityCaseManagementCholera = customWrapRoute({
parent: surgeCatalogueLayout,
path: 'health/community-case-management-chlorea',
path: 'health/community-case-management-cholera',
component: {
render: () => import('#views/SurgeCatalogueHealthCommunityCaseManagementChlorea'),
render: () => import('#views/SurgeCatalogueHealthCommunityCaseManagementCholera'),
props: {},
},
wrapperComponent: Auth,
context: {
title: 'Community Case Management of Chlorea',
title: 'Community Case Management of Cholera',
visibility: 'anything',
},
});
Expand Down Expand Up @@ -472,6 +472,20 @@ const surgeCatalogueHealthSafeDignifiedBurials = customWrapRoute({
},
});

const surgeCatalogueHealthInfectionPreventionAndControl = customWrapRoute({
parent: surgeCatalogueLayout,
path: 'health/infection-prevention-and-control',
component: {
render: () => import('#views/SurgeCatalogueHealthInfectionPreventionAndControl'),
props: {},
},
wrapperComponent: Auth,
context: {
title: 'Infection Prevention and Control',
visibility: 'anything',
},
});

const surgeCatalogueHealthCommunityManagementMalnutrition = customWrapRoute({
parent: surgeCatalogueLayout,
path: 'health/community-management-malnutrition',
Expand Down Expand Up @@ -1301,9 +1315,10 @@ function DeploymentCatalogueNavigate() {
'eru-pss-module': surgeCatalogueHealthEruPsychosocialSupport,
'community-case-management-of-malnutrition-ccmm': surgeCatalogueHealthCommunityManagementMalnutrition,
'safe-and-dignified-burials': surgeCatalogueHealthSafeDignifiedBurials,
'infection-prevention-and-control': surgeCatalogueHealthInfectionPreventionAndControl,
'community-based-surveillance-cbs': surgeCatalogueHealthCommunityBasedSurveillance,
'community-case-management-of-cholera-ccmc': surgeCatalogueHealthCommunityCaseManagementChlorea,
'eru-cholera-treatment-center': surgeCatalogueHealthEruChloreaTreatment,
'community-case-management-of-cholera-ccmc': surgeCatalogueHealthCommunityCaseManagementCholera,
'eru-cholera-treatment-center': surgeCatalogueHealthEruCholeraTreatment,
'emergency-mobile-clinic': surgeCatalogueHealthEmergencyClinic,
'maternal-newborn-health-clinic': surgeCatalogueHealthMaternalNewbornClinic,
'surgical-surge': surgeCatalogueHealthEruSurgical,
Expand Down Expand Up @@ -1457,10 +1472,11 @@ export default {
surgeCatalogueHealthEruSurgical,
surgeCatalogueHealthMaternalNewbornClinic,
surgeCatalogueHealthEmergencyClinic,
surgeCatalogueHealthEruChloreaTreatment,
surgeCatalogueHealthCommunityCaseManagementChlorea,
surgeCatalogueHealthEruCholeraTreatment,
surgeCatalogueHealthCommunityCaseManagementCholera,
surgeCatalogueHealthCommunityBasedSurveillance,
surgeCatalogueHealthSafeDignifiedBurials,
surgeCatalogueHealthInfectionPreventionAndControl,
surgeCatalogueHealthCommunityManagementMalnutrition,
surgeCatalogueHealthEruPsychosocialSupport,
surgeCatalogueInformationManagement,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -169,49 +169,53 @@ function Presence() {
)}
</div>
</Container>
<Container
className={styles.presenceCard}
heading={strings.countryICRCPresenceTitle}
footerActions={isDefined(countryResponse?.icrc_presence?.url) && (
<TextOutput
label={strings.source}
value={(
{countryResponse?.icrc_presence?.icrc_presence && (
<Container
className={styles.presenceCard}
heading={strings.countryICRCPresenceTitle}
footerActions={isDefined(countryResponse.icrc_presence.url) && (
<TextOutput
label={strings.source}
value={(
<Link
variant="tertiary"
href={countryResponse.icrc_presence.url}
external
withUnderline
>
{strings.icrc}
</Link>
)}
/>
)}
withHeaderBorder
withInternalPadding
>
{
resolveToString(
strings.countryICRCConfirmedPartner,
{ year },
)
}
{countryResponse.icrc_presence.key_operation && (
<div className={styles.icrcPresenceItem}>
<Link
variant="tertiary"
key={countryResponse.icrc_presence.id}
href={countryResponse.icrc_presence.url}
external
variant="tertiary"
withUnderline
>
{strings.icrc}
{strings.countryICRCKeyOperations}
</Link>
)}
/>
)}
withHeaderBorder
withInternalPadding
>
{resolveToString(
strings.countryICRCConfirmedPartner,
{ year },
)}
{countryResponse?.icrc_presence?.key_operation && (
<div className={styles.icrcPresenceItem}>
<Link
key={countryResponse?.icrc_presence.id}
href={countryResponse?.icrc_presence.url}
external
variant="tertiary"
withUnderline
>
{strings.countryICRCKeyOperations}
</Link>
{resolveToString(
strings.countryICRCWithin,
{ name: countryResponse?.name ?? '--' },
)}
</div>
)}
</Container>
{resolveToString(
strings.countryICRCWithin,
{ name: countryResponse.name ?? '--' },
)}
</div>
)}
</Container>
)}
</Container>
);
}
Expand Down
1 change: 1 addition & 0 deletions app/src/views/SurgeCatalogueHealth/i18n.json
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@
"healthCCMCLink": "Community Case Management of Cholera (CCMC)",
"healthCBSLink": "Community-based Surveillance (CBS)",
"healthBurialsTitle": "Safe and Dignified Burials",
"healthIPCTitle": "Infection Prevention and Control (IPC)",
"healthCCMMTitle": "Community Case Management of Malnutrition (CCMM)",
"healthPSSDetails": "24 hour clinical services for 100-200 outpatients/day.",
"healthRapidResponsePersonnelTitle": "Rapid Response Personnel",
Expand Down
32 changes: 20 additions & 12 deletions app/src/views/SurgeCatalogueHealth/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -50,18 +50,18 @@ export function Component() {
},
];

const emergencyChloreaTreatment: LinkData[] = [
const emergencyCholeraTreatment: LinkData[] = [
{
title: strings.emergencyCholeraTreatmentTitleLink,
to: 'surgeCatalogueHealthEruChloreaTreatment',
to: 'surgeCatalogueHealthEruCholeraTreatment',
withLinkIcon: true,
},
];

const healthCCMC: LinkData[] = [
{
title: strings.healthCCMCLink,
to: 'surgeCatalogueHealthCommunityCaseManagementChlorea',
to: 'surgeCatalogueHealthCommunityCaseManagementCholera',
withLinkIcon: true,
},
];
Expand All @@ -74,22 +74,30 @@ export function Component() {
},
];

const healthBurials: LinkData[] = [
const healthIPC: LinkData[] = [
{
title: strings.healthBurialsTitle,
to: 'surgeCatalogueHealthSafeDignifiedBurials',
title: strings.healthIPCTitle,
to: 'surgeCatalogueHealthInfectionPreventionAndControl',
withLinkIcon: true,
},
];

const healthCCMM: LinkData[] = [
const healthBurials: LinkData[] = [
{
title: strings.communityCaseLink,
to: 'surgeCatalogueHealthCommunityManagementMalnutrition',
title: strings.healthBurialsTitle,
to: 'surgeCatalogueHealthSafeDignifiedBurials',
withLinkIcon: true,
},
];

// const healthCCMM: LinkData[] = [
// {
// title: strings.communityCaseLink,
// to: 'surgeCatalogueHealthCommunityManagementMalnutrition',
// withLinkIcon: true,
// },
// ];

const healthPSS: LinkData[] = [
{
title: strings.pssModuleLink,
Expand Down Expand Up @@ -243,7 +251,7 @@ export function Component() {
/>
<CatalogueInfoCard
title={strings.healthServicesEruClinicTitle}
data={emergencyChloreaTreatment}
data={emergencyCholeraTreatment}
description={strings.emergencyCholeraTreatmentDetails}
/>
<CatalogueInfoCard
Expand All @@ -256,11 +264,11 @@ export function Component() {
/>
<CatalogueInfoCard
title={strings.publicHealth}
data={healthBurials}
data={healthIPC}
/>
<CatalogueInfoCard
title={strings.publicHealth}
data={healthCCMM}
data={healthBurials}
/>
<CatalogueInfoCard
title={strings.nonClinicalTitle}
Expand Down
Loading