chore: release version v1.3.0

Fix signatures sort

CHANGELOG.md

@@ -2,6 +2,66 @@
 
 <!-- changelog -->
 
+## [v1.3.0](https://github.com/wanderer-industries/wanderer/compare/v1.2.10...v1.3.0) (2024-10-07)
+
+
+
+
+### Features:
+
+* Map: Fix default sort
+
+* Map: Remove resizible and fix styles of column sorting
+
+* Map: Revision of sorting from also adding ability to sort all columns
+
+## [v1.2.10](https://github.com/wanderer-industries/wanderer/compare/v1.2.9...v1.2.10) (2024-10-07)
+
+
+
+
+## [v1.2.9](https://github.com/wanderer-industries/wanderer/compare/v1.2.8...v1.2.9) (2024-10-07)
+
+
+
+
+## [v1.2.8](https://github.com/wanderer-industries/wanderer/compare/v1.2.7...v1.2.8) (2024-10-06)
+
+
+
+
+## [v1.2.7](https://github.com/wanderer-industries/wanderer/compare/v1.2.6...v1.2.7) (2024-10-05)
+
+
+
+
+## [v1.2.6](https://github.com/wanderer-industries/wanderer/compare/v1.2.5...v1.2.6) (2024-10-05)
+
+
+
+
+### Bug Fixes:
+
+* Core: Stability & performance improvements
+
+## [v1.2.5](https://github.com/wanderer-industries/wanderer/compare/v1.2.4...v1.2.5) (2024-10-04)
+
+
+
+
+### Bug Fixes:
+
+* Core: Add system "true security" correction
+
+## [v1.2.4](https://github.com/wanderer-industries/wanderer/compare/v1.2.3...v1.2.4) (2024-10-03)
+
+
+
+
+### Bug Fixes:
+
+* Map: Remove duplicate connections
+
 ## [v1.2.3](https://github.com/wanderer-industries/wanderer/compare/v1.2.2...v1.2.3) (2024-10-02)
 
 

assets/js/hooks/Mapper/common-styles/fixes.scss

@@ -67,3 +67,21 @@
   }
 }
 
+.p-sortable-column {
+  font-size: 12px;
+  font-weight: bold;
+  padding: 3px 4px;
+}
+
+.p-selectable-row td {
+  padding: 4px 4px;
+}
+
+.p-sortable-column > .p-column-header-content > span:last-child {
+  transform: scale(0.7);
+
+  & > svg {
+    margin-left: 4px;
+  }
+}
+

assets/js/hooks/Mapper/components/mapInterface/widgets/SystemSignatures/SystemSignaturesContent/SystemSignaturesContent.module.scss

@@ -4,3 +4,7 @@
   font-size: 12px !important;
   line-height: 8px;
 }
+
+.Table {
+
+}

assets/js/hooks/Mapper/components/mapInterface/widgets/SystemSignatures/SystemSignaturesContent/SystemSignaturesContent.tsx

@@ -4,7 +4,7 @@ import { parseSignatures } from '@/hooks/Mapper/helpers';
 import { OutCommand } from '@/hooks/Mapper/types/mapHandlers.ts';
 import { WdTooltip, WdTooltipHandlers } from '@/hooks/Mapper/components/ui-kit';
 
-import { DataTable, DataTableRowMouseEvent } from 'primereact/datatable';
+import { DataTable, DataTableRowMouseEvent, SortOrder } from 'primereact/datatable';
 import { Column } from 'primereact/column';
 import { useCallback, useEffect, useMemo, useRef, useState } from 'react';
 import useRefState from 'react-usestateref';
@@ -25,6 +25,18 @@ import {
   renderName,
   renderTimeLeft,
 } from '@/hooks/Mapper/components/mapInterface/widgets/SystemSignatures/renders';
