From 615f0c08af38577ec1470e62c76022f6e073c646 Mon Sep 17 00:00:00 2001 From: sophiamersmann Date: Mon, 30 Oct 2023 17:10:15 +0000 Subject: [PATCH] refactor: use a type union for OwidProcessingLevel --- datapage/Datapage.ts | 2 +- .../components/src/IndicatorKeyData/IndicatorKeyData.tsx | 2 +- packages/@ourworldindata/utils/src/OwidVariable.ts | 5 +---- packages/@ourworldindata/utils/src/index.ts | 2 +- 4 files changed, 4 insertions(+), 7 deletions(-) diff --git a/datapage/Datapage.ts b/datapage/Datapage.ts index 382f97baf75..3f3ec523931 100644 --- a/datapage/Datapage.ts +++ b/datapage/Datapage.ts @@ -30,7 +30,7 @@ export const getDatapageDataV2 = async ( ): Promise => { { const processingLevel = - variableMetadata.processingLevel ?? OwidProcessingLevel.minor + variableMetadata.processingLevel ?? "minor" const lastUpdated = getLastUpdatedFromVariable(variableMetadata) ?? "" const nextUpdate = getNextUpdateFromVariable(variableMetadata) const datapageJson: DataPageDataV2 = { diff --git a/packages/@ourworldindata/components/src/IndicatorKeyData/IndicatorKeyData.tsx b/packages/@ourworldindata/components/src/IndicatorKeyData/IndicatorKeyData.tsx index ecc11db9e6a..a882ffdef59 100644 --- a/packages/@ourworldindata/components/src/IndicatorKeyData/IndicatorKeyData.tsx +++ b/packages/@ourworldindata/components/src/IndicatorKeyData/IndicatorKeyData.tsx @@ -19,7 +19,7 @@ interface IndicatorKeyDataProps { export const IndicatorKeyData = (props: IndicatorKeyDataProps) => { const canonicalUrl = props.canonicalUrl ?? "" const processedAdapted = getPhraseForProcessingLevel( - props.owidProcessingLevel ?? OwidProcessingLevel.minor + props.owidProcessingLevel ?? "minor" ) const dateRange = getDateRange(props.dateRange) const lastUpdated = dayjs(props.lastUpdated, ["YYYY", "YYYY-MM-DD"]) diff --git a/packages/@ourworldindata/utils/src/OwidVariable.ts b/packages/@ourworldindata/utils/src/OwidVariable.ts index 45a75ba30ce..5b7bbf4df66 100644 --- a/packages/@ourworldindata/utils/src/OwidVariable.ts +++ b/packages/@ourworldindata/utils/src/OwidVariable.ts @@ -100,10 +100,7 @@ export interface OwidVariablePresentation { faqs?: FaqLink[] } -export enum OwidProcessingLevel { - minor = "minor", - major = "major", -} +export type OwidProcessingLevel = 'minor' | 'major' export interface FaqLink { gdocId: string diff --git a/packages/@ourworldindata/utils/src/index.ts b/packages/@ourworldindata/utils/src/index.ts index 5454e673b3d..e5dc3f2faf3 100644 --- a/packages/@ourworldindata/utils/src/index.ts +++ b/packages/@ourworldindata/utils/src/index.ts @@ -497,7 +497,7 @@ export { type OwidVariablePresentation, type OwidEntityKey, type OwidLicense, - OwidProcessingLevel, + type OwidProcessingLevel, } from "./OwidVariable.js" export {