🚧 remove direct R2 bindings

.env.devcontainer

@@ -16,8 +16,8 @@ GDOCS_CLIENT_ID=''
 GDOCS_BASIC_ARTICLE_TEMPLATE_URL=''
 GDOCS_SHARED_DRIVE_ID=''
 
-IMAGE_HOSTING_R2_ENDPOINT=''
+R2_ENDPOINT=''
 IMAGE_HOSTING_R2_CDN_URL=''
 IMAGE_HOSTING_R2_BUCKET_PATH=''
-IMAGE_HOSTING_R2_ACCESS_KEY_ID=''
-IMAGE_HOSTING_R2_SECRET_ACCESS_KEY=''
+R2_ACCESS_KEY_ID=''
+R2_SECRET_ACCESS_KEY=''

.env.example-full

@@ -22,11 +22,17 @@ GDOCS_BASIC_ARTICLE_TEMPLATE_URL=
 GDOCS_SHARED_DRIVE_ID=
 GDOCS_DONATE_FAQS_DOCUMENT_ID=  # optional
 
-IMAGE_HOSTING_R2_ENDPOINT=  # optional
+R2_ENDPOINT=  # optional
 IMAGE_HOSTING_R2_CDN_URL=
 IMAGE_HOSTING_R2_BUCKET_PATH=
-IMAGE_HOSTING_R2_ACCESS_KEY_ID=  # optional
-IMAGE_HOSTING_R2_SECRET_ACCESS_KEY=  # optional
+R2_ACCESS_KEY_ID=  # optional
+R2_SECRET_ACCESS_KEY=  # optional
+# These two GRAPHER_CONFIG_ settings are used to store grapher configs in an R2 bucket.
+# The cloudflare workers for thumbnail rendering etc use these settings to fetch the grapher configs.
+# This means that for most local dev it is not necessary to set these.
+GRAPHER_CONFIG_R2_BUCKET= # optional - for local dev set it to "owid-grapher-configs-staging"
+GRAPHER_CONFIG_R2_BUCKET_PATH= # optional - for local dev set it to "devs/YOURNAME"
+
 
 OPENAI_API_KEY=
 

.github/workflows/check-default-grapher-config.yml

