Merge pull request #1385 from ita-social-projects/feature/issue-1692

feature/issue-1692
ita-social-projects · Sep 18, 2024 · c4cf01c · c4cf01c
2 parents 56746ef + ed5688b
commit c4cf01c
Showing 1 changed file with 7 additions and 1 deletion.
diff --git a/src/features/AdminPage/StreetcodesTable/StreetcodesTable.component.tsx b/src/features/AdminPage/StreetcodesTable/StreetcodesTable.component.tsx
@@ -56,8 +56,14 @@ const StreetcodesTable = () => {
     const [requestGetAll, setRequestGetAll] = useState<GetAllStreetcodesRequest>(requestDefault);
 
     const setRequest = () => {
+        let page = pageRequest;
+        if(requestGetAll.Title !== titleRequest || requestGetAll.Filter !== statusRequest) {
+            setPageRequest(1);
+            setCurrentPages(1);
+            page = 1;
+        }
         setRequestGetAll({
-            Page: pageRequest,
+            Page: page,
             Amount: amountRequest,
             Title: titleRequest === '' ? null : titleRequest,
             Sort: null,