Skip to content

Commit

Permalink
🔨 rename gdocs template env vars
Browse files Browse the repository at this point in the history
  • Loading branch information
sophiamersmann committed Feb 14, 2025
1 parent 451e2e5 commit 94786cf
Show file tree
Hide file tree
Showing 4 changed files with 20 additions and 12 deletions.
4 changes: 2 additions & 2 deletions .env.devcontainer
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,8 @@ DEBUG='knex:query'
GDOCS_PRIVATE_KEY=''
GDOCS_CLIENT_EMAIL=''
GDOCS_CLIENT_ID=''
GDOCS_BASIC_ARTICLE_TEMPLATE_URL=''
GDOCS_DATA_INSIGHT_TEMPLATE_URL=''
GDOCS_ARTICLE_DUPLICATION_TEMPLATE_ID=''
GDOCS_DATA_INSIGHT_DUPLICATION_TEMPLATE_ID=''

R2_ENDPOINT=''
IMAGE_HOSTING_R2_CDN_URL=''
Expand Down
4 changes: 2 additions & 2 deletions .env.example-full
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,8 @@ GRAPHER_TEST_DB_PORT=3308
GDOCS_PRIVATE_KEY=
GDOCS_CLIENT_EMAIL=
GDOCS_CLIENT_ID=
GDOCS_BASIC_ARTICLE_TEMPLATE_URL=
GDOCS_DATA_INSIGHT_TEMPLATE_URL=
GDOCS_ARTICLE_DUPLICATION_TEMPLATE_ID=
GDOCS_DATA_INSIGHT_DUPLICATION_TEMPLATE_ID=
GDOCS_DETAILS_ON_DEMAND_ID=
GDOCS_DONATE_FAQS_DOCUMENT_ID=
GDOCS_BACKPORTING_TARGET_FOLDER= # optional
Expand Down
16 changes: 12 additions & 4 deletions adminSiteClient/GdocsAdd.tsx
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
import { GDOCS_URL_PLACEHOLDER, gdocUrlRegex } from "@ourworldindata/utils"
import * as React from "react"
import {
GDOCS_BASIC_ARTICLE_TEMPLATE_URL,
GDOCS_ARTICLE_DUPLICATION_TEMPLATE_ID,
GDOCS_CLIENT_EMAIL,
GDOCS_DATA_INSIGHT_TEMPLATE_URL,
GDOCS_DATA_INSIGHT_DUPLICATION_TEMPLATE_ID,
} from "../settings/clientSettings.js"
import { useGdocsStore } from "./GdocsStoreContext.js"

Expand Down Expand Up @@ -32,15 +32,19 @@ export const GdocsAdd = ({ onAdd }: { onAdd: (id: string) => void }) => {
<li>
Create a new document from the{" "}
<a
href={GDOCS_BASIC_ARTICLE_TEMPLATE_URL}
href={makeGdocDuplicationUrl(
GDOCS_ARTICLE_DUPLICATION_TEMPLATE_ID
)}
target="_blank"
rel="noopener"
>
basic article template
</a>{" "}
or the{" "}
<a
href={GDOCS_DATA_INSIGHT_TEMPLATE_URL}
href={makeGdocDuplicationUrl(
GDOCS_DATA_INSIGHT_DUPLICATION_TEMPLATE_ID
)}
target="_blank"
rel="noopener"
>
Expand Down Expand Up @@ -91,3 +95,7 @@ export const GdocsAdd = ({ onAdd }: { onAdd: (id: string) => void }) => {
</form>
)
}

function makeGdocDuplicationUrl(docId: string): string {
return `https://docs.google.com/document/d/${docId}/copy?copyCollaborators=true`
}
8 changes: 4 additions & 4 deletions settings/clientSettings.ts
Original file line number Diff line number Diff line change
Expand Up @@ -73,10 +73,10 @@ export const TOPICS_CONTENT_GRAPH: boolean =
process.env.TOPICS_CONTENT_GRAPH === "true"

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 ?? ""
export const GDOCS_DATA_INSIGHT_TEMPLATE_URL: string =
process.env.GDOCS_DATA_INSIGHT_TEMPLATE_URL ?? ""
export const GDOCS_ARTICLE_DUPLICATION_TEMPLATE_ID: string =
process.env.GDOCS_ARTICLE_DUPLICATION_TEMPLATE_ID ?? ""
export const GDOCS_DATA_INSIGHT_DUPLICATION_TEMPLATE_ID: string =
process.env.GDOCS_DATA_INSIGHT_DUPLICATION_TEMPLATE_ID ?? ""

export const IMAGE_HOSTING_R2_CDN_URL: string =
process.env.IMAGE_HOSTING_R2_CDN_URL || ""
Expand Down

0 comments on commit 94786cf

Please sign in to comment.