Skip to content

Commit 6bb80b5

Browse files
committed
fix url pagination not required
1 parent 587686d commit 6bb80b5

1 file changed

Lines changed: 17 additions & 14 deletions

File tree

client/src/features/projectMigrationV2/ProjectMigrationBanner.tsx

Lines changed: 17 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import cx from "classnames";
2-
import { useCallback, useMemo, useState, useEffect } from "react";
2+
import { useCallback, useMemo, useState } from "react";
33
import { BoxArrowInUp, XLg } from "react-bootstrap-icons";
44
import { useSearchParams } from "react-router";
55
import {
@@ -47,6 +47,7 @@ export function ProjectMigrationBanner() {
4747
const onSearchTerm = useCallback(
4848
(term: string) => {
4949
setSearchTerm(term);
50+
if (term != "") onPageChange(1);
5051
},
5152
[setSearchTerm, onPageChange]
5253
);
@@ -64,13 +65,6 @@ export function ProjectMigrationBanner() {
6465
}
6566
}, [searchParams]);
6667

67-
const toggle = useCallback(() => {
68-
if (isOpenModal) {
69-
onPageChange(1);
70-
}
71-
setIsOpenModal((open) => !open);
72-
}, [isOpenModal]);
73-
7468
const { data: dataUserPreferences, isLoading: isLoadingUserPreferences } =
7569
useGetUserPreferencesQuery();
7670

@@ -87,12 +81,12 @@ export function ProjectMigrationBanner() {
8781
refetch: refetchMigrations,
8882
} = useGetRenkuV1ProjectsMigrationsQuery();
8983

90-
useEffect(() => {
91-
if (!isOpenModal) {
92-
refetchMigrations();
93-
onSearchTerm("");
94-
}
95-
}, [isOpenModal, refetchMigrations, onSearchTerm]);
84+
// useEffect(() => {
85+
// if (!isOpenModal) {
86+
// // refetchMigrations();
87+
// // onSearchTerm("");
88+
// }
89+
// }, [isOpenModal, refetchMigrations, onSearchTerm]);
9690

9791
const {
9892
data: dataGitlabProjects,
@@ -126,6 +120,15 @@ export function ProjectMigrationBanner() {
126120
});
127121
}, [dataGitlabProjects, dataProjectsMigrations]);
128122

123+
const toggle = useCallback(() => {
124+
if (isOpenModal) {
125+
onPageChange(1);
126+
refetchMigrations();
127+
onSearchTerm("");
128+
}
129+
setIsOpenModal((open) => !open);
130+
}, [isOpenModal, onPageChange, onSearchTerm, refetchMigrations]);
131+
129132
// initially if there are project to migrate should display the banner, if a search by term doesn't return values it should show the banner.
130133
const hasInitialProjectsToMigrate = true;
131134

0 commit comments

Comments
 (0)