From 6eb3a941dd52809d1e746c44f551b57ef6852dd1 Mon Sep 17 00:00:00 2001
From: Dawid Pers <dawid.pers@ringieraxelspringer.pl>
Date: Wed, 3 Jun 2026 15:54:20 +0200
Subject: [PATCH] fix: correct GenericList pagination offset calculation for
 postShift > 0

Simplified offset formula to: totalItemsBefore + postShiftValue.
Removed incorrect isAjaxCall/isFirstCall branching that caused duplicate
articles when postShift was non-zero (e.g. aerotelegraph postShift=3).
Cleaned up unused isAjaxCall/isFirstCall params from function signature,
all callers, and client-side InfiniteScrollButton.
---
 package.json                                       |  2 +-
 .../widgets/Lists/GenericList/GenericList.astro    |  4 +---
 .../Lists/GenericList/GenericListGetData.ts        |  4 +---
 .../generalParts/InfiniteScrollButton.astro        |  8 +-------
 src/helpers/GenericListHelper.ts                   | 14 ++------------
 .../seo/SeoMetaData/SeoListGridPrevNext.ts         |  4 +---
 6 files changed, 7 insertions(+), 29 deletions(-)

diff --git a/package.json b/package.json
index c736c3fc..34c4b6b9 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
     "name": "hat-ring-components",
-    "version": "4.14.1",
+    "version": "4.14.2",
     "description": "Head App Template - RING components",
     "license": "MIT",
     "repository": {},
diff --git a/src/components/widgets/Lists/GenericList/GenericList.astro b/src/components/widgets/Lists/GenericList/GenericList.astro
index bb621f59..a09c3f97 100644
--- a/src/components/widgets/Lists/GenericList/GenericList.astro
+++ b/src/components/widgets/Lists/GenericList/GenericList.astro
@@ -22,9 +22,7 @@ const allGeneralParts = GeneralParts;
 let queryFragment = '';
 let response: any = null;
 
