feat(gui-client): set a different tray icon when signed out by ReactorScram · Pull Request #5817 · firezone/firezone

ReactorScram · 2024-07-09T22:46:51Z

### Tasks
- [x] Try not to set the icon every time we change Resources
- [x] Get production icons
- [x] Add changelog comment
- [x] Add CI stress test that sets the icon 10,000 times
- [x] Open for review
- [x] Repair changelog
- [x] Merge

vercel · 2024-07-09T22:46:54Z

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	Jul 11, 2024 7:07pm

ReactorScram · 2024-07-09T22:47:48Z

@jamilbk You can replace this file, ~~I'm planning to package this in the binary and extract it to a cache dir the same way we unpack wintun.dll. It ends up writing redundant data to disk but it looks easy and it's only 20 KB~~ this is the placeholder signed-out icon

Also 2 other questions:

Do we need a "signing in" icon in addition to "signed in" and "signed out"? There are actually 5 possible menu states, the other 3 are "Waiting on browser", "Waiting on connlib", and "Loading" https://github.com/firezone/firezone/pull/5817/files#diff-f99d43b72eb35bc908c93849dd50e0b2be5e2c676b72e4f9266f1c3caeca9deaR57-R62

While we're fixing the icons, can we fix bug(gui-client): the tray icon has poor contrast against the default dark Ubuntu task bar #5014? It came up again with Fix favicon #5822

github-actions · 2024-07-09T22:49:04Z

Terraform Cloud Plan Output

Plan: 15 to add, 23 to change, 15 to destroy.

Terraform Cloud Plan

github-actions · 2024-07-09T22:55:43Z

Performance Test Results

TCP

Test Name	Received/s	Sent/s	Retransmits
direct-tcp-client2server	230.9 MiB (-1%)	232.4 MiB (-1%)	259 (+67%)
direct-tcp-server2client	241.1 MiB (+1%)	242.8 MiB (+1%)	484 (+122%)
relayed-tcp-client2server	233.8 MiB (-3%)	234.5 MiB (-3%)	378 (+1%)
relayed-tcp-server2client	238.1 MiB (+0%)	238.8 MiB (+0%)	504 (-24%)

UDP

Test Name	Total/s	Jitter	Lost
direct-udp-client2server	500.0 MiB (-0%)	0.03ms (+44%)	45.44% (+18%)
direct-udp-server2client	500.0 MiB (-0%)	0.01ms (+3%)	22.25% (-8%)
relayed-udp-client2server	500.0 MiB (-0%)	0.04ms (+88%)	55.57% (+5%)
relayed-udp-server2client	500.0 MiB (-0%)	0.03ms (+349%)	33.69% (-5%)

…i-set-icon

ReactorScram · 2024-07-10T17:01:24Z

    Ok(())
 }
