Compare commits

...

6 Commits

Author SHA1 Message Date
CI
931a8e629d chore: [skip ci] 2026-03-23 11:20:01 +00:00
CI
a06df968a2 chore: release version v1.97.2 2026-03-23 11:20:01 +00:00
Dmitry Popov
965df31da0 Merge branch 'fix-add-from-routes' 2026-03-23 12:19:25 +01:00
Dmitry Popov
171591f07d fix(core): Fixed tracking issues & adding systems to map from routes 2026-03-23 12:19:17 +01:00
CI
9a63700dfb chore: [skip ci] 2026-03-21 15:23:02 +00:00
DanSylvest
f00deb1556 chore: Changed old API for adding system from routes to new. 2026-03-17 10:28:15 +03:00
7 changed files with 104 additions and 43 deletions

View File

@@ -2,6 +2,15 @@
<!-- changelog -->
## [v1.97.2](https://github.com/wanderer-industries/wanderer/compare/v1.97.1...v1.97.2) (2026-03-23)
### Bug Fixes:
* core: Fixed tracking issues & adding systems to map from routes
## [v1.97.1](https://github.com/wanderer-industries/wanderer/compare/v1.97.0...v1.97.1) (2026-03-21)

View File

@@ -49,9 +49,9 @@ export const useContextMenuSystemInfoHandlers = () => {
}
outCommand({
type: OutCommand.addSystem,
type: OutCommand.manualAddSystem,
data: {
system_id: solarSystemId,
solar_system_id: parseInt(solarSystemId),
},
});

View File

@@ -115,9 +115,11 @@ defmodule WandererApp.Character.TrackingUtils do
end)}
end
# Filter characters to only include those with actual tracking permission
# This prevents showing characters in the tracking dialog that will fail when toggled
defp filter_characters_with_tracking_permission(characters, %{id: map_id, owner_id: owner_id}) do
@doc """
Filters a list of characters to only include those with actual tracking permission on a map.
This prevents showing characters in the tracking dialog that will fail when toggled.
"""
def filter_characters_with_tracking_permission(characters, %{id: map_id, owner_id: owner_id}) do
# Load ACLs with members properly (same approach as get_map_characters)
acls = load_map_acls_with_members(map_id)

View File

@@ -789,8 +789,7 @@ defmodule WandererApp.Map.Server.SystemsImpl do
defp do_add_system(
map_id,
%{
solar_system_id: solar_system_id,
coordinates: coordinates
solar_system_id: solar_system_id
} = system_info,
user_id,
character_id
@@ -803,19 +802,14 @@ defmodule WandererApp.Map.Server.SystemsImpl do
rtree_name = "rtree_#{map_id}"
%{"x" => x, "y" => y} =
coordinates
system_info
|> Map.get(:coordinates)
|> case do
%{"x" => x, "y" => y} ->
%{"x" => x, "y" => y}
_ ->
%{x: x, y: y} =
WandererApp.Map.PositionCalculator.get_new_system_position(
nil,
rtree_name,
map_opts
)
{:ok, %{x: x, y: y}} = calc_new_system_position(map_id, nil, rtree_name, map_opts)
%{"x" => x, "y" => y}
end

View File

@@ -54,7 +54,7 @@ defmodule WandererAppWeb.CharactersTrackingLive do
selected_map_slug: map_slug
)
|> assign_async(:characters, fn ->
WandererApp.Maps.load_characters(selected_map, current_user.id)
load_trackable_characters(selected_map, current_user.id)
end)
end
@@ -100,37 +100,55 @@ defmodule WandererAppWeb.CharactersTrackingLive do
selected_map = socket.assigns.selected_map
%{result: characters} = socket.assigns.characters
case characters |> Enum.find(&(&1.id == character_id)) do
%{tracked: current_tracked, eve_id: eve_id} ->
# Use TrackingUtils.update_tracking to properly set/unset the tracking_start_time
# cache key, which is required for the character to appear in get_tracked_character_ids
case TrackingUtils.update_tracking(
selected_map.id,
eve_id,
current_user.id,
not current_tracked,
self(),
false
) do
{:ok, _tracking_data, _event} ->
:ok
result =
case characters |> Enum.find(&(&1.id == character_id)) do
%{tracked: current_tracked, eve_id: eve_id} ->
# Use TrackingUtils.update_tracking to properly set/unset the tracking_start_time
# cache key, which is required for the character to appear in get_tracked_character_ids
case TrackingUtils.update_tracking(
selected_map.id,
eve_id,
current_user.id,
not current_tracked,
self(),
false
) do
{:ok, _tracking_data, _event} ->
:ok
{:error, reason} ->
Logger.error(
"Failed to toggle tracking for character #{character_id} on map #{selected_map.id}: #{inspect(reason)}"
)
end
{:error, reason} ->
Logger.error(
"Failed to toggle tracking for character #{character_id} on map #{selected_map.id}: #{inspect(reason)}"
)
nil ->
Logger.warning(
"Character #{character_id} not found in available characters for map #{selected_map.id}"
)
end
{:error, reason}
end
nil ->
Logger.warning(
"Character #{character_id} not found in available characters for map #{selected_map.id}"
)
{:error, "Character not found"}
end
socket =
case result do
{:error, _reason} ->
put_flash(
socket,
:error,
"Failed to toggle tracking. Character may not have sufficient permissions on this map."
)
_ ->
socket
end
{:noreply,
socket
|> assign_async(:characters, fn ->
WandererApp.Maps.load_characters(selected_map, current_user.id)
load_trackable_characters(selected_map, current_user.id)
end)}
end
@@ -154,10 +172,21 @@ defmodule WandererAppWeb.CharactersTrackingLive do
{:noreply,
socket
|> assign_async(:characters, fn ->
WandererApp.Maps.load_characters(selected_map, current_user.id)
load_trackable_characters(selected_map, current_user.id)
end)}
end
@impl true
def handle_info(_event, socket), do: {:noreply, socket}
defp load_trackable_characters(map, user_id) do
case WandererApp.Maps.load_characters(map, user_id) do
{:ok, %{characters: characters}} ->
filtered = TrackingUtils.filter_characters_with_tracking_permission(characters, map)
{:ok, %{characters: filtered}}
error ->
error
end
end
end

View File

@@ -128,6 +128,33 @@ defmodule WandererAppWeb.MapSystemsEventHandler do
{:noreply, socket}
end
def handle_ui_event(
"manual_add_system",
%{"solar_system_id" => solar_system_id} = _event,
%{
assigns: %{
current_user: %{id: current_user_id},
has_tracked_characters?: true,
map_id: map_id,
main_character_id: main_character_id,
user_permissions: %{add_system: true}
}
} =
socket
)
when not is_nil(main_character_id) do
WandererApp.Map.Server.add_system(
map_id,
%{
solar_system_id: solar_system_id
},
current_user_id,
main_character_id
)
{:noreply, socket}
end
def handle_ui_event(
"manual_paste_systems_and_connections",
%{

View File

@@ -3,7 +3,7 @@ defmodule WandererApp.MixProject do
@source_url "https://github.com/wanderer-industries/wanderer"
@version "1.97.1"
@version "1.97.2"
def project do
[