Skip to content

fix(gui-client): fix minor frontend issues in app window - #9505

Merged
jamilbk merged 2 commits into
mainfrom
fix/cursor-pointer
Jun 11, 2025
Merged

jamilbk merged 2 commits into
mainfrom
fix/cursor-pointer

Conversation

@jamilbk

@jamilbk jamilbk commented Jun 11, 2025 •

Copy link
Copy Markdown
Member
  • removes NavLink in favor of using the href prop on SidebarItem. This fixes vertical spacing between sidebar items (it was inconsistent) and DOM structure issues caused by setting NavLink as a direct child of <SidebarItemGroup>.
  • adds cursor-pointer to all <Button>s
  • adds cursor-pointer to the <SidebarCollapse>

Before

Screenshot 2025-06-10 at 7 57 37 PM

After

Screenshot 2025-06-10 at 7 57 55 PM

Copilot AI review requested due to automatic review settings June 11, 2025 02:09
@vercel

vercel Bot commented Jun 11, 2025 •

Copy link
Copy Markdown

The latest updates on your projects. Learn more about Vercel for Git ↗︎

Name Status Preview Comments Updated (UTC)
firezone ✅ Ready (Inspect) Visit Preview 💬 Add feedback Jun 11, 2025 2:53am

Copilot AI left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Copilot encountered an error and was unable to review this pull request. You can try again by re-requesting a review.

@jamilbk
jamilbk requested a review from a team June 11, 2025 02:09
@jamilbk

jamilbk commented Jun 11, 2025

Copy link
Copy Markdown
Member Author

I've tested this with pnpm vite dev.

@jamilbk
jamilbk force-pushed the fix/cursor-pointer branch from e5f3fd3 to 9ff8559 Compare June 11, 2025 02:12
@jamilbk jamilbk changed the title fix(gui-client): fix minor visual issues in app window fix(gui-client): fix minor frontend issues in app window Jun 11, 2025
@jamilbk
jamilbk added this pull request to the merge queue Jun 11, 2025
logsRecountedUnlisten.then((unlistenFn) => unlistenFn());
};
}, []);
}, [location, handleClick]);

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why are these dependencies of useEffect? You are not using them in the effect handler so that should not be necessary?

Copy link
Copy Markdown
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

👍 developer error.

active={location.pathname.startsWith("/advanced-settings")}
icon={WrenchScrewdriverIcon}
href="/advanced-settings"
onClick={handleClick}

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It appears to me that a better abstraction would be if we had our own ReactRouterSidebarItem component that uses the two hooks internally and checks if its href is in the pathname. Then we'd only need to pass icon and href and children to each component.

Copy link
Copy Markdown
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

yeah good point.

Merged via the queue into main with commit 1295adc Jun 11, 2025
@jamilbk
jamilbk deleted the fix/cursor-pointer branch June 11, 2025 06:07
github-merge-queue Bot pushed a commit that referenced this pull request Jun 15, 2025
This cleans up some changes left over from #9505 by using a custom
component.

This branch was successfully deployed

1 active deployment
Preview — 26c5a3d5 Deployed Jun 11, 2025 by vercel[bot]
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants