Skip to content

Commit a73c680

Browse files
committed
Add admin for multidimensional data pages
1 parent a497ef4 commit a73c680

18 files changed

+958
-338
lines changed

adminSiteClient/AdminApp.tsx

+289-255
Large diffs are not rendered by default.

adminSiteClient/AdminSidebar.tsx

+6
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ import * as React from "react"
33
import { FontAwesomeIcon } from "@fortawesome/react-fontawesome/index.js"
44
import {
55
faChartBar,
6+
faChartLine,
67
faFile,
78
faTable,
89
faSkullCrossbones,
@@ -38,6 +39,11 @@ export const AdminSidebar = (): React.ReactElement => (
3839
<FontAwesomeIcon icon={faPanorama} /> Narrative charts
3940
</Link>
4041
</li>
42+
<li>
43+
<Link to="/multi-dims">
44+
<FontAwesomeIcon icon={faChartLine} /> Multi-dims
45+
</Link>
46+
</li>
4147
<li>
4248
<Link to="/posts">
4349
<FontAwesomeIcon icon={faFile} /> Posts

adminSiteClient/ChartViewIndexPage.tsx

+2-3
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,10 @@
11
import { useCallback, useContext, useEffect, useMemo, useState } from "react"
22
import * as React from "react"
3-
import { Button, Flex, Input, Space, Table } from "antd"
3+
import { Button, Flex, Input, Space, Table, TableColumnsType } from "antd"
44

55
import { AdminLayout } from "./AdminLayout.js"
66
import { AdminAppContext } from "./AdminAppContext.js"
77
import { Timeago } from "./Forms.js"
8-
import { ColumnsType } from "antd/es/table/InternalTable.js"
98
import { ApiChartViewOverview } from "../adminShared/AdminTypes.js"
109
import { GRAPHER_DYNAMIC_THUMBNAIL_URL } from "../settings/clientSettings.js"
1110
import { Link } from "./Link.js"
@@ -20,7 +19,7 @@ function createColumns(ctx: {
2019
text: string | null | undefined
2120
) => React.ReactElement | string
2221
deleteFn: (chartViewId: number) => void
23-
}): ColumnsType<ApiChartViewOverview> {
22+
}): TableColumnsType<ApiChartViewOverview> {
2423
return [
2524
{
2625
title: "Preview",

adminSiteClient/ImagesIndexPage.tsx

+2-2
Original file line numberDiff line numberDiff line change
@@ -14,14 +14,14 @@ import {
1414
Popconfirm,
1515
Popover,
1616
Table,
17+
TableColumnsType,
1718
Upload,
1819
notification,
1920
} from "antd"
2021
import { AdminLayout } from "./AdminLayout.js"
2122
import { AdminAppContext } from "./AdminAppContext.js"
2223
import { DbEnrichedImageWithUserId, DbPlainUser } from "@ourworldindata/types"
2324
import { Timeago } from "./Forms.js"
24-
import { ColumnsType } from "antd/es/table/InternalTable.js"
2525
import { FontAwesomeIcon } from "@fortawesome/react-fontawesome"
2626
import {
2727
faClose,
@@ -246,7 +246,7 @@ function createColumns({
246246
users: UserMap
247247
usage: Dictionary<UsageInfo[]>
248248
notificationApi: NotificationInstance
249-
}): ColumnsType<DbEnrichedImageWithUserId> {
249+
}): TableColumnsType<DbEnrichedImageWithUserId> {
250250
return [
251251
{
252252
title: "Preview",

0 commit comments

Comments
 (0)