Fix location from ingested items display

assets/agenda/utils.ts

@@ -1,4 +1,4 @@
 import {get, isEmpty, includes, keyBy, sortBy} from 'lodash';
 import moment from 'moment/moment';
 
 import {IAgendaItem, IAgendaListGroup, IAgendaListGroupItem, ICoverage, IUser} from 'interfaces';
@@ -235,14 +235,19 @@
  * @return {String}
  */
 export function getLocationString(item: any) {
-    return [
-        get(item, 'location.0.name', get(item, 'location.0.address.title')),
-        get(item, 'location.0.address.line.0'),
-        get(item, 'location.0.address.city') || get(item, 'location.0.address.area'),
-        get(item, 'location.0.address.state') || get(item, 'location.0.address.locality'),
-        get(item, 'location.0.address.postal_code'),
-        get(item, 'location.0.address.country'),
-    ].filter((d: any) => d).join(', ');
+    const location = item.location?.[0];
+    const locationAddress = location?.address;
+
+    const locationArray: Array<string> = [
+        location?.name ?? locationAddress?.title ?? '',
+        locationAddress?.line?.[0] ?? '',
+        locationAddress?.city ?? locationAddress?.area ?? '',
+        locationAddress?.state ?? locationAddress?.locality ?? '',
+        locationAddress?.postal_code ?? '',
+        locationAddress?.country ?? '',
+    ];
+
+    return locationArray.filter((d: string) => d != null && d.trim() != '').map((loc) => loc.trim()).join(', ');
 }
 
 /**

newsroom/utils.py

@@ -229,7 +229,9 @@ def get_location_string(agenda):
         location[0].get("address", {}).get("country"),
     ]
 
-    return ", ".join([location_part for location_part in location_items if location_part])
+    return ", ".join(
+        [location_part.strip() for location_part in location_items if location_part and not location_part.isspace()]
+    )
 
 
 def get_public_contacts(agenda):