+// import { PrimeIcons } from 'primereact/api';
+import useLocalStorageState from 'use-local-storage-state';
+
+type SystemSignaturesSortSettings = {
+  sortField: string;
+  sortOrder: SortOrder;
+};
+
+const SORT_DEFAULT_VALUES: SystemSignaturesSortSettings = {
+  sortField: 'updated_at',
+  sortOrder: -1,
+};
 
 interface SystemSignaturesContentProps {
   systemId: string;
@@ -39,6 +51,10 @@ export const SystemSignaturesContent = ({ systemId, settings }: SystemSignatures
 
   const [hoveredSig, setHoveredSig] = useState<SystemSignature | null>(null);
 
+  const [sortSettings, setSortSettings] = useLocalStorageState<SystemSignaturesSortSettings>('window:signatures:sort', {
+    defaultValue: SORT_DEFAULT_VALUES,
+  });
+
   const tableRef = useRef<HTMLDivElement>(null);
   const compact = useMaxWidth(tableRef, 260);
   const medium = useMaxWidth(tableRef, 380);
@@ -50,7 +66,7 @@ export const SystemSignaturesContent = ({ systemId, settings }: SystemSignatures
   const handleResize = useCallback(() => {
     if (tableRef.current) {
       const tableWidth = tableRef.current.offsetWidth;
-      const otherColumnsWidth = 265;
+      const otherColumnsWidth = 276;
       const availableWidth = tableWidth - otherColumnsWidth;
       setNameColumnWidth(`${availableWidth}px`);
     }
@@ -159,6 +175,14 @@ export const SystemSignaturesContent = ({ systemId, settings }: SystemSignatures
     setHoveredSig(null);
   }, []);
 
+  // const renderToolbar = (/*row: SystemSignature*/) => {
+  //   return (
+  //     <div className="flex justify-end items-center gap-2">
+  //       <span className={clsx(PrimeIcons.PENCIL, 'text-[10px]')}></span>
+  //     </div>
+  //   );
+  // };
+
   return (
     <div ref={tableRef} className="h-full">
       {filteredSignatures.length === 0 ? (
@@ -168,19 +192,23 @@ export const SystemSignaturesContent = ({ systemId, settings }: SystemSignatures
       ) : (
         <>
           <DataTable
+            className={classes.Table}
             value={filteredSignatures}
             size="small"
             selectionMode="multiple"
             selection={selectedSignatures}
+            metaKeySelection
             onSelectionChange={e => setSelectedSignatures(e.value)}
             dataKey="eve_id"
             tableClassName="w-full select-none"
-            resizableColumns
+            resizableColumns={false}
             rowHover
             selectAll
-            showHeaders={false}
-            onRowMouseEnter={handleEnterRow}
-            onRowMouseLeave={handleLeaveRow}
+            sortField={sortSettings.sortField}
+            sortOrder={sortSettings.sortOrder}
+            onSort={event => setSortSettings(() => ({ sortField: event.sortField, sortOrder: event.sortOrder }))}
+            onRowMouseEnter={compact || medium ? handleEnterRow : undefined}
+            onRowMouseLeave={compact || medium ? handleLeaveRow : undefined}
             rowClassName={row => {
               if (selectedSignatures.some(x => x.eve_id === row.eve_id)) {
                 return clsx(classes.TableRowCompact, 'bg-amber-500/50 hover:bg-amber-500/70 transition duration-200');
@@ -198,7 +226,7 @@ export const SystemSignaturesContent = ({ systemId, settings }: SystemSignatures
               bodyClassName="p-0 px-1"
               field="group"
               body={renderIcon}
-              style={{ maxWidth: 26, minWidth: 26, width: 26 }}
+              style={{ maxWidth: 26, minWidth: 26, width: 26, height: 25 }}
             ></Column>
 
             <Column
@@ -206,12 +234,14 @@ export const SystemSignaturesContent = ({ systemId, settings }: SystemSignatures
               header="Id"
               bodyClassName="text-ellipsis overflow-hidden whitespace-nowrap"
               style={{ maxWidth: 72, minWidth: 72, width: 72 }}
+              sortable
             ></Column>
             <Column
               field="group"
               header="Group"
               bodyClassName="text-ellipsis overflow-hidden whitespace-nowrap"
               hidden={compact}
+              sortable
             ></Column>
             <Column
               field="name"
@@ -220,6 +250,7 @@ export const SystemSignaturesContent = ({ systemId, settings }: SystemSignatures
               body={renderName}
               style={{ maxWidth: nameColumnWidth }}
               hidden={compact || medium}
+              sortable
             ></Column>
             <Column
               field="updated_at"
@@ -227,7 +258,16 @@ export const SystemSignaturesContent = ({ systemId, settings }: SystemSignatures
               dataType="date"
               bodyClassName="w-[80px] text-ellipsis overflow-hidden whitespace-nowrap"
               body={renderTimeLeft}
+              sortable
             ></Column>
+
+            {/*<Column*/}
+            {/*  bodyClassName="p-0 pl-1 pr-2"*/}
+            {/*  field="group"*/}
+            {/*  body={renderToolbar}*/}
+            {/*  headerClassName={headerClasses}*/}
+            {/*  style={{ maxWidth: 26, minWidth: 26, width: 26 }}*/}
+            {/*></Column>*/}
           </DataTable>
         </>
       )}

assets/js/hooks/Mapper/components/mapInterface/widgets/SystemSignatures/renders/renderTimeLeft.tsx

@@ -3,7 +3,7 @@ import { TimeLeft } from '@/hooks/Mapper/components/ui-kit';
 
 export const renderTimeLeft = (row: SystemSignature) => {
   return (
-    <div className="flex justify-end w-full items-center">
+    <div className="flex w-full items-center">
       <TimeLeft cDate={row.updated_at ? new Date(row.updated_at) : undefined} />
     </div>
   );

config/runtime.exs

@@ -192,9 +192,20 @@ if config_env() == :prod do
     |> get_var_from_path_or_env("DATABASE_SSL_ENABLED", "false")
     |> String.to_existing_atom()
 
+  db_ssl_verify_none =
+    config_dir
+    |> get_var_from_path_or_env("DATABASE_SSL_VERIFY_NONE", "false")
+    |> String.to_existing_atom()
+
+  client_opts =
+    if db_ssl_verify_none do
+      [verify: :verify_none]
+    end
+
   config :wanderer_app, WandererApp.Repo,
     url: database_url,
     ssl: db_ssl_enabled,
+    ssl_opts: client_opts,
     pool_size: String.to_integer(System.get_env("POOL_SIZE") || "10"),
     socket_options: maybe_ipv6
 

lib/wanderer_app/api/map_connection.ex

@@ -18,10 +18,7 @@ defmodule WandererApp.Api.MapConnection do
       action: :read
     )
 
-    define(:by_locations,
-      get_by: [:map_id, :solar_system_source, :solar_system_target],
-      action: :read
-    )
+    define(:by_locations, action: :read_by_locations)
 
     define(:read_by_map, action: :read_by_map)
     define(:get_link_pairs_advanced, action: :get_link_pairs_advanced)
@@ -47,6 +44,13 @@ defmodule WandererApp.Api.MapConnection do
       filter(expr(map_id == ^arg(:map_id)))
     end
 
+    read :read_by_locations do
+      argument(:map_id, :string, allow_nil?: false)
+      argument(:solar_system_source, :integer, allow_nil?: false)
+      argument(:solar_system_target, :integer, allow_nil?: false)
+      filter(expr(map_id == ^arg(:map_id) and solar_system_source == ^arg(:solar_system_source) and solar_system_target == ^arg(:solar_system_target)))
+    end
+
     read :get_link_pairs_advanced do
       argument(:map_id, :string, allow_nil?: false)
       argument(:include_mass_crit, :boolean, allow_nil?: false)

lib/wanderer_app/eve_data_service.ex

@@ -229,7 +229,7 @@ defmodule WandererApp.EveDataService do
         constellation_id = row["constellationID"] |> Integer.parse() |> elem(0)
 
         {:ok, wormhole_class_id} =
-          _get_wormhole_class_id(
+          get_wormhole_class_id(
             map_location_wormhole_classes,
             region_id,
             constellation_id,
@@ -237,16 +237,16 @@ defmodule WandererApp.EveDataService do
           )
 
         {:ok, constellation_name} =
-          _get_constellation_name(map_constellations, constellation_id)
+          get_constellation_name(map_constellations, constellation_id)
 
-        {:ok, region_name} = _get_region_name(map_regions, region_id)
+        {:ok, region_name} = get_region_name(map_regions, region_id)
 
-        {:ok, wormhole_class} = _get_wormhole_class(wormhole_classes, wormhole_class_id)
+        {:ok, wormhole_class} = get_wormhole_class(wormhole_classes, wormhole_class_id)
 
-        {:ok, security} = _get_security(row["security"])
+        {:ok, security} = get_security(row["security"])
 
         {:ok, class_title} =
-          _get_class_title(
+          get_class_title(
             wormhole_classes_info,
             wormhole_class_id,
             security,
@@ -270,7 +270,7 @@ defmodule WandererApp.EveDataService do
           solar_system_id: solar_system_id,
           solar_system_name: row["solarSystemName"],
           solar_system_name_lc: row["solarSystemName"] |> String.downcase(),
-          sun_type_id: _get_sun_type_id(row["sunTypeID"]),
+          sun_type_id: get_sun_type_id(row["sunTypeID"]),
           constellation_name: constellation_name,
           region_name: region_name,
           security: security,
@@ -279,8 +279,8 @@ defmodule WandererApp.EveDataService do
           type_description: wormhole_class.title,
           is_shattered: is_shattered
         }
-        |> _get_wormhole_data(wormhole_systems, solar_system_id, wormhole_class)
-        |> _get_triglavian_data(triglavian_systems, solar_system_id)
+        |> get_wormhole_data(wormhole_systems, solar_system_id, wormhole_class)
+        |> get_triglavian_data(triglavian_systems, solar_system_id)
       end
     )
   end
@@ -332,14 +332,14 @@ defmodule WandererApp.EveDataService do
     )
   end
 
-  defp _get_sun_type_id(sun_type_id) do
+  defp get_sun_type_id(sun_type_id) do
     case sun_type_id do
       "None" -> 0
       _ -> sun_type_id |> Integer.parse() |> elem(0)
     end
   end
 
-  defp _get_wormhole_data(default_data, wormhole_systems, solar_system_id, wormhole_class) do
+  defp get_wormhole_data(default_data, wormhole_systems, solar_system_id, wormhole_class) do
     case Enum.find(wormhole_systems, fn system -> system.solar_system_id == solar_system_id end) do
       nil ->
         default_data
@@ -355,7 +355,7 @@ defmodule WandererApp.EveDataService do
     end
   end
 
-  defp _get_triglavian_data(default_data, triglavian_systems, solar_system_id) do
+  defp get_triglavian_data(default_data, triglavian_systems, solar_system_id) do
     case Enum.find(triglavian_systems, fn system -> system.solar_system_id == solar_system_id end) do
       nil ->
         default_data
@@ -370,14 +370,18 @@ defmodule WandererApp.EveDataService do
     end
   end
 
-  defp _get_security(security) do
+  defp get_security(security) do
     case security do
       nil -> {:ok, ""}
-      _ -> {:ok, Decimal.parse(security) |> elem(0) |> Decimal.round(1) |> Decimal.to_string()}
+      _ -> {:ok, String.to_float(security) |> get_true_security() |> Float.to_string(decimals: 1)}
     end
   end
 
-  defp _get_class_title(wormhole_classes_info, wormhole_class_id, security, wormhole_class) do
+  defp get_true_security(security) when is_float(security) and security > 0.0 and security < 0.05, do: security |> Float.ceil(1)
+
+  defp get_true_security(security) when is_float(security), do: security |> Float.floor(1)
+
+  defp get_class_title(wormhole_classes_info, wormhole_class_id, security, wormhole_class) do
     case wormhole_class_id in [
            wormhole_classes_info.names["hs"],
            wormhole_classes_info.names["ls"],
@@ -391,7 +395,7 @@ defmodule WandererApp.EveDataService do
     end
   end
 
-  defp _get_constellation_name(constellations, constellation_id) do
+  defp get_constellation_name(constellations, constellation_id) do
     case Enum.find(constellations, fn constellation ->
            constellation.constellation_id == constellation_id
          end) do
@@ -400,24 +404,24 @@ defmodule WandererApp.EveDataService do
     end
   end
 
-  defp _get_region_name(regions, region_id) do
+  defp get_region_name(regions, region_id) do
     case Enum.find(regions, fn region -> region.region_id == region_id end) do
       nil -> {:ok, ""}
       region -> {:ok, region.region_name}
     end
   end
 
-  defp _get_wormhole_class(wormhole_classes, wormhole_class_id) do
+  defp get_wormhole_class(wormhole_classes, wormhole_class_id) do
     {:ok,
      Enum.find(wormhole_classes, fn wormhole_class ->
        wormhole_class.wormhole_class_id == wormhole_class_id
      end)}
   end
 
-  defp _get_wormhole_class_id(_systems, _region_id, _constellation_id, 30_100_000),
+  defp get_wormhole_class_id(_systems, _region_id, _constellation_id, 30_100_000),
     do: {:ok, 10_100}
 
-  defp _get_wormhole_class_id(systems, region_id, constellation_id, solar_system_id) do
+  defp get_wormhole_class_id(systems, region_id, constellation_id, solar_system_id) do
     with region <-
            Enum.find(systems, fn system ->
              system.location_id |> Integer.parse() |> elem(0) == region_id
@@ -430,23 +434,23 @@ defmodule WandererApp.EveDataService do
            Enum.find(systems, fn system ->
              system.location_id |> Integer.parse() |> elem(0) == solar_system_id
            end),
-         wormhole_class_id <- _get_wormhole_class_id(region, constellation, solar_system) do
+         wormhole_class_id <- get_wormhole_class_id(region, constellation, solar_system) do
       {:ok, wormhole_class_id}
     else
       _ -> {:ok, -1}
     end
   end
 
-  defp _get_wormhole_class_id(_region, _constellation, solar_system)
+  defp get_wormhole_class_id(_region, _constellation, solar_system)
        when not is_nil(solar_system),
        do: solar_system.wormhole_class_id |> Integer.parse() |> elem(0)
 
-  defp _get_wormhole_class_id(_region, constellation, _solar_system)
+  defp get_wormhole_class_id(_region, constellation, _solar_system)
        when not is_nil(constellation),
        do: constellation.wormhole_class_id |> Integer.parse() |> elem(0)
 
-  defp _get_wormhole_class_id(region, _constellation, _solar_system) when not is_nil(region),
+  defp get_wormhole_class_id(region, _constellation, _solar_system) when not is_nil(region),
     do: region.wormhole_class_id |> Integer.parse() |> elem(0)
 
-  defp _get_wormhole_class_id(_region, _constellation, _solar_system), do: -1
+  defp get_wormhole_class_id(_region, _constellation, _solar_system), do: -1
 end

lib/wanderer_app/map/map_server_impl.ex

@@ -365,17 +365,7 @@ defmodule WandererApp.Map.Server.Impl do
     connections_to_remove
     |> Enum.each(fn connection ->
       @logger.debug(fn -> "Removing connection from map: #{inspect(connection)}" end)
-
-      connection
-      |> WandererApp.MapConnectionRepo.destroy!()
-      |> case do
-        :ok ->
-          :ok
-
-        {:error, error} ->
-          @logger.error("Failed to remove connection from map: #{inspect(error, pretty: true)}")
-          :ok
-      end
+      WandererApp.MapConnectionRepo.destroy(map_id, connection)
     end)
 
     @ddrt.delete(removed_ids, rtree_name)
@@ -1575,8 +1565,7 @@ defmodule WandererApp.Map.Server.Impl do
            old_location.solar_system_id
          ) do
       {:ok, connection} ->
-        connection
-        |> WandererApp.MapConnectionRepo.destroy!()
+        :ok = WandererApp.MapConnectionRepo.destroy(map_id, connection)
 
         broadcast!(map_id, :remove_connections, [connection])
         map_id |> WandererApp.Map.remove_connection(connection)

lib/wanderer_app/repositories/map_connection_repo.ex

@@ -1,12 +1,60 @@
 defmodule WandererApp.MapConnectionRepo do
   use WandererApp, :repository
 
+  require Logger
+
+  @logger Application.compile_env(:wanderer_app, :logger)
+
   def get_by_map(map_id),
     do: WandererApp.Api.MapConnection.read_by_map(%{map_id: map_id})
 
+  def get_by_locations(map_id, solar_system_source, solar_system_target) do
+    WandererApp.Api.MapConnection.by_locations(%{map_id: map_id, solar_system_source: solar_system_source, solar_system_target: solar_system_target})
+    |> case do
+      {:ok, connections} ->
+        {:ok, connections}
+
+      {:error, %Ash.Error.Query.NotFound{}} ->
+        {:ok, []}
+
+      {:error, error} ->
+        @logger.error("Failed to get connections: #{inspect(error, pretty: true)}")
+        {:error, error}
+    end
+  end
+
   def create!(connection), do: connection |> WandererApp.Api.MapConnection.create!()
 
-  def destroy!(connection), do: connection |> WandererApp.Api.MapConnection.destroy!()
+  def destroy(map_id, connection) do
+    {:ok, from_connections} = get_by_locations(map_id, connection.solar_system_source, connection.solar_system_target)
+    {:ok, to_connections} = get_by_locations(map_id, connection.solar_system_target, connection.solar_system_source)
+
+    [from_connections ++ to_connections]
+    |> List.flatten()
+    |> bulk_destroy!()
+    |> case do
+      :ok ->
+        :ok
+
+      error ->
+        @logger.error("Failed to remove connections from map: #{inspect(error, pretty: true)}")
+        :ok
+    end
+  end
+
+  def destroy!(connection), do:
+    connection |> WandererApp.Api.MapConnection.destroy!()
+
+  def bulk_destroy!(connections) do
+    connections
+    |> WandererApp.Api.MapConnection.destroy!()
+    |> case do
+      %Ash.BulkResult{status: :success} ->
+        :ok
+      error ->
+        error
+    end
+  end
 
   def update_time_status(connection, update),
     do:

mix.exs

@@ -2,7 +2,7 @@ defmodule WandererApp.MixProject do
   use Mix.Project
 
   @source_url "https://github.com/wanderer-industries/wanderer"
-  @version "1.2.3"
+  @version "1.3.0"
 
   def project do
     [