chore: release version v1.32.4

* add follow character functionality

CHANGELOG.md

@@ -2,6 +2,130 @@
 
 <!-- changelog -->
 
+## [v1.32.4](https://github.com/wanderer-industries/wanderer/compare/v1.32.3...v1.32.4) (2025-01-02)
+
+
+
+
+### Bug Fixes:
+
+* Map: Fix 'Character Activity' modal
+
+## [v1.32.3](https://github.com/wanderer-industries/wanderer/compare/v1.32.2...v1.32.3) (2025-01-02)
+
+
+
+
+### Bug Fixes:
+
+* Map: Fix 'Allow only tracked characters' saving
+
+## [v1.32.2](https://github.com/wanderer-industries/wanderer/compare/v1.32.1...v1.32.2) (2025-01-02)
+
+
+
+
+## [v1.32.1](https://github.com/wanderer-industries/wanderer/compare/v1.32.0...v1.32.1) (2024-12-25)
+
+
+
+
+## [v1.32.0](https://github.com/wanderer-industries/wanderer/compare/v1.31.0...v1.32.0) (2024-12-24)
+
+
+
+
+### Features:
+
+* Map: Add search & update manual adding systems API
+
+* Map: Add search & update manual adding systems API
+
+### Bug Fixes:
+
+* Map: Added ability to add new system to routes via routes widget
+
+* Map: Reworked add system to map
+
+## [v1.31.0](https://github.com/wanderer-industries/wanderer/compare/v1.30.2...v1.31.0) (2024-12-20)
+
+
+
+
+### Features:
+
+* Core: Show tracking for new users by default. Auto link characters to account fix. Add character loading indicators.
+
+## [v1.30.2](https://github.com/wanderer-industries/wanderer/compare/v1.30.1...v1.30.2) (2024-12-17)
+
+
+
+
+### Bug Fixes:
+
+* Map: Fixed problem with ship size change.
+
+## [v1.30.1](https://github.com/wanderer-industries/wanderer/compare/v1.30.0...v1.30.1) (2024-12-17)
+
+
+
+
+### Bug Fixes:
+
+* Map: Little rework Signatures header: change System Signatures to Signatures, and show selected system name instead.
+
+* Map: update default size of connections
+
+* Map: add ability set the size of wormhole and mark connection with label
+
+## [v1.30.0](https://github.com/wanderer-industries/wanderer/compare/v1.29.5...v1.30.0) (2024-12-16)
+
+
+
+
+### Features:
+
+* Map: Fixed incorrect wrapping labels of checkboxes in System Signatures, Local and Routes. Also changed dotlan links for k-spacem now it leads to region map before, for wh all stay as it was. Added ability to chane to softer background and remove dots on background of map. Also some small design issues. #2
+
+* Map: Fixed incorrect wrapping labels of checkboxes in System Signatures, Local and Routes. Also changed dotlan links for k-spacem now it leads to region map before, for wh all stay as it was. Added ability to chane to softer background and remove dots on background of map. Also some small design issues.
+
+### Bug Fixes:
+
+* Map: fixed U210, K346 for C4 shattered systems
+
+* Map: fixed U210, K346 for shattered systems. Fixed mass of mediums chains. Fixed size of some capital chains from 3M to 3.3M. Based on https://whtype.info/ data.
+
+* Map: removed unnecessary log
+
+* Map: Uncomment what should not be commented
+
+## [v1.29.5](https://github.com/wanderer-industries/wanderer/compare/v1.29.4...v1.29.5) (2024-12-14)
+
+
+
+
+### Bug Fixes:
+
+* Core: Fix character trackers cleanup
+
+## [v1.29.4](https://github.com/wanderer-industries/wanderer/compare/v1.29.3...v1.29.4) (2024-12-10)
+
+
+
+
+### Bug Fixes:
+
+* Core: Small fixes
+
+## [v1.29.3](https://github.com/wanderer-industries/wanderer/compare/v1.29.2...v1.29.3) (2024-12-07)
+
+
+
+
+### Bug Fixes:
+
+* Core: Increased eve DB data download timeout
+
 ## [v1.29.2](https://github.com/wanderer-industries/wanderer/compare/v1.29.1...v1.29.2) (2024-12-07)
 
 

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

@@ -108,3 +108,7 @@
 .p-dropdown-empty-message {
   padding: 0.25rem 0.5rem;
 }
+
+.p-autocomplete .p-autocomplete-multiple-container .p-autocomplete-token {
+  margin-right: 0 !important;
+}

assets/js/hooks/Mapper/components/contexts/ContextMenuSystem/useContextMenuSystemItems.tsx

@@ -8,6 +8,7 @@ import { useWaypointMenu } from '@/hooks/Mapper/components/contexts/hooks';
 import { FastSystemActions } from '@/hooks/Mapper/components/contexts/components';
 import { useMapCheckPermissions } from '@/hooks/Mapper/mapRootProvider/hooks/api';
 import { UserPermission } from '@/hooks/Mapper/types/permissions.ts';
