Skip to content
Open
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
5 changes: 5 additions & 0 deletions .changeset/late-hornets-strive.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
"go-web-app": patch
---

Position and Keywords filter for all Surge Alerts (/alerts/all)
2 changes: 2 additions & 0 deletions app/src/views/AllSurgeAlerts/i18n.json
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
58 changes: 55 additions & 3 deletions app/src/views/AllSurgeAlerts/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ import {
NumberOutput,
Pager,
Table,
TextInput,
} from '@ifrc-go/ui';
import { useTranslation } from '@ifrc-go/ui/hooks';
import {
Expand Down Expand Up @@ -111,6 +112,32 @@ export function Component() {
EventItem[] | undefined | null
>([]);

const [positionFilter, setPositionFilter] = useUrlSearchState<string | undefined>(
'position',
(value) => {
const v = value == null ? undefined : String(value);
const normalized = v && v.trim() ? v.trim() : undefined;
if (isDefined(normalized)) {
setPage(0);
}
return normalized;
},
(position) => position ?? undefined,
);

const [keywordsFilter, setKeywordsFilter] = useUrlSearchState<string | undefined>(
'keywords',
(value) => {
const v = value == null ? undefined : String(value);
const normalized = v && v.trim() ? v.trim() : undefined;
if (isDefined(normalized)) {
setPage(0);
}
return normalized;
},
(keywords) => keywords ?? undefined,
);

useRequest({
skip: isNotDefined(eventFilter)
|| (!!eventOptions?.find((event) => event.id === eventFilter)),
Expand Down Expand Up @@ -162,8 +189,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',
},
});
Expand Down Expand Up @@ -290,11 +318,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(
Expand Down Expand Up @@ -328,6 +366,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={(
Expand Down
17 changes: 17 additions & 0 deletions translationMigrations/000053-1760549647996.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
{
"parent": "000052-1758547474974.json",
"actions": [
{
"action": "add",
"key": "keywordsFilterLabel",
"namespace": "allSurgeAlerts",
"value": "Keywords"
},
{
"action": "add",
"key": "positionFilterLabel",
"namespace": "allSurgeAlerts",
"value": "Position"
}
]
}