Merge branch 'master' of github.com:owid/owid-grapher

owid · May 22, 2024 · 2a99b12 · 2a99b12
2 parents a2c7023 + ab9ef41
commit 2a99b12
Show file tree

Hide file tree

Showing 4 changed files with 38 additions and 46 deletions.
diff --git a/packages/@ourworldindata/grapher/src/bodyPortal/.eslintrc.yaml b/packages/@ourworldindata/grapher/src/bodyPortal/.eslintrc.yaml
diff --git a/packages/@ourworldindata/grapher/src/bodyPortal/BodyPortal.tsx b/packages/@ourworldindata/grapher/src/bodyPortal/BodyPortal.tsx
diff --git a/packages/@ourworldindata/grapher/src/entitySelector/EntitySelector.tsx b/packages/@ourworldindata/grapher/src/entitySelector/EntitySelector.tsx
@@ -78,10 +78,11 @@ interface SortConfig {
     order: SortOrder
 }
 
-type SearchableEntity = { name: string; local?: boolean } & Record<
-    ColumnSlug,
-    CoreValueType | undefined
->
+type SearchableEntity = {
+    name: string
+    local?: boolean
+    isWorld?: boolean
+} & Record<ColumnSlug, CoreValueType | undefined>
 
 interface PartitionedEntities {
     selected: SearchableEntity[]
@@ -447,7 +448,10 @@ export class EntitySelector extends React.Component<{
 
     @computed private get availableEntities(): SearchableEntity[] {
         return this.availableEntityNames.map((entityName) => {
-            const searchableEntity: SearchableEntity = { name: entityName }
+            const searchableEntity: SearchableEntity = {
+                name: entityName,
+                isWorld: entityName === "World",
+            }
 
             if (this.localEntityNames) {
                 searchableEntity.local =
@@ -468,15 +472,17 @@ export class EntitySelector extends React.Component<{
 
     private sortEntities(
         entities: SearchableEntity[],
-        options: { sortLocalsToTop: boolean } = { sortLocalsToTop: true }
+        options: { sortLocalsAndWorldToTop: boolean } = {
+            sortLocalsAndWorldToTop: true,
+        }
     ): SearchableEntity[] {
         const { sortConfig } = this
 
         const shouldBeSortedByName =
             sortConfig.slug === this.table.entityNameSlug
 
         // sort by name, ignoring local entities
-        if (shouldBeSortedByName && !options.sortLocalsToTop) {
+        if (shouldBeSortedByName && !options.sortLocalsAndWorldToTop) {
             return orderBy(
                 entities,
                 (entity: SearchableEntity) => entity.name,
@@ -485,9 +491,14 @@ export class EntitySelector extends React.Component<{
         }
 
         // sort by name, with local entities at the top
-        if (shouldBeSortedByName && options.sortLocalsToTop) {
-            const [localEntities, otherEntities] = partition(
+        if (shouldBeSortedByName && options.sortLocalsAndWorldToTop) {
+            const [[worldEntity], entitiesWithoutWorld] = partition(
                 entities,
+                (entity) => entity.isWorld
+            )
+
+            const [localEntities, otherEntities] = partition(
+                entitiesWithoutWorld,
                 (entity: SearchableEntity) => entity.local
             )
 
@@ -503,7 +514,11 @@ export class EntitySelector extends React.Component<{
                 sortConfig.order
             )
 
-            return [...sortedLocalEntities, ...sortedOtherEntities]
+            return excludeUndefined([
+                ...sortedLocalEntities,
+                worldEntity,
+                ...sortedOtherEntities,
+            ])
         }
 
         // sort by number column, with missing values at the end
@@ -563,7 +578,9 @@ export class EntitySelector extends React.Component<{
         )
 
         return {
-            selected: this.sortEntities(selected, { sortLocalsToTop: false }),
+            selected: this.sortEntities(selected, {
+                sortLocalsAndWorldToTop: false,
+            }),
             unselected: this.sortEntities(unselected),
         }
     }

diff --git a/site/DataPageV2.tsx b/site/DataPageV2.tsx
@@ -14,6 +14,7 @@ import {
     pick,
     GrapherInterface,
     ImageMetadata,
+    Url,
 } from "@ourworldindata/utils"
 import { MarkdownTextWrap } from "@ourworldindata/components"
 import React from "react"
@@ -57,6 +58,7 @@ export const DataPageV2 = (props: {
     const canonicalUrl = grapher?.slug
         ? urljoin(baseGrapherUrl, grapher.slug as string)
         : ""
+    const dataApiOrigin = Url.fromURL(DATA_API_URL).origin
     let pageDesc: string
     if (grapher?.subtitle?.length) {
         // convert subtitle from markdown to plaintext
@@ -123,6 +125,7 @@ export const DataPageV2 = (props: {
                     figure[data-grapher-src] { display: none !important; }
                 `}</style>
                 </noscript>
+                <link rel="preconnect" href={dataApiOrigin} />
                 {variableIds.flatMap((variableId) =>
                     [
                         getVariableDataRoute(DATA_API_URL, variableId),
@@ -137,6 +140,13 @@ export const DataPageV2 = (props: {
                         />
                     ))
                 )}
+                <link
+                    rel="preload"
+                    href="/fonts/PlayfairDisplayLatin-SemiBold.woff2"
+                    as="font"
+                    type="font/woff2"
+                    crossOrigin="anonymous"
+                />
             </Head>
             <body className="DataPage">
                 <SiteHeader baseUrl={baseUrl} />