chore: use assignment operators when possible (??=, ||=, +=, `-…

…=`) (#4227)
owid · Nov 27, 2024 · 0758f9f · 0758f9f
1 parent 5324762
commit 0758f9f
Show file tree

Hide file tree

Showing 13 changed files with 29 additions and 30 deletions.
diff --git a/adminSiteClient/GrapherConfigGridEditor.tsx b/adminSiteClient/GrapherConfigGridEditor.tsx
@@ -1341,7 +1341,7 @@ export class GrapherConfigGridEditor extends React.Component<GrapherConfigGridEd
             (this.numTotalRows ?? 0) > PAGEING_SIZE &&
             this.desiredPagingOffset >= PAGEING_SIZE
         )
-            this.desiredPagingOffset = this.desiredPagingOffset - PAGEING_SIZE
+            this.desiredPagingOffset -= PAGEING_SIZE
     }
 
     @action.bound
@@ -1350,7 +1350,7 @@ export class GrapherConfigGridEditor extends React.Component<GrapherConfigGridEd
             (this.numTotalRows ?? 0) > PAGEING_SIZE &&
             this.desiredPagingOffset + PAGEING_SIZE < (this.numTotalRows ?? 0)
         ) {
-            this.desiredPagingOffset = this.desiredPagingOffset + PAGEING_SIZE
+            this.desiredPagingOffset += PAGEING_SIZE
         }
     }
 

