diff --git a/.env.devcontainer b/.env.devcontainer index 7147993e53..4c13a7a05c 100644 --- a/.env.devcontainer +++ b/.env.devcontainer @@ -15,7 +15,7 @@ GDOCS_CLIENT_EMAIL='' GDOCS_CLIENT_ID='' GDOCS_BASIC_ARTICLE_TEMPLATE_URL='' GDOCS_DATA_INSIGHT_TEMPLATE_URL='' -GDOCS_DATA_INSIGHT_TEMPLATE_ID='' +GDOCS_DATA_INSIGHT_API_TEMPLATE_ID='' R2_ENDPOINT='' IMAGE_HOSTING_R2_CDN_URL='' diff --git a/.env.example-full b/.env.example-full index c7fbf204ef..cc6ec89c8a 100644 --- a/.env.example-full +++ b/.env.example-full @@ -19,8 +19,8 @@ GDOCS_PRIVATE_KEY= GDOCS_CLIENT_EMAIL= GDOCS_CLIENT_ID= GDOCS_BASIC_ARTICLE_TEMPLATE_URL= -GDOCS_DATA_INSIGHT_TEMPLATE_URL= # share url -GDOCS_DATA_INSIGHT_TEMPLATE_ID= # document with placeholders used for automation +GDOCS_DATA_INSIGHT_TEMPLATE_URL= +GDOCS_DATA_INSIGHT_API_TEMPLATE_ID= GDOCS_DETAILS_ON_DEMAND_ID= GDOCS_DONATE_FAQS_DOCUMENT_ID= GDOCS_BACKPORTING_TARGET_FOLDER= # optional diff --git a/adminSiteServer/apiRoutes/dataInsights.ts b/adminSiteServer/apiRoutes/dataInsights.ts index 6795486101..98ccaf31e7 100644 --- a/adminSiteServer/apiRoutes/dataInsights.ts +++ b/adminSiteServer/apiRoutes/dataInsights.ts @@ -26,7 +26,7 @@ import { createGdocFromTemplate, replacePlaceholdersInGdoc, } from "../../db/model/Gdoc/archieToGdoc.js" -import { GDOCS_DATA_INSIGHT_TEMPLATE_ID } from "../../settings/clientSettings.js" +import { GDOCS_DATA_INSIGHT_API_TEMPLATE_ID } from "../../settings/clientSettings.js" const GRAPHER_URL_PREFIX = "https://ourworldindata.org/grapher/" const EXPLORER_URL_PREFIX = "https://ourworldindata.org/explorers/" @@ -68,7 +68,7 @@ export async function createDataInsightGDoc( // Create a new GDoc from the template const docTitle = req.body.title ?? "Untitled Data Insight" const gdocId = await createGdocFromTemplate( - GDOCS_DATA_INSIGHT_TEMPLATE_ID, + GDOCS_DATA_INSIGHT_API_TEMPLATE_ID, docTitle, targetFolder ) diff --git a/settings/clientSettings.ts b/settings/clientSettings.ts index 1f4380d03e..35cde2a6e4 100644 --- a/settings/clientSettings.ts +++ b/settings/clientSettings.ts @@ -75,12 +75,10 @@ export const TOPICS_CONTENT_GRAPH: boolean = export const GDOCS_CLIENT_EMAIL: string = process.env.GDOCS_CLIENT_EMAIL ?? "" export const GDOCS_BASIC_ARTICLE_TEMPLATE_URL: string = process.env.GDOCS_BASIC_ARTICLE_TEMPLATE_URL ?? "" -// share url export const GDOCS_DATA_INSIGHT_TEMPLATE_URL: string = process.env.GDOCS_DATA_INSIGHT_TEMPLATE_URL ?? "" -// document with placeholders used for automation -export const GDOCS_DATA_INSIGHT_TEMPLATE_ID: string = - process.env.GDOCS_DATA_INSIGHT_TEMPLATE_ID ?? "" +export const GDOCS_DATA_INSIGHT_API_TEMPLATE_ID: string = + process.env.GDOCS_DATA_INSIGHT_API_TEMPLATE_ID ?? "" export const IMAGE_HOSTING_R2_CDN_URL: string = process.env.IMAGE_HOSTING_R2_CDN_URL || ""