pagination for topic and subject

Author: Jonas-C

src/containers/SearchPage/GrepFilter.tsx

@@ -76,10 +76,10 @@ export const GrepFilter = () => {
   });
 
   useEffect(() => {
-    if (nodeType && nodeType !== RESOURCE_NODE_TYPE) {
+    if (nodeType && nodeType !== RESOURCE_NODE_TYPE && codes.length) {
       setSearchParams({ grepCodes: null });
     }
-  }, [nodeType, setSearchParams]);
+  }, [codes.length, nodeType, setSearchParams]);
 
   // const groupedCompetenceGoals = useMemo(() => {
   //   return groupCompetenceGoals(grepQuery.data?.competenceGoals ?? [], true, "LK20");

src/containers/SearchPage/SearchContainer.tsx

@@ -465,7 +465,7 @@ export const SearchContainer = ({ resourceTypes, resourceTypesLoading }: Props)
               onClick={() => {
                 const prevPage = page - 1;
                 setPage(prevPage);
-                setSearchParams({ page: prevPage.toString() });
+                setSearchParams({ page: prevPage === 1 ? null : prevPage.toString() });
                 focusRef.current?.focus();
               }}
             >

src/containers/SearchPage/SubjectFilter.tsx

@@ -87,10 +87,10 @@ export const SubjectFilter = () => {
   });
 
   useEffect(() => {
-    if (nodeType === SUBJECT_NODE_TYPE) {
+    if (nodeType && nodeType === SUBJECT_NODE_TYPE && searchParams.get("subjects")) {
       setSearchParams({ subjects: null });
     }
-  }, [nodeType, setSearchParams]);
+  }, [nodeType, searchParams, setSearchParams]);
 
   const activeSubjectIds = useMemo(() => searchParams.get("subjects")?.split(",") ?? [], [searchParams]);
 

src/containers/SearchPage/TraitFilter.tsx

@@ -31,10 +31,10 @@ export const TraitFilter = () => {
   const nodeType = searchParams.get("type");
 
   useEffect(() => {
-    if (nodeType && nodeType !== RESOURCE_NODE_TYPE) {
+    if (nodeType && nodeType !== RESOURCE_NODE_TYPE && searchParams.get("traits")) {
       setSearchParams({ traits: null });
     }
-  }, [nodeType, setSearchParams]);
+  }, [nodeType, searchParams, setSearchParams]);
 
   const onValueChange = useCallback(
     (traits: string[]) => {