Merge pull request #429 from Klimatbyran/staging

Hotfix for broken column headers in municipality list
Klimatbyran · Mar 19, 2024 · 810cf9f · 810cf9f
2 parents e529668 + 63edf19
commit 810cf9f
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 4 deletions.
diff --git a/pages/index.tsx b/pages/index.tsx
@@ -155,7 +155,7 @@ function StartPage({ municipalities }: PropsType) {
     )
   }
 
-  const cols = listColumns(selectedDataset)
+  const cols = listColumns(selectedDataset, datasetDescriptions[selectedDataset].columnHeader)
   const rankedData = rankData(municipalities, selectedDataset) // fixme hur byter jag ut denna till municipalityData?
 
   const isDefaultDataView = selectedDataView === defaultDataView

diff --git a/utils/createMunicipalityList.tsx b/utils/createMunicipalityList.tsx
@@ -86,6 +86,7 @@ export const rankData = (municipalities: Municipality[], selectedData: SelectedD
 
 export const listColumns = (
   selectedData: SelectedData,
+  columnHeader: string,
 ): ColumnDef<{
   name: string
   dataPoint: string | number | Date | JSX.Element
@@ -97,7 +98,7 @@ export const listColumns = (
 
   return [
     {
-      header: 'Har plan?',
+      header: isClimatePlan ? 'Har plan?' : 'Ranking',
       cell: (row) => {
         if (isClimatePlan) {
           return row.row.original.index === -1
@@ -124,14 +125,16 @@ export const listColumns = (
       accessorKey: 'name',
     },
     {
-      header: 'Antagen år',
+      header: () => columnHeader,
       cell: (row) => {
+        const { formattedDataPoint } = row.row.original
+
         if (isClimatePlan) {
           return row.row.original.dataPoint !== 'Saknas'
             ? <span style={{ color: 'grey' }}>{row.row.original.yearAdapted}</span>
             : <span style={{ color: 'grey' }}>Saknar plan</span>
         }
-        return row.cell.row.index + 1
+        return formattedDataPoint
       },
       accessorKey: 'dataPoint',
     },