@@ -0,0 +1,53 @@
+name: Check default grapher config
+on:
+    push:
+        branches:
+            - "**"
+            - "!master"
+        paths:
+            - "packages/@ourworldindata/grapher/src/schema/**"
+
+jobs:
+    commit-default-config:
+        runs-on: ubuntu-latest
+
+        steps:
+            - name: Clone repository
+              uses: actions/checkout@v4
+              with:
+                  ref: ${{ github.head_ref }}
+
+            - uses: ./.github/actions/setup-node-yarn-deps
+            - uses: ./.github/actions/build-tsc
+
+            - uses: hustcer/setup-nu@v3
+              with:
+                  version: "0.80" # Don't use 0.80 here, as it was a float number and will be convert to 0.8, you can use v0.80/0.80.0 or '0.80'
+
+            # Turn all yaml files in the schema directory into json (should only be one)
+            - name: Convert yaml schema to json
+              run: |
+                  (ls packages/@ourworldindata/grapher/src/schema/*.yaml
+                  | each {|yaml|
+                      open $yaml.name
+                      | to json
+                      | save -f ($yaml.name
+                          | path parse
+                          | upsert extension "json"
+                          | path join) })
+              shell: nu {0}
+
+            # Construct default config objects for all grapher schemas in the schema directory (should only be one)
+            - name: Generate default grapher config
+              run: |
+                  (ls packages/@ourworldindata/grapher/src/schema/grapher-schema.*.json
+                  | each {|json|
+                      node itsJustJavascript/devTools/schema/generate-default-object-from-schema.js $json.name --save-ts packages/@ourworldindata/grapher/src/schema/defaultGrapherConfig.ts })
+              shell: nu {0}
+
+            - name: Run prettier
+              run: yarn fixPrettierAll
+
+            - uses: stefanzweifel/git-auto-commit-action@v5
+              with:
+                  commit_message: "🤖 update default grapher config"

.gitignore

@@ -43,3 +43,4 @@ dist/
 .nx/workspace-data
 .dev.vars
 **/tsup.config.bundled*.mjs
+cfstorage

adminSiteClient/ChartEditor.ts

@@ -14,6 +14,10 @@ import {
     ChartRedirect,
     DimensionProperty,
     Json,
+    GrapherInterface,
+    diffGrapherConfigs,
+    isEqual,
+    omit,
 } from "@ourworldindata/utils"
 import { computed, observable, runInAction, when } from "mobx"
 import { BAKED_GRAPHER_URL } from "../settings/clientSettings.js"
@@ -97,6 +101,7 @@ export interface ChartEditorManager {
     admin: Admin
     grapher: Grapher
     database: EditorDatabase
+    parentGrapherConfig: GrapherInterface
     logs: Log[]
     references: References | undefined
     redirects: ChartRedirect[]
@@ -124,7 +129,7 @@ export class ChartEditor {
     @observable.ref errorMessage?: { title: string; content: string }
     @observable.ref previewMode: "mobile" | "desktop"
     @observable.ref showStaticPreview = false
-    @observable.ref savedGrapherJson: string = ""
+    @observable.ref savedPatchConfig: GrapherInterface = {}
 
     // This gets set when we save a new chart for the first time
     // so the page knows to update the url
@@ -137,13 +142,26 @@ export class ChartEditor {
                 ? "mobile"
                 : "desktop"
         when(
-            () => this.grapher.isReady,
-            () => (this.savedGrapherJson = JSON.stringify(this.grapher.object))
+            () => this.grapher.hasData && this.grapher.isReady,
+            () => (this.savedPatchConfig = this.patchConfig)
         )
     }
 
+    @computed get fullConfig(): GrapherInterface {
+        return this.grapher.object
+    }
+
+    @computed get patchConfig(): GrapherInterface {
+        const { parentGrapherConfig } = this.manager
+        if (!parentGrapherConfig) return this.fullConfig
+        return diffGrapherConfigs(this.fullConfig, parentGrapherConfig)
+    }
+
     @computed get isModified(): boolean {
-        return JSON.stringify(this.grapher.object) !== this.savedGrapherJson
+        return !isEqual(
+            omit(this.patchConfig, "version"),
+            omit(this.savedPatchConfig, "version")
+        )
     }
 
     @computed get grapher() {
@@ -238,12 +256,12 @@ export class ChartEditor {
             if (isNewGrapher) {
                 this.newChartId = json.chartId
                 this.grapher.id = json.chartId
-                this.savedGrapherJson = JSON.stringify(this.grapher.object)
+                this.savedPatchConfig = json.savedPatch
             } else {
                 runInAction(() => {
                     grapher.version += 1
                     this.logs.unshift(json.newLog)
-                    this.savedGrapherJson = JSON.stringify(currentGrapherObject)
+                    this.savedPatchConfig = json.savedPatch
                 })
             }
         } else onError?.()

adminSiteClient/ChartEditorPage.tsx

@@ -28,7 +28,7 @@ import {
     ChartRedirect,
     DimensionProperty,
 } from "@ourworldindata/types"
-import { Grapher } from "@ourworldindata/grapher"
+import { defaultGrapherConfig, Grapher } from "@ourworldindata/grapher"
 import { Admin } from "./Admin.js"
 import {
     ChartEditor,
@@ -104,7 +104,7 @@ export class ChartEditorPage
     extends React.Component<{
         grapherId?: number
         newGrapherIndex?: number
-        grapherConfig?: any
+        grapherConfig?: GrapherInterface
     }>
     implements ChartEditorManager
 {
@@ -124,7 +124,9 @@ export class ChartEditorPage
 
     @observable simulateVisionDeficiency?: VisionDeficiency
 
-    fetchedGrapherConfig?: any
+    fetchedGrapherConfig?: GrapherInterface
+    // for now, every chart's parent config is the default layer
+    parentGrapherConfig = defaultGrapherConfig
 
     async fetchGrapher(): Promise<void> {
         const { grapherId } = this.props

adminSiteClient/EditorHistoryTab.tsx

@@ -129,7 +129,7 @@ export class EditorHistoryTab extends React.Component<{ editor: ChartEditor }> {
     @action.bound copyYamlToClipboard() {
         // Use the Clipboard API to copy the config into the users clipboard
         const chartConfigObject = {
-            ...this.props.editor.grapher.object,
+            ...this.props.editor.patchConfig,
         }
         delete chartConfigObject.id
         delete chartConfigObject.dimensions
@@ -149,15 +149,20 @@ export class EditorHistoryTab extends React.Component<{ editor: ChartEditor }> {
         // Avoid modifying the original JSON object
         // Due to mobx memoizing computed values, the JSON can be mutated.
         const chartConfigObject = {
-            ...this.props.editor.grapher.object,
+            ...this.props.editor.patchConfig,
         }
         return (
             <div>
                 {this.logs.map((log, i) => (
                     <ul key={i} className="list-group">
                         <LogRenderer
                             log={log}
-                            previousLog={this.logs[i + 1]} // Needed for comparison, might be undefined
+                            // Needed for comparison, might be undefined
+                            previousLog={
+                                i + 1 < this.logs.length
+                                    ? this.logs[i + 1]
+                                    : undefined
+                            }
                             applyConfig={this.applyConfig}
                         ></LogRenderer>
                     </ul>

adminSiteClient/GrapherConfigGridEditor.tsx

@@ -348,6 +348,7 @@ export class GrapherConfigGridEditor extends React.Component<GrapherConfigGridEd
             selectedRowContent.id
         )
 
+        // TODO(inheritance): use mergeGrapherConfigs instead
         const mergedConfig = merge(grapherConfig, finalConfigLayer)
         this.loadGrapherJson(mergedConfig)
     }