Keyword filtering in all-surge-alerts

Author: szabozoltan69

.changeset/late-hornets-strive.md

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

app/src/views/AllSurgeAlerts/i18n.json

@@ -6,7 +6,7 @@
         "eventFilterLabel": "Emergency",
         "countryFilterLabel": "Country",
         "positionFilterLabel": "Position",
-        "positionFilterPlaceholder": "Search position",
+        "keywordsFilterLabel": "Keywords",
         "defaultPlaceholder": "All",
         "failedToCreateExport": "Failed to generate export.",
         "surgeAlertDate": "Alert Date",

app/src/views/AllSurgeAlerts/index.tsx

@@ -126,6 +126,20 @@ export function Component() {
         (position: string | undefined) => position,
     );
 
+    const [keywordsFilter, setKeywordsFilter] = useUrlSearchState<string | undefined>(
+        'keywords',
+        (searchValue: string | undefined) => {
+            const potentialValue = isDefined(searchValue)
+                ? String(searchValue)
+                : undefined;
+            if (isDefined(potentialValue)) {
+                setPage(0);
+            }
+            return potentialValue;
+        },
+        (keywords: string | undefined) => keywords,
+    );
+
     useRequest({
         skip: isNotDefined(eventFilter)
             || (!!eventOptions?.find((event) => event.id === eventFilter)),
@@ -178,6 +192,7 @@ export function Component() {
             event: eventFilter,
             country: countryFilter,
             message__icontains: positionFilter,
+            molnix_tag_name: keywordsFilter,
 
             // FIXME: this should come from the useFilterState
             ordering: 'molnix_status,-opens',
@@ -310,6 +325,7 @@ export function Component() {
                 event: eventFilter,
                 country: countryFilter,
                 message__icontains: positionFilter,
+                molnix_tag_name: keywordsFilter,
                 ordering: 'molnix_status,-opens',
             },
         );
@@ -319,6 +335,7 @@ export function Component() {
         eventFilter,
         countryFilter,
         positionFilter,
+        keywordsFilter,
     ]);
 
     const heading = resolveToComponent(
@@ -355,10 +372,17 @@ export function Component() {
                         <TextInput
                             name="position"
                             label={strings.positionFilterLabel}
-                            placeholder={strings.positionFilterPlaceholder}
+                            placeholder={strings.defaultPlaceholder}
                             value={positionFilter}
                             onChange={setPositionFilter}
                         />
+                        <TextInput
+                            name="keywords"
+                            label={strings.keywordsFilterLabel}
+                            placeholder={strings.defaultPlaceholder}
+                            value={keywordsFilter}
+                            onChange={setKeywordsFilter}
+                        />
                     </>
                 )}
                 footerActions={(

translationMigrations/000053-1760549647996.json

@@ -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"
+        }
+    ]
+}