-const isAjaxCall = UtilsHelper_getQueryParam('gridLocationWidgetType', context) === 'genericList';
-const isFirstCall = UtilsHelper_getQueryParam('isFirstCall', context) === '1';
-const offset = WidgetHelper_calculateOffsetForGenericListPagination(widgetConfig, currentPage, isAjaxCall, isFirstCall);
+const offset = WidgetHelper_calculateOffsetForGenericListPagination(widgetConfig, currentPage);
 
 if (offset >= 1000) {
     toRender = `<script>
diff --git a/src/components/widgets/Lists/GenericList/GenericListGetData.ts b/src/components/widgets/Lists/GenericList/GenericListGetData.ts
index 40e2c061..4fbbce93 100644
--- a/src/components/widgets/Lists/GenericList/GenericListGetData.ts
+++ b/src/components/widgets/Lists/GenericList/GenericListGetData.ts
@@ -97,9 +97,7 @@ export async function GenericList_getData(context: AppContext, queryNodeFragment
         return flag.excludedFlag
     }) : null;
 
-    const isAjaxCall = UtilsHelper_getQueryParam('gridLocationWidgetType', context) === 'genericList';
-    const isFirstCall = UtilsHelper_getQueryParam('isFirstCall', context) === '1';
-    const offset = WidgetHelper_calculateOffsetForGenericListPagination(widgetConfig, currentPage, isAjaxCall, isFirstCall);
+    const offset = WidgetHelper_calculateOffsetForGenericListPagination(widgetConfig, currentPage);
     const queryForDynamicName = getQueryForDynamicName(context, widgetConfig);
 
     const variables: any = {
diff --git a/src/components/widgets/Lists/GenericList/generalParts/InfiniteScrollButton.astro b/src/components/widgets/Lists/GenericList/generalParts/InfiniteScrollButton.astro
index ea91654d..0315d418 100644
--- a/src/components/widgets/Lists/GenericList/generalParts/InfiniteScrollButton.astro
+++ b/src/components/widgets/Lists/GenericList/generalParts/InfiniteScrollButton.astro
@@ -23,7 +23,6 @@ const noMoreItems = (response?.data?.stories?.edges?.length || 0) <= 0 || (respo
 
     <script define:vars={{buttonId, gridLocation: widgetConfig.gridLocation, isMainSeoList: widgetConfig.mainSeoList, widgetType: widgetConfig.widgetType}}>
         const button = document.getElementById(buttonId);
-        let isFirstCall = true;
         button.addEventListener('click', loadMore);
 
         const seoObserver = new IntersectionObserver(entries => {
@@ -54,12 +53,7 @@ const noMoreItems = (response?.data?.stories?.edges?.length || 0) <= 0 || (respo
                 ajaxNextPageUrl.searchParams.set('page', nextPage);
                 ajaxNextPageUrl.searchParams.set('gridLocation', gridLocation);
                 ajaxNextPageUrl.searchParams.set('gridLocationWidgetType', widgetType);
-                if (isFirstCall) {
-                    ajaxNextPageUrl.searchParams.set('isFirstCall', 1);
-                    isFirstCall = false;
-                } else {
-                    ajaxNextPageUrl.searchParams.delete('isFirstCall');
-                }
+
                 const fetchedData = await fetch(ajaxNextPageUrl.href);
                 const html = await fetchedData.text();
                 const parser = new DOMParser();
diff --git a/src/helpers/GenericListHelper.ts b/src/helpers/GenericListHelper.ts
index 9e16c98d..97b4d860 100644
--- a/src/helpers/GenericListHelper.ts
+++ b/src/helpers/GenericListHelper.ts
@@ -1,22 +1,12 @@
 import {UtilsHelper_convertToInt, UtilsHelper_parsePositiveIntFromString} from "./UtilsHelper";
 import {GenericListWidgetConfig} from "../components/widgets/Lists/GenericList/types";
 const MAX_OFFSET = 1000;
-export function WidgetHelper_calculateOffsetForGenericListPagination(widgetConfig: GenericListWidgetConfig, currentPage: number, isAjaxCall: boolean, isFirstCall: boolean) {
+export function WidgetHelper_calculateOffsetForGenericListPagination(widgetConfig: GenericListWidgetConfig, currentPage: number) {
     const perPageAllItems = UtilsHelper_convertToInt(widgetConfig?.perPageAllItems) || UtilsHelper_convertToInt(widgetConfig?.paginationElements);
     const postShiftValue = UtilsHelper_convertToInt(widgetConfig?.postShift) || 0;
     currentPage = UtilsHelper_parsePositiveIntFromString(currentPage) || 1;
     const totalItemsBefore = perPageAllItems * (currentPage - 1);
-    let offset = 0;
-    if (isAjaxCall) {
-        if (isFirstCall) {
-            offset = totalItemsBefore;
-        } else {
-            const shiftAdjustment = postShiftValue * (currentPage - 2);
-            offset = totalItemsBefore - shiftAdjustment;
-        }
-    } else {
-        offset = totalItemsBefore + postShiftValue;
-    }
+    const offset = totalItemsBefore + postShiftValue;
 
     return Math.min(MAX_OFFSET - perPageAllItems, Math.max(0, offset));
 }
diff --git a/src/renderlessComponents/seo/SeoMetaData/SeoListGridPrevNext.ts b/src/renderlessComponents/seo/SeoMetaData/SeoListGridPrevNext.ts
index 2de29385..76e4f8b7 100644
--- a/src/renderlessComponents/seo/SeoMetaData/SeoListGridPrevNext.ts
+++ b/src/renderlessComponents/seo/SeoMetaData/SeoListGridPrevNext.ts
@@ -29,9 +29,7 @@ export async function SeoListGridPrevNext(context: AppContext) {
         return {};
     }
     const currentPage = UtilsHelper_parsePositiveIntFromString(UtilsHelper_getQueryParam('page', context)) || 1;
-    const isAjaxCall = UtilsHelper_getQueryParam('gridLocationWidgetType', context) === 'genericList';
-    const isFirstCall = UtilsHelper_getQueryParam('isFirstCall', context) === '1';
-    const offset = WidgetHelper_calculateOffsetForGenericListPagination(foundGenericList, currentPage, isAjaxCall, isFirstCall);
+    const offset = WidgetHelper_calculateOffsetForGenericListPagination(foundGenericList, currentPage);
 
     if (offset >= MAX_OFFSET) {
         return {}