-
-fn tray_menu() -> Result<()> {


Wasn't needed anymore

…i-set-icon

…to feat/tauri-set-icon

…icon Signed-off-by: Reactor Scram <ReactorScram@users.noreply.github.com>

ReactorScram · 2024-07-10T22:26:19Z

        run: pnpm tailwindcss -i src/input.css -o src/output.css
      - name: Build client
-        run: cargo build -p firezone-gui-client
+        run: cargo build -p firezone-gui-client --all-targets


This allows us to remove cargo build invocations from the gui-smoke-test Rust binary

…c' into feat/tauri-set-icon

…orm-specific

…icon Signed-off-by: Reactor Scram <ReactorScram@users.noreply.github.com>

Signed-off-by: Reactor Scram <ReactorScram@users.noreply.github.com>

conectado

LGTM!

Left a few comments but nothing pressing/blocking, feel free to merge

conectado · 2024-07-11T20:03:17Z

 pub(crate) enum Cmd {
    SetAutostart(SetAutostartArgs),
-    TrayMenu,
 }


can we not have a subdommand now?

This was for debugging a previous PR and I didn't need it anymore

conectado · 2024-07-11T20:06:26Z

        .await
        .context("Failed to send ClearLogs request")?;

+    // Tray icon stress test


what's the purpose of this stress test?

There is a strange part deep inside Tauri that exports the icon as a PNG to /run every time we call set_icon: https://github.com/tauri-apps/tao/blob/tao-v0.16.7/src/platform_impl/linux/system_tray.rs#L119

I wanted to make sure this doesn't take too long or use too much disk. It looks fine, and /run is supposed to be a RAM disk, so it won't use real disk space. But in case there's a performance regression or something, it could show up here.

conectado · 2024-07-11T20:16:08Z

-        // TODO: Show some "Waiting for portal..." state if we got the deep link but
-        // haven't got `on_tunnel_ready` yet.
-        if let Some(auth_session) = self.auth.session() {
+        let menu = if let Some(auth_session) = self.auth.session() {


We can reduce indentation a bit by using a let Some(auth_session) = self.auth.session() else { ... } here

I'm having trouble seeing it because there's 3 branches, it returns menu and then calls self.tray.update

ReactorScram added 3 commits July 9, 2024 17:26

testing

e8fdeec

add placeholder icon

984a601

comment

a5ee928

ReactorScram self-assigned this Jul 9, 2024

ReactorScram commented Jul 9, 2024

View reviewed changes

ReactorScram added 4 commits July 10, 2024 10:08

refactor(gui-client): simplify how Resources in the menu are updated

1369570

checkpoint

9e87881

simplify IPC too

4cb3cc0

oh this was not supposed to be a merge oops

c59fd7e

vercel Bot deployed to Preview July 10, 2024 16:58 View deployment

ReactorScram changed the base branch from main to refactor/gui-simplify-resource-updating July 10, 2024 16:59

Merge branch 'refactor/gui-simplify-resource-updating' into feat/taur…

acc9b5d

…i-set-icon

ReactorScram commented Jul 10, 2024

View reviewed changes

ReactorScram added 4 commits July 10, 2024 13:09

don't build inside the smoke test

f3a1c0f

add signed-in icon

9798598

Merge branch 'main' into refactor/gui-simplify-resource-updating

c220f7f

Merge branch 'refactor/gui-simplify-resource-updating' into feat/taur…

4200578

…i-set-icon

vercel Bot deployed to Preview July 10, 2024 18:19 View deployment

ReactorScram added 9 commits July 10, 2024 13:27

add signed-out icon

0a16639

add busy icon

b4641ac

loop in the new icons

4d65f34

dummy this out

ccaa467

fix GUI command

ecec262

shrink icons to 64x64

22ee4d2

Merge branch 'feat/tauri-set-icon' of github.com:firezone/firezone in…

06514aa

…to feat/tauri-set-icon

32x32

84e8cf4

pixel alignment

ce33458

Base automatically changed from refactor/gui-simplify-resource-updating to main July 10, 2024 21:49

ReactorScram added 2 commits July 10, 2024 17:06

fix some platform-specific notes in the changelog

13d5087

fix

45c8c4c

ReactorScram changed the base branch from main to chore/changelog-platform-specific July 10, 2024 22:15

Merge branch 'chore/changelog-platform-specific' into feat/tauri-set-…

e827635

…icon Signed-off-by: Reactor Scram <ReactorScram@users.noreply.github.com>

vercel Bot deployed to Preview July 10, 2024 22:22 View deployment

ReactorScram marked this pull request as ready for review July 10, 2024 22:25

ReactorScram commented Jul 10, 2024

View reviewed changes

ReactorScram added 3 commits July 10, 2024 17:27

simplify

274b45c

update comment

31a8a49

Merge remote-tracking branch 'origin/chore/changelog-platform-specifi…

7574a3f

…c' into feat/tauri-set-icon

ReactorScram requested a review from conectado July 10, 2024 22:34

ReactorScram added 2 commits July 10, 2024 17:36

Merge remote-tracking branch 'origin/main' into chore/changelog-platf…

84fb66e

…orm-specific

fix

8e10d09

vercel Bot deployed to Preview July 10, 2024 22:37 View deployment

ReactorScram added 3 commits July 11, 2024 10:07

Merge remote-tracking branch 'origin/main' into chore/changelog-platf…

86b8ae2

…orm-specific

clean up

3e13a38

Merge branch 'chore/changelog-platform-specific' into feat/tauri-set-…

5010ae0

…icon Signed-off-by: Reactor Scram <ReactorScram@users.noreply.github.com>

vercel Bot deployed to Preview July 11, 2024 15:29 View deployment

Base automatically changed from chore/changelog-platform-specific to main July 11, 2024 16:12

Merge branch 'main' into feat/tauri-set-icon

0ff9e24

Signed-off-by: Reactor Scram <ReactorScram@users.noreply.github.com>

ReactorScram commented Jul 11, 2024

View reviewed changes

Comment thread website/src/components/Changelog/GUI.tsx

vercel Bot deployed to Preview July 11, 2024 19:07 View deployment

conectado approved these changes Jul 11, 2024

View reviewed changes

ReactorScram added this pull request to the merge queue Jul 11, 2024

Merged via the queue into main with commit 64e0b71 Jul 11, 2024

ReactorScram deleted the feat/tauri-set-icon branch July 11, 2024 21:04

ReactorScram mentioned this pull request Jul 11, 2024

bug(gui-client): the tray icon has poor contrast against the default dark Ubuntu task bar #5014

Closed

ReactorScram mentioned this pull request Aug 1, 2024

gui-client: Check for updates periodically via website API endpoint and notify in menubar icon and menu #5811

Closed

Conversation

ReactorScram commented Jul 9, 2024 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

vercel Bot commented Jul 9, 2024 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

ReactorScram Jul 9, 2024 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

github-actions Bot commented Jul 9, 2024 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Terraform Cloud Plan Output

Uh oh!

github-actions Bot commented Jul 9, 2024 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Performance Test Results

TCP

UDP

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Uh oh!

conectado left a comment

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

2 participants

ReactorScram commented Jul 9, 2024 •

edited

Loading

vercel Bot commented Jul 9, 2024 •

edited

Loading

ReactorScram Jul 9, 2024 •

edited

Loading

github-actions Bot commented Jul 9, 2024 •

edited

Loading

github-actions Bot commented Jul 9, 2024 •

edited

Loading