feat(client/tauri): allow users to favorite specific Resources and hide the rest by ReactorScram · Pull Request #5923 · firezone/firezone

ReactorScram · 2024-07-19T22:58:39Z

Looking at a Resource when nothing is favorited

Looking at a favorited Resource

Looking at a non-favorited Resource

- [x] Double-check that the Resources are sorted alphabetically (or whatever) and leave a comment where they're sorted
- [x] String changes
- [x] Move "Add" and "Remove" down to a different section
- [x] Fix empty favorites menu
- [x] Merge

vercel · 2024-07-19T22:58:43Z

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	Aug 6, 2024 10:16pm

github-actions · 2024-07-19T23:00:42Z

Terraform Cloud Plan Output

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

Terraform Cloud Plan

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

ReactorScram · 2024-07-19T23:09:58Z

+            submenu
+                .separator()
+                .disabled("Site")
+                .copyable(&site.name) // Hope this is okay - The code is simpler if every enabled item sends an `Event` on click


I can change this back to the old behavior where we have some rare items that are enabled but clicking does nothing, by making enabled explicit. I just thought it's weird to have a button that does nothing, at least if it copies the text maybe it'll aid debugging or something.

github-actions · 2024-07-19T23:17:28Z

Performance Test Results

TCP

Test Name	Received/s	Sent/s	Retransmits
direct-tcp-client2server	238.4 MiB (-2%)	239.7 MiB (-2%)	210 (-15%)
direct-tcp-server2client	244.0 MiB (-0%)	245.3 MiB (-0%)	624 (+96%)
relayed-tcp-client2server	245.0 MiB (-2%)	245.8 MiB (-2%)	310 (-31%)
relayed-tcp-server2client	267.6 MiB (+1%)	268.3 MiB (+1%)	625 (+3%)

UDP

Test Name	Total/s	Jitter	Lost
direct-udp-client2server	500.0 MiB (-0%)	0.04ms (-15%)	44.00% (+7%)
direct-udp-server2client	500.0 MiB (+0%)	0.00ms (-40%)	20.71% (+3%)
relayed-udp-client2server	500.0 MiB (-0%)	0.04ms (+39%)	54.67% (+2%)
relayed-udp-server2client	500.0 MiB (+0%)	0.02ms (-40%)	29.15% (-10%)

thomaseizinger

Nice work!

thomaseizinger · 2024-07-20T00:37:28Z

