🚧 Temporary feature merge branch for x-mas features (as a base for gr…

…apher refactorings)

.devcontainer/Dockerfile

@@ -1,4 +1,4 @@
-ARG VARIANT=18
+ARG VARIANT=22
 FROM mcr.microsoft.com/vscode/devcontainers/javascript-node:dev-${VARIANT}
 
 COPY .tmux.conf /home/node/.tmux.conf

.nvmrc

@@ -1 +1 @@
-18.16.0
+22.12.0

adminSiteClient/AdminSidebar.tsx

@@ -37,7 +37,7 @@ export const AdminSidebar = (): React.ReactElement => (
             {chartViewsFeatureEnabled && (
                 <li>
                     <Link to="/chartViews">
-                        <FontAwesomeIcon icon={faPanorama} /> Narrative views
+                        <FontAwesomeIcon icon={faPanorama} /> Narrative charts
                     </Link>
                 </li>
             )}

adminSiteClient/ChartEditor.ts

@@ -200,15 +200,15 @@ export class ChartEditor extends AbstractChartEditor<ChartEditorManager> {
             )
     }
 
-    async saveAsNarrativeView(): Promise<void> {
+    async saveAsChartView(): Promise<void> {
         const { patchConfig, grapher } = this
 
         const chartJson = omit(patchConfig, CHART_VIEW_PROPS_TO_OMIT)
 
         const suggestedName = grapher.title ? slugify(grapher.title) : undefined
 
         const name = prompt(
-            "Please enter a programmatic name for the narrative view. Note that this name cannot be changed later.",
+            "Please enter a programmatic name for the narrative chart. Note that this name cannot be changed later.",
             suggestedName
         )
 

adminSiteClient/ChartViewEditor.ts

@@ -5,7 +5,7 @@ import {
     References,
     type EditorTab,
 } from "./AbstractChartEditor.js"
-import { ENV } from "../settings/clientSettings.js"
+import { BAKED_BASE_URL, ENV } from "../settings/clientSettings.js"
 import {
     CHART_VIEW_PROPS_TO_OMIT,
     CHART_VIEW_PROPS_TO_PERSIST,
@@ -16,7 +16,8 @@ import { diffGrapherConfigs, omit, pick } from "@ourworldindata/utils"
 // Don't yet show chart views in the admin interface
 // This is low-stakes - if it shows up anyhow (e.g. on staging servers), it's not a big deal.
 // TODO: Remove this flag once we're launching this feature
-export const chartViewsFeatureEnabled = ENV === "development"
+export const chartViewsFeatureEnabled =
+    ENV === "development" || BAKED_BASE_URL.includes("narrative-")
 
 export interface Chart {
     id: number

adminSiteClient/ChartViewIndexPage.tsx

@@ -7,7 +7,7 @@ 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 { BAKED_GRAPHER_URL } from "../settings/clientSettings.js"
+import { GRAPHER_DYNAMIC_THUMBNAIL_URL } from "../settings/clientSettings.js"
 import { Link } from "./Link.js"
 import {
     buildSearchWordsFromSearchString,
@@ -28,7 +28,7 @@ function createColumns(
             width: 200,
             render: (chartConfigId) => (
                 <img
-                    src={`${BAKED_GRAPHER_URL}/by-uuid/${chartConfigId}.svg`}
+                    src={`${GRAPHER_DYNAMIC_THUMBNAIL_URL}/by-uuid/${chartConfigId}.svg`}
                     style={{ maxWidth: 200, maxHeight: 200 }}
                 />
             ),
@@ -135,7 +135,7 @@ export function ChartViewIndexPage() {
     }, [admin])
 
     return (
-        <AdminLayout title="Narrative views">
+        <AdminLayout title="Narrative charts">
             <main className="ChartViewIndexPage">
                 <Flex justify="space-between">
                     <Input

adminSiteClient/EditorReferencesTab.tsx

@@ -127,7 +127,7 @@ export const ReferencesSection = (props: {
 
     const chartViews = !!props.references?.chartViews?.length && (
         <>
-            <p>Narrative views based on this chart</p>
+            <p>Narrative charts based on this chart</p>
             <ul className="list-group">
                 {props.references.chartViews.map((chartView) => (
                     <li key={chartView.id} className="list-group-item">

adminSiteClient/SaveButtons.tsx

@@ -61,8 +61,8 @@ class SaveButtonsForChart extends Component<{
         void this.props.editor.saveAsNewGrapher()
     }
 
-    @action.bound onSaveAsNarrativeView() {
-        void this.props.editor.saveAsNarrativeView()
+    @action.bound onSaveAsChartView() {
+        void this.props.editor.saveAsChartView()
     }
 
     @action.bound onPublishToggle() {
@@ -120,10 +120,10 @@ class SaveButtonsForChart extends Component<{
                     <div className="mt-2">
                         <button
                             className="btn btn-primary"
-                            onClick={this.onSaveAsNarrativeView}
+                            onClick={this.onSaveAsChartView}
                             disabled={isSavingDisabled}
                         >
-                            Save as narrative view
+                            Save as narrative chart
                         </button>
                     </div>
                 )}