+import { isWormholeSpace } from '@/hooks/Mapper/components/map/helpers/isWormholeSpace.ts';
 
 export const useContextMenuSystemItems = ({
   onDeleteSystem,
@@ -44,6 +45,8 @@ export const useContextMenuSystemItems = ({
             <FastSystemActions
               systemId={systemId}
               systemName={system.system_static_info.solar_system_name}
+              regionName={system.system_static_info.region_name}
+              isWH={isWormholeSpace(system.system_static_info.system_class)}
               showEdit
               onOpenSettings={onOpenSettings}
             />

assets/js/hooks/Mapper/components/contexts/ContextMenuSystemInfo/ContextMenuSystemInfo.tsx

@@ -10,6 +10,7 @@ import { WaypointSetContextHandler } from '@/hooks/Mapper/components/contexts/ty
 import { FastSystemActions } from '@/hooks/Mapper/components/contexts/components';
 import { useJumpPlannerMenu } from '@/hooks/Mapper/components/contexts/hooks';
 import { Route } from '@/hooks/Mapper/types/routes.ts';
+import { isWormholeSpace } from '@/hooks/Mapper/components/map/helpers/isWormholeSpace.ts';
 
 export interface ContextMenuSystemInfoProps {
   systemStatics: Map<number, SolarSystemStaticInfoRaw>;
@@ -48,7 +49,6 @@ export const ContextMenuSystemInfo: React.FC<ContextMenuSystemInfoProps> = ({
     if (!systemId || !system) {
       return [];
     }
-
     return [
       {
         className: classes.FastActions,
@@ -57,6 +57,8 @@ export const ContextMenuSystemInfo: React.FC<ContextMenuSystemInfoProps> = ({
             <FastSystemActions
               systemId={systemId}
               systemName={system.solar_system_name}
+              regionName={system.region_name}
+              isWH={isWormholeSpace(system.system_class)}
               onOpenSettings={onOpenSettings}
             />
           );

assets/js/hooks/Mapper/components/contexts/components/FastSystemActions/FastSystemActions.tsx

@@ -9,13 +9,22 @@ import { PrimeIcons } from 'primereact/api';
 export interface FastSystemActionsProps {
   systemId: string;
   systemName: string;
+  regionName: string;
+  isWH: boolean;
   showEdit?: boolean;
   onOpenSettings(): void;
 }
 
-export const FastSystemActions = ({ systemId, systemName, onOpenSettings, showEdit }: FastSystemActionsProps) => {
-  const ref = useRef({ systemId, systemName });
-  ref.current = { systemId, systemName };
+export const FastSystemActions = ({
+  systemId,
+  systemName,
+  regionName,
+  isWH,
+  onOpenSettings,
+  showEdit,
+}: FastSystemActionsProps) => {
+  const ref = useRef({ systemId, systemName, regionName, isWH });
+  ref.current = { systemId, systemName, regionName, isWH };
 
   const handleOpenZKB = useCallback(
     () => window.open(`https://zkillboard.com/system/${ref.current.systemId}`, '_blank'),
@@ -27,10 +36,17 @@ export const FastSystemActions = ({ systemId, systemName, onOpenSettings, showEd
     [],
   );
 
-  const handleOpenDotlan = useCallback(
-    () => window.open(`https://evemaps.dotlan.net/system/${ref.current.systemName}`, '_blank'),
-    [],
-  );
+  const handleOpenDotlan = useCallback(() => {
+    if (ref.current.isWH) {
+      window.open(`https://evemaps.dotlan.net/system/${ref.current.systemName}`, '_blank');
+      return;
+    }
+
+    return window.open(
+      `https://evemaps.dotlan.net/map/${ref.current.regionName.replace(/ /gim, '_')}/${ref.current.systemName}#jumps`,
+      '_blank',
+    );
+  }, []);
 
   const copySystemNameToClipboard = useCallback(async () => {
     try {
@@ -43,9 +59,9 @@ export const FastSystemActions = ({ systemId, systemName, onOpenSettings, showEd
   return (
     <LayoutEventBlocker className={clsx('flex px-2 gap-2 justify-between items-center h-full')}>
       <div className={clsx('flex gap-2 items-center h-full', classes.Links)}>
-        <WdImgButton source={ZKB_ICON} onClick={handleOpenZKB} />
-        <WdImgButton source={ANOIK_ICON} onClick={handleOpenAnoikis} />
-        <WdImgButton source={DOTLAN_ICON} onClick={handleOpenDotlan} />
+        <WdImgButton tooltip={{ content: 'Open zkillboard' }} source={ZKB_ICON} onClick={handleOpenZKB} />
+        <WdImgButton tooltip={{ content: 'Open Anoikis' }} source={ANOIK_ICON} onClick={handleOpenAnoikis} />
+        <WdImgButton tooltip={{ content: 'Open Dotlan' }} source={DOTLAN_ICON} onClick={handleOpenDotlan} />
       </div>
 
       <div className="flex gap-2 items-center pl-1">

assets/js/hooks/Mapper/components/map/Map.module.scss

@@ -2,3 +2,7 @@
   width: 100%;
   height: 100%;
 }
+
+.BackgroundAlternateColor {
+
+}

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

@@ -29,11 +29,12 @@ import {
   useContextMenuConnectionHandlers,
   useContextMenuRootHandlers,
 } from './components';
-import { OnMapSelectionChange } from './map.types';
+import { OnMapAddSystemCallback, OnMapSelectionChange } from './map.types';
 import { SESSION_KEY } from '@/hooks/Mapper/constants.ts';
 import { SolarSystemConnection, SolarSystemRawType } from '@/hooks/Mapper/types';
 import { ctxManager } from '@/hooks/Mapper/utils/contextManager.ts';
 import { NodeSelectionMouseHandler } from '@/hooks/Mapper/components/contexts/types.ts';
+import clsx from 'clsx';
 
 const DEFAULT_VIEW_PORT = { zoom: 1, x: 0, y: 0 };
 
@@ -91,12 +92,15 @@ interface MapCompProps {
   onSelectionChange: OnMapSelectionChange;
   onManualDelete(systems: string[]): void;
   onConnectionInfoClick?(e: SolarSystemConnection): void;
+  onAddSystem?: OnMapAddSystemCallback;
   onSelectionContextMenu?: NodeSelectionMouseHandler;
   minimapClasses?: string;
   isShowMinimap?: boolean;
   onSystemContextMenu: (event: MouseEvent<Element>, systemId: string) => void;
   showKSpaceBG?: boolean;
   isThickConnections?: boolean;
+  isShowBackgroundPattern?: boolean;
+  isSoftBackground?: boolean;
 }
 
 const MapComp = ({
@@ -111,6 +115,9 @@ const MapComp = ({
   isShowMinimap,
   showKSpaceBG,
   isThickConnections,
+  isShowBackgroundPattern,
+  isSoftBackground,
+  onAddSystem,
 }: MapCompProps) => {
   const { getNode } = useReactFlow();
   const [nodes, , onNodesChange] = useNodesState<Node<SolarSystemRawType>>(initialNodes);
@@ -118,7 +125,7 @@ const MapComp = ({
 
   useMapHandlers(refn, onSelectionChange);
   useUpdateNodes(nodes);
-  const { handleRootContext, ...rootCtxProps } = useContextMenuRootHandlers();
+  const { handleRootContext, ...rootCtxProps } = useContextMenuRootHandlers({ onAddSystem });
   const { handleConnectionContext, ...connectionCtxProps } = useContextMenuConnectionHandlers();
   const { update } = useMapState();
 
@@ -216,7 +223,7 @@ const MapComp = ({
 
   return (
     <>
-      <div className={classes.MapRoot}>
+      <div className={clsx(classes.MapRoot, { ['bg-neutral-900']: isSoftBackground })}>
         <ReactFlow
           nodes={nodes}
           edges={edges}
@@ -263,7 +270,7 @@ const MapComp = ({
           selectionMode={SelectionMode.Partial}
         >
           {isShowMinimap && <MiniMap pannable zoomable ariaLabel="Mini map" className={minimapClasses} />}
-          <Background />
+          {isShowBackgroundPattern && <Background />}
         </ReactFlow>
         {/* <button className="z-auto btn btn-primary absolute top-20 right-20" onClick={handleGetPassages}>
           Test // DON NOT REMOVE

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

@@ -6,7 +6,14 @@ import { Edge } from '@reactflow/core/dist/esm/types/edges';
 import { ConnectionType, MassState, ShipSizeStatus, SolarSystemConnection, TimeStatus } from '@/hooks/Mapper/types';
 import clsx from 'clsx';
 import classes from './ContextMenuConnection.module.scss';
-import { MASS_STATE_NAMES, MASS_STATE_NAMES_ORDER } from '@/hooks/Mapper/components/map/constants.ts';
+import {
+  MASS_STATE_NAMES,
+  MASS_STATE_NAMES_ORDER,
+  SHIP_SIZES_NAMES,
+  SHIP_SIZES_NAMES_ORDER,
+  SHIP_SIZES_NAMES_SHORT,
+  SHIP_SIZES_SIZE,
+} from '@/hooks/Mapper/components/map/constants.ts';
 
 export interface ContextMenuConnectionProps {
   contextMenuRef: RefObject<ContextMenu>;
@@ -48,10 +55,6 @@ export const ContextMenuConnection: React.FC<ContextMenuConnectionProps> = ({
               icon: PrimeIcons.CLOCK,
               command: onChangeTimeState,
             },
-          ]
-        : []),
-      ...(isWormhole
-        ? [
             {
               label: `Frigate`,
               className: clsx({
@@ -60,13 +63,9 @@ export const ContextMenuConnection: React.FC<ContextMenuConnectionProps> = ({
               icon: PrimeIcons.CLOUD,
               command: () =>
                 onChangeShipSizeStatus(
-                  edge.data?.ship_size_type === ShipSizeStatus.small ? ShipSizeStatus.normal : ShipSizeStatus.small,
+                  edge.data?.ship_size_type === ShipSizeStatus.small ? ShipSizeStatus.large : ShipSizeStatus.small,
                 ),
             },
-          ]
-        : []),
-      ...(isWormhole
-        ? [
             {
               label: `Save mass`,
               className: clsx({
@@ -75,19 +74,40 @@ export const ContextMenuConnection: React.FC<ContextMenuConnectionProps> = ({
               icon: PrimeIcons.LOCK,
               command: () => onToggleMassSave(!edge.data?.locked),
             },
-          ]
-        : []),
-      ...(isWormhole && !isFrigateSize
-        ? [
+            ...(!isFrigateSize
+              ? [
+                  {
+                    label: `Mass status`,
+                    icon: PrimeIcons.CHART_PIE,
+                    items: MASS_STATE_NAMES_ORDER.map(x => ({
+                      label: MASS_STATE_NAMES[x],
+                      className: clsx({
+                        [classes.SelectedItem]: edge.data?.mass_status === x,
+                      }),
+                      command: () => onChangeMassState(x),
+                    })),
+                  },
+                ]
+              : []),
+
             {
-              label: `Mass status`,
-              icon: PrimeIcons.CHART_PIE,
-              items: MASS_STATE_NAMES_ORDER.map(x => ({
-                label: MASS_STATE_NAMES[x],
+              label: `Ship Size`,
+              icon: PrimeIcons.CLOUD,
+              items: SHIP_SIZES_NAMES_ORDER.map(x => ({
+                label: (
+                  <div className="grid grid-cols-[20px_120px_1fr_40px] gap-2 items-center">
+                    <div className="text-[12px] font-bold text-stone-400">{SHIP_SIZES_NAMES_SHORT[x]}</div>
+                    <div>{SHIP_SIZES_NAMES[x]}</div>
+                    <div></div>
+                    <div className="flex justify-end whitespace-nowrap text-[12px] font-bold text-stone-500">
+                      {SHIP_SIZES_SIZE[x]} t.
+                    </div>
+                  </div>
+                ) as unknown as string, // TODO my lovely kostyl
                 className: clsx({
-                  [classes.SelectedItem]: edge.data?.mass_status === x,
+                  [classes.SelectedItem]: edge.data?.ship_size_type === x,
                 }),
-                command: () => onChangeMassState(x),
+                command: () => onChangeShipSizeStatus(x),
               })),
             },
           ]
@@ -98,7 +118,7 @@ export const ContextMenuConnection: React.FC<ContextMenuConnectionProps> = ({
         command: onDeleteConnection,
       },
     ];
-  }, [edge, onChangeTimeState, onDeleteConnection, onChangeMassState, onChangeShipSizeStatus]);
+  }, [edge, onChangeTimeState, onDeleteConnection, onChangeShipSizeStatus, onToggleMassSave, onChangeMassState]);
 
   return (
     <>

assets/js/hooks/Mapper/components/map/components/ContextMenuConnection/useContextMenuConnectionHandlers.ts

@@ -97,14 +97,16 @@ export const useContextMenuConnectionHandlers = () => {
       },
     });
 
-    outCommand({
-      type: OutCommand.updateConnectionMassStatus,
-      data: {
-        source: edge.source,
-        target: edge.target,
-        value: MassState.normal,
-      },
-    });
+    if (status === ShipSizeStatus.small) {
+      outCommand({
+        type: OutCommand.updateConnectionMassStatus,
+        data: {
+          source: edge.source,
+          target: edge.target,
+          value: MassState.normal,
+        },
+      });
+    }
   }, []);
 
   const onToggleMassSave = useCallback((locked: boolean) => {

assets/js/hooks/Mapper/components/map/components/ContextMenuRoot/useContextMenuRootHandlers.ts

@@ -1,14 +1,16 @@
 import { useReactFlow, XYPosition } from 'reactflow';
-import React, { useRef, useState } from 'react';
+import React, { useCallback, useRef, useState } from 'react';
 import { ContextMenu } from 'primereact/contextmenu';
-import { useMapState } from '../../MapProvider.tsx';
-import { OutCommand } from '@/hooks/Mapper/types/mapHandlers.ts';
 import { ctxManager } from '@/hooks/Mapper/utils/contextManager.ts';
+import { OnMapAddSystemCallback } from '@/hooks/Mapper/components/map/map.types.ts';
 
-export const useContextMenuRootHandlers = () => {
+type UseContextMenuRootHandlers = {
+  onAddSystem?: OnMapAddSystemCallback;
+};
+
+export const useContextMenuRootHandlers = ({ onAddSystem }: UseContextMenuRootHandlers = {}) => {
   const rf = useReactFlow();
   const contextMenuRef = useRef<ContextMenu | null>(null);
-  const { outCommand } = useMapState();
   const [position, setPosition] = useState<XYPosition | null>(null);
 
   const handleRootContext = (e: React.MouseEvent<HTMLDivElement>) => {
@@ -18,14 +20,17 @@ export const useContextMenuRootHandlers = () => {
     contextMenuRef.current?.show(e);
   };
 
-  const onAddSystem = () => {
-    outCommand({ type: OutCommand.manualAddSystem, data: { coordinates: position } });
-  };
+  const ref = useRef({ onAddSystem, position });
+  ref.current = { onAddSystem, position };
+
+  const onAddSystemCallback = useCallback(() => {
+    ref.current.onAddSystem?.({ coordinates: position });
+  }, [position]);
 
   return {
     handleRootContext,
 
     contextMenuRef,
-    onAddSystem,
+    onAddSystem: onAddSystemCallback,
   };
 };

assets/js/hooks/Mapper/components/map/components/SolarSystemEdge/SolarSystemEdge.module.scss

@@ -13,11 +13,11 @@
   stroke-width: 2px;
 
   &.MassVerge:not(&.Frigate) {
-    stroke: #af2900;
+    stroke: #af0000;
   }
 
   &.MassHalf:not(&.Frigate) {
-    stroke: #a85f00;
+    stroke: #ffd700;
   }
 
   &.Frigate {

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

@@ -8,6 +8,7 @@ import { ConnectionType, MassState, ShipSizeStatus, SolarSystemConnection, TimeS
 import { PrimeIcons } from 'primereact/api';
 import { WdTooltipWrapper } from '@/hooks/Mapper/components/ui-kit/WdTooltipWrapper';
 import { useMapState } from '@/hooks/Mapper/components/map/MapProvider.tsx';
+import { SHIP_SIZES_DESCRIPTION, SHIP_SIZES_NAMES_SHORT } from '@/hooks/Mapper/components/map/constants.ts';
 
 const MAP_TRANSLATES: Record<string, string> = {
   [Position.Top]: 'translate(-48%, 0%)',
@@ -30,6 +31,14 @@ const MAP_OFFSETS: Record<string, { x: number; y: number }> = {
   [Position.Right]: { x: 0, y: 0 },
 };
 
+export const SHIP_SIZES_COLORS = {
+  [ShipSizeStatus.small]: 'bg-indigo-400',
+  [ShipSizeStatus.medium]: 'bg-cyan-500',
+  [ShipSizeStatus.large]: '',
+  [ShipSizeStatus.freight]: 'bg-lime-400',
+  [ShipSizeStatus.capital]: 'bg-red-400',
+};
+
 export const SolarSystemEdge = ({ id, source, target, markerEnd, style, data }: EdgeProps<SolarSystemConnection>) => {
   const sourceNode = useStore(useCallback(store => store.nodeInternals.get(source), [source]));
   const targetNode = useStore(useCallback(store => store.nodeInternals.get(target), [target]));
@@ -137,6 +146,19 @@ export const SolarSystemEdge = ({ id, source, target, markerEnd, style, data }:
               <span className={clsx(PrimeIcons.LOCK, classes.icon)} />
             </WdTooltipWrapper>
           )}
+
+          {isWormhole && data.ship_size_type !== ShipSizeStatus.large && (
+            <WdTooltipWrapper
+              content={SHIP_SIZES_DESCRIPTION[data.ship_size_type]}
+              className={clsx(
+                classes.LinkLabel,
+                'pointer-events-auto rounded opacity-100 cursor-auto text-neutral-900 font-bold',
+                SHIP_SIZES_COLORS[data.ship_size_type],
+              )}
+            >
+              {SHIP_SIZES_NAMES_SHORT[data.ship_size_type]}
+            </WdTooltipWrapper>
+          )}
         </div>
       </EdgeLabelRenderer>
     </>

assets/js/hooks/Mapper/components/map/constants.ts

@@ -1,4 +1,4 @@
-import { ConnectionType, MassState } from '@/hooks/Mapper/types';
+import { ConnectionType, MassState, ShipSizeStatus } from '@/hooks/Mapper/types';
 
 export enum SOLAR_SYSTEM_CLASS_IDS {
   ccp1 = -1,
@@ -727,16 +727,41 @@ export const MASS_STATE_NAMES = {
   [MassState.verge]: 'Verge of collapse',
 };
 
-// export const SHIP_SIZES_NAMES_ORDER = [
-//   ShipSizeStatus.small,
-//   ShipSizeStatus.normal,
-//   // ShipSizeStatus.large,
-//   // ShipSizeStatus.capital,
-// ];
-//
-// export const SHIP_SIZES_NAMES = {
-//   [ShipSizeStatus.small]: 'Frigate',
-//   [ShipSizeStatus.normal]: 'Normal',
-//   // [ShipSizeStatus.large]: 'Normal',
-//   // [ShipSizeStatus.capital]: 'Normal',
-// };
+export const SHIP_SIZES_NAMES_ORDER = [
+  ShipSizeStatus.small,
+  ShipSizeStatus.medium,
+  ShipSizeStatus.large,
+  ShipSizeStatus.freight,
+  ShipSizeStatus.capital,
+];
+
+export const SHIP_SIZES_NAMES = {
+  [ShipSizeStatus.small]: 'Frigate',
+  [ShipSizeStatus.medium]: 'Medium',
+  [ShipSizeStatus.large]: 'Normal',
+  [ShipSizeStatus.freight]: 'Huge',
+  [ShipSizeStatus.capital]: 'Capital',
+};
+export const SHIP_SIZES_SIZE = {
+  [ShipSizeStatus.small]: '5K',
+  [ShipSizeStatus.medium]: '62K',
+  [ShipSizeStatus.large]: '375K',
+  [ShipSizeStatus.freight]: '1M',
+  [ShipSizeStatus.capital]: '2M',
+};
+
+export const SHIP_SIZES_DESCRIPTION = {
+  [ShipSizeStatus.small]: 'Frigate wormhole - up to Destroyer | 5K t.',
+  [ShipSizeStatus.medium]: 'Cruise wormhole - up to Battlecruiser | 62K t.',
+  [ShipSizeStatus.large]: 'Large wormhole - up to Battleship | 375K t.',
+  [ShipSizeStatus.freight]: 'Huge wormhole - up to Freighter | 1M t.',
+  [ShipSizeStatus.capital]: 'Capital wormhole - up to Capital | 2M t.',
+};
+
+export const SHIP_SIZES_NAMES_SHORT = {
+  [ShipSizeStatus.small]: 'S',
+  [ShipSizeStatus.medium]: 'M',
+  [ShipSizeStatus.large]: 'L',
+  [ShipSizeStatus.freight]: 'H',
+  [ShipSizeStatus.capital]: 'XL',
+};

assets/js/hooks/Mapper/components/map/map.types.ts

@@ -1,5 +1,6 @@
 import { SolarSystemRawType } from '@/hooks/Mapper/types/system';
 import { SolarSystemConnection } from '@/hooks/Mapper/types';
+import { XYPosition } from 'reactflow';
 
 export type MapSolarSystemType = Omit<SolarSystemRawType, 'position'>;
 
@@ -7,3 +8,5 @@ export type OnMapSelectionChange = (event: {
   systems: string[];
   connections: Pick<SolarSystemConnection, 'source' | 'target'>[];
 }) => void;
+
+export type OnMapAddSystemCallback = (props: { coordinates: XYPosition | null }) => void;

assets/js/hooks/Mapper/components/mapInterface/components/AddSystemDialog/AddSystemDialog.module.scss

@@ -0,0 +1,10 @@
+.SearchItem {
+  & > * {
+    font-size: 13px !important;
+  }
+}
+
+.SearchItemEffect {
+  font-weight: initial !important;
+}
+

assets/js/hooks/Mapper/components/mapInterface/components/AddSystemDialog/AddSystemDialog.tsx

@@ -0,0 +1,203 @@
+import { Dialog } from 'primereact/dialog';
+import { useMapRootState } from '@/hooks/Mapper/mapRootProvider';
+import { useCallback, useRef, useState } from 'react';
+import { Button } from 'primereact/button';
+import { IconField } from 'primereact/iconfield';
+import { AutoComplete } from 'primereact/autocomplete';
+import { OutCommand, SearchSystemItem } from '@/hooks/Mapper/types';
+import { SystemViewStandalone, WHClassView, WHEffectView } from '@/hooks/Mapper/components/ui-kit';
+import classes from './AddSystemDialog.module.scss';
+
+import clsx from 'clsx';
+import { isWormholeSpace } from '@/hooks/Mapper/components/map/helpers/isWormholeSpace.ts';
+import { sortWHClasses } from '@/hooks/Mapper/helpers';
+
+export type SearchOnSubmitCallback = (item: SearchSystemItem) => void;
+
+interface AddSystemDialogProps {
+  title?: string;
+  visible: boolean;
+  setVisible: (visible: boolean) => void;
+  onSubmit?: SearchOnSubmitCallback;
+  excludedSystems?: number[];
+}
+
+export const AddSystemDialog = ({
+  title = 'Add system',
+  visible,
+  setVisible,
+  onSubmit,
+  excludedSystems = [],
+}: AddSystemDialogProps) => {
+  const {
+    outCommand,
+    data: { wormholesData },
+  } = useMapRootState();
+
+  const inputRef = useRef<any>();
+  const onShow = useCallback(() => {
+    inputRef.current?.focus();
+  }, []);
+
+  const [filteredItems, setFilteredItems] = useState<SearchSystemItem[]>([]);
+  const [selectedItem, setSelectedItem] = useState<SearchSystemItem[] | null>(null);
+
+  const searchItems = useCallback(
+    async (event: { query: string }) => {
+      if (event.query.length < 2) {
+        setFilteredItems([]);
+        return;
+      }
+
+      const query = event.query;
+
+      if (query.length === 0) {
+        setFilteredItems([]);
+      } else {
+        try {
+          const result = await outCommand({
+            type: OutCommand.searchSystems,
+            data: {
+              text: query,
+            },
+          });
+
+          let prepared = (result.systems as SearchSystemItem[]).sort((a, b) => {
+            const amatch = a.label.indexOf(query);
+            const bmatch = b.label.indexOf(query);
+            return amatch - bmatch;
+          });
+
+          if (excludedSystems) {
+            prepared = prepared.filter(x => !excludedSystems.includes(x.system_static_info.solar_system_id));
+          }
+
+          setFilteredItems(prepared);
+        } catch (error) {
+          console.error('Error fetching data:', error);
+          setFilteredItems([]);
+        }
+      }
+    },
+    [excludedSystems, outCommand],
+  );
+
+  const ref = useRef({ onSubmit, selectedItem });
+  ref.current = { onSubmit, selectedItem };
+
+  const handleSubmit = useCallback(() => {
+    const { onSubmit, selectedItem } = ref.current;
+    setFilteredItems([]);
+    setSelectedItem([]);
+
+    if (!selectedItem) {
+      setVisible(false);
+      return;
+    }
+
+    onSubmit?.(selectedItem[0]);
+    setVisible(false);
+  }, [setVisible]);
+
+  return (
+    <Dialog
+      header={title}
+      visible={visible}
+      draggable={false}
+      style={{ width: '520px' }}
+      onShow={onShow}
+      onHide={() => {
+        if (!visible) {
+          return;
+        }
+
+        setVisible(false);
+      }}
+    >
+      <div className="flex flex-col gap-3 px-1.5">
+        <div className="flex flex-col gap-2 py-3.5">
+          <div className="flex flex-col gap-1">
+            <IconField>
+              <AutoComplete
+                ref={inputRef}
+                multiple
+                showEmptyMessage
+                scrollHeight="300px"
+                value={selectedItem}
+                suggestions={filteredItems}
+                completeMethod={searchItems}
+                onChange={e => {
+                  setSelectedItem(e.value.length < 2 ? e.value : [e.value[e.value.length - 1]]);
+                }}
+                emptyMessage="Not found any system..."
+                placeholder="Type here..."
+                field="label"
+                id="value"
+                className="w-full"
+                itemTemplate={(item: SearchSystemItem) => {
+                  const { security, system_class, effect_power, effect_name, statics } = item.system_static_info;
+                  const sortedStatics = sortWHClasses(wormholesData, statics);
+                  const isWH = isWormholeSpace(system_class);
+
+                  return (
+                    <div className={clsx('flex gap-1.5', classes.SearchItem)}>
+                      <SystemViewStandalone
+                        security={security}
+                        system_class={system_class}
+                        solar_system_id={item.value}
+                        class_title={item.class_title}
+                        solar_system_name={item.label}
+                        region_name={item.region_name}
+                      />
+
+                      {effect_name && isWH && (
+                        <WHEffectView
+                          effectName={effect_name}
+                          effectPower={effect_power}
+                          className={classes.SearchItemEffect}
+                        />
+                      )}
+
+                      {isWH && (
+                        <div className="flex gap-1 grow justify-between">
+                          <div></div>
+                          <div className="flex gap-1">
+                            {sortedStatics.map(x => (
+                              <WHClassView key={x} whClassName={x} />
+                            ))}
+                          </div>
+                        </div>
+                      )}
+                    </div>
+                  );
+                }}
+                selectedItemTemplate={(item: SearchSystemItem) => (
+                  <SystemViewStandalone
+                    security={item.system_static_info.security}
+                    system_class={item.system_static_info.system_class}
+                    solar_system_id={item.value}
+                    class_title={item.class_title}
+                    solar_system_name={item.label}
+                    region_name={item.region_name}
+                  />
+                )}
+              />
+            </IconField>
+
+            <span className="text-[12px] text-stone-400 ml-1">*to search type at least 2 symbols.</span>
+          </div>
+        </div>
+
+        <div className="flex gap-2 justify-end">
+          <Button
+            onClick={handleSubmit}
+            outlined
+            disabled={!selectedItem || selectedItem.length !== 1}
+            size="small"
+            label="Submit"
+          />
+        </div>
+      </div>
+    </Dialog>
+  );
+};

assets/js/hooks/Mapper/components/mapInterface/components/AddSystemDialog/index.ts

@@ -0,0 +1 @@
+export * from './AddSystemDialog';

assets/js/hooks/Mapper/components/mapInterface/widgets/LocalCharacters/LocalCharacters.tsx

@@ -1,4 +1,4 @@
-import { useCallback, useMemo } from 'react';
+import { useCallback, useMemo, useRef } from 'react';
 import { Widget } from '@/hooks/Mapper/components/mapInterface/components';
 import { useMapRootState } from '@/hooks/Mapper/mapRootProvider';
 import { VirtualScroller, VirtualScrollerTemplateOptions } from 'primereact/virtualscroller';
@@ -10,6 +10,8 @@ import { sortCharacters } from '@/hooks/Mapper/components/mapInterface/helpers/s
 import useLocalStorageState from 'use-local-storage-state';
 import { useMapCheckPermissions, useMapGetOption } from '@/hooks/Mapper/mapRootProvider/hooks/api';
 import { UserPermission } from '@/hooks/Mapper/types/permissions.ts';
+import useMaxWidth from '@/hooks/Mapper/hooks/useMaxWidth.ts';
+import { WdTooltipWrapper } from '@/hooks/Mapper/components/ui-kit/WdTooltipWrapper';
 
 type CharItemProps = {
   compact: boolean;
@@ -92,21 +94,26 @@ export const LocalCharacters = () => {
   const isNotSelectedSystem = selectedSystems.length !== 1;
   const showList = sorted.length > 0 && selectedSystems.length === 1;
 
+  const ref = useRef<HTMLDivElement>(null);
+  const compact = useMaxWidth(ref, 145);
+
   return (
     <Widget
       label={
-        <div className="flex justify-between items-center text-xs w-full">
+        <div className="flex justify-between items-center text-xs w-full" ref={ref}>
           <span className="select-none">Local{showList ? ` [${sorted.length}]` : ''}</span>
           <LayoutEventBlocker className="flex items-center gap-2">
             {showOffline && (
-              <WdCheckbox
-                size="xs"
-                labelSide="left"
-                label={'Show offline'}
-                value={settings.showOffline}
-                classNameLabel="text-stone-400 hover:text-stone-200 transition duration-300"
-                onChange={() => setSettings(() => ({ ...settings, showOffline: !settings.showOffline }))}
-              />
+              <WdTooltipWrapper content="Show offline characters in system">
+                <WdCheckbox
+                  size="xs"
+                  labelSide="left"
+                  label={compact ? '' : 'Show offline'}
+                  value={settings.showOffline}
+                  classNameLabel="text-stone-400 hover:text-stone-200 transition duration-300"
+                  onChange={() => setSettings(() => ({ ...settings, showOffline: !settings.showOffline }))}
+                />
+              </WdTooltipWrapper>
             )}
 
             <span

assets/js/hooks/Mapper/components/mapInterface/widgets/RoutesWidget/RoutesWidget.tsx

@@ -19,6 +19,13 @@ import { PrimeIcons } from 'primereact/api';
 import { RoutesSettingsDialog } from './RoutesSettingsDialog';
 import { RoutesProvider, useRouteProvider } from './RoutesProvider.tsx';
 import { ContextMenuSystemInfo, useContextMenuSystemInfoHandlers } from '@/hooks/Mapper/components/contexts';
+import useMaxWidth from '@/hooks/Mapper/hooks/useMaxWidth.ts';
+import { WdTooltipWrapper } from '@/hooks/Mapper/components/ui-kit/WdTooltipWrapper';
+import {
+  AddSystemDialog,
+  SearchOnSubmitCallback,
+} from '@/hooks/Mapper/components/mapInterface/components/AddSystemDialog';
+import { OutCommand } from '@/hooks/Mapper/types';
 
 const sortByDist = (a: Route, b: Route) => {
   const distA = a.has_connection ? a.systems?.length || 0 : Infinity;
@@ -161,6 +168,12 @@ export const RoutesWidgetContent = () => {
 export const RoutesWidgetComp = () => {
   const [routeSettingsVisible, setRouteSettingsVisible] = useState(false);
   const { data, update } = useRouteProvider();
+  const {
+    data: { hubs = [] },
+    outCommand,
+  } = useMapRootState();
+
+  const preparedHubs = useMemo(() => hubs.map(x => parseInt(x)), [hubs]);
 
   const isSecure = data.path_type === 'secure';
   const handleSecureChange = useCallback(() => {
@@ -170,27 +183,70 @@ export const RoutesWidgetComp = () => {
     });
   }, [data, update]);
 
+  const ref = useRef<HTMLDivElement>(null);
+  const compact = useMaxWidth(ref, 155);
+  const [openAddSystem, setOpenAddSystem] = useState<boolean>(false);
+
+  const onAddSystem = useCallback(() => setOpenAddSystem(true), []);
+
+  const handleSubmitAddSystem: SearchOnSubmitCallback = useCallback(
+    async item => {
+      if (preparedHubs.includes(item.value)) {
+        return;
+      }
+
+      await outCommand({
+        type: OutCommand.addHub,
+        data: { system_id: item.value },
+      });
+    },
+    [hubs, outCommand],
+  );
+
   return (
     <Widget
       label={
-        <div className="flex justify-between items-center text-xs w-full">
+        <div className="flex justify-between items-center text-xs w-full" ref={ref}>
           <span className="select-none">Routes</span>
           <LayoutEventBlocker className="flex items-center gap-2">
-            <WdCheckbox
-              size="xs"
-              labelSide="left"
-              label={'Show shortest'}
-              value={!isSecure}
-              onChange={handleSecureChange}
-              classNameLabel={clsx('text-red-400')}
+            <WdImgButton
+              className={PrimeIcons.PLUS_CIRCLE}
+              onClick={onAddSystem}
+              tooltip={{
+                content: 'Click here to add new system to routes',
+              }}
+            />
+
+            <WdTooltipWrapper content="Show shortest route">
+              <WdCheckbox
+                size="xs"
+                labelSide="left"
+                label={compact ? '' : 'Show shortest'}
+                value={!isSecure}
+                onChange={handleSecureChange}
+                classNameLabel={clsx('text-red-400')}
+              />
+            </WdTooltipWrapper>
+            <WdImgButton
+              className={PrimeIcons.SLIDERS_H}
+              onClick={() => setRouteSettingsVisible(true)}
+              tooltip={{
+                content: 'Click here to open Routes settings',
+              }}
             />
-            <WdImgButton className={PrimeIcons.SLIDERS_H} onClick={() => setRouteSettingsVisible(true)} />
           </LayoutEventBlocker>
         </div>
       }
     >
       <RoutesWidgetContent />
       <RoutesSettingsDialog visible={routeSettingsVisible} setVisible={setRouteSettingsVisible} />
+
+      <AddSystemDialog
+        title="Add system to routes"
+        visible={openAddSystem}
+        setVisible={() => setOpenAddSystem(false)}
+        onSubmit={handleSubmitAddSystem}
+      />
     </Widget>
   );
 };

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

@@ -2,30 +2,33 @@ import { Widget } from '@/hooks/Mapper/components/mapInterface/components';
 import {
   InfoDrawer,
   LayoutEventBlocker,
+  SystemView,
   TooltipPosition,
-  WdImgButton,
   WdCheckbox,
+  WdImgButton,
 } from '@/hooks/Mapper/components/ui-kit';
 import { SystemSignaturesContent } from './SystemSignaturesContent';
 import {
-  Setting,
-  SystemSignatureSettingsDialog,
-  COSMIC_SIGNATURE,
   COSMIC_ANOMALY,
+  COSMIC_SIGNATURE,
   DEPLOYABLE,
-  STRUCTURE,
-  STARBASE,
-  SHIP,
   DRONE,
+  Setting,
+  SHIP,
+  STARBASE,
+  STRUCTURE,
+  SystemSignatureSettingsDialog,
 } from './SystemSignatureSettingsDialog';
 import { SignatureGroup } from '@/hooks/Mapper/types';
 
-import React, { useCallback, useEffect, useState, useMemo } from 'react';
+import React, { useCallback, useEffect, useMemo, useRef, useState } from 'react';
 
 import { PrimeIcons } from 'primereact/api';
 
 import { useMapRootState } from '@/hooks/Mapper/mapRootProvider';
 import { CheckboxChangeEvent } from 'primereact/checkbox';
+import useMaxWidth from '@/hooks/Mapper/hooks/useMaxWidth.ts';
+import { WdTooltipWrapper } from '@/hooks/Mapper/components/ui-kit/WdTooltipWrapper';
 
 const SIGNATURE_SETTINGS_KEY = 'wanderer_system_signature_settings_v5_2';
 export const SHOW_DESCRIPTION_COLUMN_SETTING = 'show_description_column_setting';
@@ -96,21 +99,33 @@ export const SystemSignatures = () => {
     }
   }, []);
 
+  const ref = useRef<HTMLDivElement>(null);
+  const compact = useMaxWidth(ref, 260);
+
   return (
     <Widget
       label={
-        <div className="flex justify-between items-center text-xs w-full h-full">
-          <div className="flex gap-1">System Signatures</div>
+        <div className="flex justify-between items-center text-xs w-full h-full" ref={ref}>
+          <div className="flex justify-between items-center gap-1">
+            {!compact && (
+              <div className="flex whitespace-nowrap text-ellipsis overflow-hidden text-stone-400">
+                Signatures {isNotSelectedSystem ? '' : 'in'}
+              </div>
+            )}
+            {!isNotSelectedSystem && <SystemView systemId={systemId} className="select-none text-center" hideRegion />}
+          </div>
 
           <LayoutEventBlocker className="flex gap-2.5">
-            <WdCheckbox
-              size="xs"
-              labelSide="left"
-              label={'Lazy delete'}
-              value={lazyDeleteValue}
-              classNameLabel="text-stone-400 hover:text-stone-200 transition duration-300"
-              onChange={(event: CheckboxChangeEvent) => handleLazyDeleteChange(!!event.checked)}
-            />
+            <WdTooltipWrapper content="Enable Lazy delete">
+              <WdCheckbox
+                size="xs"
+                labelSide="left"
+                label={compact ? '' : 'Lazy delete'}
+                value={lazyDeleteValue}
+                classNameLabel="text-stone-400 hover:text-stone-200 transition duration-300 whitespace-nowrap text-ellipsis overflow-hidden"
+                onChange={(event: CheckboxChangeEvent) => handleLazyDeleteChange(!!event.checked)}
+              />
+            </WdTooltipWrapper>
 
             <WdImgButton
               className={PrimeIcons.QUESTION_CIRCLE}

assets/js/hooks/Mapper/components/mapRootContent/components/MapSettings/MapSettings.tsx

@@ -58,11 +58,13 @@ const SIGNATURES_CHECKBOXES_PROPS: CheckboxesList = [
 
 const CONNECTIONS_CHECKBOXES_PROPS: CheckboxesList = [
   { prop: UserSettingsRemoteProps.delete_connection_with_sigs, label: 'Delete connections to linked signatures' },
+  { prop: InterfaceStoredSettingsProps.isThickConnections, label: 'Thicker connections' },
 ];
 
 const UI_CHECKBOXES_PROPS: CheckboxesList = [
   { prop: InterfaceStoredSettingsProps.isShowMenu, label: 'Enable compact map menu bar' },
-  { prop: InterfaceStoredSettingsProps.isThickConnections, label: 'Thicker connections' },
+  { prop: InterfaceStoredSettingsProps.isShowBackgroundPattern, label: 'Show background pattern' },
+  { prop: InterfaceStoredSettingsProps.isSoftBackground, label: 'Enable soft background' },
 ];
 
 export const MapSettings = ({ show, onHide }: MapSettingsProps) => {

assets/js/hooks/Mapper/components/mapRootContent/components/SignatureSettings/components/SignatureWormholeTypeSelect/SignatureWormholeTypeSelect.tsx

@@ -17,7 +17,17 @@ const getPossibleWormholes = (systemStatic: SolarSystemStaticInfoRaw, wormholes:
 
   // @ts-ignore
   const spawnClassGroup = SOLAR_SYSTEM_CLASSES_TO_CLASS_GROUPS[whType];
-  const possibleWHTypes = wormholes.filter(x => x.src.includes(spawnClassGroup));
+  const possibleWHTypes = wormholes.filter(x => {
+    return x.src.some(x => {
+      const [group, type] = x.split('-');
+
+      if (type === 'shattered') {
+        return systemStatic.is_shattered && group === spawnClassGroup;
+      }
+
+      return group === spawnClassGroup;
+    });
+  });
 
   return {
     statics: possibleWHTypes

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

@@ -2,7 +2,7 @@ import { Map } from '@/hooks/Mapper/components/map/Map.tsx';
 import { useCallback, useRef, useState } from 'react';
 import { OutCommand, OutCommandHandler, SolarSystemConnection } from '@/hooks/Mapper/types';
 import { MapRootData, useMapRootState } from '@/hooks/Mapper/mapRootProvider';
-import { OnMapSelectionChange } from '@/hooks/Mapper/components/map/map.types.ts';
+import { OnMapAddSystemCallback, OnMapSelectionChange } from '@/hooks/Mapper/components/map/map.types.ts';
 import isEqual from 'lodash.isequal';
 import { ContextMenuSystem, useContextMenuSystemHandlers } from '@/hooks/Mapper/components/contexts';
 import {
@@ -14,14 +14,18 @@ import classes from './MapWrapper.module.scss';
 import { Connections } from '@/hooks/Mapper/components/mapRootContent/components/Connections';
 import { ContextMenuSystemMultiple, useContextMenuSystemMultipleHandlers } from '../contexts/ContextMenuSystemMultiple';
 import { getSystemById } from '@/hooks/Mapper/helpers';
-import { Node } from 'reactflow';
+import { Node, XYPosition } from 'reactflow';
 
 import { Commands } from '@/hooks/Mapper/types/mapHandlers.ts';
-import { useMapEventListener } from '@/hooks/Mapper/events';
+import { emitMapEvent, useMapEventListener } from '@/hooks/Mapper/events';
 
 import { STORED_INTERFACE_DEFAULT_VALUES } from '@/hooks/Mapper/mapRootProvider/MapRootProvider';
 import { useDeleteSystems } from '@/hooks/Mapper/components/contexts/hooks';
 import { useCommonMapEventProcessor } from '@/hooks/Mapper/components/mapWrapper/hooks/useCommonMapEventProcessor.ts';
+import {
+  AddSystemDialog,
+  SearchOnSubmitCallback,
+} from '@/hooks/Mapper/components/mapInterface/components/AddSystemDialog';
 
 // TODO: INFO - this component needs for abstract work with Map instance
 export const MapWrapper = () => {
@@ -34,6 +38,8 @@ export const MapWrapper = () => {
       isShowMinimap = STORED_INTERFACE_DEFAULT_VALUES.isShowMinimap,
       isShowKSpace,
       isThickConnections,
+      isShowBackgroundPattern,
+      isSoftBackground,
     },
   } = useMapRootState();
   const { deleteSystems } = useDeleteSystems();
@@ -45,6 +51,7 @@ export const MapWrapper = () => {
   const [openSettings, setOpenSettings] = useState<string | null>(null);
   const [openLinkSignatures, setOpenLinkSignatures] = useState<any | null>(null);
   const [openCustomLabel, setOpenCustomLabel] = useState<string | null>(null);
+  const [openAddSystem, setOpenAddSystem] = useState<XYPosition | null>(null);
   const [selectedConnection, setSelectedConnection] = useState<SolarSystemConnection | null>(null);
 
   const ref = useRef({ selectedConnections, selectedSystems, systemContextProps, systems, deleteSystems });
@@ -121,6 +128,28 @@ export const MapWrapper = () => {
     }
   }, []);
 
+  const onAddSystem: OnMapAddSystemCallback = useCallback(({ coordinates }) => {
+    setOpenAddSystem(coordinates);
+  }, []);
+
+  const handleSubmitAddSystem: SearchOnSubmitCallback = useCallback(
+    async item => {
+      if (ref.current.systems.some(x => x.system_static_info.solar_system_id === item.value)) {
+        emitMapEvent({
+          name: Commands.centerSystem,
+          data: item.value.toString(),
+        });
+        return;
+      }
+
+      await outCommand({
+        type: OutCommand.manualAddSystem,
+        data: { coordinates: openAddSystem, solar_system_id: item.value },
+      });
+    },
+    [openAddSystem, outCommand],
+  );
+
   return (
     <>
       <Map
@@ -135,6 +164,9 @@ export const MapWrapper = () => {
         showKSpaceBG={isShowKSpace}
         onManualDelete={handleManualDelete}
         isThickConnections={isThickConnections}
+        isShowBackgroundPattern={isShowBackgroundPattern}
+        isSoftBackground={isSoftBackground}
+        onAddSystem={onAddSystem}
       />
 
       {openSettings != null && (
@@ -149,6 +181,12 @@ export const MapWrapper = () => {
         <SystemLinkSignatureDialog data={openLinkSignatures} setVisible={() => setOpenLinkSignatures(null)} />
       )}
 
+      <AddSystemDialog
+        visible={!!openAddSystem}
+        setVisible={() => setOpenAddSystem(null)}
+        onSubmit={handleSubmitAddSystem}
+      />
+
       <Connections selectedConnection={selectedConnection} onHide={() => setSelectedConnection(null)} />
 
       <ContextMenuSystem

assets/js/hooks/Mapper/components/topbar/Topbar.tsx

@@ -18,7 +18,7 @@ const Topbar = ({ children }: WithChildren) => {
     <nav
       className={clsx(
         'px-2 flex items-center justify-center min-w-0 h-12 pointer-events-auto',
-        'border-b border-gray-900 bg-gray-800 bg-opacity-5',
+        'border-b border-stone-800 bg-gray-800 bg-opacity-5',
         'bg-opacity-70 bg-neutral-900',
       )}
     >

assets/js/hooks/Mapper/components/ui-kit/WHEffectView/WHEffectView.tsx

@@ -31,12 +31,15 @@ const prepareEffects = (effects: Record<string, EffectRaw>, effectName: string,
   return out;
 };
 
+let counter = 0;
+
 export interface WHEffectViewProps {
   effectName: string;
   effectPower: number;
+  className?: string;
 }
 
-export const WHEffectView = ({ effectName, effectPower }: WHEffectViewProps) => {
+export const WHEffectView = ({ effectName, effectPower, className }: WHEffectViewProps) => {
   const {
     data: { effects },
   } = useMapRootState();
@@ -49,7 +52,7 @@ export const WHEffectView = ({ effectName, effectPower }: WHEffectViewProps) =>
     [effectName, effectPower, effects],
   );
 
-  const targetClass = `wh-effect-name${effectInfo.id}`;
+  const targetClass = useMemo(() => `wh-effect-name${effectInfo.id}-${counter++}`, []);
 
   return (
     <div className={classes.WHEffectViewRoot}>
@@ -84,7 +87,7 @@ export const WHEffectView = ({ effectName, effectPower }: WHEffectViewProps) =>
         </div>
       </FixedTooltip>
 
-      <div className={clsx('font-bold select-none cursor-help w-min-content', effectClass, targetClass)}>
+      <div className={clsx('font-bold select-none cursor-help w-min-content', effectClass, targetClass, className)}>
         {effectName}
       </div>
     </div>

assets/js/hooks/Mapper/mapRootProvider/MapRootProvider.tsx

@@ -35,6 +35,8 @@ export enum InterfaceStoredSettingsProps {
   isShowKSpace = 'isShowKSpace',
   isThickConnections = 'isThickConnections',
   isShowUnsplashedSignatures = 'isShowUnsplashedSignatures',
+  isShowBackgroundPattern = 'isShowBackgroundPattern',
+  isSoftBackground = 'isSoftBackground',
 }
 
 export type InterfaceStoredSettings = {
@@ -43,6 +45,8 @@ export type InterfaceStoredSettings = {
   isShowKSpace: boolean;
   isThickConnections: boolean;
   isShowUnsplashedSignatures: boolean;
+  isShowBackgroundPattern: boolean;
+  isSoftBackground: boolean;
 };
 
 export const STORED_INTERFACE_DEFAULT_VALUES: InterfaceStoredSettings = {
@@ -51,6 +55,8 @@ export const STORED_INTERFACE_DEFAULT_VALUES: InterfaceStoredSettings = {
   isShowKSpace: false,
   isThickConnections: false,
   isShowUnsplashedSignatures: false,
+  isShowBackgroundPattern: true,
+  isSoftBackground: false,
 };
 
 export interface MapRootContextProps {

assets/js/hooks/Mapper/types/connection.ts

@@ -14,16 +14,12 @@ export enum TimeStatus {
   eol,
 }
 
-// export enum ShipSizeStatus {
-//   small, // frigates, destroyers - less than 5K t
-//   medium, // less than 20K t
-//   large, // less than 375K t
-//   capital, // less than 1.8M t
-// }
-
 export enum ShipSizeStatus {
-  small, // frigates, destroyers - less than 5K t
-  normal,
+  small = 0, // frigates, destroyers - less than 5K t
+  medium = 1, // less than 62K t
+  large = 2, // less than 375K t
+  freight = 3, // less than 1M t
+  capital = 4, // less than 1.8M t
 }
 
 export type SolarSystemConnection = {

assets/js/hooks/Mapper/types/mapHandlers.ts

@@ -153,6 +153,7 @@ export enum OutCommand {
   getUserSettings = 'get_user_settings',
   updateUserSettings = 'update_user_settings',
   unlinkSignature = 'unlink_signature',
+  searchSystems = 'search_systems',
 }
 
 export type OutCommandHandler = <T = any>(event: { type: OutCommand; data: any }) => Promise<T>;

assets/js/hooks/Mapper/types/system.ts

@@ -120,3 +120,13 @@ export type SolarSystemRawType = {
   system_static_info: SolarSystemStaticInfoRaw;
   system_signatures: SystemSignature[];
 };
+
+export type SearchSystemItem = {
+  class_title: string;
+  constellation_name: string;
+  label: string;
+  region_name: string;
+  system_static_info: SolarSystemStaticInfoRaw;
+  value: number;
+};
+

assets/js/hooks/index.ts

@@ -8,6 +8,7 @@ import CopyToClipboard from './copyToClipboard';
 import DownloadJson from './downloadJson';
 import NewVersionUpdate from './newVersionUpdate';
 import MapAction from './maps/mapAction';
+import ShowCharactersAddAlert from './showCharactersAddAlert';
 
 export default {
   DownloadJson,
@@ -20,4 +21,5 @@ export default {
   Ping,
   CopyToClipboard,
   NewVersionUpdate,
+  ShowCharactersAddAlert,
 };

assets/js/hooks/showCharactersAddAlert.ts

@@ -0,0 +1,11 @@
+export default {
+  mounted() {
+    this.pushEvent('restore_show_characters_add_alert', {
+      value: localStorage.getItem('wanderer:hide_characters_add_alert') !== 'true',
+    });
+
+    document.getElementById('characters-add-alert-hide')?.addEventListener('click', e => {
+      localStorage.setItem('wanderer:hide_characters_add_alert', 'true');
+    });
+  },
+};

lib/wanderer_app/api/map_character_settings.ex

@@ -12,32 +12,37 @@ defmodule WandererApp.Api.MapCharacterSettings do
 
   code_interface do
     define(:create, action: :create)
+    define(:destroy, action: :destroy)
 
-    define(:read_by_map,
-      action: :read_by_map
-    )
-
-    define(:tracked_by_map_filtered,
-      action: :tracked_by_map_filtered
-    )
-
-    define(:tracked_by_map_all,
-      action: :tracked_by_map_all
-    )
+    define(:read_by_map, action: :read_by_map)
+    define(:by_map_filtered, action: :by_map_filtered)
+    define(:tracked_by_map_filtered, action: :tracked_by_map_filtered)
+    define(:tracked_by_map_all, action: :tracked_by_map_all)
 
     define(:track, action: :track)
     define(:untrack, action: :untrack)
+
+    define(:follow, action: :follow)
+    define(:unfollow, action: :unfollow)
   end
 
   actions do
     default_accept [
       :map_id,
       :character_id,
-      :tracked
+      :tracked,
+      :followed
     ]
 
     defaults [:create, :read, :update, :destroy]
 
+    read :by_map_filtered do
+      argument(:map_id, :string, allow_nil?: false)
+      argument(:character_ids, {:array, :uuid}, allow_nil?: false)
+
+      filter(expr(map_id == ^arg(:map_id) and character_id in ^arg(:character_ids)))
+    end
+
     read :tracked_by_map_filtered do
       argument(:map_id, :string, allow_nil?: false)
       argument(:character_ids, {:array, :uuid}, allow_nil?: false)
@@ -64,6 +69,14 @@ defmodule WandererApp.Api.MapCharacterSettings do
     update :untrack do
       change(set_attribute(:tracked, false))
     end
+
+    update :follow do
+      change(set_attribute(:followed, true))
+    end
+
+    update :unfollow do
+      change(set_attribute(:followed, false))
+    end
   end
 
   attributes do
@@ -74,6 +87,11 @@ defmodule WandererApp.Api.MapCharacterSettings do
       allow_nil? true
     end
 
+    attribute :followed, :boolean do
+      default false
+      allow_nil? true
+    end
+
     create_timestamp(:inserted_at)
     update_timestamp(:updated_at)
   end

lib/wanderer_app/api/map_connection.ex

@@ -128,11 +128,13 @@ defmodule WandererApp.Api.MapConnection do
       allow_nil?(true)
     end
 
-    # where 0 - Frigate
-    # where 1 - Medium and Large
-    # where 2 - Capital
+    # where 0 - Frigate (small
+    # where 1 - Medium
+    # where 2 - Large
+    # where 3 - Freight
+    # where 4 - Capital
     attribute :ship_size_type, :integer do
-      default(1)
+      default(2)
 
       allow_nil?(true)
     end

lib/wanderer_app/character/tracker.ex

@@ -446,8 +446,13 @@ defmodule WandererApp.Character.Tracker do
         |> Map.merge(%{alliance_id: alliance_id, corporation_id: corporation_id})
         |> maybe_update_alliance()
 
-      _error ->
-        Logger.warning("Failed to get corporation info for #{corporation_id}")
+      error ->
+        Logger.warning(
+          "Failed to get corporation info for character #{character_id}: #{inspect(error)}",
+          character_id: character_id,
+          corporation_id: corporation_id
+        )
+
         state
     end
   end
@@ -484,7 +489,7 @@ defmodule WandererApp.Character.Tracker do
 
   defp maybe_update_location(
          %{
-           character_id: character_id
+           character_id: character_id,
          } =
            state,
          location

lib/wanderer_app/eve_data_service.ex

@@ -49,7 +49,7 @@ defmodule WandererApp.EveDataService do
         end)
       end)
 
-    Task.await_many(tasks, :timer.minutes(1))
+    Task.await_many(tasks, :timer.minutes(30))
   end
 
   def download_file(file_name) do

lib/wanderer_app/map.ex

@@ -191,7 +191,7 @@ defmodule WandererApp.Map do
     case characters |> Enum.member?(character_id) do
       true ->
         map_id
-        |> update_map(%{characters: Enum.reject(characters, fn id -> id == character_id end)})
+        |> update_map(%{characters: characters |> Enum.reject(fn id -> id == character_id end)})
 
         :ok
 

lib/wanderer_app/map/server/map_server_characters_impl.ex

@@ -15,13 +15,12 @@ defmodule WandererApp.Map.Server.CharactersImpl do
              WandererApp.MapCharacterSettingsRepo.create(%{
                character_id: character_id,
                map_id: map_id,
-               tracked: track_character
+               tracked: track_character,
+               followed: false
              }),
            {:ok, character} <- WandererApp.Character.get_character(character_id) do
         Impl.broadcast!(map_id, :character_added, character)
-
         :telemetry.execute([:wanderer_app, :map, :character, :added], %{count: 1})
-
         :ok
       else
         _error ->
@@ -89,6 +88,11 @@ defmodule WandererApp.Map.Server.CharactersImpl do
         []
       )
 
+    acls =
+      map_id
+      |> WandererApp.Map.get_map!()
+      |> Map.get(:acls, [])
+
     invalidate_character_ids
     |> Task.async_stream(
       fn character_id ->
@@ -96,11 +100,6 @@ defmodule WandererApp.Map.Server.CharactersImpl do
         |> WandererApp.Character.get_character()
         |> case do
           {:ok, character} ->
-            acls =
-              map_id
-              |> WandererApp.Map.get_map!()
-              |> Map.get(:acls, [])
-
             [character_permissions] =
               WandererApp.Permissions.check_characters_access([character], acls)
 
@@ -157,12 +156,12 @@ defmodule WandererApp.Map.Server.CharactersImpl do
     |> untrack_characters(character_ids)
 
     map_id
-    |> WandererApp.MapCharacterSettingsRepo.get_tracked_by_map_filtered(character_ids)
+    |> WandererApp.MapCharacterSettingsRepo.get_by_map_filtered(character_ids)
     |> case do
       {:ok, settings} ->
         settings
         |> Enum.each(fn s ->
-          WandererApp.MapCharacterSettingsRepo.untrack(s)
+          WandererApp.MapCharacterSettingsRepo.destroy!(s)
           remove_character(map_id, s.character_id)
         end)
 
@@ -382,7 +381,6 @@ defmodule WandererApp.Map.Server.CharactersImpl do
               {:character_location, %{solar_system_id: solar_system_id},
                %{solar_system_id: old_solar_system_id}}
             ]
-
           _ ->
             [:skip]
         end

lib/wanderer_app/map/server/map_server_connections_impl.ex

@@ -333,7 +333,7 @@ defmodule WandererApp.Map.Server.ConnectionsImpl do
 
         Impl.broadcast!(map_id, :maybe_select_system, %{
           character_id: character_id,
-          solar_system_id: location.solar_system_id
+          solar_system_id: location.solar_system_id,
         })
 
         Impl.broadcast!(map_id, :add_connection, connection)
@@ -346,9 +346,20 @@ defmodule WandererApp.Map.Server.ConnectionsImpl do
 
         :ok
 
-      {:error, error} ->
-        Logger.debug(fn -> "Failed to add connection: #{inspect(error, pretty: true)}" end)
-        :ok
+        {:error, :already_exists} ->
+          # Still broadcast location change in case of followed character
+          Impl.broadcast!(map_id, :maybe_select_system, %{
+            character_id: character_id,
+            solar_system_id: location.solar_system_id
+          })
+
+          :ok
+
+        {:error, error} ->
+          Logger.debug(fn -> "Failed to add connection: #{inspect(error, pretty: true)}" end)
+
+          :ok
+
     end
   end
 
@@ -359,33 +370,30 @@ defmodule WandererApp.Map.Server.ConnectionsImpl do
   def can_add_location(:none, _solar_system_id), do: false
 
   def can_add_location(scope, solar_system_id) do
-    system_static_info =
-      case WandererApp.CachedInfo.get_system_static_info(solar_system_id) do
-        {:ok, system_static_info} when not is_nil(system_static_info) ->
-          system_static_info
-
-        _ ->
-          %{system_class: nil}
-      end
+    {:ok, system_static_info} = get_system_static_info(solar_system_id)
 
     case scope do
       :wormholes ->
-        not (@prohibited_system_classes |> Enum.member?(system_static_info.system_class)) and
+        not is_prohibited_system_class?(system_static_info.system_class) and
           not (@prohibited_systems |> Enum.member?(solar_system_id)) and
           @wh_space |> Enum.member?(system_static_info.system_class)
 
       :stargates ->
-        not (@prohibited_system_classes |> Enum.member?(system_static_info.system_class)) and
+        not is_prohibited_system_class?(system_static_info.system_class) and
           @known_space |> Enum.member?(system_static_info.system_class)
 
       :all ->
-        not (@prohibited_system_classes |> Enum.member?(system_static_info.system_class))
+        not is_prohibited_system_class?(system_static_info.system_class)
 
       _ ->
         false
     end
   end
 
+  def is_prohibited_system_class?(system_class) do
+    @prohibited_system_classes |> Enum.member?(system_class)
+  end
+
   def is_connection_exist(map_id, from_solar_system_id, to_solar_system_id),
     do:
       not is_nil(
@@ -414,24 +422,21 @@ defmodule WandererApp.Map.Server.ConnectionsImpl do
         current_system_id: to_solar_system_id
       })
 
-    system_static_info =
-      case WandererApp.CachedInfo.get_system_static_info(to_solar_system_id) do
-        {:ok, system_static_info} when not is_nil(system_static_info) ->
-          system_static_info
-
-        _ ->
-          %{system_class: nil}
-      end
+    {:ok, from_system_static_info} = get_system_static_info(from_solar_system_id)
+    {:ok, to_system_static_info} = get_system_static_info(to_solar_system_id)
 
     case scope do
       :wormholes ->
-        not (@prohibited_system_classes |> Enum.member?(system_static_info.system_class)) and
+        not is_prohibited_system_class?(from_system_static_info.system_class) and
+          not is_prohibited_system_class?(to_system_static_info.system_class) and
+          not (@prohibited_systems |> Enum.member?(from_solar_system_id)) and
           not (@prohibited_systems |> Enum.member?(to_solar_system_id)) and
           known_jumps |> Enum.empty?() and to_solar_system_id != @jita and
           from_solar_system_id != @jita
 
       :stargates ->
-        not (@prohibited_system_classes |> Enum.member?(system_static_info.system_class)) and
+        not is_prohibited_system_class?(from_system_static_info.system_class) and
+          not is_prohibited_system_class?(to_system_static_info.system_class) and
           not (known_jumps |> Enum.empty?())
     end
   end
@@ -447,6 +452,16 @@ defmodule WandererApp.Map.Server.ConnectionsImpl do
     end
   end
 
+  defp get_system_static_info(solar_system_id) do
+    case WandererApp.CachedInfo.get_system_static_info(solar_system_id) do
+      {:ok, system_static_info} when not is_nil(system_static_info) ->
+        {:ok, system_static_info}
+
+      _ ->
+        {:ok, %{system_class: nil}}
+    end
+  end
+
   defp maybe_remove_connection(map_id, location, old_location)
        when not is_nil(location) and not is_nil(old_location) and
               location.solar_system_id != old_location.solar_system_id do

lib/wanderer_app/map/server/map_server_systems_impl.ex

@@ -486,7 +486,7 @@ defmodule WandererApp.Map.Server.SystemsImpl do
       state
     else
       error ->
-        Logger.error("Fail ed to update system: #{inspect(error, pretty: true)}")
+        Logger.error("Failed to update system: #{inspect(error, pretty: true)}")
         state
     end
   end

lib/wanderer_app/maps.ex

@@ -84,20 +84,22 @@ defmodule WandererApp.Maps do
         id: id,
         eve_id: eve_id,
         corporation_ticker: corporation_ticker,
-        tracked: false
+        tracked: false,
+        followed: false
       }
 
   def map_character(
         %{name: name, id: id, eve_id: eve_id, corporation_ticker: corporation_ticker} =
           _character,
-        %{tracked: tracked} = _character_settings
+        %{tracked: tracked, followed: followed} = _character_settings
       ),
       do: %{
         name: name,
         id: id,
         eve_id: eve_id,
         corporation_ticker: corporation_ticker,
-        tracked: tracked
+        tracked: tracked,
+        followed: followed
       }
 
   @decorate cacheable(

lib/wanderer_app/repositories/map_character_settings_repo.ex

@@ -11,15 +11,44 @@ defmodule WandererApp.MapCharacterSettingsRepo do
         character_ids: character_ids
       })
 
+  def get_by_map_filtered(map_id, character_ids),
+    do:
+      WandererApp.Api.MapCharacterSettings.by_map_filtered(%{
+        map_id: map_id,
+        character_ids: character_ids
+      })
+
   def get_all_by_map(map_id),
     do: WandererApp.Api.MapCharacterSettings.read_by_map(%{map_id: map_id})
 
   def get_tracked_by_map_all(map_id),
     do: WandererApp.Api.MapCharacterSettings.tracked_by_map_all(%{map_id: map_id})
 
+  def get_by_map(map_id, character_id) do
+    case get_by_map_filtered(map_id, [character_id]) do
+      {:ok, [setting | _]} ->
+        {:ok, setting}
+
+      {:ok, []} ->
+        {:error, :not_found}
+
+      {:error, reason} ->
+        {:error, reason}
+    end
+  end
+
   def track(settings), do: settings |> WandererApp.Api.MapCharacterSettings.track()
   def untrack(settings), do: settings |> WandererApp.Api.MapCharacterSettings.untrack()
 
   def track!(settings), do: settings |> WandererApp.Api.MapCharacterSettings.track!()
   def untrack!(settings), do: settings |> WandererApp.Api.MapCharacterSettings.untrack!()
+
+  def follow(settings), do: settings |> WandererApp.Api.MapCharacterSettings.follow()
+  def unfollow(settings), do: settings |> WandererApp.Api.MapCharacterSettings.unfollow()
+
+  def follow!(settings), do: settings |> WandererApp.Api.MapCharacterSettings.follow!()
+  def unfollow!(settings), do: settings |> WandererApp.Api.MapCharacterSettings.unfollow!()
+
+
+  def destroy!(settings), do: settings |> WandererApp.Api.MapCharacterSettings.destroy!()
 end

lib/wanderer_app_web/components/character_activity.ex

@@ -0,0 +1,47 @@
+defmodule WandererAppWeb.CharacterActivity do
+  use WandererAppWeb, :live_component
+  use LiveViewEvents
+
+  @impl true
+  def mount(socket) do
+    {:ok, socket}
+  end
+
+  @impl true
+  def update(
+        assigns,
+        socket
+      ) do
+    {:ok,
+     socket
+     |> handle_info_or_assign(assigns)}
+  end
+
+  def render(assigns) do
+    ~H"""
+    <div id={@id}>
+      <.table class="!max-h-[80vh] !overflow-y-auto" id="activity-tbl" rows={@activity}>
+        <:col :let={row} label="Character">
+          <.character_item character={row.character} />
+        </:col>
+        <:col :let={row} label="Passages">
+          <%= row.count %>
+        </:col>
+      </.table>
+    </div>
+    """
+  end
+
+  def character_item(assigns) do
+    ~H"""
+    <div class="flex items-center gap-3">
+      <div class="avatar">
+        <div class="rounded-md w-12 h-12">
+          <img src={member_icon_url(@character.eve_id)} alt={@character.name} />
+        </div>
+      </div>
+      <%= @character.name %>
+    </div>
+    """
+  end
+end

lib/wanderer_app_web/components/core_components.ex

@@ -393,6 +393,7 @@ defmodule WandererAppWeb.CoreComponents do
               data-pc-name="checkbox"
               data-pc-section="root"
             >
+              <input type="hidden" name={@name} value="false" disabled={@rest[:disabled]} />
               <input
                 id={@id}
                 name={@name}

lib/wanderer_app_web/components/layouts/live.html.heex

@@ -9,7 +9,7 @@
   >
     <%= @inner_content %>
   </main>
-  <aside class="h-full w-14 left-0 absolute bg-gray-400 bg-opacity-5  text-gray-200 shadow-lg border-r border-gray-900  bg-opacity-70 bg-neutral-900">
+  <aside class="h-full w-14 left-0 absolute bg-gray-400 bg-opacity-5  text-gray-200 shadow-lg border-r border-stone-800  bg-opacity-70 bg-neutral-900">
     <.sidebar_nav_links
       active_tab={@active_tab}
       show_admin={@show_admin}

lib/wanderer_app_web/controllers/auth_controller.ex

@@ -93,13 +93,9 @@ defmodule WandererAppWeb.AuthController do
     |> redirect(to: ~p"/")
   end
 
-  def maybe_update_character_user_id(character, user_id) do
-    case character.user_id do
-      nil ->
-        WandererApp.Api.Character.assign_user!(character, %{user_id: user_id})
-
-      _ ->
-        Logger.debug("character already has user_id")
-    end
+  def maybe_update_character_user_id(character, user_id) when not is_nil(user_id) do
+    WandererApp.Api.Character.assign_user!(character, %{user_id: user_id})
   end
+
+  def maybe_update_character_user_id(_character, _user_id), do: :ok
 end

lib/wanderer_app_web/live/characters/characters_live.ex

@@ -28,6 +28,7 @@ defmodule WandererAppWeb.CharactersLive do
     {:ok,
      socket
      |> assign(
+       show_characters_add_alert: true,
        mode: :blocks,
        wallet_tracking_enabled?: WandererApp.Env.wallet_tracking_enabled?(),
        characters: characters |> Enum.sort_by(& &1.name, :asc) |> Enum.map(&map_ui_character/1),
@@ -45,6 +46,13 @@ defmodule WandererAppWeb.CharactersLive do
     {:noreply, apply_action(socket, socket.assigns.live_action, params)}
   end
 
+  @impl true
+  def handle_event("restore_show_characters_add_alert", %{"value" => value}, socket) do
+    {:noreply,
+     socket
+     |> assign(show_characters_add_alert: value)}
+  end
+
   @impl true
   def handle_event("authorize", form, socket) do
     track_wallet = form |> Map.get("track_wallet", false)

lib/wanderer_app_web/live/characters/characters_live.html.heex

@@ -1,4 +1,4 @@
-<nav class="px-6 flex items-center justify-between w-full h-12 pointer-events-auto border-b border-gray-900  bg-opacity-70 bg-neutral-900">
+<nav class="px-6 flex items-center justify-between w-full h-12 pointer-events-auto border-b border-stone-800  bg-opacity-70 bg-neutral-900">
   <span className="w-full"></span>
   <span className="mr-2"></span>
   <div class="flex gap-2">
@@ -29,9 +29,45 @@
   id="characters-list"
   class="w-full h-full col-span-2 lg:col-span-1 p-4 pl-20 pb-20 overflow-auto"
 >
+  <div
+    :if={@show_characters_add_alert}
+    role="alert"
+    class="alert"
+    id="characters-add-alert"
+    phx-hook="ShowCharactersAddAlert"
+    phx-ignore
+    data-key="show_characters_add_alert"
+  >
+    <svg
+      xmlns="http://www.w3.org/2000/svg"
+      fill="none"
+      viewBox="0 0 24 24"
+      class="h-6 w-6 shrink-0 stroke-current"
+    >
+      <path
+        stroke-linecap="round"
+        stroke-linejoin="round"
+        stroke-width="2"
+        d="M13 16h-1v-4h-1m1-4h.01M21 12a9 9 0 11-18 0 9 9 0 0118 0z"
+      >
+      </path>
+    </svg>
+    <span>
+      All added characters will be automatically linked to your user account. You can't have same characters linked to several accounts.
+    </span>
+    <div>
+      <button
+        class="btn btn-sm"
+        id="characters-add-alert-hide"
+        phx-click={JS.toggle_class("hidden", to: "#characters-add-alert")}
+      >
+        Hide
+      </button>
+    </div>
+  </div>
   <div
     :if={@mode == :blocks}
-    class="gap-4 grid grid-cols-1 lg:grid-cols-5 md:grid-cols-3 sm:grid-cols-2 "
+    class="gap-4 grid grid-cols-1 lg:grid-cols-5 md:grid-cols-3 sm:grid-cols-2 mt-4"
   >
     <.link patch={~p"/characters/authorize"}>
       <div class="card card-side rounded-none h-full items-center hover:text-white bg-gradient-to-l from-stone-950 to-stone-900 transform transition duration-500">
@@ -51,9 +87,24 @@
         <div class="absolute left-0 bottom-0 w-full h-30 bg-opacity-60 bg-gray-900">
           <h2 class="absolute w-full flex justify-between px-4 left-0 top-10 text-xs">
             Corporation:
+            <span
+              :if={
+                is_nil(
+                  character
+                  |> get(
+                    path(:corporation_name),
+                    nil
+                  )
+                )
+              }
+              class="loading loading-dots loading-xs"
+            />
             <span>
               <%= character
-              |> get(path(:corporation_name), "-") %>
+              |> get(
+                path(:corporation_name),
+                ""
+              ) %>
             </span>
           </h2>
           <h2 class="absolute w-full flex justify-between px-4 left-0 top-16 text-xs">
@@ -65,9 +116,21 @@
           </h2>
           <h2 class="absolute left-0 bottom-12 px-4 text-xs w-full flex justify-between">
             Location:
+            <span
+              :if={
+                is_nil(
+                  character
+                  |> get(
+                    path(:location / :solar_system_info / :solar_system_name, :map),
+                    nil
+                  )
+                )
+              }
+              class="loading loading-dots loading-xs"
+            />
             <span>
               <%= character
-              |> get(path(:location / :solar_system_info / :solar_system_name, :map), "-") %>
+              |> get(path(:location / :solar_system_info / :solar_system_name, :map), "") %>
             </span>
           </h2>
           <h2
@@ -126,7 +189,7 @@
     </div>
   </div>
 
-  <div :if={@mode == :table} class="flex flex-col gap-4">
+  <div :if={@mode == :table} class="flex flex-col gap-4  mt-4">
     <.link patch={~p"/characters/authorize"}>
       <button
         type="button"

lib/wanderer_app_web/live/characters/characters_tracking_live.ex

@@ -86,7 +86,8 @@ defmodule WandererAppWeb.CharactersTrackingLive do
         WandererApp.MapCharacterSettingsRepo.create(%{
           character_id: character_id,
           map_id: selected_map.id,
-          tracked: true
+          tracked: true,
+          followed: false
         })
 
         {:noreply, socket}

lib/wanderer_app_web/live/maps/event_handlers/map_activity_event_handler.ex

@@ -18,15 +18,12 @@ defmodule WandererAppWeb.MapActivityEventHandler do
     do: MapCoreEventHandler.handle_server_event(event, socket)
 
   def handle_ui_event("show_activity", _, %{assigns: %{map_id: map_id}} = socket) do
-    Task.async(fn ->
-      {:ok, character_activity} = map_id |> get_character_activity()
-
-      {:character_activity, character_activity}
-    end)
-
     {:noreply,
      socket
-     |> assign(:show_activity?, true)}
+     |> assign(:show_activity?, true)
+     |> assign_async(:character_activity, fn ->
+       map_id |> get_character_activity()
+     end)}
   end
 
   def handle_ui_event("hide_activity", _, socket),
@@ -44,6 +41,6 @@ defmodule WandererAppWeb.MapActivityEventHandler do
         %{p | character: p.character |> MapEventHandler.map_ui_character_stat()}
       end)
 
-    {:ok, %{jumps: jumps}}
+    {:ok, %{character_activity: jumps}}
   end
 end

lib/wanderer_app_web/live/maps/event_handlers/map_characters_event_handler.ex

@@ -66,35 +66,9 @@ defmodule WandererAppWeb.MapCharactersEventHandler do
   def handle_ui_event(
         "add_character",
         _,
-        %{
-          assigns: %{
-            current_user: current_user,
-            map_id: map_id,
-            user_permissions: %{track_character: true}
-          }
-        } = socket
-      ) do
-    {:noreply,
-     socket
-     |> assign(show_tracking?: true)
-     |> assign_async(:characters, fn ->
-       {:ok, map} =
-         map_id
-         |> WandererApp.MapRepo.get([:acls])
-
-       {:ok, character_settings} =
-         case WandererApp.MapCharacterSettingsRepo.get_all_by_map(map_id) do
-           {:ok, settings} -> {:ok, settings}
-           _ -> {:ok, []}
-         end
-
-       map
-       |> WandererApp.Maps.load_characters(
-         character_settings,
-         current_user.id
-       )
-     end)}
-  end
+        socket
+      ),
+      do: {:noreply, socket |> add_character()}
 
   def handle_ui_event(
         "add_character",
@@ -137,7 +111,8 @@ defmodule WandererAppWeb.MapCharactersEventHandler do
             WandererApp.MapCharacterSettingsRepo.create(%{
               character_id: character_id,
               map_id: map_id,
-              tracked: true
+              tracked: true,
+              followed: false
             })
 
           character = map_character_settings |> Ash.load!(:character) |> Map.get(:character)
@@ -216,12 +191,130 @@ defmodule WandererAppWeb.MapCharactersEventHandler do
      )}
   end
 
+  def handle_ui_event(
+      "toggle_follow",
+      %{"character-id" => clicked_char_id},
+      %{
+        assigns: %{
+          map_id: map_id,
+          current_user: current_user
+        }
+      } = socket
+    ) do
+
+    {:ok, all_settings} = WandererApp.MapCharacterSettingsRepo.get_all_by_map(map_id)
+
+    # Find and filter user's characters
+    {:ok, user_characters} = get_tracked_map_characters(map_id, current_user)
+    user_char_ids = Enum.map(user_characters, & &1.id)
+
+    my_settings =
+      all_settings
+      |> Enum.filter(fn s ->
+        s.character_id in user_char_ids
+      end)
+
+    existing = Enum.find(my_settings, &(&1.character_id == clicked_char_id))
+
+    {:ok, target_setting} =
+      if existing do
+        {:ok, existing}
+      else
+        WandererApp.MapCharacterSettingsRepo.create(%{
+          character_id: clicked_char_id,
+          map_id: map_id,
+          tracked: true,
+          followed: true
+        })
+      end
+
+    # If the target_setting is already followed => unfollow it
+    if target_setting.followed do
+      {:ok, updated} = WandererApp.MapCharacterSettingsRepo.unfollow(target_setting)
+    else
+      # Only unfollow other rows from the current user
+      for s <- my_settings, s.id != target_setting.id, s.followed == true do
+        WandererApp.MapCharacterSettingsRepo.unfollow!(s)
+      end
+
+      # Ensure the new followed char is tracked
+      if not target_setting.tracked do
+        WandererApp.MapCharacterSettingsRepo.track!(target_setting)
+
+        char = target_setting |> Ash.load!(:character) |> Map.get(:character)
+        :ok = track_characters([char], map_id, true)
+        :ok = add_characters([char], map_id, true)
+      end
+
+      {:ok, updated} = WandererApp.MapCharacterSettingsRepo.follow(target_setting)
+    end
+
+    # re-fetch or re-map to confirm final results in UI
+    %{result: characters} = socket.assigns.characters
+
+    {:ok, tracked_characters} = get_tracked_map_characters(map_id, current_user)
+    user_eve_ids = Enum.map(tracked_characters, & &1.eve_id)
+
+    {:ok, final_settings} = WandererApp.MapCharacterSettingsRepo.get_all_by_map(map_id)
+
+    updated_chars =
+      characters
+      |> Enum.map(fn c ->
+        s = Enum.find(final_settings, &(&1.character_id == c.id))
+        WandererApp.Maps.map_character(c, s)
+      end)
+
+    socket =
+      socket
+      |> assign(user_characters: user_eve_ids)
+      |> assign(has_tracked_characters?: has_tracked_characters?(user_eve_ids))
+      |> assign_async(:characters, fn ->
+        {:ok, %{characters: updated_chars}}
+      end)
+      |> MapEventHandler.push_map_event("init", %{user_characters: user_eve_ids, reset: false})
+
+    {:noreply, socket}
+  end
+
+
   def handle_ui_event("hide_tracking", _, socket),
     do: {:noreply, socket |> assign(show_tracking?: false)}
 
   def handle_ui_event(event, body, socket),
     do: MapCoreEventHandler.handle_ui_event(event, body, socket)
 
+  def add_character(
+        %{
+          assigns: %{
+            current_user: current_user,
+            map_id: map_id,
+            user_permissions: %{track_character: true}
+          }
+        } = socket
+      ),
+      do:
+        socket
+        |> assign(show_tracking?: true)
+        |> assign_async(:characters, fn ->
+          {:ok, map} =
+            map_id
+            |> WandererApp.MapRepo.get([:acls])
+
+          {:ok, character_settings} =
+            case WandererApp.MapCharacterSettingsRepo.get_all_by_map(map_id) do
+              {:ok, settings} -> {:ok, settings}
+              _ -> {:ok, []}
+            end
+
+          map
+          |> WandererApp.Maps.load_characters(
+            character_settings,
+            current_user.id
+          )
+        end)
+
+  def add_character(socket), do: socket
+
   def has_tracked_characters?([]), do: false
   def has_tracked_characters?(_user_characters), do: true
 

lib/wanderer_app_web/live/maps/event_handlers/map_core_event_handler.ex

@@ -3,7 +3,7 @@ defmodule WandererAppWeb.MapCoreEventHandler do
   use Phoenix.Component
   require Logger
 
-  alias WandererAppWeb.{MapEventHandler, MapCharactersEventHandler}
+  alias WandererAppWeb.{MapEventHandler, MapCharactersEventHandler, MapSystemsEventHandler}
 
   def handle_server_event(:update_permissions, socket) do
     DebounceAndThrottle.Debounce.apply(
@@ -147,7 +147,7 @@ defmodule WandererAppWeb.MapCoreEventHandler do
     options =
       WandererApp.Api.MapSolarSystem.find_by_name!(%{name: text})
       |> Enum.take(100)
-      |> Enum.map(&map_system/1)
+      |> Enum.map(&MapSystemsEventHandler.map_system/1)
 
     send_update(LiveSelect.Component, options: options, id: id)
 
@@ -162,6 +162,14 @@ defmodule WandererAppWeb.MapCoreEventHandler do
         socket
       )
 
+    def handle_ui_event("toggle_follow_" <> character_id, _, socket),
+    do:
+      MapCharactersEventHandler.handle_ui_event(
+        "toggle_follow",
+        %{"character-id" => character_id},
+        socket
+      )
+
   def handle_ui_event(
         "get_user_settings",
         _,
@@ -221,8 +229,9 @@ defmodule WandererAppWeb.MapCoreEventHandler do
          socket
          |> put_flash(
            :error,
-           "You should enable tracking for at least one character."
-         )}
+           "You should enable tracking for at least one character!"
+         )
+         |> MapCharactersEventHandler.add_character()}
 
   def handle_ui_event(event, body, socket) do
     Logger.warning(fn -> "unhandled map ui event: #{event} #{inspect(body)}" end)
@@ -448,23 +457,35 @@ defmodule WandererAppWeb.MapCoreEventHandler do
       |> filter_map_characters(user_character_eve_ids, user_permissions, options)
       |> Enum.map(&MapCharactersEventHandler.map_ui_character/1)
 
-    socket
-    |> assign(
-      map_loaded?: true,
-      map_user_settings: map_user_settings,
-      user_characters: user_character_eve_ids,
-      has_tracked_characters?:
-        MapCharactersEventHandler.has_tracked_characters?(user_character_eve_ids)
-    )
-    |> MapEventHandler.push_map_event(
-      "init",
-      initial_data
-      |> Map.put(:characters, map_characters)
-    )
-    |> push_event("js-exec", %{
-      to: "#map-loader",
-      attr: "data-loaded"
-    })
+    has_tracked_characters? =
+      MapCharactersEventHandler.has_tracked_characters?(user_character_eve_ids)
+
+    socket =
+      socket
+      |> assign(
+        map_loaded?: true,
+        map_user_settings: map_user_settings,
+        user_characters: user_character_eve_ids,
+        has_tracked_characters?: has_tracked_characters?
+      )
+      |> MapEventHandler.push_map_event(
+        "init",
+        initial_data
+        |> Map.put(:characters, map_characters)
+      )
+      |> push_event("js-exec", %{
+        to: "#map-loader",
+        attr: "data-loaded"
+      })
+
+    case not has_tracked_characters? && user_permissions.track_character do
+      true ->
+        socket
+        |> MapCharactersEventHandler.add_character()
+
+      _ ->
+        socket
+    end
   end
 
   defp handle_map_start_events(socket, map_id, events) do
@@ -487,10 +508,6 @@ defmodule WandererAppWeb.MapCoreEventHandler do
 
         :empty_tracked_characters ->
           socket
-          |> put_flash(
-            :info,
-            "You should enable tracking for at least one character to work with map."
-          )
 
         :map_character_limit ->
           socket
@@ -555,21 +572,4 @@ defmodule WandererAppWeb.MapCoreEventHandler do
         user_character_eve_ids |> Enum.member?(character.eve_id)
     end)
   end
-
-  defp map_system(
-         %{
-           solar_system_name: solar_system_name,
-           constellation_name: constellation_name,
-           region_name: region_name,
-           solar_system_id: solar_system_id,
-           class_title: class_title
-         } = _system
-       ),
-       do: %{
-         label: solar_system_name,
-         value: solar_system_id,
-         constellation_name: constellation_name,
-         region_name: region_name,
-         class_title: class_title
-       }
 end

lib/wanderer_app_web/live/maps/event_handlers/map_systems_event_handler.ex

@@ -21,32 +21,57 @@ defmodule WandererAppWeb.MapSystemsEventHandler do
       |> MapEventHandler.push_map_event("remove_systems", solar_system_ids)
 
   def handle_server_event(
-        %{
-          event: :maybe_select_system,
-          payload: %{
-            character_id: character_id,
-            solar_system_id: solar_system_id
-          }
-        },
-        %{assigns: %{current_user: current_user, map_user_settings: map_user_settings}} = socket
-      ) do
-    is_user_character =
-      current_user.characters |> Enum.map(& &1.id) |> Enum.member?(character_id)
+      %{
+        event: :maybe_select_system,
+        payload: %{
+          character_id: character_id,
+          solar_system_id: solar_system_id
+        }
+      },
+      %{assigns: %{current_user: current_user, map_id: map_id, map_user_settings: map_user_settings}} = socket
+    ) do
 
-    is_select_on_spash =
-      map_user_settings
-      |> WandererApp.MapUserSettingsRepo.to_form_data!()
-      |> WandererApp.MapUserSettingsRepo.get_boolean_setting("select_on_spash")
+      is_user_character =
+        current_user.characters
+        |> Enum.map(& &1.id)
+        |> Enum.member?(character_id)
 
-    (is_user_character && is_select_on_spash)
-    |> case do
-      true ->
+      is_select_on_spash =
+        map_user_settings
+        |> WandererApp.MapUserSettingsRepo.to_form_data!()
+        |> WandererApp.MapUserSettingsRepo.get_boolean_setting("select_on_spash")
+
+      is_followed =
+        case WandererApp.MapCharacterSettingsRepo.get_by_map(map_id, character_id) do
+          {:ok, setting} -> setting.followed == true
+          _ -> false
+        end
+
+      must_select? = is_user_character && (is_select_on_spash || is_followed)
+      if not must_select? do
         socket
-        |> MapEventHandler.push_map_event("select_system", solar_system_id)
+      else
+        # Check if we already selected this exact system for this char:
+        last_selected =
+          WandererApp.Cache.lookup!(
+            "char:#{character_id}:map:#{map_id}:last_selected_system_id",
+            nil
+          )
 
-      false ->
-        socket
-    end
+        if last_selected == solar_system_id do
+          # same system => skip
+          socket
+        else
+          # new system => update cache + push event
+          WandererApp.Cache.put(
+            "char:#{character_id}:map:#{map_id}:last_selected_system_id",
+            solar_system_id
+          )
+
+          socket
+          |> MapEventHandler.push_map_event("select_system", solar_system_id)
+        end
+      end
   end
 
   def handle_server_event(%{event: :kills_updated, payload: kills}, socket) do
@@ -65,55 +90,32 @@ defmodule WandererAppWeb.MapSystemsEventHandler do
     do: MapCoreEventHandler.handle_server_event(event, socket)
 
   def handle_ui_event(
-        "add_system",
-        %{"system_id" => [solar_system_id]} = _event,
+        "manual_add_system",
+        %{"solar_system_id" => solar_system_id, "coordinates" => coordinates} = _event,
         %{
-          assigns:
-            %{
-              map_id: map_id,
-              map_slug: map_slug,
-              current_user: current_user,
-              tracked_character_ids: tracked_character_ids,
-              user_permissions: %{add_system: true}
-            } = assigns
-        } = socket
-      )
-      when is_binary(solar_system_id) and solar_system_id != "" do
-    coordinates = Map.get(assigns, :coordinates)
-
+          assigns: %{
+            current_user: current_user,
+            has_tracked_characters?: true,
+            map_id: map_id,
+            tracked_character_ids: tracked_character_ids,
+            user_permissions: %{add_system: true}
+          }
+        } =
+          socket
+      ) do
     WandererApp.Map.Server.add_system(
       map_id,
       %{
-        solar_system_id: solar_system_id |> String.to_integer(),
+        solar_system_id: solar_system_id,
         coordinates: coordinates
       },
       current_user.id,
       tracked_character_ids |> List.first()
     )
 
-    {:noreply,
-     socket
-     |> push_patch(to: ~p"/#{map_slug}")}
+    {:noreply, socket}
   end
 
-  def handle_ui_event(
-        "manual_add_system",
-        %{"coordinates" => coordinates} = _event,
-        %{
-          assigns: %{
-            has_tracked_characters?: true,
-            map_slug: map_slug,
-            user_permissions: %{add_system: true}
-          }
-        } =
-          socket
-      ),
-      do:
-        {:noreply,
-         socket
-         |> assign(coordinates: coordinates)
-         |> push_patch(to: ~p"/#{map_slug}/add-system")}
-
   def handle_ui_event(
         "add_hub",
         %{"system_id" => solar_system_id} = _event,
@@ -280,6 +282,25 @@ defmodule WandererAppWeb.MapSystemsEventHandler do
     {:reply, %{system_static_infos: system_static_infos}, socket}
   end
 
+  def handle_ui_event(
+        "search_systems",
+        %{"text" => text} = _event,
+        socket
+      ) do
+    systems =
+      WandererApp.Api.MapSolarSystem.find_by_name!(%{name: text})
+      |> Enum.take(100)
+      |> Enum.map(&map_system/1)
+      |> Enum.filter(fn system ->
+        not is_nil(system) && not is_nil(system.system_static_info) &&
+          not WandererApp.Map.Server.ConnectionsImpl.is_prohibited_system_class?(
+            system.system_static_info.system_class
+          )
+      end)
+
+    {:reply, %{systems: systems}, socket}
+  end
+
   def handle_ui_event(
         "delete_systems",
         solar_system_ids,
@@ -307,6 +328,27 @@ defmodule WandererAppWeb.MapSystemsEventHandler do
   def handle_ui_event(event, body, socket),
     do: MapCoreEventHandler.handle_ui_event(event, body, socket)
 
+  def map_system(
+        %{
+          solar_system_name: solar_system_name,
+          constellation_name: constellation_name,
+          region_name: region_name,
+          solar_system_id: solar_system_id,
+          class_title: class_title
+        } = _system
+      ) do
+    system_static_info = MapEventHandler.get_system_static_info(solar_system_id)
+
+    %{
+      label: solar_system_name,
+      value: solar_system_id,
+      constellation_name: constellation_name,
+      region_name: region_name,
+      class_title: class_title,
+      system_static_info: system_static_info
+    }
+  end
+
   defp can_update_system?(:locked, %{lock_system: false} = _user_permissions), do: false
   defp can_update_system?(_key, _user_permissions), do: true
 

lib/wanderer_app_web/live/maps/map_audit_live.html.heex

@@ -15,7 +15,7 @@
     />
   </div>
 </main>
-<nav class="fixed top-0 z-100 px-6 pl-20 flex items-center justify-between w-full h-12 pointer-events-auto border-b border-gray-900  bg-opacity-70 bg-neutral-900">
+<nav class="fixed top-0 z-100 px-6 pl-20 flex items-center justify-between w-full h-12 pointer-events-auto border-b border-stone-800  bg-opacity-70 bg-neutral-900">
   <span className="w-full font-medium text-sm">
     <.link navigate={~p"/#{@map_slug}"} class="text-neutral-100">
       <%= @map_name %>

lib/wanderer_app_web/live/maps/map_event_handler.ex

@@ -24,6 +24,7 @@ defmodule WandererAppWeb.MapEventHandler do
   @map_characters_ui_events [
     "add_character",
     "toggle_track",
+    "toggle_follow",
     "hide_tracking"
   ]
 
@@ -38,10 +39,10 @@ defmodule WandererAppWeb.MapEventHandler do
   @map_system_ui_events [
     "add_hub",
     "delete_hub",
-    "add_system",
     "delete_systems",
-    "manual_add_system",
     "get_system_static_infos",
+    "manual_add_system",
+    "search_systems",
     "update_system_position",
     "update_system_positions",
     "update_system_name",

lib/wanderer_app_web/live/maps/map_live.ex

@@ -6,7 +6,7 @@ defmodule WandererAppWeb.MapLive do
 
   @impl true
   def mount(%{"slug" => map_slug} = _params, _session, socket) when is_connected?(socket) do
-    Process.send_after(self(), %{event: :load_map}, Enum.random(10..500))
+    Process.send_after(self(), %{event: :load_map}, Enum.random(10..800))
 
     {:ok,
      socket
@@ -76,13 +76,15 @@ defmodule WandererAppWeb.MapLive do
 
   def handle_info(:not_all_characters_tracked, %{assigns: %{map_slug: map_slug}} = socket),
     do:
-      {:noreply,
-       socket
-       |> put_flash(
-         :error,
-         "You should enable tracking for all characters that have access to this map first!"
-       )
-       |> push_navigate(to: ~p"/tracking/#{map_slug}")}
+      WandererAppWeb.MapEventHandler.handle_ui_event(
+        %{event: "add_character"},
+        nil,
+        socket
+        |> put_flash(
+          :error,
+          "You should enable tracking for all characters that have access to this map first!"
+        )
+      )
 
   @impl true
   def handle_info(info, socket),
@@ -100,13 +102,6 @@ defmodule WandererAppWeb.MapLive do
     |> assign(:active_page, :map)
   end
 
-  defp apply_action(socket, :add_system, _params) do
-    socket
-    |> assign(:active_page, :map)
-    |> assign(:page_title, "Add System")
-    |> assign(:add_system_form, to_form(%{"system_id" => nil}))
-  end
-
   def character_item(assigns) do
     ~H"""
     <div class="flex items-center gap-3">

lib/wanderer_app_web/live/maps/map_live.html.heex

@@ -31,41 +31,6 @@
   </.link>
 </div>
 
-<.modal
-  :if={@live_action in [:add_system] && not is_nil(assigns |> Map.get(:map_slug)) && @map_loaded?}
-  id="add-system-modal"
-  class="!w-[400px]"
-  title="Add System"
-  show
-  on_cancel={JS.patch(~p"/#{@map_slug}")}
->
-  <.form :let={f} for={@add_system_form} phx-submit="add_system">
-    <.live_select
-      label="Search system"
-      field={f[:system_id]}
-      update_min_len={2}
-      available_option_class="w-full text-sm"
-      debounce={200}
-      mode={:tags}
-    >
-      <:option :let={option}>
-        <div class="gap-1 w-full flex flex-align-center p-autocomplete-item  text-sm">
-          <div class="eve-wh-type-color-c1 text-gray-400 w-8"><%= option.class_title %></div>
-          <div class="text-white w-16"><%= option.label %></div>
-          <div class="text-gray-600 w-20"><%= option.constellation_name %></div>
-          <div class="text-gray-600"><%= option.region_name %></div>
-        </div>
-      </:option>
-    </.live_select>
-    <div class="mt-2 bg-neutral text-neutral-content rounded-md p-1 text-xs w-full">
-      * Start search system. You should type at least 2 symbols.
-    </div>
-    <div class="modal-action mt-0">
-      <.button class="mt-2" type="submit">Add</.button>
-    </div>
-  </.form>
-</.modal>
-
 <.modal
   :if={assigns |> Map.get(:show_activity?, false)}
   id="map-activity-modal"
@@ -74,31 +39,35 @@
   show
   on_cancel={JS.push("hide_activity")}
 >
-  <.table
-    :if={not (assigns |> Map.get(:character_activity) |> is_nil())}
-    class="!max-h-[80vh] !overflow-y-auto"
-    id="activity-tbl"
-    rows={@character_activity.jumps}
-  >
-    <:col :let={activity} label="Character">
-      <.character_item character={activity.character} />
-    </:col>
-    <:col :let={activity} label="Passages">
-      <%= activity.count %>
-    </:col>
-  </.table>
+  <.async_result :let={character_activity} assign={@character_activity}>
+    <:loading>Loading...</:loading>
+    <:failed :let={reason}><%= reason %></:failed>
+
+    <span :if={character_activity}>
+      <.live_component
+        module={WandererAppWeb.CharacterActivity}
+        id="character-activity"
+        activity={character_activity}
+        notify_to={self()}
+      />
+    </span>
+  </.async_result>
 </.modal>
 
 <.modal
   :if={assigns |> Map.get(:show_tracking?, false)}
   id="map-tracking-modal"
-  title="Characters tracking"
+  title="Track and Follow Characters"
   show
   on_cancel={JS.push("hide_tracking")}
 >
   <.async_result :let={characters} assign={@characters}>
-    <:loading><span class="loading loading-dots loading-xs" />.</:loading>
-    <:failed :let={reason}><%= reason %></:failed>
+    <:loading>
+      <span class="loading loading-dots loading-xs" />
+    </:loading>
+    <:failed :let={reason}>
+      <%= reason %>
+    </:failed>
 
     <.table
       :if={characters}
@@ -106,8 +75,8 @@
       class="h-[400px] !overflow-y-auto"
       rows={characters}
     >
-      <:col :let={character} label="Tracked">
-        <label class="flex items-center gap-3">
+      <:col :let={character} label="Track">
+        <label class="flex items-center gap-2 justify-center">
           <input
             type="checkbox"
             class="checkbox"
@@ -116,17 +85,34 @@
             id={"character-track-#{character.id}"}
             checked={character.tracked}
           />
-          <div class="flex items-center gap-3">
-            <.avatar url={member_icon_url(character.eve_id)} label={character.name} />
-            <div>
-              <div class="font-bold">
-                <%= character.name %><span class="ml-1 text-gray-400">[<%= character.corporation_ticker %>]</span>
-              </div>
-              <div class="text-sm opacity-50"></div>
-            </div>
-          </div>
         </label>
       </:col>
+      <:col :let={character} label="Follow">
+        <label class="flex items-center gap-2 justify-center">
+          <input
+            type="radio"
+            name="followed_character"
+            class="radio"
+            phx-click="toggle_follow"
+            phx-value-character-id={character.id}
+            checked={Map.get(character, :followed, false)}
+          />
+        </label>
+      </:col>
+      <:col :let={character} label="Character">
+        <div class="flex items-center gap-3">
+          <.avatar url={member_icon_url(character.eve_id)} label={character.name} />
+          <div>
+            <div class="font-bold">
+              <%= character.name %>
+              <span class="ml-1 text-gray-400">
+                [<%= character.corporation_ticker %>]
+              </span>
+            </div>
+            <div class="text-sm opacity-50"></div>
+          </div>
+        </div>
+      </:col>
     </.table>
   </.async_result>
 </.modal>

lib/wanderer_app_web/live/maps/maps_live.ex

@@ -197,11 +197,16 @@ defmodule WandererAppWeb.MapsLive do
     {:noreply, socket}
   end
 
-  def handle_event("validate", %{"form" => params} = _params, socket) do
+  def handle_event("validate", %{"form" => form} = _params, socket) do
     form =
       AshPhoenix.Form.validate(
         socket.assigns.form,
-        params |> Map.put("acls", params["acls"] || [])
+        form
+        |> Map.put("acls", form["acls"] || [])
+        |> Map.put(
+          "only_tracked_characters",
+          (form["only_tracked_characters"] || "false") |> String.to_existing_atom()
+        )
       )
 
     {:noreply, socket |> assign(form: form)}
@@ -591,7 +596,13 @@ defmodule WandererAppWeb.MapsLive do
         scope -> scope
       end
 
-    form = form |> Map.put("scope", scope)
+    form =
+      form
+      |> Map.put("scope", scope)
+      |> Map.put(
+        "only_tracked_characters",
+        (form["only_tracked_characters"] || "false") |> String.to_existing_atom()
+      )
 
     map
     |> WandererApp.Api.Map.update(form)

lib/wanderer_app_web/router.ex

@@ -197,7 +197,6 @@ defmodule WandererAppWeb.Router do
       live("/profile/deposit", ProfileLive, :deposit)
       live("/profile/subscribe", ProfileLive, :subscribe)
       live("/:slug/audit", MapAuditLive, :index)
-      live("/:slug/add-system", MapLive, :add_system)
       live("/:slug", MapLive, :index)
     end
   end

m

@@ -15,6 +15,15 @@ case $COMMAND in
   deps)
     MIX_ENV=dev mix deps.get
     ;;
+  setup)
+    MIX_ENV=dev mix setup
+    ;;
+  createdb)
+    MIX_ENV=dev mix ecto.create
+    ;;
+  testdb)
+    MIX_ENV=dev mix ash.codegen test111
+    ;;
   depsf)
     MIX_ENV=dev mix deps.compile syslog --force
     ;;

mix.exs

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

priv/repo/data/invGroups.csv

@@ -755,11 +755,11 @@ groupID,categoryID,groupName,iconID,useBasePrice,anchored,anchorable,fittableNon
 944,9,Capital Industrial Ship Blueprint,None,1,0,0,0,1
 945,9,Industrial Command Ship Blueprint,None,1,0,0,0,1
 952,11,Mission Container,0,0,1,0,0,0
-954,32,Defensive Subsystem,None,0,0,0,0,1
+954,32,Defensive Subsystem,3631,0,0,0,0,1
 955,17,Depricated Subsystems,None,0,0,0,0,0
-956,32,Offensive Subsystem,None,0,0,0,0,1
-957,32,Propulsion Subsystem,None,0,0,0,0,1
-958,32,Core Subsystem,None,0,0,0,0,1
+956,32,Offensive Subsystem,3641,0,0,0,0,1
+957,32,Propulsion Subsystem,3646,0,0,0,0,1
+958,32,Core Subsystem,3636,0,0,0,0,1
 959,11,Deadspace Sleeper Sleepless Sentinel,0,0,0,0,0,0
 960,11,Deadspace Sleeper Awakened Sentinel,0,0,0,0,0,0
 961,11,Deadspace Sleeper Emergent Sentinel,0,0,0,0,0,0
@@ -1529,6 +1529,8 @@ groupID,categoryID,groupName,iconID,useBasePrice,anchored,anchorable,fittableNon
 4811,9,Mercenary Den Blueprint,None,1,0,0,0,1
 4820,9,Mutaplasmid Blueprint,None,1,0,0,0,1
 4821,17,Atavum,None,1,0,0,0,1
+4824,17,Infomorph Systems,None,1,0,0,0,1
+4825,2,Local Beacon,None,0,1,0,0,0
 350858,350001,Infantry Weapons,None,1,0,0,0,0
 351064,350001,Infantry Dropsuits,None,1,0,0,0,0
 351121,350001,Infantry Modules,None,1,0,0,0,0

priv/repo/data/wormholeSystems.json

@@ -4417,7 +4417,8 @@
 		],
 		"solarSystemID": 31002576,
 		"statics": [
-			"W237"
+			"W237",
+      "K346"
 		],
 		"systemName": "J010366",
 		"effectName": null
@@ -13395,7 +13396,6 @@
 		],
 		"solarSystemID": 31002559,
 		"statics": [
-			"D792",
 			"K346",
 			"M267"
 		],
@@ -13718,7 +13718,8 @@
 		],
 		"solarSystemID": 31002566,
 		"statics": [
-			"E175"
+			"E175",
+      "K346"
 		],
 		"systemName": "J012773",
 		"effectName": "Wolf-Rayet Star"
@@ -23262,7 +23263,8 @@
 		],
 		"solarSystemID": 31002568,
 		"statics": [
-			"U210"
+			"U210",
+			"H296"
 		],
 		"systemName": "J005663",
 		"effectName": null
@@ -37631,4 +37633,4 @@
 		"systemName": "J130650",
 		"effectName": "Cataclysmic Variable"
 	}
-]
+]

priv/repo/data/wormholes.json

@@ -114,7 +114,7 @@
     "dest": "c2",
     "src": ["c1"],
     "static": false,
-    "max_mass_per_jump": 20000000,
+    "max_mass_per_jump": 62000000,
     "lifetime": "16",
     "total_mass": 1000000000,
     "name": "C125",
@@ -127,7 +127,7 @@
     "static": false,
     "max_mass_per_jump": 1350000000,
     "lifetime": "24",
-    "total_mass": 3000000000,
+    "total_mass": 3300000000,
     "name": "C140",
     "respawn": ["wandering"]
   },
@@ -149,7 +149,7 @@
     "static": false,
     "max_mass_per_jump": 1350000000,
     "lifetime": "24",
-    "total_mass": 3000000000,
+    "total_mass": 3300000000,
     "name": "C248",
     "respawn": ["wandering"]
   },
@@ -160,7 +160,7 @@
     "static": false,
     "max_mass_per_jump": 1000000000,
     "lifetime": "48",
-    "total_mass": 3000000000,
+    "total_mass": 3300000000,
     "name": "C391",
     "respawn": ["wandering"]
   },
@@ -301,7 +301,7 @@
     "dest": "thera",
     "src": ["c1"],
     "static": false,
-    "max_mass_per_jump": 20000000,
+    "max_mass_per_jump": 62000000,
     "lifetime": "16",
     "total_mass": 100000000,
     "name": "F353",
@@ -334,7 +334,7 @@
     "dest": "c1",
     "src": ["c1"],
     "static": false,
-    "max_mass_per_jump": 20000000,
+    "max_mass_per_jump": 62000000,
     "lifetime": "16",
     "total_mass": 500000000,
     "name": "H121",
@@ -378,7 +378,7 @@
     "dest": "ls",
     "src": ["c1"],
     "static": true,
-    "max_mass_per_jump": 20000000,
+    "max_mass_per_jump": 62000000,
     "lifetime": "24",
     "total_mass": 1000000000,
     "name": "J244",
@@ -409,7 +409,7 @@
   {
     "mass_regen": 0,
     "dest": "ns",
-    "src": ["c3"],
+    "src": ["c3", "c4-shattered", "c5-shattered", "c6-shattered"],
     "static": true,
     "max_mass_per_jump": 300000000,
     "lifetime": "16",
@@ -455,7 +455,7 @@
     "dest": "c5",
     "src": ["c1", "ns"],
     "static": false,
-    "max_mass_per_jump": 20000000,
+    "max_mass_per_jump": 62000000,
     "lifetime": "24",
     "total_mass": 1000000000,
     "name": "L614",
@@ -510,7 +510,7 @@
     "dest": "c4",
     "src": ["c1"],
     "static": false,
-    "max_mass_per_jump": 20000000,
+    "max_mass_per_jump": 62000000,
     "lifetime": "16",
     "total_mass": 1000000000,
     "name": "M609",
@@ -532,7 +532,7 @@
     "dest": "hs",
     "src": ["c1"],
     "static": true,
-    "max_mass_per_jump": 20000000,
+    "max_mass_per_jump": 62000000,
     "lifetime": "24",
     "total_mass": 1000000000,
     "name": "N110",
@@ -631,7 +631,7 @@
     "dest": "c3",
     "src": ["c1", "ns"],
     "static": false,
-    "max_mass_per_jump": 20000000,
+    "max_mass_per_jump": 62000000,
     "lifetime": "16",
     "total_mass": 1000000000,
     "name": "O883",
@@ -642,7 +642,7 @@
     "dest": "c1",
     "src": ["c4"],
     "static": true,
-    "max_mass_per_jump": 20000000,
+    "max_mass_per_jump": 62000000,
     "lifetime": "16",
     "total_mass": 500000000,
     "name": "P060",
@@ -664,7 +664,7 @@
     "dest": "hs",
     "src": ["thera"],
     "static": true,
-    "max_mass_per_jump": 20000000,
+    "max_mass_per_jump": 62000000,
     "lifetime": "16",
     "total_mass": 500000000,
     "name": "Q063",
@@ -675,7 +675,7 @@
     "dest": "c1",
     "src": ["c6"],
     "static": true,
-    "max_mass_per_jump": 20000000,
+    "max_mass_per_jump": 62000000,
     "lifetime": "16",
     "total_mass": 500000000,
     "name": "Q317",
@@ -763,7 +763,7 @@
     "dest": "c6",
     "src": ["c1", "ns"],
     "static": false,
-    "max_mass_per_jump": 20000000,
+    "max_mass_per_jump": 62000000,
     "lifetime": "24",
     "total_mass": 1000000000,
     "name": "S804",
@@ -796,7 +796,7 @@
     "dest": "thera",
     "src": ["hs"],
     "static": false,
-    "max_mass_per_jump": 20000000,
+    "max_mass_per_jump": 62000000,
     "lifetime": "16",
     "total_mass": 500000000,
     "name": "T458",
@@ -805,7 +805,7 @@
   {
     "mass_regen": 0,
     "dest": "ls",
-    "src": ["c3"],
+    "src": ["c3", "c4-shattered", "c5-shattered"],
     "static": true,
     "max_mass_per_jump": 300000000,
     "lifetime": "24",
@@ -862,7 +862,7 @@
     "dest": "c1",
     "src": ["c3", "thera"],
     "static": false,
-    "max_mass_per_jump": 20000000,
+    "max_mass_per_jump": 62000000,
     "lifetime": "16",
     "total_mass": 500000000,
     "name": "V301",
@@ -972,7 +972,7 @@
     "dest": "c1",
     "src": ["c5"],
     "static": true,
-    "max_mass_per_jump": 20000000,
+    "max_mass_per_jump": 62000000,
     "lifetime": "16",
     "total_mass": 500000000,
     "name": "Y790",
@@ -994,7 +994,7 @@
     "dest": "ns",
     "src": ["c1"],
     "static": true,
-    "max_mass_per_jump": 20000000,
+    "max_mass_per_jump": 62000000,
     "lifetime": "16",
     "total_mass": 1000000000,
     "name": "Z060",
@@ -1027,7 +1027,7 @@
     "dest": "c1",
     "src": ["c2", "drifter"],
     "static": true,
-    "max_mass_per_jump": 20000000,
+    "max_mass_per_jump": 62000000,
     "lifetime": "16",
     "total_mass": 500000000,
     "name": "Z647",
@@ -1038,7 +1038,7 @@
     "dest": "c1",
     "src": ["hs", "ls", "ns"],
     "static": false,
-    "max_mass_per_jump": 20000000,
+    "max_mass_per_jump": 62000000,
     "lifetime": "16",
     "total_mass": 100000000,
     "name": "Z971",

priv/repo/migrations/20241217103838_ship_size.exs

@@ -0,0 +1,21 @@
+defmodule WandererApp.Repo.Migrations.ShipSize do
+  @moduledoc """
+  Updates resources based on their most recent snapshots.
+
+  This file was autogenerated with `mix ash_postgres.generate_migrations`
+  """
+
+  use Ecto.Migration
+
+  def up do
+    alter table(:map_chain_v1) do
+      modify :ship_size_type, :bigint, default: 2
+    end
+  end
+
+  def down do
+    alter table(:map_chain_v1) do
+      modify :ship_size_type, :bigint, default: 1
+    end
+  end
+end

priv/repo/migrations/20241231030731_add_character_settings_followed.exs

@@ -0,0 +1,21 @@
+defmodule WandererApp.Repo.Migrations.MigrateResources1 do
+  @moduledoc """
+  Updates resources based on their most recent snapshots.
+
+  This file was autogenerated with `mix ash_postgres.generate_migrations`
+  """
+
+  use Ecto.Migration
+
+  def up do
+    alter table(:map_character_settings_v1) do
+      add :followed, :boolean, default: false
+    end
+  end
+
+  def down do
+    alter table(:map_character_settings_v1) do
+      remove :followed
+    end
+  end
+end

priv/resource_snapshots/repo/map_chain_v1/20241217103838.json

@@ -0,0 +1,178 @@
+{
+  "attributes": [
+    {
+      "allow_nil?": false,
+      "default": "fragment(\"gen_random_uuid()\")",
+      "generated?": false,
+      "primary_key?": true,
+      "references": null,
+      "size": null,
+      "source": "id",
+      "type": "uuid"
+    },
+    {
+      "allow_nil?": true,
+      "default": "nil",
+      "generated?": false,
+      "primary_key?": false,
+      "references": null,
+      "size": null,
+      "source": "solar_system_source",
+      "type": "bigint"
+    },
+    {
+      "allow_nil?": true,
+      "default": "nil",
+      "generated?": false,
+      "primary_key?": false,
+      "references": null,
+      "size": null,
+      "source": "solar_system_target",
+      "type": "bigint"
+    },
+    {
+      "allow_nil?": true,
+      "default": "0",
+      "generated?": false,
+      "primary_key?": false,
+      "references": null,
+      "size": null,
+      "source": "mass_status",
+      "type": "bigint"
+    },
+    {
+      "allow_nil?": true,
+      "default": "0",
+      "generated?": false,
+      "primary_key?": false,
+      "references": null,
+      "size": null,
+      "source": "time_status",
+      "type": "bigint"
+    },
+    {
+      "allow_nil?": true,
+      "default": "2",
+      "generated?": false,
+      "primary_key?": false,
+      "references": null,
+      "size": null,
+      "source": "ship_size_type",
+      "type": "bigint"
+    },
+    {
+      "allow_nil?": true,
+      "default": "0",
+      "generated?": false,
+      "primary_key?": false,
+      "references": null,
+      "size": null,
+      "source": "type",
+      "type": "bigint"
+    },
+    {
+      "allow_nil?": true,
+      "default": "nil",
+      "generated?": false,
+      "primary_key?": false,
+      "references": null,
+      "size": null,
+      "source": "wormhole_type",
+      "type": "text"
+    },
+    {
+      "allow_nil?": true,
+      "default": "0",
+      "generated?": false,
+      "primary_key?": false,
+      "references": null,
+      "size": null,
+      "source": "count_of_passage",
+      "type": "bigint"
+    },
+    {
+      "allow_nil?": true,
+      "default": "nil",
+      "generated?": false,
+      "primary_key?": false,
+      "references": null,
+      "size": null,
+      "source": "locked",
+      "type": "boolean"
+    },
+    {
+      "allow_nil?": true,
+      "default": "nil",
+      "generated?": false,
+      "primary_key?": false,
+      "references": null,
+      "size": null,
+      "source": "custom_info",
+      "type": "text"
+    },
+    {
+      "allow_nil?": false,
+      "default": "fragment(\"(now() AT TIME ZONE 'utc')\")",
+      "generated?": false,
+      "primary_key?": false,
+      "references": null,
+      "size": null,
+      "source": "inserted_at",
+      "type": "utc_datetime_usec"
+    },
+    {
+      "allow_nil?": false,
+      "default": "fragment(\"(now() AT TIME ZONE 'utc')\")",
+      "generated?": false,
+      "primary_key?": false,
+      "references": null,
+      "size": null,
+      "source": "updated_at",
+      "type": "utc_datetime_usec"
+    },
+    {
+      "allow_nil?": true,
+      "default": "nil",
+      "generated?": false,
+      "primary_key?": false,
+      "references": {
+        "deferrable": false,
+        "destination_attribute": "id",
+        "destination_attribute_default": null,
+        "destination_attribute_generated": null,
+        "index?": false,
+        "match_type": null,
+        "match_with": null,
+        "multitenancy": {
+          "attribute": null,
+          "global": null,
+          "strategy": null
+        },
+        "name": "map_chain_v1_map_id_fkey",
+        "on_delete": null,
+        "on_update": null,
+        "primary_key?": true,
+        "schema": "public",
+        "table": "maps_v1"
+      },
+      "size": null,
+      "source": "map_id",
+      "type": "uuid"
+    }
+  ],
+  "base_filter": null,
+  "check_constraints": [],
+  "custom_indexes": [],
+  "custom_statements": [],
+  "has_create_action": true,
+  "hash": "3495268959E42B3B8D31B5B154B416A5BEF80D57D684375296EA5C1711FE3521",
+  "identities": [],
+  "multitenancy": {
+    "attribute": null,
+    "global": null,
+    "strategy": null
+  },
+  "repo": "Elixir.WandererApp.Repo",
+  "schema": null,
+  "table": "map_chain_v1"
+}