-    fn separator(self) -> Self;
-}
+#[cfg(test)]
+mod tests {


Nice tests!

jamilbk

Looks good! Couple UX nits:

"Add favorite" -> "Add to favorites"
"Remove favorite" -> "Remove from favorites"

If 1 or more favorites exist, maybe we should title that section "Favorite Resources" and ~~move others to a section below (doesn't need a title) and~~ call the menu "Other resources"? EDIT: looks like you already added a section divider, nice.

jamilbk · 2024-07-20T02:11:17Z

Just curious, how do they reset the menu? Is there a button for it in settings or does it reset with "Reset to defaults"?

jamilbk · 2024-07-22T14:40:53Z

Another thought (ux) -- should "Add to favorites" be in the second submenu section at the bottom? I.e. under the other "Resource" details.

I could see it going either way, just curious your thoughts.

…menu

ReactorScram · 2024-07-22T15:12:54Z

@jamilbk Those changes all sound good. And yeah resetting advanced settings removes all favorites. It's not intuitive but they're hooked into the settings file so it was easy to write the code that way.

jamilbk · 2024-07-22T15:29:59Z

@jamilbk Those changes all sound good. And yeah resetting advanced settings removes all favorites. It's not intuitive but they're hooked into the settings file so it was easy to write the code that way.

Gotcha, I need to think if this should work the same way on other platforms. We can reset this menu no prob with the user signed in, unlike the other settings which either sign you out (Apple) or tell you changes won't take effect until next sign in (Android).

Might need either a "Reset favorites" button or add more logic to the above cases... probably will opt for the former for the other clients.

ReactorScram · 2024-07-22T15:35:27Z

@jamilbk Should I keep this PR open until we figure that out?

Also, what happens in this sequence?

Account has Resources A, B, C
User favorites C
Account loses C

We shouldn't display an empty "Favorite Resources" section, right, we should act as if the now-deleted C is also unfavorited?

jamilbk · 2024-07-22T15:43:56Z

Should I keep this PR open until we figure that out?

Yeah I think that makes sense. Probably need to get this feature right since most have asked for it.

We shouldn't display an empty "Favorite Resources" section, right, we should act as if the now-deleted C is also unfavorited?

Yeah, interesting edge case. Maybe it could work like this:

"Add to favorites" tracks resource ids in a favorites array that persists until user removes from favorites or resets favorites state
"Update resources" callback updates displayed resources
When the menu is rendered, if at least one resource_id lies in favorites, use favorites menu
otherwise display all resources

…menu

ReactorScram · 2024-07-30T18:54:53Z

    }

    #[test]
-    fn dns_resource_with_url() {


Got rid of this by just testing the URL marker arrows (<https://example.com>) in every unit test

github-actions · 2024-07-30T19:00:16Z

Bencher

Report	Tue, August 6, 2024 at 22:22:39 UTC
Project	Firezone
Branch	feat/tauri-favorites-menu
Testbed	github-actions

Click to view all benchmark results

Benchmark	Throughput	Throughput Results bits/s \| (Δ%)	Throughput Lower Boundary bits/s \| (%)
direct-tcp-client2server	✅ (view plot)	243,341,638.48 (+0.58%)	237,213,423.87 (97.48%)
direct-tcp-server2client	✅ (view plot)	244,920,338.89 (-1.32%)	241,359,870.35 (98.55%)
direct-udp-client2server	✅ (view plot)	302,142,583.71 (+4.52%)	271,866,563.77 (89.98%)
direct-udp-server2client	✅ (view plot)	402,191,907.38 (+1.53%)	384,057,369.62 (95.49%)
relayed-tcp-client2server	✅ (view plot)	244,063,316.68 (-0.75%)	239,404,508.18 (98.09%)
relayed-tcp-server2client	✅ (view plot)	253,623,827.81 (-1.44%)	246,961,074.61 (97.37%)
relayed-udp-client2server	✅ (view plot)	227,491,793.93 (-0.85%)	218,883,860.87 (96.22%)
relayed-udp-server2client	✅ (view plot)	334,813,938.43 (-0.81%)	317,943,028.04 (94.96%)

Bencher - Continuous Benchmarking
View Public Perf Page
Docs | Repo | Chat | Help

…menu

thomaseizinger · 2024-08-01T01:08:50Z

@ReactorScram Please let me know when this is ready for re-review.

ReactorScram · 2024-08-01T14:06:33Z

@thomaseizinger The Tauri Client itself should be ready, but I'm keeping it in draft to remind myself that we want to synchronize the release with Android and Apple too, so Tauri can't go out by itself

thomaseizinger · 2024-08-01T21:43:36Z

@thomaseizinger The Tauri Client itself should be ready, but I'm keeping it in draft to remind myself that we want to synchronize the release with Android and Apple too, so Tauri can't go out by itself

Maybe we should implement feature-flags as part of the init message so we can release these things early and activate them all at once?

ReactorScram · 2024-08-01T21:50:38Z

@thomaseizinger Sure. And we could do a CLI flag for local testing like Chromium does.

Though, it will be hard if the feature flag is needed before we reach the portal. So far there are no features like that, but there could be.

thomaseizinger · 2024-08-02T03:52:07Z

@thomaseizinger Sure. And we could do a CLI flag for local testing like Chromium does.

Though, it will be hard if the feature flag is needed before we reach the portal. So far there are no features like that, but there could be.

The feature flag config could also just be at https://firezone.dev/flags.json, right? Doesn't have to be delivered via connlib.

ReactorScram · 2024-08-02T14:11:59Z

Yeah I suppose. It will have to do something reasonable if we boot up without Internet. Maybe just save the flags to disk whenever they're seen, then fall back on disk if we can't reach the website. That way a flag that's seen flipped is never unflipped unless we unflip it on the server

ReactorScram · 2024-08-06T22:11:22Z

We agreed in a meeting that we can ship this for all 3 platforms (Tauri, Android, Swift) whenever ready, so I'll merge this one first

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

ReactorScram added 3 commits July 19, 2024 14:08

add a spot in the code for favorited Resources to go

39e6806

refactor and add unit tests

ebbf20f

save favorites to disk

ed69dd2

ReactorScram self-assigned this Jul 19, 2024

Update GUI.tsx

79aa22a

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

ReactorScram commented Jul 19, 2024

View reviewed changes

Comment thread rust/gui-client/src-tauri/src/client/settings.rs

vercel bot deployed to Preview July 19, 2024 23:03 View deployment

ReactorScram commented Jul 19, 2024

View reviewed changes

Comment thread rust/gui-client/src-tauri/src/client/settings.rs

ReactorScram commented Jul 19, 2024

View reviewed changes

Comment thread rust/gui-client/src-tauri/src/client/gui/system_tray.rs

ReactorScram marked this pull request as ready for review July 19, 2024 23:07

ReactorScram requested review from conectado and thomaseizinger July 19, 2024 23:07

ReactorScram commented Jul 19, 2024

View reviewed changes

thomaseizinger approved these changes Jul 20, 2024

View reviewed changes

jamilbk reviewed Jul 20, 2024

View reviewed changes

ReactorScram mentioned this pull request Jul 22, 2024

chore(gui-client): remove keyboard accelerators since they don't work #5953

Closed

Merge remote-tracking branch 'origin/main' into feat/tauri-favorites-…

ebbb30d

…menu

vercel bot deployed to Preview July 22, 2024 15:08 View deployment

ReactorScram added 3 commits July 22, 2024 11:08

move things around

cbdcaf9

comment

6d852bf

extract str consts

d27eeef

Base automatically changed from refactor/tauri-menu to main July 30, 2024 16:03

ReactorScram added 2 commits July 30, 2024 18:46

Merge remote-tracking branch 'origin/main' into feat/tauri-favorites-…

c8dca5c

…menu

Merge remote-tracking branch 'origin/main' into feat/tauri-favorites-…

9bf991f

…menu

vercel bot deployed to Preview July 30, 2024 18:52 View deployment

ReactorScram commented Jul 30, 2024

View reviewed changes

ReactorScram changed the title ~~feat(gui-client): allow users to favorite specific Resources and hide the rest~~ feat(client/tauri): allow users to favorite specific Resources and hide the rest Jul 31, 2024

Merge remote-tracking branch 'origin/main' into feat/tauri-favorites-…

5230a46

…menu

vercel bot deployed to Preview July 31, 2024 22:05 View deployment

ReactorScram requested a review from thomaseizinger August 1, 2024 14:06

Merge branch 'main' into feat/tauri-favorites-menu

415b311

vercel bot deployed to Preview August 1, 2024 14:14 View deployment

thomaseizinger mentioned this pull request Aug 6, 2024

Feature-flags for clients #6177

Closed

ReactorScram marked this pull request as ready for review August 6, 2024 22:11

Merge branch 'main' into feat/tauri-favorites-menu

92defc3

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

ReactorScram enabled auto-merge August 6, 2024 22:13

vercel bot deployed to Preview August 6, 2024 22:16 View deployment

ReactorScram added this pull request to the merge queue Aug 6, 2024

github-merge-queue bot removed this pull request from the merge queue due to failed status checks Aug 6, 2024

ReactorScram added this pull request to the merge queue Aug 6, 2024

Merged via the queue into main with commit 5b75e87 Aug 6, 2024

ReactorScram deleted the feat/tauri-favorites-menu branch August 6, 2024 22:50

Conversation

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

Uh oh!

Uh oh!

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

Uh oh!

Uh oh!

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

Uh oh!

Terraform Cloud Plan Output

Uh oh!

Uh oh!

Uh oh!

Uh oh!

ReactorScram Jul 19, 2024

Choose a reason for hiding this comment

Uh oh!

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

Uh oh!

Performance Test Results

TCP

UDP

Uh oh!

thomaseizinger left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

thomaseizinger Jul 20, 2024

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

jamilbk left a comment • 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!

jamilbk commented Jul 20, 2024

Uh oh!

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

Uh oh!

Uh oh!

ReactorScram commented Jul 22, 2024

Uh oh!

jamilbk commented Jul 22, 2024

Uh oh!

ReactorScram commented Jul 22, 2024

Uh oh!

jamilbk commented Jul 22, 2024

Uh oh!

Uh oh!

Uh oh!

ReactorScram Jul 30, 2024

Choose a reason for hiding this comment

Uh oh!

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

Uh oh!

Bencher

Uh oh!

thomaseizinger commented Aug 1, 2024

Uh oh!

ReactorScram commented Aug 1, 2024

Uh oh!

thomaseizinger commented Aug 1, 2024

Uh oh!

ReactorScram commented Aug 1, 2024

Uh oh!

thomaseizinger commented Aug 2, 2024

Uh oh!

ReactorScram commented Aug 2, 2024

Uh oh!

ReactorScram commented Aug 6, 2024

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

ReactorScram commented Jul 19, 2024 •

edited

Loading

vercel bot commented Jul 19, 2024 •

edited

Loading

github-actions bot commented Jul 19, 2024 •

edited

Loading

github-actions bot commented Jul 19, 2024 •

edited

Loading

jamilbk left a comment •

edited

Loading

jamilbk commented Jul 22, 2024 •

edited

Loading

github-actions bot commented Jul 30, 2024 •

edited

Loading