KAIZEN-0: Fikset bug hvor paginering ikke ble nullstilt på filter endring

Author: AlexGaard

src/components/sok-sync.tsx

@@ -3,13 +3,21 @@ import { useDataFetcherStore } from '../stores/data-fetcher-store';
 import { lagBeslutterOversiktSok } from '../utils/sok-utils';
 import { useSokStore } from '../stores/sok-store';
 import { hasFinishedWithData } from '../rest/utils';
+import { usePrevious } from '../utils';
 
 export const SokSync = () => {
 	const { brukereFetcher } = useDataFetcherStore();
-	const { filters, currentPage, pageSize, orderByDirection, orderByField, seeAll, setTotalPages } = useSokStore();
+	const { filters, currentPage, pageSize, orderByDirection, orderByField, seeAll, setTotalPages, setCurrentPage } = useSokStore();
+	const previousFilters = usePrevious(filters);
 
 	useEffect(() => {
-		const sok = lagBeslutterOversiktSok(filters, currentPage, pageSize, seeAll, orderByDirection, orderByField);
+		let curPage = currentPage;
+		if (previousFilters !== filters) {
+			curPage = 1; // When filters change, start from first page
+			setCurrentPage(curPage);
+		}
+
+		const sok = lagBeslutterOversiktSok(filters, curPage, pageSize, seeAll, orderByDirection, orderByField);
 		brukereFetcher.fetch({ sok });
 		// eslint-disable-next-line react-hooks/exhaustive-deps
 	}, [filters, currentPage, orderByDirection, orderByField, seeAll]);

src/utils/index.ts

@@ -1,5 +1,17 @@
 // tslint:disable-next-line:no-empty
 import { UtkastStatus } from '../rest/data/bruker';
+import { useEffect, useRef } from 'react';
+
+export function usePrevious<T> (value: T) {
+	const ref = useRef<T>(value);
+
+	// Store current value in ref
+	useEffect(() => {
+		ref.current = value;
+	}, [value]);
+
+	return ref.current;
+}
 
 export function doNothing() {}