enhance(countries): sort countries alphabetically

owid · Aug 5, 2024 · c0b5e33 · c0b5e33
1 parent 8d77c0d
commit c0b5e33
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 12 deletions.
diff --git a/site/CountriesIndexPage.tsx b/site/CountriesIndexPage.tsx
@@ -2,19 +2,16 @@ import React from "react"
 import { Head } from "./Head.js"
 import { SiteHeader } from "./SiteHeader.js"
 import { SiteFooter } from "./SiteFooter.js"
-
-interface Country {
-    name: string
-    slug: string
-    code: string
-}
+import { Country, sortBy } from "@ourworldindata/utils"
 
 export const CountriesIndexPage = (props: {
     countries: Country[]
     baseUrl: string
 }) => {
     const { countries, baseUrl } = props
 
+    const sortedCountries = sortBy(countries, (country) => country.name)
+
     return (
         <html>
             <Head
@@ -28,7 +25,7 @@ export const CountriesIndexPage = (props: {
                 <main className="wrapper">
                     <h1>Data by country</h1>
                     <ul>
-                        {countries.map((country) => (
+                        {sortedCountries.map((country) => (
                             <li key={country.code}>
                                 <a href={`/country/${country.slug}`}>
                                     <img

diff --git a/site/CountryProfilePage.tsx b/site/CountryProfilePage.tsx
@@ -3,6 +3,7 @@ import { Head } from "./Head.js"
 import { SiteHeader } from "./SiteHeader.js"
 import { SiteFooter } from "./SiteFooter.js"
 import urljoin from "url-join"
+import { Country } from "@ourworldindata/utils"
 
 export interface CountryProfileIndicator {
     name: string
@@ -21,11 +22,7 @@ export interface CountryProfileKeyStats {
 }
 
 export interface CountryProfilePageProps {
-    country: {
-        name: string
-        slug: string
-        code: string
-    }
+    country: Country
     indicators: CountryProfileIndicator[]
     baseUrl: string
 }