Add admin for multidimensional data pages

owid · Feb 7, 2025 · 9c3aa88 · 9c3aa88
1 parent a497ef4
commit 9c3aa88
Show file tree

Hide file tree

Showing 18 changed files with 958 additions and 338 deletions.
diff --git a/adminSiteClient/AdminApp.tsx b/adminSiteClient/AdminApp.tsx
diff --git a/adminSiteClient/AdminSidebar.tsx b/adminSiteClient/AdminSidebar.tsx
@@ -3,6 +3,7 @@ import * as React from "react"
 import { FontAwesomeIcon } from "@fortawesome/react-fontawesome/index.js"
 import {
     faChartBar,
+    faChartLine,
     faFile,
     faTable,
     faSkullCrossbones,
@@ -38,6 +39,11 @@ export const AdminSidebar = (): React.ReactElement => (
                     <FontAwesomeIcon icon={faPanorama} /> Narrative charts
                 </Link>
             </li>
+            <li>
+                <Link to="/multi-dims">
+                    <FontAwesomeIcon icon={faChartLine} /> Multi-dims
+                </Link>
+            </li>
             <li>
                 <Link to="/posts">
                     <FontAwesomeIcon icon={faFile} /> Posts

diff --git a/adminSiteClient/ChartViewIndexPage.tsx b/adminSiteClient/ChartViewIndexPage.tsx
@@ -1,11 +1,10 @@
 import { useCallback, useContext, useEffect, useMemo, useState } from "react"
 import * as React from "react"
-import { Button, Flex, Input, Space, Table } from "antd"
+import { Button, Flex, Input, Space, Table, TableColumnsType } from "antd"
 
 import { AdminLayout } from "./AdminLayout.js"
 import { AdminAppContext } from "./AdminAppContext.js"
 import { Timeago } from "./Forms.js"
-import { ColumnsType } from "antd/es/table/InternalTable.js"
 import { ApiChartViewOverview } from "../adminShared/AdminTypes.js"
 import { GRAPHER_DYNAMIC_THUMBNAIL_URL } from "../settings/clientSettings.js"
 import { Link } from "./Link.js"
@@ -20,7 +19,7 @@ function createColumns(ctx: {
         text: string | null | undefined
     ) => React.ReactElement | string
     deleteFn: (chartViewId: number) => void
-}): ColumnsType<ApiChartViewOverview> {
+}): TableColumnsType<ApiChartViewOverview> {
     return [
         {
             title: "Preview",

diff --git a/adminSiteClient/ImagesIndexPage.tsx b/adminSiteClient/ImagesIndexPage.tsx
@@ -14,14 +14,14 @@ import {
     Popconfirm,
     Popover,
     Table,
+    TableColumnsType,
     Upload,
     notification,
 } from "antd"
 import { AdminLayout } from "./AdminLayout.js"
 import { AdminAppContext } from "./AdminAppContext.js"
 import { DbEnrichedImageWithUserId, DbPlainUser } from "@ourworldindata/types"
 import { Timeago } from "./Forms.js"
-import { ColumnsType } from "antd/es/table/InternalTable.js"
 import { FontAwesomeIcon } from "@fortawesome/react-fontawesome"
 import {
     faClose,
@@ -246,7 +246,7 @@ function createColumns({
     users: UserMap
     usage: Dictionary<UsageInfo[]>
     notificationApi: NotificationInstance
-}): ColumnsType<DbEnrichedImageWithUserId> {
+}): TableColumnsType<DbEnrichedImageWithUserId> {
     return [
         {
             title: "Preview",