From 86443ac8cd0d54197b69887318abf51956ec0bf6 Mon Sep 17 00:00:00 2001
From: runarvestmann <runar@stefna.is>
Date: Wed, 6 Nov 2024 19:47:11 +0000
Subject: [PATCH 1/3] Only fetch preview if selected year is the most recent
 one

---
 .../PensionCalculatorResults.tsx                         | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/apps/web/screens/Organization/SocialInsuranceAdministration/PensionCalculatorResults.tsx b/apps/web/screens/Organization/SocialInsuranceAdministration/PensionCalculatorResults.tsx
index 5fd808c2191e..89c0cc464b65 100644
--- a/apps/web/screens/Organization/SocialInsuranceAdministration/PensionCalculatorResults.tsx
+++ b/apps/web/screens/Organization/SocialInsuranceAdministration/PensionCalculatorResults.tsx
@@ -614,6 +614,7 @@ PensionCalculatorResults.getProps = async ({
 }) => {
   const calculationInput = convertQueryParametersToCalculationInput(query)
   const slug = extractSlug(locale, customPageData)
+  const dateOfCalculationsOptions = getDateOfCalculationsOptions(customPageData)
   const [
     {
       data: { getOrganizationPage },
@@ -654,7 +655,11 @@ PensionCalculatorResults.getProps = async ({
     }),
     calculationInput.typeOfBasePension ===
       SocialInsurancePensionCalculationBasePensionType.Disability &&
-    is2025PreviewActive(customPageData)
+    is2025PreviewActive(customPageData) &&
+    dateOfCalculationsOptions.length > 0 &&
+    calculationInput.dateOfCalculations &&
+    new Date(calculationInput.dateOfCalculations).getFullYear() ===
+      new Date(dateOfCalculationsOptions[0].value).getFullYear()
       ? apolloClient.query<Query, QueryGetPensionCalculationArgs>({
           query: GET_PENSION_CALCULATION,
           variables: {
@@ -700,7 +705,7 @@ PensionCalculatorResults.getProps = async ({
     calculation: getPensionCalculation,
     calculation2025: getPensionCalculation2025,
     calculationInput,
-    dateOfCalculationsOptions: getDateOfCalculationsOptions(customPageData),
+    dateOfCalculationsOptions,
     queryParamString: queryParams.toString(),
     ...getThemeConfig(
       getOrganizationPage?.theme,

From 968b90fb55b6594d8b4cb0637dfd76a709a7eccb Mon Sep 17 00:00:00 2001
From: runarvestmann <runar@stefna.is>
Date: Wed, 6 Nov 2024 19:51:33 +0000
Subject: [PATCH 2/3] Overwrite what date gets sent to backend

---
 .../SocialInsuranceAdministration/PensionCalculatorResults.tsx | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/apps/web/screens/Organization/SocialInsuranceAdministration/PensionCalculatorResults.tsx b/apps/web/screens/Organization/SocialInsuranceAdministration/PensionCalculatorResults.tsx
index 89c0cc464b65..13ad7c2b801d 100644
--- a/apps/web/screens/Organization/SocialInsuranceAdministration/PensionCalculatorResults.tsx
+++ b/apps/web/screens/Organization/SocialInsuranceAdministration/PensionCalculatorResults.tsx
@@ -665,8 +665,7 @@ PensionCalculatorResults.getProps = async ({
           variables: {
             input: {
               ...calculationInput,
-              startYear: 2025,
-              startMonth: 9,
+              dateOfCalculations: new Date(2025, 8, 1).toISOString(),
               typeOfBasePension:
                 SocialInsurancePensionCalculationBasePensionType.NewSystem,
             },

From f4b16cda9cc60628244d253e77e600db5581afea Mon Sep 17 00:00:00 2001
From: runarvestmann <runar@stefna.is>
Date: Wed, 6 Nov 2024 20:00:24 +0000
Subject: [PATCH 3/3] Add function for comparing years

---
 .../PensionCalculatorResults.tsx                 | 16 ++++++++++++----
 1 file changed, 12 insertions(+), 4 deletions(-)

diff --git a/apps/web/screens/Organization/SocialInsuranceAdministration/PensionCalculatorResults.tsx b/apps/web/screens/Organization/SocialInsuranceAdministration/PensionCalculatorResults.tsx
index 13ad7c2b801d..e7c8c30c1094 100644
--- a/apps/web/screens/Organization/SocialInsuranceAdministration/PensionCalculatorResults.tsx
+++ b/apps/web/screens/Organization/SocialInsuranceAdministration/PensionCalculatorResults.tsx
@@ -606,6 +606,14 @@ const PensionCalculatorResults: CustomScreen<PensionCalculatorResultsProps> = ({
   )
 }
 
+const isSameYear = (
+  date1: string | null | undefined,
+  date2: string | null | undefined,
+) => {
+  if (!date1 || !date2) return false
+  return new Date(date1).getFullYear() === new Date(date2).getFullYear()
+}
+
 PensionCalculatorResults.getProps = async ({
   apolloClient,
   locale,
@@ -656,10 +664,10 @@ PensionCalculatorResults.getProps = async ({
     calculationInput.typeOfBasePension ===
       SocialInsurancePensionCalculationBasePensionType.Disability &&
     is2025PreviewActive(customPageData) &&
-    dateOfCalculationsOptions.length > 0 &&
-    calculationInput.dateOfCalculations &&
-    new Date(calculationInput.dateOfCalculations).getFullYear() ===
-      new Date(dateOfCalculationsOptions[0].value).getFullYear()
+    isSameYear(
+      dateOfCalculationsOptions?.[0]?.value,
+      calculationInput.dateOfCalculations,
+    )
       ? apolloClient.query<Query, QueryGetPensionCalculationArgs>({
           query: GET_PENSION_CALCULATION,
           variables: {