Fixed Admin UI to use offset and filter mutually exclusively dependin…

…g on comparison flag
exogee-technology · Feb 7, 2025 · 9deb397 · 9deb397
1 parent 693ec53
commit 9deb397
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 4 deletions.
diff --git a/src/packages/admin-ui-components/src/entity-list/component.tsx b/src/packages/admin-ui-components/src/entity-list/component.tsx
@@ -100,14 +100,18 @@ export const EntityList = <TData extends object>() => {
 
 	const handleFetchNextPage = async () => {
 		const nextPage = Math.ceil((data?.result.length ?? 0) / PAGE_SIZE);
+		const offset = providerComparisonSupported ? 0 : nextPage * PAGE_SIZE;
+
+		const filterVar = variables.filter ?? {};
+		const filter = providerComparisonSupported ? addStabilizationToFilter(filterVar, sort, data?.result?.[data.result.length - 1]) : filterVar;
 		fetchMore({
 			variables: {
 				...variables,
 				pagination: {
 					...variables.pagination,
-					offset: nextPage * PAGE_SIZE,
+					offset
 				},
-				filter: providerComparisonSupported ? variables.filter ?? {} : addStabilizationToFilter(variables.filter ?? {}, sort, data?.result?.[0]),
+				filter
 			},
 		});
 	};

diff --git a/src/packages/apollo-client/src/index.ts b/src/packages/apollo-client/src/index.ts
@@ -85,7 +85,7 @@ export const generateTypePolicies = (entities: Entity[]) => {
 export const addStabilizationToFilter = <TData>(
 	filter: Record<string, unknown>,
 	sort: SortEntity,
-	firstElement: TData
+	lastElement: TData
 ) => {
 	const filters = {
 		...filter,
@@ -98,7 +98,7 @@ export const addStabilizationToFilter = <TData>(
 
 		filters[stabilizationKeys] = filters[stabilizationKeys] ?? [];
 		filters[stabilizationKeys].push(`${key}_${operationKey}`);
-		filters[`${key}_${operationKey}`] = firstElement[key as keyof TData];
+		filters[`${key}_${operationKey}`] = lastElement[key as keyof TData];
 	}
 
 	return filters;