update logic

Author: devketanpro

assets/agenda/components/LocationFilter.tsx

@@ -337,9 +337,6 @@ export class LocationFilter extends React.Component<any, any> {
                 </button>
             );
         } else if (item.type === LOCATION_TYPE.STATE) {
-            if (!item.name){
-                return null;
-            }
             return (
                 <button
                     key={`state.${item.name}[${index}]`}

features/web_api/agenda_location_search.feature

@@ -0,0 +1,96 @@
+Feature: Agenda Search - Filter Locations Based on State
+
+    Background: Push content
+        When we post json to "/push"
+        """
+        {
+            "guid": "event1", "type": "event", "state": "scheduled", "pubstatus": "usable",
+            "slugline": "New Press Conference",
+            "name": "Prime minister press conference",
+            "dates": {
+                "start": "2018-05-28T04:00:00+0000",
+                "end": "2018-05-28T05:00:00+0000",
+                "tz": "Australia/Sydney"
+            },
+            "calendars": [{"qcode": "cal1", "name": "Calendar1"}],
+            "subject": [
+                {"code": "d1", "scheme": "sttdepartment", "name": "Dep1"},
+                {"code": "s1", "scheme": "sttsubj", "name": "Sub1"},
+                {"code": "e1", "scheme": "event_type", "name": "Sports"}
+            ],
+            "place": [
+                {"code": "NSW", "name": "New South Wales"}
+            ],
+            "anpa_category": [
+                {"qcode": "e", "name": "Entertainment"},
+                {"qcode": "f", "name": "Finance"}
+            ],
+            "location": [{
+                "name": "Sydney Harbour Bridge",
+                "address": {
+                    "city": "Sydney",
+                    "state": "New South Wales",
+                    "country": "Australia",
+                    "line": ["Hickson Road"],
+                    "postal_code": "2000",
+                    "type": "attraction",
+                    "title": "Sydney Harbour Bridge",
+                    "area": "Council of the City of Sydney"
+                }
+            }]
+        }
+        """
+        And we post json to "/push"
+        """
+        {
+            "guid": "event4", "type": "event", "state": "killed", "pubstatus": "cancelled",
+            "slugline": "Cancelled Melbourne Event",
+            "name": "Cancelled Melbourne Event",
+            "dates": {
+                "start": "2018-05-28T04:00:00+0000",
+                "end": "2018-05-28T05:00:00+0000",
+                "tz": "Australia/Sydney"
+            },
+            "calendars": [{"qcode": "cal2", "name": "Calendar2"}],
+            "subject": [
+                {"code": "d2", "scheme": "sttdepartment", "name": "Dep2"},
+                {"code": "s2", "scheme": "sttsubj", "name": "Sub2"},
+                {"code": "e2", "scheme": "event_type", "name": "Music"}
+            ],
+            "place": [
+                {"code": "VIC", "name": "Victoria"}
+            ],
+            "anpa_category": [
+                {"qcode": "e", "name": "Entertainment"},
+                {"qcode": "f", "name": "Finance"}
+            ],
+            "location": [{
+                "name": "Cancelled Melbourne Location",
+                "address": {
+                    "city": "Melbourne",
+                    "state": "Victoria",
+                    "country": "Australia",
+                    "line": ["Cancelled Street"],
+                    "postal_code": "3000",
+                    "type": "stadium",
+                    "title": "Cancelled Melbourne Location",
+                    "area": "Yarra Park"
+                }
+            }]
+        }
+        """
+
+    @auth @admin
+    Scenario: Verify locations are filtered based on event state
+        When we get "/agenda/search_locations"
+        Then we get existing resource
+        """
+        {
+            "regions": [
+                {"type": "city", "country": "Australia", "state": "New South Wales", "name": "Sydney"}
+            ],
+            "places": [
+                "Sydney Harbour Bridge"
+            ]
+        }
+        """

newsroom/agenda/views.py

@@ -461,13 +461,14 @@ def gen_agg_terms(field: str):
         ]:
             country_name = country_bucket["key"]
             for state_bucket in country_bucket["states"]["buckets"]:
-                regions.append(
-                    {
-                        "name": state_bucket["key"],
-                        "country": country_name,
-                        "type": "state",
-                    }
-                )
+                if state_bucket["key"]:
+                    regions.append(
+                        {
+                            "name": state_bucket["key"],
+                            "country": country_name,
+                            "type": "state",
+                        }
+                    )
 
     if location_filter_options.get("country", True):
         for country_bucket in (aggs.get("countries") or aggs["country_search"]["countries"])["buckets"]: