chore: release version v1.47.1

CHANGELOG.md

@@ -2,6 +2,24 @@
 
 <!-- changelog -->
 
+## [v1.47.1](https://github.com/wanderer-industries/wanderer/compare/v1.47.0...v1.47.1) (2025-02-09)
+
+
+
+
+### Bug Fixes:
+
+* Connections: Fixed connections auto-refresh after update
+
+## [v1.47.0](https://github.com/wanderer-industries/wanderer/compare/v1.46.1...v1.47.0) (2025-02-09)
+
+
+
+
+### Features:
+
+* Map: Added check for active map subscription to using Map APIs
+
 ## [v1.46.1](https://github.com/wanderer-industries/wanderer/compare/v1.46.0...v1.46.1) (2025-02-09)
 
 

assets/js/hooks/Mapper/components/map/Map.tsx

@@ -84,7 +84,6 @@ interface MapCompProps {
   onCommand: OutCommandHandler;
   onSelectionChange: OnMapSelectionChange;
   onManualDelete(systems: string[]): void;
-  canRemoveConnection?(connectionId: string): boolean;
   onConnectionInfoClick?(e: SolarSystemConnection): void;
   onAddSystem?: OnMapAddSystemCallback;
   onSelectionContextMenu?: NodeSelectionMouseHandler;
@@ -114,9 +113,8 @@ const MapComp = ({
   isSoftBackground,
   theme,
   onAddSystem,
-  canRemoveConnection,
 }: MapCompProps) => {
-  const { getEdge, getNode, getNodes } = useReactFlow();
+  const { getNode, getNodes } = useReactFlow();
   const [nodes, , onNodesChange] = useNodesState<Node<SolarSystemRawType>>(initialNodes);
   const [edges, , onEdgesChange] = useEdgesState<Edge<SolarSystemConnection>>(initialEdges);
 
@@ -224,40 +222,6 @@ const MapComp = ({
     [getNode, getNodes, onManualDelete, onNodesChange],
   );
 
-  const handleEdgesChange = useCallback(
-    (changes: EdgeChange[]) => {
-      const nextChanges = changes.reduce((acc, change) => {
-        if (change.type !== 'remove') {
-          return [...acc, change];
-        }
-
-        if (canRemoveConnection?.(change.id)) {
-          return [...acc, change];
-        }
-
-        const edge = getEdge(change.id);
-        if (!edge) {
-          return [...acc, change];
-        }
-
-        const sourceNode = getNode(edge.source);
-        const targetNode = getNode(edge.target);
-        if (!sourceNode || !targetNode) {
-          return [...acc, change];
-        }
-
-        if (sourceNode.data.locked || targetNode.data.locked) {
-          return acc;
-        }
-
-        return [...acc, change];
-      }, [] as EdgeChange[]);
-
-      onEdgesChange(nextChanges);
-    },
-    [canRemoveConnection, getEdge, getNode, onEdgesChange],
-  );
-
   useEffect(() => {
     update(x => ({
       ...x,
@@ -273,7 +237,7 @@ const MapComp = ({
           nodes={nodes}
           edges={edges}
           onNodesChange={handleNodesChange}
-          onEdgesChange={handleEdgesChange}
+          onEdgesChange={onEdgesChange}
           onConnect={onConnect}
           // TODO we need save into session all of this
           //      and on any action do either

assets/js/hooks/Mapper/components/map/helpers/convertSystem2Node.ts

@@ -10,5 +10,6 @@ export const convertSystem2Node = (sys: SolarSystemRawType): Node => {
     position: sys.position,
     data: sys,
     draggable: !sys.locked,
+    deletable: !sys.locked,
   };
 };

assets/js/hooks/Mapper/components/mapWrapper/MapWrapper.tsx

@@ -33,7 +33,7 @@ export const MapWrapper = () => {
   const {
     update,
     outCommand,
-    data: { selectedConnections, selectedSystems, hubs, systems, connections, linkSignatureToSystem },
+    data: { selectedConnections, selectedSystems, hubs, systems, linkSignatureToSystem },
     interfaceSettings: {
       isShowMenu,
       isShowMinimap = STORED_INTERFACE_DEFAULT_VALUES.isShowMinimap,
@@ -56,8 +56,8 @@ export const MapWrapper = () => {
   const [openAddSystem, setOpenAddSystem] = useState<XYPosition | null>(null);
   const [selectedConnection, setSelectedConnection] = useState<SolarSystemConnection | null>(null);
 
-  const ref = useRef({ selectedConnections, selectedSystems, systemContextProps, systems, connections, deleteSystems });
-  ref.current = { selectedConnections, selectedSystems, systemContextProps, systems, connections, deleteSystems };
+  const ref = useRef({ selectedConnections, selectedSystems, systemContextProps, systems, deleteSystems });
+  ref.current = { selectedConnections, selectedSystems, systemContextProps, systems, deleteSystems };
 
   useMapEventListener(event => {
     runCommand(event);
@@ -125,11 +125,6 @@ export const MapWrapper = () => {
     setOpenAddSystem(coordinates);
   }, []);
 
-  const canRemoveConnection = useCallback((connectionId: string) => {
-    const { connections } = ref.current;
-    return !connections.some(x => x.id === connectionId);
-  }, []);
-
   const handleSubmitAddSystem: SearchOnSubmitCallback = useCallback(
     async item => {
       if (ref.current.systems.some(x => x.system_static_info.solar_system_id === item.value)) {
@@ -166,7 +161,6 @@ export const MapWrapper = () => {
         isSoftBackground={isSoftBackground}
         theme={theme}
         onAddSystem={onAddSystem}
-        canRemoveConnection={canRemoveConnection}
       />
 
       {openSettings != null && (

lib/wanderer_app_web/controllers/plugs/check_map_api_key.ex

@@ -13,27 +13,19 @@ defmodule WandererAppWeb.Plugs.CheckMapApiKey do
 
     case header do
       "Bearer " <> incoming_token ->
-        case fetch_map_id(conn.query_params) do
-          {:ok, map_id} ->
-            case WandererApp.Api.Map.by_id(map_id) do
-              {:ok, map} ->
-                if map.public_api_key == incoming_token do
-                  conn
-                else
-                  conn
-                  |> send_resp(401, "Unauthorized (invalid token for map)")
-                  |> halt()
-                end
-
-              {:error, _reason} ->
-                conn
-                |> send_resp(404, "Map not found")
-                |> halt()
+        case fetch_map(conn.query_params) do
+          {:ok, map} ->
+            if map.public_api_key == incoming_token do
+              conn
+            else
+              conn
+              |> send_resp(401, "Unauthorized (invalid token for map)")
+              |> halt()
             end
 
-          {:error, msg} ->
+          {:error, _reason} ->
             conn
-            |> send_resp(400, msg)
+            |> send_resp(404, "Map not found")
             |> halt()
         end
 
@@ -44,6 +36,19 @@ defmodule WandererAppWeb.Plugs.CheckMapApiKey do
     end
   end
 
+  defp fetch_map(query_params) do
+    case fetch_map_id(query_params) do
+      {:ok, {:map, map}} ->
+        {:ok, map}
+
+      {:ok, map_id} ->
+        WandererApp.Api.Map.by_id(map_id)
+
+      error ->
+        error
+    end
+  end
+
   defp fetch_map_id(%{"map_id" => mid}) when is_binary(mid) and mid != "" do
     {:ok, mid}
   end
@@ -51,7 +56,7 @@ defmodule WandererAppWeb.Plugs.CheckMapApiKey do
   defp fetch_map_id(%{"slug" => slug}) when is_binary(slug) and slug != "" do
     case WandererApp.Api.Map.get_map_by_slug(slug) do
       {:ok, map} ->
-        {:ok, map.id}
+        {:ok, {:map, map}}
 
       {:error, _reason} ->
         {:error, "No map found for slug=#{slug}"}

lib/wanderer_app_web/controllers/plugs/check_map_subscription.ex

@@ -0,0 +1,46 @@
+defmodule WandererAppWeb.Plugs.CheckMapSubscription do
+  @moduledoc """
+  A plug that checks the Map has active subscription
+  Halts with 401 if no active subscription.
+  """
+
+  import Plug.Conn
+
+  def init(opts), do: opts
+
+  def call(conn, _opts) do
+    case fetch_map_id(conn.query_params) do
+      {:ok, map_id} ->
+        {:ok, is_subscription_active} = map_id |> WandererApp.Map.is_subscription_active?()
+
+        if is_subscription_active do
+          conn
+        else
+          conn
+          |> send_resp(401, "Unauthorized (map subscription not active)")
+          |> halt()
+        end
+
+      {:error, msg} ->
+        conn
+        |> send_resp(400, msg)
+        |> halt()
+    end
+  end
+
+  defp fetch_map_id(%{"map_id" => mid}) when is_binary(mid) and mid != "" do
+    {:ok, mid}
+  end
+
+  defp fetch_map_id(%{"slug" => slug}) when is_binary(slug) and slug != "" do
+    case WandererApp.Api.Map.get_map_by_slug(slug) do
+      {:ok, map} ->
+        {:ok, map.id}
+
+      {:error, _reason} ->
+        {:error, "No map found for slug=#{slug}"}
+    end
+  end
+
+  defp fetch_map_id(_), do: {:error, "Must provide either ?map_id=UUID or ?slug=SLUG"}
+end

lib/wanderer_app_web/router.ex

@@ -24,7 +24,6 @@ defmodule WandererAppWeb.Router do
   @font_src ~w('self' https://fonts.gstatic.com data: https://web.ccpgamescdn.com https://w.appzi.io )
   @script_src ~w('self' )
 
-
   pipeline :admin_bauth do
     plug :admin_basic_auth
   end
@@ -112,6 +111,7 @@ defmodule WandererAppWeb.Router do
 
   pipeline :api_map do
     plug WandererAppWeb.Plugs.CheckMapApiKey
+    plug WandererAppWeb.Plugs.CheckMapSubscription
   end
 
   pipeline :api_kills do
@@ -145,7 +145,6 @@ defmodule WandererAppWeb.Router do
 
     # GET /api/common/system-static-info?id=...
     get "/system-static-info", CommonAPIController, :show_system_static
-
   end
 
   scope "/", WandererAppWeb do

mix.exs

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