empayre/fleet
14
0
Fork 0
mirror of https://github.com/empayre/fleet.git synced 2024-11-06 08:55:24 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix UI bug where inherited_page=0 would be incorrectly added to some URLs (#11971)

Browse Source
This commit is contained in:
gillespi314 2023-05-26 11:47:35 -05:00 committed by GitHub
parent 3d478614fb
commit 5662d2cdcc
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 6 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
changes/bugfix-inherited-page-param Normal file
View File

@ -0,0 +1 @@
- Fixed UI bug where `inherited_page=0` was incorrectly added to some URLs

14
frontend/hooks/useTeamIdParam.ts
View File

@ -36,15 +36,11 @@ const rebuildQueryStringWithTeamId = (
const inheritedPageIndex = parts.findIndex((p) =>
p.startsWith("inherited_page=")
);
const newPagePart = "page=0";
const newInheritedPagePart = "inherited_page=0";
if (pageIndex) {
parts.splice(pageIndex, 1, newPagePart);
if (pageIndex !== -1) {
parts.splice(pageIndex, 1, "page=0");
}
if (inheritedPageIndex) {
parts.splice(inheritedPageIndex, 1, newInheritedPagePart);
if (inheritedPageIndex !== -1) {
parts.splice(inheritedPageIndex, 1, "inherited_page=0");
}
const teamIndex = parts.findIndex((p) => p.startsWith("team_id="));
@ -52,7 +48,7 @@ const rebuildQueryStringWithTeamId = (
const newTeamPart =
newTeamId > APP_CONTEXT_ALL_TEAMS_ID ? `team_id=${newTeamId}` : "";
if (teamIndex < 0) {
if (teamIndex === -1) {
// nothing to remove/replace so add the new part (if any) and rejoin
return joinQueryStringParts(
newTeamPart ? parts.concat(newTeamPart) : parts