[MIM-2092] ManualDate render fixes for KeyFigures (#3100)

Reverted old changes and added working ones
statisticsnorway · Jan 15, 2025 · e461010 · e461010
1 parent 7059fd6
commit e461010
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 21 deletions.
diff --git a/src/main/resources/lib/ssb/parts/keyFigure.ts b/src/main/resources/lib/ssb/parts/keyFigure.ts
@@ -75,7 +75,7 @@ export function parseKeyFigure(
     noNumberText: localize({
       key: 'value.notFound',
     }),
-    time: undefined,
+    time: keyFigure.data.manualDate || undefined, // Use manualDate if available
     size: keyFigure.data.size,
     title: keyFigure.displayName,
     changes: undefined,

diff --git a/src/main/resources/lib/types/partTypes/keyFigure.ts b/src/main/resources/lib/types/partTypes/keyFigure.ts
@@ -14,7 +14,6 @@ export interface KeyFigureProps {
   hiddenTitle: string
   isInStatisticsPage: boolean
   isMacro: boolean
-  dateInput?: string | undefined
 }
 
 export interface KeyFigureData {

diff --git a/src/main/resources/site/content-types/keyFigure/keyFigure.xml b/src/main/resources/site/content-types/keyFigure/keyFigure.xml
@@ -4,8 +4,8 @@
 	<allow-child-content>true</allow-child-content>
 	<form>
 		<mixin name="dataSource" />
-		<input name="dateInput" type="TextLine">
-			<label>Dato</label>
+		<input name="manualDate" type="TextLine">
+			<label>Manuell dato</label>
 			<occurrences minimum="0" maximum="1" />
 			<config/>
 		</input>

diff --git a/src/main/resources/site/parts/keyFigure/keyFigure.ts b/src/main/resources/site/parts/keyFigure/keyFigure.ts
@@ -103,31 +103,27 @@ function renderKeyFigure(
   config?: KeyFigurePartConfig
 ): XP.Response {
   const draftExist = !!parsedKeyFiguresDraft
-  const rawDateInput = page.data.dateInput as string | undefined
-  const dateInput = rawDateInput ? rawDateInput : undefined
-
-  const existingTimeValue = parsedKeyFigures.find((keyFigure) => keyFigure.time)?.time
-
-  const timeValue = existingTimeValue || dateInput || undefined
 
   if ((parsedKeyFigures && parsedKeyFigures.length > 0) || draftExist) {
     const hiddenTitle: Array<string> = parsedKeyFigures.map((keyFigureData) => {
       return keyFigureData.title
     })
 
     const props: KeyFigureProps = {
-      displayName: config?.title,
-      keyFigures: parsedKeyFigures.map((keyFigureData) => ({
-        ...keyFigureData,
-        time: timeValue,
-        glossary: keyFigureData.glossaryText,
-      })),
+      displayName: config && config.title,
+      keyFigures: parsedKeyFigures.map((keyFigureData) => {
+        return {
+          ...keyFigureData,
+          glossary: keyFigureData.glossaryText,
+        }
+      }),
       keyFiguresDraft: parsedKeyFiguresDraft
-        ? parsedKeyFiguresDraft.map((keyFigureDraftData) => ({
-            ...keyFigureDraftData,
-            time: timeValue,
-            glossary: keyFigureDraftData.glossaryText,
-          }))
+        ? parsedKeyFiguresDraft.map((keyFigureDraftData) => {
+            return {
+              ...keyFigureDraftData,
+              glossary: keyFigureDraftData.glossaryText,
+            }
+          })
         : undefined,
       sourceLabel: getPhrases(page)!.source,
       source: config?.source,