MIM-1723:Fixed data i dimensionCode is Tid

statisticsnorway · Jan 22, 2024 · 0d94bfe · 0d94bfe
1 parent 6a8b174
commit 0d94bfe
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 14 deletions.
diff --git a/src/main/resources/lib/ssb/parts/simpleStatbank.ts b/src/main/resources/lib/ssb/parts/simpleStatbank.ts
@@ -1,6 +1,6 @@
 // @ts-ignore
 import JSONstat from 'jsonstat-toolkit/import.mjs'
-import { type Dataset, type Data, type Dimension } from '/lib/types/jsonstat-toolkit'
+import { type Dataset, type Data, type Dimension, Category } from '/lib/types/jsonstat-toolkit'
 import { fetchStatbankApiDataQuery } from '/lib/ssb/dataset/statbankApi/statbankApi'
 
 export function getStatbankApiData(
@@ -17,24 +17,21 @@ export function getStatbankApiData(
 
   try {
     const result: DimensionData[] = dataDimensions.map(function (dataDimension: string) {
-      const values = timeDimensions.map((timeDimension) => {
-        const data: Data | null = dataset?.Data({
-          [dimensionCode]: dataDimension,
-          Tid: timeDimension,
-        }) as Data
+      const data: Data | null = dataset?.Data({
+        [dimensionCode]: dataDimension,
+      }) as Data
 
-        return data.value ?? data.status
-      })
+      const filterCategory: Category | null = filterDimensionCode?.Category(dataDimension) as Category | null
 
       return {
-        displayName: filterDimensionCode?.Category(dataDimension)?.label,
+        displayName: filterCategory ? filterCategory.label : '',
         dataCode: dataDimension, // Hvis vi må ta høyde for at de dytter inn mer enn en dimensjon her må det hånderes
-        value: values[0], // Forventer at dette arryayet kun har et element (kun en tidsserie)
+        value: data.value ?? data.status, // Forventer at dette arryayet kun har et element (kun en tidsserie)
+        time: dimensionCode === 'Tid' ? dataDimension : timeDimensions[0],
       }
     })
 
     return {
-      time: timeDimensions[0],
       data: result,
     }
   } catch (error) {
@@ -44,12 +41,12 @@ export function getStatbankApiData(
 }
 
 export interface SimpleStatbankResult {
-  time: string
   data: DimensionData[]
 }
 
 interface DimensionData {
   displayName: string
   dataCode: string
   value: (string | number)[]
+  time: string
 }
diff --git a/src/main/resources/site/parts/simpleStatbank/simpleStatbank.jsx b/src/main/resources/site/parts/simpleStatbank/simpleStatbank.jsx
@@ -32,7 +32,7 @@ function SimpleStatbank(props) {
   function renderResult() {
     if (selectedValue) {
       const result = Number(selectedValue.value) > 0 ? selectedValue.value : '-'
-      const resultView = resultLayout.replace('{value}', result).replace('{time}', statbankApiData.time)
+      const resultView = resultLayout.replace('{value}', result).replace('{time}', selectedValue.time)
       const textResult = <span dangerouslySetInnerHTML={{ __html: resultView }} />
       return (
         <div>
@@ -49,6 +49,7 @@ function SimpleStatbank(props) {
           id: element.dataCode,
           title: selectDisplay == 'text' ? element.displayName : `${element.dataCode}: ${element.displayName}`,
           value: element.value,
+          time: element.time,
         }))
       : []
     return (
@@ -91,7 +92,6 @@ SimpleStatbank.propTypes = {
   urlOrId: PropTypes.string,
   selectDisplay: PropTypes.string,
   statbankApiData: PropTypes.objectOf({
-    time: PropTypes.string,
     data: PropTypes.object,
   }),
 }