Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat: Allow the dropdown to appear in read-only mode #2916

Merged
merged 40 commits into from
Jan 22, 2025
Merged
Changes from 1 commit
Commits
Show all changes
40 commits
Select commit Hold shift + click to select a range
b55e03f
feat: Set up detours channels
hannahpurcell Dec 11, 2024
59910e7
tweak: Mis-commit in detours.ex
hannahpurcell Dec 11, 2024
1df7bf2
fix: channel name for active detours by route id
hannahpurcell Dec 11, 2024
144976c
tweak: make a function private
hannahpurcell Dec 11, 2024
007ca7f
Merge branch 'main' into hp/skate-detours-channel
hannahpurcell Dec 19, 2024
6d5b7b0
tweak: have a default list in grouped_detours
hannahpurcell Dec 19, 2024
c084049
tweak: add value needed by db_detour_to_detour to detour_snapshot_fac…
hannahpurcell Dec 19, 2024
64662b8
tweak: delete unused line
hannahpurcell Dec 19, 2024
e7ad20b
tweak: make author_id a FK to detours
hannahpurcell Dec 19, 2024
0175b71
feat: Elixir tests for detoursChannel
hannahpurcell Dec 19, 2024
b954e54
tweak: build user differently to avoid test failure (from broadcast_d…
hannahpurcell Dec 19, 2024
090c05f
fix: Big fixes to useActiveDetoursByRoute to help channel joins / lea…
hannahpurcell Dec 19, 2024
014d5df
test: frontend tests for detour channels
hannahpurcell Dec 19, 2024
2c9023f
tweak: formatting / credo
hannahpurcell Dec 19, 2024
3456887
tweak: test simplification
hannahpurcell Dec 20, 2024
9914136
fix: spec typos fixed
hannahpurcell Dec 30, 2024
f7ee64c
tweak: Added hook for the recurrent pattern of loading one detour
hannahpurcell Dec 31, 2024
2736874
feat: New BSIcons for inbound/outbound symbol
hannahpurcell Jan 2, 2025
047a062
tweak: export DetoursMap interface
hannahpurcell Jan 2, 2025
592dec4
feat: Add skate detours to route ladder dropdown
hannahpurcell Jan 2, 2025
8acf707
fix: Channel name in broadcast for detours by route
hannahpurcell Jan 2, 2025
e269c7d
fix: need to parse backend data to frontend struct
hannahpurcell Jan 6, 2025
18605d4
fix: don't mix-match route name and id!
hannahpurcell Jan 6, 2025
071dcb2
fix: Tests needed updated with detour parsing, but also caught a bug
hannahpurcell Jan 6, 2025
01404bb
Merge branch 'hp/skate-detours-channel' into hp/hook-for-loading-sing…
hannahpurcell Jan 6, 2025
0e396ac
fix: Prevent double modals appearing
hannahpurcell Jan 6, 2025
8cf9e36
Merge branch 'hp/hook-for-loading-single-detour' into hp/detours-in-r…
hannahpurcell Jan 6, 2025
2fe6a69
fix: existing tests
hannahpurcell Jan 9, 2025
d34d285
tweak: formatting
hannahpurcell Jan 13, 2025
fcdcc31
test: new detourfactory + renaming old one
hannahpurcell Jan 13, 2025
82d50a1
test: add test for opening deatour from dropdown
hannahpurcell Jan 13, 2025
a8b9608
tweak: use mockReturnValue instead of mockImplementation
hannahpurcell Jan 13, 2025
d5d35ec
fix: test failing as a result of re-renders and how promises resolved
hannahpurcell Jan 15, 2025
e0907d5
test: remaining tests for populating detour dropdown and showing aler…
hannahpurcell Jan 15, 2025
f434be5
Merge branch 'main' into hp/detours-in-route-ladder-dropdown
hannahpurcell Jan 15, 2025
bbfd84d
fix: missed 1 test tweak after updating the text for the detour dropdown
hannahpurcell Jan 15, 2025
a034316
tweak: Allow the dropdown to appear in read-only mode
hannahpurcell Jan 15, 2025
cf8634f
test: added new tests, fixed snapshots, updated conditional prop logic
hannahpurcell Jan 15, 2025
6a1556c
fix: update snapshots everywhere for route ladder header change
hannahpurcell Jan 15, 2025
f7866c1
Merge main
hannahpurcell Jan 22, 2025
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
tweak: build user differently to avoid test failure (from broadcast_d…
…etour)
  • Loading branch information
hannahpurcell committed Dec 19, 2024
commit b954e549e70b29cbcda9d06ac647898b52bfa160
2 changes: 1 addition & 1 deletion test/skate_web/controllers/detours_controller_test.exs
Original file line number Diff line number Diff line change
Expand Up @@ -352,7 +352,7 @@ defmodule SkateWeb.DetoursControllerTest do
test "will not return detours from other users", %{conn: conn} do
current_user_id = populate_db_and_get_user(conn)

other_user = build(:user)
other_user = Skate.Settings.User.upsert("secondary_user_uid", "secondary_user@test.com")

# Manually insert a detour by another user
Detours.upsert_from_snapshot(other_user.id, %{
Expand Down