Add inheritance column to charts list

owid · Sep 4, 2024 · 1483820 · 1483820
1 parent 896b800
commit 1483820
Show file tree

Hide file tree

Showing 3 changed files with 47 additions and 3 deletions.
diff --git a/adminSiteClient/ChartList.tsx b/adminSiteClient/ChartList.tsx
@@ -27,6 +27,9 @@ export interface ChartListItem {
     publishedAt: string
     publishedBy: string
 
+    hasParentIndicator?: boolean
+    isInheritanceEnabled?: boolean
+
     tags: DbChartTagJoin[]
 }
 
@@ -101,6 +104,11 @@ export class ChartList extends React.Component<{
     render() {
         const { charts, searchHighlight } = this.props
         const { availableTags } = this
+
+        // if the first chart has inheritance information, we assume all charts have it
+        const showInheritanceColumn =
+            charts[0]?.isInheritanceEnabled !== undefined
+
         return (
             <table className="table table-bordered">
                 <thead>
@@ -109,6 +117,7 @@ export class ChartList extends React.Component<{
                         <th>Chart</th>
                         <th>Id</th>
                         <th>Type</th>
+                        {showInheritanceColumn && <th>Inheritance</th>}
                         <th>Tags</th>
                         <th>Published</th>
                         <th>Last Updated</th>
@@ -124,6 +133,7 @@ export class ChartList extends React.Component<{
                             availableTags={availableTags}
                             searchHighlight={searchHighlight}
                             onDelete={this.onDeleteChart}
+                            showInheritanceColumn={showInheritanceColumn}
                         />
                     ))}
                 </tbody>

diff --git a/adminSiteClient/ChartRow.tsx b/adminSiteClient/ChartRow.tsx
@@ -19,6 +19,7 @@ export class ChartRow extends React.Component<{
     searchHighlight?: (text: string) => string | React.ReactElement
     availableTags: DbChartTagJoin[]
     onDelete: (chart: ChartListItem) => void
+    showInheritanceColumn?: boolean
 }> {
     static contextType = AdminAppContext
     context!: AdminAppContextType
@@ -40,7 +41,8 @@ export class ChartRow extends React.Component<{
     }
 
     render() {
-        const { chart, searchHighlight, availableTags } = this.props
+        const { chart, searchHighlight, availableTags, showInheritanceColumn } =
+            this.props
 
         const highlight = searchHighlight || lodash.identity
 
@@ -80,6 +82,7 @@ export class ChartRow extends React.Component<{
                 </td>
                 <td style={{ minWidth: "100px" }}>{chart.id}</td>
                 <td style={{ minWidth: "100px" }}>{showChartType(chart)}</td>
+                {showInheritanceColumn && <InheritanceStatus chart={chart} />}
                 <td style={{ minWidth: "340px" }}>
                     <EditableTags
                         tags={chart.tags}
@@ -122,3 +125,17 @@ export class ChartRow extends React.Component<{
         )
     }
 }
+
+function InheritanceStatus({ chart }: { chart: ChartListItem }) {
+    // if no information is available, return an empty cell
+    if (
+        chart.hasParentIndicator === undefined ||
+        chart.isInheritanceEnabled === undefined
+    )
+        return <td></td>
+
+    // if the chart doesn't have a parent, inheritance doesn't apply
+    if (!chart.hasParentIndicator) return <td>n/a</td>
+
+    return chart.isInheritanceEnabled ? <td>enabled</td> : <td>disabled</td>
+}
diff --git a/adminSiteServer/apiRouter.ts b/adminSiteServer/apiRouter.ts
@@ -56,6 +56,8 @@ import {
     mergeGrapherConfigs,
     diffGrapherConfigs,
     omitUndefinedValues,
+    getParentVariableIdFromChartConfig,
+    omit,
 } from "@ourworldindata/utils"
 import { applyPatch } from "../adminShared/patchHelper.js"
 import {
@@ -94,6 +96,7 @@ import {
     DbInsertUser,
     FlatTagGraph,
     DbRawChartConfig,
+    parseChartConfig,
 } from "@ourworldindata/types"
 import { uuidv7 } from "uuidv7"
 import {
@@ -1408,10 +1411,15 @@ getRouteWithROTransaction(
             variable.catalogPath += `#${variable.shortName}`
         }
 
-        const charts = await db.knexRaw<OldChartFieldList>(
+        const rawCharts = await db.knexRaw<
+            OldChartFieldList & {
+                isInheritanceEnabled: DbPlainChart["isInheritanceEnabled"]
+                config: DbRawChartConfig["full"]
+            }
+        >(
             trx,
             `-- sql
-                SELECT ${oldChartFieldList}
+                SELECT ${oldChartFieldList}, charts.isInheritanceEnabled, chart_configs.full AS config
                 FROM charts
                 JOIN chart_configs ON chart_configs.id = charts.configId
                 JOIN users lastEditedByUser ON lastEditedByUser.id = charts.lastEditedByUserId
@@ -1423,6 +1431,15 @@ getRouteWithROTransaction(
             [variableId]
         )
 
+        // check for parent indicators
+        const charts = rawCharts.map((chart) => {
+            const parentIndicatorId = getParentVariableIdFromChartConfig(
+                parseChartConfig(chart.config)
+            )
+            const hasParentIndicator = parentIndicatorId !== undefined
+            return omit({ ...chart, hasParentIndicator }, "config")
+        })
+
         await assignTagsForCharts(trx, charts)
 
         const variableWithConfigs = await getGrapherConfigsForVariable(