diff --git a/adminSiteServer/chartConfigHelpers.ts b/adminSiteServer/chartConfigHelpers.ts
@@ -90,7 +90,7 @@ export const saveNewChartConfigInDbAndR2 = async (
     patchConfig: GrapherInterface,
     fullConfig: GrapherInterface
 ) => {
-    chartConfigId = chartConfigId ?? (uuidv7() as Base64String)
+    chartConfigId ??= uuidv7() as Base64String
 
     await knex<DbInsertChartConfig>(ChartConfigsTableName).insert({
         id: chartConfigId,

diff --git a/adminSiteServer/testPageRouter.tsx b/adminSiteServer/testPageRouter.tsx
@@ -152,12 +152,12 @@ async function propsFromQueryParams(
     if (params.type) {
         if (params.type === GRAPHER_MAP_TYPE) {
             query = query.andWhereRaw(`cc.full->>"$.hasMapTab" = "true"`)
-            tab = tab || GRAPHER_TAB_OPTIONS.map
+            tab ||= GRAPHER_TAB_OPTIONS.map
         } else {
             query = query.andWhereRaw(`cc.chartType = :type`, {
                 type: params.type,
             })
-            tab = tab || GRAPHER_TAB_OPTIONS.chart
+            tab ||= GRAPHER_TAB_OPTIONS.chart
         }
     }
 

diff --git a/db/migration/1661264304751-MigrateSelectedData.ts b/db/migration/1661264304751-MigrateSelectedData.ts
@@ -67,8 +67,7 @@ export class MigrateSelectedData1661264304751 implements MigrationInterface {
                 if (item.entityId && item.color) {
                     // migrate entity color
                     if (!legacyConfig.selectedEntityColors) {
-                        newConfig.selectedEntityColors =
-                            newConfig.selectedEntityColors ?? {}
+                        newConfig.selectedEntityColors ??= {}
                         const entityName = entityNameById[item.entityId]
                         if (entityName) {
                             newConfig.selectedEntityColors[entityName] ??=
@@ -79,7 +78,7 @@ export class MigrateSelectedData1661264304751 implements MigrationInterface {
                     // migrate dimension color
                     const dimension = newConfig.dimensions?.[item.index]
                     if (dimension?.variableId) {
-                        dimension.display = dimension.display ?? {}
+                        dimension.display ??= {}
                         dimension.display.color ??= item.color
                     }
                 }

diff --git a/db/model/Gdoc/htmlToEnriched.ts b/db/model/Gdoc/htmlToEnriched.ts
@@ -438,7 +438,7 @@ export function adjustHeadingLevels(
             const correction = isEntry
                 ? minHeadingLevel - 1
                 : Math.max(0, minHeadingLevel - 2)
-            block.level = block.level - correction
+            block.level -= correction
         } else if ("children" in block) {
             adjustHeadingLevels(
                 block.children as OwidEnrichedGdocBlock[],

diff --git a/packages/@ourworldindata/core-table/src/CoreTable.ts b/packages/@ourworldindata/core-table/src/CoreTable.ts
@@ -1398,9 +1398,10 @@ export class CoreTable<
         sourceTable: CoreTable,
         by?: ColumnSlug[]
     ): COL_DEF_TYPE[] {
-        by =
-            by ??
-            intersection(sourceTable.columnSlugs, destinationTable.columnSlugs)
+        by ??= intersection(
+            sourceTable.columnSlugs,
+            destinationTable.columnSlugs
+        )
         const columnSlugsToAdd = difference(
             sourceTable.columnSlugs,
             destinationTable.columnSlugs

diff --git a/packages/@ourworldindata/core-table/src/CoreTablePrinters.ts b/packages/@ourworldindata/core-table/src/CoreTablePrinters.ts
@@ -42,7 +42,7 @@ export const toAlignedTextTable = (
     // Drop columns if they exceed the max line width
     let runningWidth = 0
     const finalHeaderSlugs = headerSlugs.filter((slug, index) => {
-        runningWidth = runningWidth + colWidths[index]
+        runningWidth += colWidths[index]
         if (runningWidth <= maxCharactersPerLine) return true
         return false
     })

diff --git a/packages/@ourworldindata/explorer/src/Explorer.tsx b/packages/@ourworldindata/explorer/src/Explorer.tsx
@@ -723,7 +723,7 @@ export class Explorer
                 const mergedDef = { ...def, ...manuallyProvidedDef }
 
                 // update display properties
-                mergedDef.display = mergedDef.display ?? {}
+                mergedDef.display ??= {}
                 if (manuallyProvidedDef.name)
                     mergedDef.display.name = manuallyProvidedDef.name
                 if (manuallyProvidedDef.unit)

diff --git a/packages/@ourworldindata/grapher/src/controls/VerticalScrollContainer.tsx b/packages/@ourworldindata/grapher/src/controls/VerticalScrollContainer.tsx
@@ -48,7 +48,7 @@ export const VerticalScrollContainer = React.forwardRef(
             ...rest
         } = props
 
-        scrollingShadows = scrollingShadows ?? true
+        scrollingShadows ??= true
 
         const scrollContainerRef = useCombinedRefs<HTMLDivElement>(ref)
         const [scrollTop, scrollBottom] = useScrollBounds(

diff --git a/packages/@ourworldindata/grapher/src/stackedCharts/StackedAreaChart.tsx b/packages/@ourworldindata/grapher/src/stackedCharts/StackedAreaChart.tsx
@@ -170,7 +170,7 @@ class Areas extends React.Component<AreasProps> {
             if (index > 0) {
                 prevPoints = placedSeriesArr[index - 1].placedPoints
             } else {
-                prevPoints = prevPoints = [
+                prevPoints = [
                     [
                         placedPoints[0][0], // placed x coord of first (= leftmost) point in chart
                         verticalAxis.range[0],

diff --git a/packages/@ourworldindata/types/src/domainTypes/Various.ts b/packages/@ourworldindata/types/src/domainTypes/Various.ts
@@ -62,7 +62,7 @@ export class JsonError extends Error {
     status: number
     constructor(message: string, status?: number) {
         super(message)
-        this.status = status || 400
+        this.status = status ?? 400
     }
 }
 

diff --git a/site/gdocs/components/HomepageIntro.tsx b/site/gdocs/components/HomepageIntro.tsx
@@ -60,9 +60,9 @@ function FeaturedWorkTile({
         }
     }
 
-    title = title || linkedDocument?.title
-    authors = authors || linkedDocument?.authors
-    description = description || linkedDocument?.excerpt
+    title ||= linkedDocument?.title
+    authors ||= linkedDocument?.authors
+    description ||= linkedDocument?.excerpt
 
     return (
         <a

diff --git a/site/gdocs/components/ProminentLink.tsx b/site/gdocs/components/ProminentLink.tsx
@@ -65,20 +65,19 @@ export const ProminentLink = (props: {
     let thumbnail: string | undefined = props.thumbnail
     if (linkType === "gdoc") {
         href = `/${linkedDocument?.slug}`
-        title = title ?? linkedDocument?.title
-        description = description ?? linkedDocument?.excerpt
-        thumbnail = thumbnail ?? linkedDocument?.["featured-image"]
+        title ??= linkedDocument?.title
+        description ??= linkedDocument?.excerpt
+        thumbnail ??= linkedDocument?.["featured-image"]
     } else if (linkType === "grapher") {
         href = `${linkedChart?.resolvedUrl}`
-        title = title ?? linkedChart?.title
-        thumbnail = thumbnail ?? linkedChart?.thumbnail
-        description =
-            description ?? "See the data in our interactive visualization"
+        title ??= linkedChart?.title
+        thumbnail ??= linkedChart?.thumbnail
+        description ??= "See the data in our interactive visualization"
     } else if (linkType === "explorer") {
         href = `${linkedChart?.resolvedUrl}`
-        title = title ?? `${linkedChart?.title} Data Explorer`
-        thumbnail = thumbnail ?? linkedChart?.thumbnail
-        description = description ?? linkedChart?.subtitle
+        title ??= `${linkedChart?.title} Data Explorer`
+        thumbnail ??= linkedChart?.thumbnail
+        description ??= linkedChart?.subtitle
     }
 
     const anchorTagProps =