chore: release version v1.13.7

Use ESI /characters/affiliation to fetch characters corporation changes
(1H cached instead of 7D)

.github/workflows/build.yml

@@ -58,6 +58,8 @@ jobs:
         otp: ["27"]
         elixir: ["1.17"]
         node-version: ["18.x"]
+    outputs:
+      commit_hash: ${{ steps.generate-changelog.outputs.commit_hash }}
     steps:
       - name: Prepare
         run: |
@@ -108,16 +110,17 @@ jobs:
         run: mix compile
 
       - name: Generate Changelog & Update Tag Version
+        id: generate-changelog
         run: |
           git config --global user.name 'CI'
           git config --global user.email 'ci@users.noreply.github.com'
           mix git_ops.release --force-patch --yes
           git push --follow-tags
+          echo "commit_hash=$(git rev-parse HEAD)" >> $GITHUB_OUTPUT
 
   docker:
     name: 🛠 Build Docker Images
-    needs:
-      - build
+    needs: build
     runs-on: ubuntu-22.04
     permissions:
       checks: write
@@ -141,6 +144,7 @@ jobs:
       - name: ⬇️ Checkout repo
         uses: actions/checkout@v3
         with:
+          ref: ${{ needs.build.outputs.commit_hash }}
           fetch-depth: 0
 
       - name: Prepare Changelog
@@ -189,6 +193,30 @@ jobs:
       - name: Image digest
         run: echo ${{ steps.build.outputs.digest }}
 
+      - uses: markpatterson27/markdown-to-output@v1
+        id: extract-changelog
+        with:
+          filepath: CHANGELOG.md
+
+      - name: Get content
+        uses: 2428392/gh-truncate-string-action@v1.3.0
+        id: get-content
+        with:
+          stringToTruncate: |
+            📣 Wanderer new release available 🎉
+
+            **Version**: ${{ steps.get-latest-tag.outputs.tag }}
+
+            ${{ steps.extract-changelog.outputs.body }}
+          maxLength: 500
+          truncationSymbol: "…"
+
+      - name: Discord Webhook Action
+        uses: tsickert/discord-webhook@v5.3.0
+        with:
+          webhook-url: ${{ secrets.DISCORD_WEBHOOK_URL }}
+          content: ${{ steps.get-content.outputs.string }}
+
   create-release:
     name: 🏷 Create Release
     runs-on: ubuntu-22.04

CHANGELOG.md

@@ -1,6 +1,14 @@
 # Change Log
 
 <!-- changelog -->
+## [v1.13.0](https://github.com/wanderer-industries/wanderer/compare/v1.12.11...v1.13.0) (2024-10-28)
+
+
+
+
+### Features:
+
+* Core: Use ESI /characters/affiliation API
 
 ## [v1.12.4](https://github.com/wanderer-industries/wanderer/compare/v1.12.3...v1.12.4) (2024-10-21)
 
@@ -20,11 +28,6 @@
 
 * Map: Fix regression issues
 
-## [v1.12.2](https://github.com/wanderer-industries/wanderer/compare/v1.12.1...v1.12.2) (2024-10-16)
-
-
-
-
 ## [v1.12.1](https://github.com/wanderer-industries/wanderer/compare/v1.12.0...v1.12.1) (2024-10-16)
 
 
@@ -43,31 +46,6 @@
 
 * Map: Prettify user settings
 
-## [v1.11.5](https://github.com/wanderer-industries/wanderer/compare/v1.11.4...v1.11.5) (2024-10-16)
-
-
-
-
-## [v1.11.4](https://github.com/wanderer-industries/wanderer/compare/v1.11.3...v1.11.4) (2024-10-16)
-
-
-
-
-## [v1.11.3](https://github.com/wanderer-industries/wanderer/compare/v1.11.2...v1.11.3) (2024-10-16)
-
-
-
-
-## [v1.11.2](https://github.com/wanderer-industries/wanderer/compare/v1.11.1...v1.11.2) (2024-10-15)
-
-
-
-
-## [v1.11.1](https://github.com/wanderer-industries/wanderer/compare/v1.11.0...v1.11.1) (2024-10-14)
-
-
-
-
 ## [v1.11.0](https://github.com/wanderer-industries/wanderer/compare/v1.10.0...v1.11.0) (2024-10-14)
 
 

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

@@ -85,3 +85,26 @@
   }
 }
 
+.p-dropdown-label, .p-inputtext {
+  padding: 0.25rem 0.75rem;
+  font-size: 14px;
+}
+
+.p-dropdown-item {
+  padding: 0.25rem 0.5rem;
+  font-size: 14px;
+}
+
+.p-dropdown-item-group {
+  padding: 0.25rem 0.75rem;
+  font-size: 14px;
+}
+
+.p-dropdown-trigger {
+  width: 14px;
+  margin: 0 12px;
+}
+
+.p-dropdown-empty-message {
+  padding: 0.25rem 0.5rem;
+}

assets/js/hooks/Mapper/components/contexts/ContextMenuSystem/hooks/useTagMenu/useTagMenu.ts

@@ -18,7 +18,7 @@ export const useTagMenu = (
   ref.current = { onSystemTag, systems, systemId };
 
   return useCallback(() => {
-    const { onSystemTag, systemId , systems} = ref.current;
+    const { onSystemTag, systemId, systems } = ref.current;
     const system = systemId ? getSystemById(systems, systemId) : undefined;
 
     const isSelectedLetters = AVAILABLE_LETTERS.includes(system?.tag ?? '');

assets/js/hooks/Mapper/components/contexts/ContextMenuSystem/useContextMenuSystemHandlers.ts

@@ -4,6 +4,7 @@ import { OutCommand, OutCommandHandler } from '@/hooks/Mapper/types/mapHandlers.
 import { SolarSystemRawType } from '@/hooks/Mapper/types';
 import { WaypointSetContextHandler } from '@/hooks/Mapper/components/contexts/types.ts';
 import { ctxManager } from '@/hooks/Mapper/utils/contextManager.ts';
+import { useDeleteSystems } from '@/hooks/Mapper/components/contexts/hooks';
 
 interface UseContextMenuSystemHandlersProps {
   hubs: string[];
@@ -16,8 +17,10 @@ export const useContextMenuSystemHandlers = ({ systems, hubs, outCommand }: UseC
 
   const [system, setSystem] = useState<string>();
 
-  const ref = useRef({ hubs, system, systems, outCommand });
-  ref.current = { hubs, system, systems, outCommand };
+  const { deleteSystems } = useDeleteSystems();
+
+  const ref = useRef({ hubs, system, systems, outCommand, deleteSystems });
+  ref.current = { hubs, system, systems, outCommand, deleteSystems };
 
   const open = useCallback((ev: any, systemId: string) => {
     setSystem(systemId);
@@ -27,12 +30,12 @@ export const useContextMenuSystemHandlers = ({ systems, hubs, outCommand }: UseC
   }, []);
 
   const onDeleteSystem = useCallback(() => {
-    const { system, outCommand } = ref.current;
+    const { system, deleteSystems } = ref.current;
     if (!system) {
       return;
     }
 
-    outCommand({ type: OutCommand.deleteSystems, data: [system] });
+    deleteSystems([system]);
     setSystem(undefined);
   }, []);
 

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

@@ -8,7 +8,7 @@ import { getSystemById } from '@/hooks/Mapper/helpers';
 import { useWaypointMenu } from '@/hooks/Mapper/components/contexts/hooks';
 import { WaypointSetContextHandler } from '@/hooks/Mapper/components/contexts/types.ts';
 import { FastSystemActions } from '@/hooks/Mapper/components/contexts/components';
-import { useJumpPlannerMenu } from '@/hooks/Mapper/components/contexts/hooks/useJumpPlannerMenu';
+import { useJumpPlannerMenu } from '@/hooks/Mapper/components/contexts/hooks';
 import { Route } from '@/hooks/Mapper/types/routes.ts';
 
 export interface ContextMenuSystemInfoProps {

assets/js/hooks/Mapper/components/contexts/ContextMenuSystemMultiple/useContextMenuSystemMultipleHandlers.ts

@@ -1,17 +1,17 @@
 import { Node } from 'reactflow';
-import { useRef, useState } from 'react';
+import { useCallback, useRef, useState } from 'react';
 import { ContextMenu } from 'primereact/contextmenu';
-import { OutCommand } from '@/hooks/Mapper/types/mapHandlers.ts';
 import { SolarSystemRawType } from '@/hooks/Mapper/types';
 import { ctxManager } from '@/hooks/Mapper/utils/contextManager.ts';
-import { useMapRootState } from '@/hooks/Mapper/mapRootProvider';
 import { NodeSelectionMouseHandler } from '@/hooks/Mapper/components/contexts/types.ts';
+import { useDeleteSystems } from '@/hooks/Mapper/components/contexts/hooks';
 
 export const useContextMenuSystemMultipleHandlers = () => {
   const contextMenuRef = useRef<ContextMenu | null>(null);
-  const { outCommand } = useMapRootState();
   const [systems, setSystems] = useState<Node<SolarSystemRawType>[]>();
 
+  const { deleteSystems } = useDeleteSystems();
+
   const handleSystemMultipleContext: NodeSelectionMouseHandler = (ev, systems_) => {
     setSystems(systems_);
     ev.preventDefault();
@@ -19,7 +19,7 @@ export const useContextMenuSystemMultipleHandlers = () => {
     contextMenuRef.current?.show(ev);
   };
 
-  const onDeleteSystems = () => {
+  const onDeleteSystems = useCallback(() => {
     if (!systems) {
       return;
     }
@@ -29,12 +29,11 @@ export const useContextMenuSystemMultipleHandlers = () => {
       return;
     }
 
-    outCommand({ type: OutCommand.deleteSystems, data: sysToDel });
-  };
+    deleteSystems(sysToDel);
+  }, [deleteSystems, systems]);
 
   return {
     handleSystemMultipleContext,
-
     contextMenuRef,
     onDeleteSystems,
   };

assets/js/hooks/Mapper/components/contexts/hooks/index.ts

@@ -1 +1,3 @@
 export * from './useWaypointMenu';
+export * from './useJumpPlannerMenu';
+export * from './useDeleteSystems';

assets/js/hooks/Mapper/components/contexts/hooks/useDeleteSystems.ts

@@ -0,0 +1,18 @@
+import { OutCommand } from '@/hooks/Mapper/types/mapHandlers.ts';
+import { useMapRootState } from '@/hooks/Mapper/mapRootProvider';
+
+export const useDeleteSystems = () => {
+  const { outCommand } = useMapRootState();
+
+  const deleteSystems = (systemIds: string[]) => {
+    if (!systemIds || !systemIds.length) {
+      return;
+    }
+
+    outCommand({ type: OutCommand.deleteSystems, data: systemIds });
+  };
+
+  return {
+    deleteSystems,
+  };
+};

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

@@ -0,0 +1,2 @@
+export * from './useSystemInfo';
+export * from './useGetOwnOnlineCharacters';

assets/js/hooks/Mapper/components/hooks/useSystemInfo.ts

@@ -0,0 +1,33 @@
+import { useMapRootState } from '@/hooks/Mapper/mapRootProvider';
+import { useMemo } from 'react';
+import { getSystemById } from '@/hooks/Mapper/helpers';
+import { useLoadSystemStatic } from '@/hooks/Mapper/mapRootProvider/hooks/useLoadSystemStatic.ts';
+
+interface UseSystemInfoProps {
+  systemId: string;
+}
+
+export const useSystemInfo = ({ systemId }: UseSystemInfoProps) => {
+  const {
+    data: { systems, connections },
+  } = useMapRootState();
+
+  const { systems: systemStatics } = useLoadSystemStatic({ systems: [systemId] });
+
+  return useMemo(() => {
+    const staticInfo = systemStatics.get(parseInt(systemId));
+    const dynamicInfo = getSystemById(systems, systemId);
+
+    if (!staticInfo || !dynamicInfo) {
+      throw new Error(`Error on getting system ${systemId}`);
+    }
+
+    const leadsTo = connections
+      .filter(x => [x.source, x.target].includes(systemId))
+      .map(x => [x.source, x.target])
+      .flat()
+      .filter(x => x !== systemId);
+
+    return { dynamicInfo, staticInfo, leadsTo };
+  }, [systemStatics, systemId, systems, connections]);
+};

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

@@ -1,4 +1,4 @@
-import { ForwardedRef, forwardRef, MouseEvent, useCallback, useEffect } from 'react';
+import { ForwardedRef, forwardRef, MouseEvent, useCallback, useEffect, useRef } from 'react';
 import ReactFlow, {
   Background,
   ConnectionMode,
@@ -13,12 +13,15 @@ import ReactFlow, {
   SelectionMode,
   useEdgesState,
   useNodesState,
+  NodeChange,
+  useReactFlow,
 } from 'reactflow';
 import 'reactflow/dist/style.css';
 import classes from './Map.module.scss';
 import './styles/neon-theme.scss';
 import './styles/eve-common.scss';
 import { MapProvider, useMapState } from './MapProvider';
+import { useMapRootState } from '@/hooks/Mapper/mapRootProvider';
 import { useMapHandlers, useUpdateNodes } from './hooks';
 import { MapHandlers, OutCommand, OutCommandHandler } from '@/hooks/Mapper/types/mapHandlers.ts';
 import {
@@ -34,6 +37,7 @@ 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 { useDeleteSystems } from '@/hooks/Mapper/components/contexts/hooks';
 
 const DEFAULT_VIEW_PORT = { zoom: 1, x: 0, y: 0 };
 
@@ -108,6 +112,7 @@ const MapComp = ({
   isShowMinimap,
   showKSpaceBG,
 }: MapCompProps) => {
+  const { getNode } = useReactFlow();
   const [nodes, , onNodesChange] = useNodesState<SolarSystemRawType>(initialNodes);
   const [edges, , onEdgesChange] = useEdgesState<Edge<SolarSystemConnection>[]>(initialEdges);
 
@@ -115,8 +120,15 @@ const MapComp = ({
   useUpdateNodes(nodes);
   const { handleRootContext, ...rootCtxProps } = useContextMenuRootHandlers();
   const { handleConnectionContext, ...connectionCtxProps } = useContextMenuConnectionHandlers();
-
   const { update } = useMapState();
+  const {
+    data: { systems },
+  } = useMapRootState();
+
+  const { deleteSystems } = useDeleteSystems();
+
+  const systemsRef = useRef({ systems });
+  systemsRef.current = { systems };
 
   const onConnect: OnConnect = useCallback(
     params => {
@@ -171,6 +183,32 @@ const MapComp = ({
     localStorage.setItem(SESSION_KEY.viewPort, JSON.stringify(viewport));
   };
 
+  const handleNodesChange = useCallback(
+    (changes: NodeChange[]) => {
+      const systemsIdsToRemove: string[] = [];
+      const nextChanges = changes.reduce((acc, change) => {
+        if (change.type === 'remove') {
+          const node = getNode(change.id);
+          const { systems = [] } = systemsRef.current;
+          if (node?.data?.id && !systems.map(s => s.id).includes(node?.data?.id)) {
+            return [...acc, change];
+          } else if (!node?.data?.locked) {
+            systemsIdsToRemove.push(node?.data?.id);
+          }
+          return acc;
+        }
+        return [...acc, change];
+      }, [] as NodeChange[]);
+
+      if (systemsIdsToRemove.length) {
+        deleteSystems(systemsIdsToRemove);
+      }
+
+      onNodesChange(nextChanges);
+    },
+    [deleteSystems, getNode, onNodesChange],
+  );
+
   useEffect(() => {
     update(x => ({
       ...x,
@@ -184,7 +222,7 @@ const MapComp = ({
         <ReactFlow
           nodes={nodes}
           edges={edges}
-          onNodesChange={onNodesChange}
+          onNodesChange={handleNodesChange}
           onEdgesChange={onEdgesChange}
           onConnect={onConnect}
           // TODO we need save into session all of this
@@ -219,10 +257,10 @@ const MapComp = ({
           minZoom={0.2}
           maxZoom={1.5}
           elevateNodesOnSelect
+          deleteKeyCode={['Delete']}
           // TODO need create clear example with problem with that flag
           //  if system is not visible edge not drawing (and any render in Custom node is not happening)
           // onlyRenderVisibleElements
-          deleteKeyCode={null}
           selectionMode={SelectionMode.Partial}
         >
           {isShowMinimap && <MiniMap pannable zoomable ariaLabel="Mini map" className={minimapClasses} />}

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

@@ -1,4 +1,4 @@
-@import "@/hooks/Mapper/components/map/styles/eve-common-variables";
+@import '@/hooks/Mapper/components/map/styles/eve-common-variables';
 
 $pastel-blue: #5a7d9a;
 $pastel-pink: #d291bc;
@@ -25,9 +25,11 @@ $tooltip-bg: #202020; // Темный фон для подсказок
   z-index: 1;
   overflow: hidden;
 
-
-  &.Mataria, &.Amarria, &.Gallente, &.Caldaria {
-    &::Before {
+  &.Mataria,
+  &.Amarria,
+  &.Gallente,
+  &.Caldaria {
+    &::before {
       content: '';
       position: absolute;
       top: 0;
@@ -44,42 +46,40 @@ $tooltip-bg: #202020; // Темный фон для подсказок
 
   &.Mataria {
     &::before {
-      background-image: url("/images/mataria.png");
+      background-image: url('/images/mataria-180.png');
       opacity: 0.6;
-      background-position-x: -28px;
-      background-position-y: -3px;
+      background-position-x: 1px;
+      background-position-y: -14px;
     }
   }
 
   &.Caldaria {
     &::before {
-      background-image: url("/images/caldaria.png");
+      background-image: url('/images/caldaria-180.png');
       opacity: 0.6;
-      background-position-x: -16px;
-      background-position-y: -17px;
+      background-position-x: 1px;
+      background-position-y: -10px;
     }
   }
 
   &.Amarria {
     &::before {
       opacity: 0.45;
-      background-image: url("/images/amarr.png");
-      background-position-x: 0px;
-      background-position-y: -1px;
-      width: calc(100% + 10px)
+      background-image: url('/images/amarr-180.png');
+      background-position-x: 0;
+      background-position-y: -13px;
     }
   }
 
   &.Gallente {
     &::before {
-      opacity: 0.6;
-      background-image: url("/images/gallente.png");
-      background-position-x: -1px;
-      background-position-y: -10px;
+      opacity: 0.5;
+      background-image: url('/images/gallente-180.png');
+      background-position-x: 1px;
+      background-position-y: 0;
     }
   }
 
-
   &.selected {
     border-color: $pastel-pink;
     box-shadow: 0 0 10px #9a1af1c2;
@@ -95,7 +95,7 @@ $tooltip-bg: #202020; // Темный фон для подсказок
 
   &.eve-system-status-home {
     border: 1px solid darken($eve-solar-system-status-color-home, 30%);
-    background-image: linear-gradient(45deg, $eve-solar-system-status-friendly, transparent);
+    background-image: linear-gradient(275deg, $eve-solar-system-status-friendly, transparent);
 
     &.selected {
       border-color: $eve-solar-system-status-color-home;
@@ -104,7 +104,7 @@ $tooltip-bg: #202020; // Темный фон для подсказок
 
   &.eve-system-status-friendly {
     border: 1px solid darken($eve-solar-system-status-color-friendly, 20%);
-    background-image: linear-gradient(45deg, darken($eve-solar-system-status-friendly, 30%), transparent);
+    background-image: linear-gradient(275deg, darken($eve-solar-system-status-friendly, 30%), transparent);
 
     &.selected {
       border-color: darken($eve-solar-system-status-color-friendly, 5%);
@@ -113,7 +113,7 @@ $tooltip-bg: #202020; // Темный фон для подсказок
 
   &.eve-system-status-lookingFor {
     border: 1px solid darken($eve-solar-system-status-color-lookingFor, 15%);
-    background-image: linear-gradient(45deg, #45ff8f2f, #457fff2f);
+    background-image: linear-gradient(275deg, #45ff8f2f, #457fff2f);
 
     &.selected {
       border-color: $pastel-pink;
@@ -121,17 +121,16 @@ $tooltip-bg: #202020; // Темный фон для подсказок
   }
 
   &.eve-system-status-warning {
-    background-image: linear-gradient(45deg, $eve-solar-system-status-warning, transparent);
+    background-image: linear-gradient(275deg, $eve-solar-system-status-warning, transparent);
   }
 
   &.eve-system-status-dangerous {
-    background-image: linear-gradient(45deg, $eve-solar-system-status-dangerous, transparent);
+    background-image: linear-gradient(275deg, $eve-solar-system-status-dangerous, transparent);
   }
 
   &.eve-system-status-target {
-    background-image: linear-gradient(45deg, $eve-solar-system-status-target, transparent);
+    background-image: linear-gradient(275deg, $eve-solar-system-status-target, transparent);
   }
-
 }
 
 .Bookmarks {
@@ -158,7 +157,7 @@ $tooltip-bg: #202020; // Темный фон для подсказок
     //background-color: #833ca4;
 
     &:not(:first-child) {
-      box-shadow: inset 4px -3px 4px rgba(0, 0, 0, .3);
+      box-shadow: inset 4px -3px 4px rgba(0, 0, 0, 0.3);
     }
   }
 
@@ -181,7 +180,6 @@ $tooltip-bg: #202020; // Темный фон для подсказок
       font-size: 9px;
     }
   }
-
 }
 
 .icon {
@@ -219,9 +217,7 @@ $tooltip-bg: #202020; // Темный фон для подсказок
   }
 
   .solarSystemName {
-
   }
-
 }
 
 .BottomRow {
@@ -288,11 +284,19 @@ $tooltip-bg: #202020; // Темный фон для подсказок
     border-color: $pastel-pink;
   }
 
-  &.HandleTop { top: -2px }
+  &.HandleTop {
+    top: -2px;
+  }
 
-  &.HandleRight { right: -2px }
+  &.HandleRight {
+    right: -2px;
+  }
 
-  &.HandleBottom { bottom: -2px }
+  &.HandleBottom {
+    bottom: -2px;
+  }
 
-  &.HandleLeft { left: -2px }
+  &.HandleLeft {
+    left: -2px;
+  }
 }

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

@@ -133,7 +133,7 @@ export const SolarSystemNode = memo(({ data, selected }: WrapNodeProps<MapSolarS
         <div className={classes.Bookmarks}>
           {labelCustom !== '' && (
             <div className={clsx(classes.Bookmark, MARKER_BOOKMARK_BG_STYLES.custom)}>
-              <div>{labelCustom}</div>
+              <span className="[text-shadow:_0_1px_0_rgb(0_0_0_/_40%)] ">{labelCustom}</span>
             </div>
           )}
 
@@ -168,14 +168,16 @@ export const SolarSystemNode = memo(({ data, selected }: WrapNodeProps<MapSolarS
         {visible && (
           <>
             <div className={classes.HeadRow}>
-              <div className={clsx(classes.classTitle, classTitleColor)}>{class_title ?? '-'}</div>
+              <div className={clsx(classes.classTitle, classTitleColor, '[text-shadow:_0_1px_0_rgb(0_0_0_/_40%)]')}>
+                {class_title ?? '-'}
+              </div>
               {tag != null && tag !== '' && (
                 <div className={clsx(classes.TagTitle, 'text-sky-400 font-medium')}>{tag}</div>
               )}
               <div
                 className={clsx(
                   classes.classSystemName,
-                  'flex-grow overflow-hidden text-ellipsis whitespace-nowrap font-sans',
+                  '[text-shadow:_0_1px_0_rgb(0_0_0_/_40%)] flex-grow overflow-hidden text-ellipsis whitespace-nowrap font-sans',
                 )}
               >
                 {solar_system_name}
@@ -196,16 +198,16 @@ export const SolarSystemNode = memo(({ data, selected }: WrapNodeProps<MapSolarS
 
             <div className={clsx(classes.BottomRow, 'flex items-center justify-between')}>
               {customName && (
-                <div className="text-blue-300 whitespace-nowrap overflow-hidden text-ellipsis mr-0.5">{customName}</div>
+                <div className="[text-shadow:_0_1px_0_rgb(0_0_0_/_40%)] text-blue-300 whitespace-nowrap overflow-hidden text-ellipsis mr-0.5">
+                  {customName}
+                </div>
               )}
 
               {!isWormhole && !customName && (
                 <div
-                  className={clsx('text-stone-400 whitespace-nowrap overflow-hidden text-ellipsis mr-0.5', {
-                    ['text-teal-100 font-bold']: space === Spaces.Caldari,
-                    ['text-yellow-100 font-bold']: space === Spaces.Amarr || space === Spaces.Matar,
-                    ['text-lime-200/80 font-bold']: space === Spaces.Gallente,
-                  })}
+                  className={clsx(
+                    '[text-shadow:_0_1px_0_rgb(0_0_0_/_40%)] text-stone-300 whitespace-nowrap overflow-hidden text-ellipsis mr-0.5',
+                  )}
                 >
                   {region_name}
                 </div>
@@ -215,10 +217,10 @@ export const SolarSystemNode = memo(({ data, selected }: WrapNodeProps<MapSolarS
 
               <div className="flex items-center justify-end">
                 <div className="flex gap-1 items-center">
-                  {locked && <i className={PrimeIcons.LOCK} style={{ fontSize: '0.45rem' }}></i>}
+                  {locked && <i className={PrimeIcons.LOCK} style={{ fontSize: '0.45rem', fontWeight: 'bold' }}></i>}
 
                   {hubs.includes(solar_system_id.toString()) && (
-                    <i className={PrimeIcons.MAP_MARKER} style={{ fontSize: '0.45rem' }}></i>
+                    <i className={PrimeIcons.MAP_MARKER} style={{ fontSize: '0.45rem', fontWeight: 'bold' }}></i>
                   )}
 
                   {charactersInSystem.length > 0 && (

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

@@ -18,5 +18,9 @@ export const WormholeClassComp = ({ id }: WormholeClassComp) => {
   }
 
   const colorClass = WORMHOLE_CLASS_STYLES[wormholeDataAdditional.wormholeClassID.toString()];
-  return <div className={clsx(colorClass)}>{wormholeDataAdditional.shortName}</div>;
+  return (
+    <div className={clsx(colorClass, '[text-shadow:_0_1px_0_rgb(0_0_0_/_40%)]')}>
+      {wormholeDataAdditional.shortName}
+    </div>
+  );
 };

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

@@ -30,11 +30,77 @@ export enum SOLAR_SYSTEM_CLASS_IDS {
   zarzakh = 10100,
 }
 
+export enum SOLAR_SYSTEM_CLASS_GROUPS {
+  ccp = 'ccp',
+  c1 = 'c1',
+  c2 = 'c2',
+  c3 = 'c3',
+  c4 = 'c4',
+  c5 = 'c5',
+  c6 = 'c6',
+  hs = 'hs',
+  ls = 'ls',
+  ns = 'ns',
+  thera = 'thera',
+  c13 = 'c13',
+  drifter = 'drifter',
+  unknown = 'unknown',
+  pochven = 'pochven',
+  jovian = 'jovian',
+}
+
+export const SOLAR_SYSTEM_TO_CLASS_GROUPS_CLASSES = {
+  c1: ['c1'],
+  c2: ['c2'],
+  c3: ['c3'],
+  c4: ['c4'],
+  c5: ['c5'],
+  c6: ['c6'],
+  hs: ['hs'],
+  ls: ['ls'],
+  ns: ['ns'],
+  thera: ['thera'],
+  c13: ['c13'],
+  pochven: ['pochven'],
+  drifter: ['sentinel', 'barbican', 'vidette', 'conflux', 'redoubt'],
+  jove: ['jove'],
+};
+
+export const SOLAR_SYSTEM_CLASSES_TO_CLASS_GROUPS = {
+  ccp1: SOLAR_SYSTEM_CLASS_GROUPS.ccp,
+  c1: SOLAR_SYSTEM_CLASS_GROUPS.c1,
+  c2: SOLAR_SYSTEM_CLASS_GROUPS.c2,
+  c3: SOLAR_SYSTEM_CLASS_GROUPS.c3,
+  c4: SOLAR_SYSTEM_CLASS_GROUPS.c4,
+  c5: SOLAR_SYSTEM_CLASS_GROUPS.c5,
+  c6: SOLAR_SYSTEM_CLASS_GROUPS.c6,
+  hs: SOLAR_SYSTEM_CLASS_GROUPS.hs,
+  ls: SOLAR_SYSTEM_CLASS_GROUPS.ls,
+  ns: SOLAR_SYSTEM_CLASS_GROUPS.ns,
+  ccp2: SOLAR_SYSTEM_CLASS_GROUPS.ccp,
+  ccp3: SOLAR_SYSTEM_CLASS_GROUPS.ccp,
+  thera: SOLAR_SYSTEM_CLASS_GROUPS.thera,
+  c13: SOLAR_SYSTEM_CLASS_GROUPS.c13,
+  sentinel: SOLAR_SYSTEM_CLASS_GROUPS.drifter,
+  baribican: SOLAR_SYSTEM_CLASS_GROUPS.drifter,
+  vidette: SOLAR_SYSTEM_CLASS_GROUPS.drifter,
+  conflux: SOLAR_SYSTEM_CLASS_GROUPS.drifter,
+  redoubt: SOLAR_SYSTEM_CLASS_GROUPS.drifter,
+  a1: SOLAR_SYSTEM_CLASS_GROUPS.unknown,
+  a2: SOLAR_SYSTEM_CLASS_GROUPS.unknown,
+  a3: SOLAR_SYSTEM_CLASS_GROUPS.unknown,
+  a4: SOLAR_SYSTEM_CLASS_GROUPS.unknown,
+  a5: SOLAR_SYSTEM_CLASS_GROUPS.unknown,
+  ccp4: SOLAR_SYSTEM_CLASS_GROUPS.ccp,
+  pochven: SOLAR_SYSTEM_CLASS_GROUPS.pochven,
+};
+
 type WormholesAdditionalInfoType = {
   id: string;
   shortName: string;
   wormholeClassID: number;
   title: string;
+  shortTitle: string;
   effectPower?: number;
 };
 
@@ -45,6 +111,7 @@ export const WORMHOLES_ADDITIONAL_INFO_RAW: WormholesAdditionalInfoType[] = [
     shortName: 'CCP',
     wormholeClassID: -1,
     title: 'CCP System',
+    shortTitle: 'CCP',
   },
   {
     id: 'c1',
@@ -52,6 +119,7 @@ export const WORMHOLES_ADDITIONAL_INFO_RAW: WormholesAdditionalInfoType[] = [
     wormholeClassID: 1,
     effectPower: 1,
     title: 'Class 1',
+    shortTitle: 'C1',
   },
   {
     id: 'c2',
@@ -59,6 +127,7 @@ export const WORMHOLES_ADDITIONAL_INFO_RAW: WormholesAdditionalInfoType[] = [
     wormholeClassID: 2,
     effectPower: 2,
     title: 'Class 2',
+    shortTitle: 'C2',
   },
   {
     id: 'c3',
@@ -66,6 +135,7 @@ export const WORMHOLES_ADDITIONAL_INFO_RAW: WormholesAdditionalInfoType[] = [
     wormholeClassID: 3,
     effectPower: 3,
     title: 'Class 3',
+    shortTitle: 'C3',
   },
   {
     id: 'c4',
@@ -73,6 +143,7 @@ export const WORMHOLES_ADDITIONAL_INFO_RAW: WormholesAdditionalInfoType[] = [
     wormholeClassID: 4,
     effectPower: 4,
     title: 'Class 4',
+    shortTitle: 'C4',
   },
   {
     id: 'c5',
@@ -80,6 +151,7 @@ export const WORMHOLES_ADDITIONAL_INFO_RAW: WormholesAdditionalInfoType[] = [
     wormholeClassID: 5,
     effectPower: 5,
     title: 'Class 5',
+    shortTitle: 'C5',
   },
   {
     id: 'c6',
@@ -87,42 +159,49 @@ export const WORMHOLES_ADDITIONAL_INFO_RAW: WormholesAdditionalInfoType[] = [
     wormholeClassID: 6,
     effectPower: 6,
     title: 'Class 6',
+    shortTitle: 'C6',
   },
   {
     id: 'hs',
     shortName: 'H',
     wormholeClassID: 7,
     title: 'High-sec',
+    shortTitle: 'High-sec',
   },
   {
     id: 'ls',
     shortName: 'L',
     wormholeClassID: 8,
     title: 'Low-sec',
+    shortTitle: 'Low-sec',
   },
   {
     id: 'ns',
     shortName: 'N',
     wormholeClassID: 9,
     title: 'Null-sec',
+    shortTitle: 'Null-sec',
   },
   {
     id: 'ccp2',
     shortName: 'CCP',
     wormholeClassID: 10,
     title: 'CCP System',
+    shortTitle: 'CCP',
   },
   {
     id: 'ccp3',
     shortName: 'CCP',
     wormholeClassID: 11,
     title: 'CCP System',
+    shortTitle: 'CCP',
   },
   {
     id: 'thera',
     shortName: 'T',
     wormholeClassID: 12,
     title: 'Class 12 (Thera)',
+    shortTitle: 'Thera',
   },
   {
     id: 'c13',
@@ -130,6 +209,7 @@ export const WORMHOLES_ADDITIONAL_INFO_RAW: WormholesAdditionalInfoType[] = [
     wormholeClassID: 13,
     effectPower: 6,
     title: 'Class 13 (Shattered Frigate)',
+    shortTitle: 'C13',
   },
   {
     id: 'sentinel',
@@ -137,6 +217,7 @@ export const WORMHOLES_ADDITIONAL_INFO_RAW: WormholesAdditionalInfoType[] = [
     wormholeClassID: 14,
     effectPower: 2,
     title: 'Class 14 (Sentinel Drifter)',
+    shortTitle: 'Sentinel',
   },
   {
     id: 'barbican',
@@ -144,6 +225,7 @@ export const WORMHOLES_ADDITIONAL_INFO_RAW: WormholesAdditionalInfoType[] = [
     wormholeClassID: 15,
     effectPower: 2,
     title: 'Class 15 (Barbican Drifter)',
+    shortTitle: 'Barbican',
   },
   {
     id: 'vidette',
@@ -151,6 +233,7 @@ export const WORMHOLES_ADDITIONAL_INFO_RAW: WormholesAdditionalInfoType[] = [
     wormholeClassID: 16,
     effectPower: 2,
     title: 'Class 16 (Vidette Drifter)',
+    shortTitle: 'Vidette',
   },
   {
     id: 'conflux',
@@ -158,6 +241,7 @@ export const WORMHOLES_ADDITIONAL_INFO_RAW: WormholesAdditionalInfoType[] = [
     wormholeClassID: 17,
     effectPower: 2,
     title: 'Class 17 (Conflux Drifter)',
+    shortTitle: 'Conflux',
   },
   {
     id: 'redoubt',
@@ -165,59 +249,79 @@ export const WORMHOLES_ADDITIONAL_INFO_RAW: WormholesAdditionalInfoType[] = [
     wormholeClassID: 18,
     effectPower: 2,
     title: 'Class 18 (Redoubt Drifter)',
+    shortTitle: 'Redoubt',
   },
   {
     id: 'a1',
     shortName: 'A1',
     wormholeClassID: 19,
     title: '(Abyssal class 1)',
+    shortTitle: 'A1',
   },
   {
     id: 'a2',
     shortName: 'A2',
     wormholeClassID: 20,
     title: '(Abyssal class 2)',
+    shortTitle: 'A2',
   },
   {
     id: 'a3',
     shortName: 'A3',
     wormholeClassID: 21,
     title: '(Abyssal class 3)',
+    shortTitle: 'A3',
   },
   {
     id: 'a4',
     shortName: 'A4',
     wormholeClassID: 22,
     title: '(Abyssal class 4)',
+    shortTitle: 'A4',
   },
   {
     id: 'a5',
     shortName: 'A5',
     wormholeClassID: 23,
     title: '(Abyssal class 5)',
+    shortTitle: 'A5',
   },
   {
     id: 'ccp4',
     shortName: 'CCP',
     wormholeClassID: 24,
     title: 'CCP System (Penalty)',
+    shortTitle: 'CCP',
   },
   {
     id: 'pochven',
     shortName: 'P',
     wormholeClassID: 25,
     title: 'Triglavian space (Pochven)',
+    shortTitle: 'Pochven',
   },
   {
     id: 'zarzakh',
     shortName: 'N',
     wormholeClassID: 10100,
     title: 'Pirate space',
+    shortTitle: 'Zarzakh',
+  },
+  {
+    id: 'k162',
+    shortName: 'K162',
+    wormholeClassID: 10101,
+    title: 'Reverse',
+    shortTitle: 'K162',
   },
 ];
+
 export const WORMHOLES_ADDITIONAL_INFO: Record<string, WormholesAdditionalInfoType> =
   WORMHOLES_ADDITIONAL_INFO_RAW.reduce((acc, x) => ({ ...acc, [x.id]: x }), {});
 
+export const WORMHOLES_ADDITIONAL_INFO_BY_CLASS_ID: Record<string, WormholesAdditionalInfoType> =
+  WORMHOLES_ADDITIONAL_INFO_RAW.reduce((acc, x) => ({ ...acc, [x.wormholeClassID]: x }), {});
+
 // export const SOLAR_SYSTEM_CLASS_NAMES = {
 //   ccp1 =  ,
 //   c1 = ,

assets/js/hooks/Mapper/components/map/hooks/api/useMapAddSystems.ts

@@ -2,28 +2,17 @@ import { Node, useReactFlow } from 'reactflow';
 import { useCallback, useRef } from 'react';
 import { CommandAddSystems } from '@/hooks/Mapper/types/mapHandlers.ts';
 import { convertSystem2Node } from '../../helpers';
-import { useMapState } from '@/hooks/Mapper/components/map/MapProvider.tsx';
 
 export const useMapAddSystems = () => {
   const rf = useReactFlow();
-  const {
-    data: { systems },
-    update,
-  } = useMapState();
 
-  const ref = useRef({ rf, systems, update });
-  ref.current = { update, systems, rf };
+  const ref = useRef({ rf });
+  ref.current = { rf };
 
-  return useCallback(
-    (systems: CommandAddSystems) => {
-      const nodes = rf.getNodes();
-      const prepared: Node[] = systems.filter(x => !nodes.some(y => x.id === y.id)).map(convertSystem2Node);
-      rf.addNodes(prepared);
-
-      ref.current.update({
-        systems: [...ref.current.systems.filter(sys => systems.some(x => sys.id !== x.id)), ...systems],
-      });
-    },
-    [rf],
-  );
+  return useCallback((systems: CommandAddSystems) => {
+    const { rf } = ref.current;
+    const nodes = rf.getNodes();
+    const prepared: Node[] = systems.filter(x => !nodes.some(y => x.id === y.id)).map(convertSystem2Node);
+    rf.addNodes(prepared);
+  }, []);
 };

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

@@ -18,6 +18,9 @@ import {
   CommandUpdateSystems,
   MapHandlers,
 } from '@/hooks/Mapper/types/mapHandlers.ts';
+
+import { useMapEventListener } from '@/hooks/Mapper/events';
+
 import {
   useCommandsCharacters,
   useCommandsConnections,
@@ -57,16 +60,13 @@ export const useMapHandlers = (ref: ForwardedRef<MapHandlers>, onSelectionChange
               mapInit(data as CommandInit);
               break;
             case Commands.addSystems:
-              mapAddSystems(data as CommandAddSystems);
               break;
             case Commands.updateSystems:
               mapUpdateSystems(data as CommandUpdateSystems);
               break;
             case Commands.removeSystems:
-              removeSystems(data as CommandRemoveSystems);
               break;
             case Commands.addConnections:
-              addConnections(data as CommandAddConnections);
               break;
             case Commands.removeConnections:
               removeConnections(data as CommandRemoveConnections);
@@ -131,4 +131,20 @@ export const useMapHandlers = (ref: ForwardedRef<MapHandlers>, onSelectionChange
     },
     [],
   );
+
+  useMapEventListener(event => {
+    switch (event.name) {
+      case Commands.addConnections:
+        addConnections(event.data as CommandAddConnections);
+        break;
+      case Commands.addSystems:
+        mapAddSystems(event.data as CommandAddSystems);
+        break;
+      case Commands.removeSystems:
+        removeSystems(event.data as CommandRemoveSystems);
+        break;
+      default:
+        break;
+    }
+  });
 };

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

@@ -79,7 +79,7 @@ export const SystemCustomLabelDialog = ({ systemId, visible, setVisible }: Syste
 
   // @ts-ignore
   const handleInput = useCallback(e => {
-    e.target.value = e.target.value.toUpperCase().replace(/[^A-Z0-9[\](){}]/g, '');
+    e.target.value = e.target.value.toUpperCase().replace(/[^A-Z0-9\-[\](){}]/g, '');
   }, []);
 
   return (

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

@@ -90,7 +90,7 @@ export const SystemSettingsDialog = ({ systemId, visible, setVisible }: SystemSe
   }, []);
 
   const handleInput = useCallback((e: any) => {
-    e.target.value = e.target.value.toUpperCase().replace(/[^A-Z0-9[\](){}]/g, '');
+    e.target.value = e.target.value.toUpperCase().replace(/[^A-Z0-9\-[\](){}]/g, '');
   }, []);
 
   return (

assets/js/hooks/Mapper/components/mapInterface/widgets/SystemInfo/SystemInfoContent/SystemInfoContent.tsx

@@ -13,9 +13,10 @@ export const SystemInfoContent = ({ systemId }: SystemInfoContentProps) => {
     data: { systems, wormholesData },
   } = useMapRootState();
 
-  const sys = getSystemById(systems, systemId)!;
+  const sys = getSystemById(systems, systemId)! || {};
   const { description } = sys;
-  const { system_class, region_name, constellation_name, statics, effect_name, effect_power } = sys.system_static_info;
+  const { system_class, region_name, constellation_name, statics, effect_name, effect_power } =
+    sys.system_static_info || {};
   const isWH = isWormholeSpace(system_class);
   const sortedStatics = useMemo(() => sortWHClasses(wormholesData, statics), [wormholesData, statics]);
 

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

@@ -1,10 +1,10 @@
 import { useMapRootState } from '@/hooks/Mapper/mapRootProvider';
 import { useClipboard } from '@/hooks/Mapper/hooks/useClipboard';
 import { parseSignatures } from '@/hooks/Mapper/helpers';
-import { OutCommand } from '@/hooks/Mapper/types/mapHandlers.ts';
+import { Commands, OutCommand } from '@/hooks/Mapper/types/mapHandlers.ts';
 import { WdTooltip, WdTooltipHandlers } from '@/hooks/Mapper/components/ui-kit';
 
-import { DataTable, DataTableRowMouseEvent, SortOrder } from 'primereact/datatable';
+import { DataTable, DataTableRowClickEvent, DataTableRowMouseEvent, SortOrder } from 'primereact/datatable';
 import { Column } from 'primereact/column';
 import { useCallback, useEffect, useMemo, useRef, useState } from 'react';
 import useRefState from 'react-usestateref';
@@ -22,12 +22,14 @@ import {
 } from '@/hooks/Mapper/components/mapInterface/widgets/SystemSignatures/helpers';
 import {
   renderIcon,
-  renderName,
+  renderInfoColumn,
   renderTimeLeft,
-  renderLinkedSystem,
 } from '@/hooks/Mapper/components/mapInterface/widgets/SystemSignatures/renders';
-// import { PrimeIcons } from 'primereact/api';
 import useLocalStorageState from 'use-local-storage-state';
+import { PrimeIcons } from 'primereact/api';
+import { SignatureSettings } from '@/hooks/Mapper/components/mapRootContent/components/SignatureSettings';
+import { useMapEventListener } from '@/hooks/Mapper/events';
+import { WdTooltipWrapper } from '@/hooks/Mapper/components/ui-kit/WdTooltipWrapper';
 
 type SystemSignaturesSortSettings = {
   sortField: string;
@@ -53,6 +55,7 @@ export const SystemSignaturesContent = ({ systemId, settings, selectable, onSele
   const [nameColumnWidth, setNameColumnWidth] = useState('auto');
   const [parsedSignatures, setParsedSignatures] = useState<SystemSignature[]>([]);
   const [askUser, setAskUser] = useState(false);
+  const [selectedSignature, setSelectedSignature] = useState<SystemSignature | null>(null);
 
   const [hoveredSig, setHoveredSig] = useState<SystemSignature | null>(null);
 
@@ -164,6 +167,8 @@ export const SystemSignaturesContent = ({ systemId, settings, selectable, onSele
   }, [parsedSignatures, handleUpdateSignatures]);
 
   const handleSelectSignatures = useCallback(
+    // TODO still will be good to define types if we use typescript
+    // @ts-ignore
     e => {
       if (selectable) {
         onSelect?.(e.value);
@@ -212,6 +217,18 @@ export const SystemSignaturesContent = ({ systemId, settings, selectable, onSele
     handleGetSignatures();
   }, [systemId]);
 
+  useMapEventListener(event => {
+    switch (event.name) {
+      case Commands.signaturesUpdated:
+        if (event.data?.toString() !== systemId.toString()) {
+          return;
+        }
+
+        handleGetSignatures();
+        return true;
+    }
+  });
+
   useEffect(() => {
     const observer = new ResizeObserver(handleResize);
     if (tableRef.current) {
@@ -240,13 +257,22 @@ export const SystemSignaturesContent = ({ systemId, settings, selectable, onSele
     setHoveredSig(null);
   }, []);
 
-  // const renderToolbar = (/*row: SystemSignature*/) => {
-  //   return (
-  //     <div className="flex justify-end items-center gap-2">
-  //       <span className={clsx(PrimeIcons.PENCIL, 'text-[10px]')}></span>
-  //     </div>
-  //   );
-  // };
+  const renderToolbar = (/*row: SystemSignature*/) => {
+    return (
+      <div className="flex justify-end items-center gap-2 mr-[4px]">
+        <WdTooltipWrapper content="To Edit Signature do double click">
+          <span className={clsx(PrimeIcons.PENCIL, 'text-[10px]')}></span>
+        </WdTooltipWrapper>
+      </div>
+    );
+  };
+
+  const [showSignatureSettings, setShowSignatureSettings] = useState(false);
+
+  const handleRowClick = (e: DataTableRowClickEvent) => {
+    setSelectedSignature(e.data as SystemSignature);
+    setShowSignatureSettings(true);
+  };
 
   return (
     <>
@@ -257,6 +283,7 @@ export const SystemSignaturesContent = ({ systemId, settings, selectable, onSele
           </div>
         ) : (
           <>
+            {/* @ts-ignore */}
             <DataTable
               className={classes.Table}
               value={filteredSignatures}
@@ -268,6 +295,7 @@ export const SystemSignaturesContent = ({ systemId, settings, selectable, onSele
               dataKey="eve_id"
               tableClassName="w-full select-none"
               resizableColumns={false}
+              onRowDoubleClick={handleRowClick}
               rowHover
               selectAll
               sortField={sortSettings.sortField}
@@ -291,7 +319,7 @@ export const SystemSignaturesContent = ({ systemId, settings, selectable, onSele
               <Column
                 bodyClassName="p-0 px-1"
                 field="group"
-                body={renderIcon}
+                body={x => renderIcon(x)}
                 style={{ maxWidth: 26, minWidth: 26, width: 26, height: 25 }}
               ></Column>
 
@@ -310,41 +338,29 @@ export const SystemSignaturesContent = ({ systemId, settings, selectable, onSele
                 sortable
               ></Column>
               <Column
-                field="name"
-                header="Name"
+                field="info"
+                // header="Info"
                 bodyClassName="text-ellipsis overflow-hidden whitespace-nowrap"
-                body={renderName}
+                body={renderInfoColumn}
                 style={{ maxWidth: nameColumnWidth }}
                 hidden={compact || medium}
-                sortable
               ></Column>
-              <Column
-                field="linked_system"
-                header="Leads To"
-                headerClassName="whitespace-nowrap"
-                bodyClassName="text-ellipsis overflow-hidden whitespace-nowrap"
-                body={renderLinkedSystem}
-                style={{ maxWidth: nameColumnWidth }}
-                hidden={compact}
-                sortable
-              ></Column>
-
               <Column
                 field="updated_at"
                 header="Updated"
                 dataType="date"
-                bodyClassName="w-[80px] text-ellipsis overflow-hidden whitespace-nowrap"
+                bodyClassName="w-[70px] text-ellipsis overflow-hidden whitespace-nowrap"
                 body={renderTimeLeft}
                 sortable
               ></Column>
 
-              {/*<Column*/}
-              {/*  bodyClassName="p-0 pl-1 pr-2"*/}
-              {/*  field="group"*/}
-              {/*  body={renderToolbar}*/}
-              {/*  headerClassName={headerClasses}*/}
-              {/*  style={{ maxWidth: 26, minWidth: 26, width: 26 }}*/}
-              {/*></Column>*/}
+              <Column
+                bodyClassName="p-0 pl-1 pr-2"
+                field="group"
+                body={renderToolbar}
+                // headerClassName={headerClasses}
+                style={{ maxWidth: 26, minWidth: 26, width: 26 }}
+              ></Column>
             </DataTable>
           </>
         )}
@@ -353,6 +369,14 @@ export const SystemSignaturesContent = ({ systemId, settings, selectable, onSele
           ref={tooltipRef}
           content={hoveredSig ? <SignatureView {...hoveredSig} /> : null}
         />
+
+        <SignatureSettings
+          systemId={systemId}
+          show={showSignatureSettings}
+          onHide={() => setShowSignatureSettings(false)}
+          signatureData={selectedSignature}
+        />
+
         {askUser && (
           <div className="absolute left-[1px] top-[29px] h-[calc(100%-30px)] w-[calc(100%-3px)] bg-stone-900/10 backdrop-blur-sm">
             <div className="absolute top-0 left-0 w-full h-full flex flex-col items-center justify-center">

assets/js/hooks/Mapper/components/mapInterface/widgets/SystemSignatures/renders/index.ts

@@ -2,3 +2,4 @@ export * from './renderIcon';
 export * from './renderName';
 export * from './renderTimeLeft';
 export * from './renderLinkedSystem';
+export * from './renderInfoColumn';

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

@@ -1,7 +1,7 @@
-import { SignatureGroup, SystemSignature } from '@/hooks/Mapper/types';
+import { GroupType, SignatureGroup, SystemSignature } from '@/hooks/Mapper/types';
 import { GROUPS } from '@/hooks/Mapper/components/mapInterface/widgets/SystemSignatures/constants.ts';
 
-export const renderIcon = (row: SystemSignature) => {
+export const renderIcon = (row: SystemSignature, customSize?: Omit<GroupType, 'icon' | 'id'>) => {
   if (row.group == null) {
     return null;
   }
@@ -13,7 +13,7 @@ export const renderIcon = (row: SystemSignature) => {
 
   return (
     <div className="flex justify-center items-center">
-      <img src={group.icon} style={{ width: group.w, height: group.h }} />
+      <img src={group.icon} style={{ width: customSize?.w ?? group.w, height: customSize?.h ?? group.h }} />
     </div>
   );
 };

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

@@ -0,0 +1,3 @@
+.whFontSize {
+  font-size: 11px !important;
+}

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

@@ -0,0 +1,44 @@
+import { SignatureGroup, SystemSignature } from '@/hooks/Mapper/types';
+import { SystemViewStandalone, WHClassView } from '@/hooks/Mapper/components/ui-kit';
+import clsx from 'clsx';
+import { renderName } from './renderName.tsx';
+import classes from './renderInfoColumn.module.scss';
+
+export const renderInfoColumn = (row: SystemSignature) => {
+  if (!row.group || row.group === SignatureGroup.Wormhole) {
+    return (
+      <div className="flex justify-start items-center gap-[6px]">
+        {row.type && (
+          <WHClassView
+            className="text-[11px]"
+            classNameWh={classes.whFontSize}
+            highlightName
+            hideWhClass={!!row.linked_system}
+            whClassName={row.type}
+            noOffset
+            useShortTitle
+          />
+        )}
+
+        {row.linked_system && (
+          <>
+            {/*<span className="w-4 h-4 hero-arrow-long-right"></span>*/}
+            <span title={row.linked_system?.solar_system_name}>
+              <SystemViewStandalone
+                className={clsx('select-none text-center cursor-context-menu')}
+                hideRegion
+                {...row.linked_system}
+              />
+            </span>
+          </>
+        )}
+      </div>
+    );
+  }
+
+  if (row.description != null && row.description.length > 0) {
+    return <span title={row.description}>{row.description}</span>;
+  }
+
+  return renderName(row);
+};

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

@@ -9,21 +9,25 @@ import { OutCommand } from '@/hooks/Mapper/types';
 export enum UserSettingsRemoteProps {
   link_signature_on_splash = 'link_signature_on_splash',
   select_on_spash = 'select_on_spash',
+  delete_connection_with_sigs = 'delete_connection_with_sigs',
 }
 
 export const DEFAULT_REMOTE_SETTINGS = {
   [UserSettingsRemoteProps.link_signature_on_splash]: false,
   [UserSettingsRemoteProps.select_on_spash]: false,
+  [UserSettingsRemoteProps.delete_connection_with_sigs]: false,
 };
 
 export const UserSettingsRemoteList = [
   UserSettingsRemoteProps.link_signature_on_splash,
   UserSettingsRemoteProps.select_on_spash,
+  UserSettingsRemoteProps.delete_connection_with_sigs,
 ];
 
 export type UserSettingsRemote = {
   link_signature_on_splash: boolean;
   select_on_spash: boolean;
+  delete_connection_with_sigs: boolean;
 };
 
 export type UserSettings = UserSettingsRemote & InterfaceStoredSettings;
@@ -51,6 +55,10 @@ const SIGNATURES_CHECKBOXES_PROPS: CheckboxesList = [
   { prop: UserSettingsRemoteProps.link_signature_on_splash, label: 'Link signature on splash' },
 ];
 
+const CONNECTIONS_CHECKBOXES_PROPS: CheckboxesList = [
+  { prop: UserSettingsRemoteProps.delete_connection_with_sigs, label: 'Delete connections to linked signatures' },
+];
+
 const UI_CHECKBOXES_PROPS: CheckboxesList = [
   { prop: InterfaceStoredSettingsProps.isShowMenu, label: 'Enable compact map menu bar' },
 ];
@@ -149,8 +157,8 @@ export const MapSettings = ({ show, onHide }: MapSettingsProps) => {
                   {renderCheckboxesList(SYSTEMS_CHECKBOXES_PROPS)}
                 </div>
               </TabPanel>
-              <TabPanel disabled header="Connections" headerClassName={styles.verticalTabHeader}>
-                <p>Connections</p>
+              <TabPanel header="Connections" headerClassName={styles.verticalTabHeader}>
+                {renderCheckboxesList(CONNECTIONS_CHECKBOXES_PROPS)}
               </TabPanel>
               <TabPanel header="Signatures" headerClassName={styles.verticalTabHeader}>
                 {renderCheckboxesList(SIGNATURES_CHECKBOXES_PROPS)}

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

@@ -0,0 +1,10 @@
+import { createGenericContext } from '@/hooks/Mapper/utils/abstractContextProvider.tsx';
+
+export interface SystemsSettingsProvider {
+  systemId: string;
+}
+
+const { Provider, useContextValue } = createGenericContext<SystemsSettingsProvider>();
+
+export const SystemsSettingsProvider = Provider;
+export const useSystemsSettingsProvider = useContextValue;

assets/js/hooks/Mapper/components/mapRootContent/components/SignatureSettings/SignatureSettings.module.scss

@@ -0,0 +1,81 @@
+.verticalTabsContainer {
+  width: 100%;
+  min-height: 300px;
+}
+
+.verticalTabsContainer {
+  display: flex;
+  width: 100%;
+  min-height: 300px;
+
+  :global {
+    .p-tabview {
+      width: 100%;
+      display: flex;
+      align-items: flex-start;
+    }
+
+    .p-tabview-panels {
+      padding: 6px 1rem !important;
+      flex-grow: 1;
+    }
+
+    .p-tabview-nav-container {
+      border-right: none;
+      height: 100%;
+    }
+
+    .p-tabview-nav {
+      flex-direction: column;
+      width: 150px;
+      min-height: 100%;
+      border: none;
+
+      li {
+        width: 100%;
+        border-right: 4px solid var(--surface-hover);
+        background-color: var(--surface-card);
+
+        transition: background-color 200ms, border-right-color 200ms;
+
+        &:hover {
+          background-color: var(--surface-hover);
+          border-right: 4px solid var(--surface-100);
+        }
+
+        .p-tabview-nav-link {
+          transition: color 200ms;
+
+          justify-content: flex-end;
+          padding: 10px;
+          background-color: initial;
+          border: none;
+          color: var(--gray-400);
+
+          border-radius: initial;
+          font-weight: 400;
+          margin: 0;
+        }
+
+        &.p-tabview-selected {
+          background-color: var(--surface-50);
+          border-right: 4px solid var(--primary-color);
+
+          .p-tabview-nav-link {
+            font-weight: 600;
+            color: var(--primary-color);
+          }
+
+          &:hover {
+            border-right: 4px solid var(--primary-color);
+          }
+
+        }
+      }
+    }
+
+    .p-tabview-panel {
+      flex-grow: 1;
+    }
+  }
+}

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

@@ -0,0 +1,171 @@
+import { Dialog } from 'primereact/dialog';
+import { useCallback, useEffect } from 'react';
+// import { useMapRootState } from '@/hooks/Mapper/mapRootProvider';
+import { OutCommand, SignatureGroup, SystemSignature } from '@/hooks/Mapper/types';
+import { Controller, FormProvider, useForm } from 'react-hook-form';
+import {
+  SignatureGroupContent,
+  SignatureGroupSelect,
+} from '@/hooks/Mapper/components/mapRootContent/components/SignatureSettings/components';
+import { InputText } from 'primereact/inputtext';
+import { SystemsSettingsProvider } from '@/hooks/Mapper/components/mapRootContent/components/SignatureSettings/Provider.tsx';
+import { Button } from 'primereact/button';
+import { useMapRootState } from '@/hooks/Mapper/mapRootProvider';
+
+type SystemSignaturePrepared = Omit<SystemSignature, 'linked_system'> & { linked_system: string };
+
+export interface MapSettingsProps {
+  systemId: string;
+  show: boolean;
+  onHide: () => void;
+  signatureData: SystemSignature | null;
+}
+
+export const SignatureSettings = ({ systemId, show, onHide, signatureData }: MapSettingsProps) => {
+  const { outCommand } = useMapRootState();
+
+  const handleShow = async () => {};
+  const form = useForm<Partial<SystemSignaturePrepared>>({});
+
+  const handleSave = useCallback(async () => {
+    if (!signatureData) {
+      return;
+    }
+
+    const { group, ...values } = form.getValues();
+    let out = { ...signatureData };
+
+    switch (group) {
+      case SignatureGroup.Wormhole:
+        if (values.linked_system) {
+          await outCommand({
+            type: OutCommand.linkSignatureToSystem,
+            data: {
+              signature_eve_id: signatureData.eve_id,
+              solar_system_source: systemId,
+              solar_system_target: values.linked_system,
+            },
+          });
+        }
+
+        if (values.type != null) {
+          out = { ...out, type: values.type };
+        }
+
+        if (signatureData.group !== SignatureGroup.Wormhole) {
+          out = { ...out, name: '' };
+        }
+
+        break;
+      case SignatureGroup.CosmicSignature:
+        out = { ...out, type: '', name: '' };
+        break;
+      default:
+        if (values.name != null) {
+          out = { ...out, name: values.name ?? '' };
+        }
+    }
+
+    if (values.description != null) {
+      out = { ...out, description: values.description };
+    }
+
+    // Note: when type of signature changed from WH to other type - we should drop name
+    if (
+      group !== SignatureGroup.Wormhole && // new
+      signatureData.group === SignatureGroup.Wormhole && // prev
+      signatureData.linked_system
+    ) {
+      await outCommand({
+        type: OutCommand.unlinkSignature,
+        data: { signature_eve_id: signatureData.eve_id, solar_system_source: systemId },
+      });
+
+      out = { ...out, type: '' };
+    }
+
+    if (group === SignatureGroup.Wormhole && signatureData.linked_system != null && values.linked_system === null) {
+      await outCommand({
+        type: OutCommand.unlinkSignature,
+        data: { signature_eve_id: signatureData.eve_id, solar_system_source: systemId },
+      });
+    }
+
+    // Note: despite groups have optional type - this will always set
+    out = { ...out, group: group! };
+
+    await outCommand({
+      type: OutCommand.updateSignatures,
+      data: {
+        system_id: systemId,
+        added: [],
+        updated: [out],
+        removed: [],
+      },
+    });
+
+    form.reset();
+    onHide();
+  }, [form, onHide, outCommand, signatureData, systemId]);
+
+  useEffect(() => {
+    if (!signatureData) {
+      form.reset();
+      return;
+    }
+
+    const { linked_system, ...rest } = signatureData;
+
+    form.reset({
+      linked_system: linked_system?.solar_system_id.toString() ?? undefined,
+      ...rest,
+    });
+  }, [form, signatureData]);
+
+  return (
+    <Dialog
+      header={`Signature Edit [${signatureData?.eve_id}]`}
+      visible={show}
+      draggable={false}
+      style={{ width: '390px' }}
+      onShow={handleShow}
+      onHide={() => {
+        if (!show) {
+          return;
+        }
+
+        onHide();
+      }}
+    >
+      <SystemsSettingsProvider initialValue={{ systemId }}>
+        <FormProvider {...form}>
+          <div className="flex flex-col gap-2 justify-between">
+            <div className="w-full flex flex-col gap-1 p-1 min-h-[150px]">
+              <label className="grid grid-cols-[100px_250px_1fr] gap-2 items-center text-[14px]">
+                <span>Group:</span>
+                <SignatureGroupSelect name="group" />
+              </label>
+
+              <SignatureGroupContent />
+
+              <label className="grid grid-cols-[100px_250px_1fr] gap-2 items-center text-[14px]">
+                <span>Description:</span>
+                <Controller
+                  name="description"
+                  control={form.control}
+                  render={({ field }) => (
+                    <InputText placeholder="Type description" value={field.value} onChange={field.onChange} />
+                  )}
+                />
+              </label>
+            </div>
+
+            <div className="flex gap-2 justify-end">
+              <Button onClick={handleSave} outlined size="small" label="Save"></Button>
+            </div>
+          </div>
+        </FormProvider>
+      </SystemsSettingsProvider>
+    </Dialog>
+  );
+};

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

@@ -0,0 +1,45 @@
+import { Controller, useFormContext } from 'react-hook-form';
+import { SignatureGroup, SystemSignature } from '@/hooks/Mapper/types';
+import { useSystemsSettingsProvider } from '@/hooks/Mapper/components/mapRootContent/components/SignatureSettings/Provider.tsx';
+import { SignatureGroupContentWormholes } from '@/hooks/Mapper/components/mapRootContent/components/SignatureSettings/components/SignatureGroupContentWormholes.tsx';
+import { InputText } from 'primereact/inputtext';
+
+export interface SignatureGroupContentProps {}
+
+export const SignatureGroupContent = ({}: SignatureGroupContentProps) => {
+  const { watch, control } = useFormContext<SystemSignature>();
+  const group = watch('group');
+
+  const {
+    value: { systemId },
+  } = useSystemsSettingsProvider();
+
+  if (!systemId) {
+    return null;
+  }
+
+  if (group === SignatureGroup.Wormhole) {
+    return (
+      <>
+        <SignatureGroupContentWormholes />
+      </>
+    );
+  }
+
+  if (group === SignatureGroup.CosmicSignature) {
+    return <div></div>;
+  }
+
+  return (
+    <div>
+      <label className="grid grid-cols-[100px_250px_1fr] gap-2 items-center text-[14px]">
+        <span>Name:</span>
+        <Controller
+          name="name"
+          control={control}
+          render={({ field }) => <InputText placeholder="Name" value={field.value} onChange={field.onChange} />}
+        />
+      </label>
+    </div>
+  );
+};

assets/js/hooks/Mapper/components/mapRootContent/components/SignatureSettings/components/SignatureGroupContent/index.ts

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

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

@@ -0,0 +1,18 @@
+import { SignatureWormholeTypeSelect } from '@/hooks/Mapper/components/mapRootContent/components/SignatureSettings/components/SignatureWormholeTypeSelect';
+import { SignatureLeadsToSelect } from '@/hooks/Mapper/components/mapRootContent/components/SignatureSettings/components/SignatureLeadsToSelect';
+
+export const SignatureGroupContentWormholes = () => {
+  return (
+    <>
+      <label className="grid grid-cols-[100px_250px_1fr] gap-2 items-center text-[14px]">
+        <span>Type:</span>
+        <SignatureWormholeTypeSelect name="type" />
+      </label>
+
+      <label className="grid grid-cols-[100px_250px_1fr] gap-2 items-center text-[14px]">
+        <span>Leads To:</span>
+        <SignatureLeadsToSelect name="linked_system" />
+      </label>
+    </>
+  );
+};

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

@@ -0,0 +1,59 @@
+import { Dropdown } from 'primereact/dropdown';
+import clsx from 'clsx';
+import { SignatureGroup, SystemSignature } from '@/hooks/Mapper/types';
+import { renderIcon } from '@/hooks/Mapper/components/mapInterface/widgets/SystemSignatures/renders';
+import { Controller, useFormContext } from 'react-hook-form';
+
+const signatureGroupOptions = Object.keys(SignatureGroup).map(x => ({
+  value: SignatureGroup[x as keyof typeof SignatureGroup],
+  label: SignatureGroup[x as keyof typeof SignatureGroup],
+}));
+
+// @ts-ignore
+const renderSignatureTemplate = option => {
+  if (!option) {
+    return 'No group selected';
+  }
+
+  return (
+    <div className="flex gap-2 items-center">
+      <span className="w-[20px] mt-[1px] flex justify-center items-center">
+        {renderIcon(
+          { group: option.label } as SystemSignature,
+          option.label === SignatureGroup.CosmicSignature ? { w: 10, h: 10 } : { w: 16, h: 16 },
+        )}
+      </span>
+      <span>{option.label}</span>
+    </div>
+  );
+};
+
+export interface SignatureGroupSelectProps {
+  name: string;
+  defaultValue?: string;
+}
+
+export const SignatureGroupSelect = ({ name, defaultValue = '' }: SignatureGroupSelectProps) => {
+  const { control } = useFormContext();
+  return (
+    <Controller
+      name={name}
+      control={control}
+      defaultValue={defaultValue}
+      render={({ field }) => (
+        <Dropdown
+          value={field.value}
+          onChange={field.onChange}
+          options={signatureGroupOptions}
+          optionLabel="label"
+          optionValue="value"
+          placeholder="Select group"
+          className={clsx('w-full')}
+          scrollHeight="240px"
+          itemTemplate={renderSignatureTemplate}
+          valueTemplate={renderSignatureTemplate}
+        />
+      )}
+    />
+  );
+};

assets/js/hooks/Mapper/components/mapRootContent/components/SignatureSettings/components/SignatureGroupSelect/index.ts

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

assets/js/hooks/Mapper/components/mapRootContent/components/SignatureSettings/components/SignatureLeadsToSelect/SignatureLeadsToSelect.module.scss

@@ -0,0 +1,3 @@
+.SystemView {
+  font-size: 14px !important;
+}

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

@@ -0,0 +1,108 @@
+import { Dropdown } from 'primereact/dropdown';
+import clsx from 'clsx';
+import { Controller, useFormContext } from 'react-hook-form';
+import { useSystemsSettingsProvider } from '@/hooks/Mapper/components/mapRootContent/components/SignatureSettings/Provider.tsx';
+import { useSystemInfo } from '@/hooks/Mapper/components/hooks';
+import { useMemo } from 'react';
+import { SystemView } from '@/hooks/Mapper/components/ui-kit';
+import classes from './SignatureLeadsToSelect.module.scss';
+import { useLoadSystemStatic } from '@/hooks/Mapper/mapRootProvider/hooks/useLoadSystemStatic.ts';
+import { SystemSignature } from '@/hooks/Mapper/types';
+import { WORMHOLES_ADDITIONAL_INFO_BY_CLASS_ID } from '@/hooks/Mapper/components/map/constants.ts';
+import { useMapRootState } from '@/hooks/Mapper/mapRootProvider';
+
+// @ts-ignore
+const renderLinkedSystemItem = (option: { value: string }) => {
+  if (option.value == null) {
+    return <div className="flex gap-2 items-center">No linked system</div>;
+  }
+
+  return (
+    <div className="flex gap-2 items-center">
+      <SystemView systemId={option.value} className={classes.SystemView} />
+    </div>
+  );
+};
+
+// @ts-ignore
+const renderLinkedSystemValue = (option: { value: string }) => {
+  if (!option) {
+    return 'Select Leads To system';
+  }
+
+  if (option.value == null) {
+    return 'Select Leads To system';
+  }
+
+  return (
+    <div className="flex gap-2 items-center">
+      <SystemView systemId={option.value} className={classes.SystemView} />
+    </div>
+  );
+};
+
+const renderLeadsToEmpty = () => <div className="flex items-center text-[14px]">No wormhole to select</div>;
+
+export interface SignatureLeadsToSelectProps {
+  name: string;
+  defaultValue?: string;
+}
+
+export const SignatureLeadsToSelect = ({ name, defaultValue = '' }: SignatureLeadsToSelectProps) => {
+  const { control, watch } = useFormContext<SystemSignature>();
+  const group = watch('type');
+
+  const {
+    value: { systemId },
+  } = useSystemsSettingsProvider();
+
+  const { leadsTo } = useSystemInfo({ systemId });
+  const { systems: systemStatics } = useLoadSystemStatic({ systems: leadsTo });
+  const {
+    data: { wormholes },
+  } = useMapRootState();
+
+  const leadsToOptions = useMemo(() => {
+    return [
+      { value: null },
+      ...leadsTo
+        .filter(systemId => {
+          const systemStatic = systemStatics.get(parseInt(systemId));
+          const whInfo = wormholes.find(x => x.name === group);
+
+          if (!systemStatic || !whInfo || group === 'K162') {
+            return true;
+          }
+
+          const { id: whType } = WORMHOLES_ADDITIONAL_INFO_BY_CLASS_ID[systemStatic.system_class];
+          return whInfo.dest === whType;
+        })
+        .map(x => ({ value: x })),
+    ];
+  }, [group, leadsTo, systemStatics, wormholes]);
+
+  return (
+    <Controller
+      // @ts-ignore
+      name={name}
+      control={control}
+      defaultValue={defaultValue}
+      render={({ field }) => {
+        return (
+          <Dropdown
+            value={field.value}
+            onChange={field.onChange}
+            options={leadsToOptions}
+            optionValue="value"
+            placeholder="Select Leads To wormhole"
+            className={clsx('w-full')}
+            scrollHeight="240px"
+            itemTemplate={renderLinkedSystemItem}
+            valueTemplate={renderLinkedSystemValue}
+            emptyMessage={renderLeadsToEmpty}
+          />
+        );
+      }}
+    />
+  );
+};

assets/js/hooks/Mapper/components/mapRootContent/components/SignatureSettings/components/SignatureLeadsToSelect/index.ts

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

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

@@ -0,0 +1,134 @@
+import { Dropdown } from 'primereact/dropdown';
+import clsx from 'clsx';
+import { Respawn, SolarSystemStaticInfoRaw, WormholeDataRaw } from '@/hooks/Mapper/types';
+import { Controller, useFormContext } from 'react-hook-form';
+import { useMapRootState } from '@/hooks/Mapper/mapRootProvider';
+import { useSystemsSettingsProvider } from '@/hooks/Mapper/components/mapRootContent/components/SignatureSettings/Provider.tsx';
+import { useSystemInfo } from '@/hooks/Mapper/components/hooks';
+import {
+  SOLAR_SYSTEM_CLASSES_TO_CLASS_GROUPS,
+  WORMHOLES_ADDITIONAL_INFO_BY_CLASS_ID,
+} from '@/hooks/Mapper/components/map/constants.ts';
+import { useMemo } from 'react';
+import { WHClassView } from '@/hooks/Mapper/components/ui-kit';
+
+const getPossibleWormholes = (systemStatic: SolarSystemStaticInfoRaw, wormholes: WormholeDataRaw[]) => {
+  const { id: whType } = WORMHOLES_ADDITIONAL_INFO_BY_CLASS_ID[systemStatic.system_class];
+
+  // @ts-ignore
+  const spawnClassGroup = SOLAR_SYSTEM_CLASSES_TO_CLASS_GROUPS[whType];
+  const possibleWHTypes = wormholes.filter(x => x.src.includes(spawnClassGroup));
+
+  return {
+    statics: possibleWHTypes
+      .filter(x => x.respawn.some(y => y === Respawn.static))
+      .filter(x => systemStatic.statics.includes(x.name)),
+    k162: wormholes.find(x => x.name === 'K162')!,
+    wanderings: possibleWHTypes.filter(x => x.respawn.some(y => y === Respawn.wandering)),
+  };
+};
+
+// @ts-ignore
+const renderWHTypeGroupTemplate = option => {
+  return (
+    <div className="flex gap-2 items-center">
+      <span>{option.label}</span>
+    </div>
+  );
+};
+
+// @ts-ignore
+const renderWHTypeTemplateValue = (option: { label: string; data: WormholeDataRaw }) => {
+  if (!option) {
+    return 'Select wormhole type';
+  }
+
+  return (
+    <div className="flex gap-2 items-center">
+      <WHClassView whClassName={option.data.name} noOffset useShortTitle />
+    </div>
+  );
+};
+
+// @ts-ignore
+const renderWHTypeTemplate = (option: { label: string; data: WormholeDataRaw }) => {
+  return (
+    <div className="flex gap-2 items-center ml-[1rem]">
+      <WHClassView whClassName={option.data.name} noOffset useShortTitle />
+    </div>
+  );
+};
+
+export interface SignatureGroupSelectProps {
+  name: string;
+  defaultValue?: string;
+}
+
+export const SignatureWormholeTypeSelect = ({ name, defaultValue = '' }: SignatureGroupSelectProps) => {
+  const { control } = useFormContext();
+
+  const {
+    data: { wormholes },
+  } = useMapRootState();
+
+  const {
+    value: { systemId },
+  } = useSystemsSettingsProvider();
+
+  const system = useSystemInfo({ systemId });
+
+  const possibleWormholesOptions = useMemo(() => {
+    const possibleWormholes = getPossibleWormholes(system.staticInfo, wormholes);
+
+    return [
+      {
+        label: 'Statics',
+        items: [
+          ...possibleWormholes.statics.map(x => ({
+            label: x.name,
+            value: x.name,
+            data: x,
+          })),
+          {
+            value: possibleWormholes.k162.name,
+            label: possibleWormholes.k162.name,
+            data: possibleWormholes.k162,
+          },
+        ],
+      },
+      {
+        label: 'Wanderings',
+        items: possibleWormholes.wanderings.map(x => ({
+          label: x.name,
+          value: x.name,
+          data: x,
+        })),
+      },
+    ];
+  }, [system, wormholes]);
+
+  return (
+    <Controller
+      name={name}
+      control={control}
+      defaultValue={defaultValue}
+      render={({ field }) => (
+        <Dropdown
+          value={field.value}
+          onChange={field.onChange}
+          options={possibleWormholesOptions}
+          optionLabel="label"
+          optionValue="value"
+          placeholder="Select wormhole type"
+          optionGroupLabel="label"
+          optionGroupChildren="items"
+          className={clsx('w-full')}
+          scrollHeight="240px"
+          optionGroupTemplate={renderWHTypeGroupTemplate}
+          itemTemplate={renderWHTypeTemplate}
+          valueTemplate={renderWHTypeTemplateValue}
+        />
+      )}
+    />
+  );
+};

assets/js/hooks/Mapper/components/mapRootContent/components/SignatureSettings/components/SignatureWormholeTypeSelect/index.ts

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

assets/js/hooks/Mapper/components/mapRootContent/components/SignatureSettings/components/index.ts

@@ -0,0 +1,2 @@
+export * from './SignatureGroupSelect';
+export * from './SignatureGroupContent';

assets/js/hooks/Mapper/components/mapRootContent/components/SignatureSettings/index.ts

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

assets/js/hooks/Mapper/components/ui-kit/WHClassView/WHClassView.module.scss

@@ -5,6 +5,11 @@
 .WHClassViewContent {
   display: flex;
   gap: 2px;
+
+  &.NoOffset {
+    gap: 4px;
+    align-items: center;
+  }
 }
 
 .WHClassName {
@@ -13,3 +18,12 @@
   font-weight: bold;
   top: -2px;
 }
+
+.NoOffset {
+  *.WHClassName {
+    position: relative;
+    font-size: 12px;
+    font-weight: initial !important;
+    top: initial !important;
+  }
+}

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

@@ -16,26 +16,42 @@ const prepareMass = (mass: number) => {
 
 export interface WHClassViewProps {
   whClassName: string;
+  noOffset?: boolean;
+  useShortTitle?: boolean;
+  hideWhClass?: boolean;
+  highlightName?: boolean;
+  className?: string;
+  classNameWh?: string;
 }
 
-export const WHClassView = ({ whClassName }: WHClassViewProps) => {
+export const WHClassView = ({
+  whClassName,
+  noOffset,
+  useShortTitle,
+  hideWhClass,
+  highlightName,
+  className,
+  classNameWh,
+}: WHClassViewProps) => {
   const {
     data: { wormholesData },
   } = useMapRootState();
 
   const whData = useMemo(() => wormholesData[whClassName], [whClassName, wormholesData]);
   const whClass = useMemo(() => WORMHOLES_ADDITIONAL_INFO[whData.dest], [whData.dest]);
-  const whClassStyle = WORMHOLE_CLASS_STYLES[whClass.wormholeClassID];
+  const whClassStyle = WORMHOLE_CLASS_STYLES[whClass?.wormholeClassID] ?? '';
+
+  const uid = useMemo(() => new Date().getTime().toString(), []);
 
   return (
-    <div className={classes.WHClassViewRoot}>
+    <div className={clsx(classes.WHClassViewRoot, className)}>
       <Tooltip
-        target={`.wh-name${whClassName}`}
+        target={`.wh-name${whClassName}${uid}`}
         position="right"
         mouseTrack
         mouseTrackLeft={20}
         mouseTrackTop={30}
-        className="border border-green-300 rounded border-opacity-10 bg-stone-900 bg-opacity-70 "
+        className="border border-green-300 rounded border-opacity-10 bg-stone-900 bg-opacity-90 "
       >
         <div className="flex gap-3">
           <div className="flex flex-col gap-1">
@@ -49,9 +65,20 @@ export const WHClassView = ({ whClassName }: WHClassViewProps) => {
         </div>
       </Tooltip>
 
-      <div className={clsx(classes.WHClassViewContent, 'wh-name select-none cursor-help', `wh-name${whClassName}`)}>
-        <span>{whClassName}</span>
-        <span className={clsx(classes.WHClassName, whClassStyle)}>{whClass.shortName}</span>
+      <div
+        className={clsx(
+          classes.WHClassViewContent,
+          { [classes.NoOffset]: noOffset },
+          'wh-name select-none cursor-help',
+          `wh-name${whClassName}${uid}`,
+        )}
+      >
+        <span className={clsx({ [whClassStyle]: highlightName })}>{whClassName}</span>
+        {!hideWhClass && whClass && (
+          <span className={clsx(classes.WHClassName, whClassStyle, classNameWh)}>
+            {useShortTitle ? whClass.shortTitle : whClass.shortName}
+          </span>
+        )}
       </div>
     </div>
   );

assets/js/hooks/Mapper/events/index.ts

@@ -1,13 +1,12 @@
 import { createEvent } from 'react-event-hook';
 
-export interface MapEvent {
-  name: string;
-  data: {
-    solar_system_source: number;
-    solar_system_target: number;
-  };
+import { Command, CommandData } from '@/hooks/Mapper/types/mapHandlers.ts';
+
+export interface MapEvent<T extends Command> {
+  name: T;
+  data: CommandData[T];
 }
 
-const { useMapEventListener, emitMapEvent } = createEvent('map-event')<MapEvent>();
+const { useMapEventListener, emitMapEvent } = createEvent('map-event')<MapEvent<Command>>();
 
 export { useMapEventListener, emitMapEvent };

assets/js/hooks/Mapper/helpers/parseSignatures.ts

@@ -19,6 +19,7 @@ export const parseSignatures = (value: string, availableKeys: string[]): SystemS
       kind: availableKeys.includes(sigArrInfo[1]) ? sigArrInfo[1] : COSMIC_SIGNATURE,
       group: sigArrInfo[2],
       name: sigArrInfo[3],
+      type: '',
     });
   }
 

assets/js/hooks/Mapper/helpers/sortWHClasses.ts

@@ -2,6 +2,10 @@ import { WORMHOLES_ADDITIONAL_INFO } from '@/hooks/Mapper/components/map/constan
 import { WormholeDataRaw } from '@/hooks/Mapper/types';
 
 export const sortWHClasses = (wormholesData: Record<string, WormholeDataRaw>, statics: string[]) => {
+  if (!statics) {
+    return [];
+  }
+
   return statics
     .map(x => wormholesData[x])
     .map(x => ({ name: x.name, ...WORMHOLES_ADDITIONAL_INFO[x.dest] }))

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

@@ -12,6 +12,7 @@ export type MapRootData = MapUnionTypes & {
 
 const INITIAL_DATA: MapRootData = {
   wormholesData: {},
+  wormholes: [],
   effects: {},
   characters: [],
   userCharacters: [],

assets/js/hooks/Mapper/mapRootProvider/hooks/api/useMapInit.ts

@@ -24,6 +24,7 @@ export const useMapInit = () => {
 
       if (wormholes) {
         updateData.wormholesData = wormholes.reduce((acc, x) => ({ ...acc, [x.name]: x }), {});
+        updateData.wormholes = wormholes;
       }
 
       if (effects) {

assets/js/hooks/Mapper/mapRootProvider/hooks/useMapRootHandlers.ts

@@ -49,15 +49,25 @@ export const useMapRootHandlers = (ref: ForwardedRef<MapHandlers>) => {
               break;
             case Commands.addSystems:
               addSystems(data as CommandAddSystems);
+              setTimeout(() => {
+                emitMapEvent({ name: Commands.addSystems, data });
+              }, 100);
               break;
             case Commands.updateSystems:
               updateSystems(data as CommandUpdateSystems);
               break;
             case Commands.removeSystems:
               removeSystems(data as CommandRemoveSystems);
+              setTimeout(() => {
+                emitMapEvent({ name: Commands.removeSystems, data });
+              }, 100);
+
               break;
             case Commands.addConnections:
               addConnections(data as CommandAddConnections);
+              setTimeout(() => {
+                emitMapEvent({ name: Commands.addConnections, data });
+              }, 100);
               break;
             case Commands.removeConnections:
               removeConnections(data as CommandRemoveConnections);
@@ -96,6 +106,8 @@ export const useMapRootHandlers = (ref: ForwardedRef<MapHandlers>) => {
               break;
 
             case Commands.linkSignatureToSystem:
+              // TODO command data type lost
+              // @ts-ignore
               emitMapEvent({ name: Commands.linkSignatureToSystem, data });
               break;
 
@@ -103,6 +115,12 @@ export const useMapRootHandlers = (ref: ForwardedRef<MapHandlers>) => {
               // do nothing here
               break;
 
+            case Commands.signaturesUpdated:
+              // TODO command data type lost
+              // @ts-ignore
+              emitMapEvent({ name: Commands.signaturesUpdated, data });
+              break;
+
             default:
               console.warn(`JOipP Interface handlers: Unknown command: ${type}`, data);
               break;

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

@@ -24,6 +24,7 @@ export enum Commands {
   centerSystem = 'center_system',
   selectSystem = 'select_system',
   linkSignatureToSystem = 'link_signature_to_system',
+  signaturesUpdated = 'signatures_updated',
 }
 
 export type Command =
@@ -44,7 +45,8 @@ export type Command =
   | Commands.routes
   | Commands.selectSystem
   | Commands.centerSystem
-  | Commands.linkSignatureToSystem;
+  | Commands.linkSignatureToSystem
+  | Commands.signaturesUpdated;
 
 export type CommandInit = {
   systems: SolarSystemRawType[];
@@ -81,6 +83,7 @@ export type CommandLinkSignatureToSystem = {
   solar_system_source: number;
   solar_system_target: number;
 };
+export type CommandLinkSignaturesUpdated = number;
 
 export interface CommandData {
   [Commands.init]: CommandInit;
@@ -101,6 +104,7 @@ export interface CommandData {
   [Commands.selectSystem]: CommandSelectSystem;
   [Commands.centerSystem]: CommandCenterSystem;
   [Commands.linkSignatureToSystem]: CommandLinkSignatureToSystem;
+  [Commands.signaturesUpdated]: CommandLinkSignaturesUpdated;
 }
 
 export interface MapHandlers {
@@ -118,6 +122,7 @@ export enum OutCommand {
   updateConnectionMassStatus = 'update_connection_mass_status',
   updateConnectionShipSizeType = 'update_connection_ship_size_type',
   updateConnectionLocked = 'update_connection_locked',
+  updateConnectionCustomInfo = 'update_connection_custom_info',
   updateSignatures = 'update_signatures',
   updateSystemName = 'update_system_name',
   updateSystemDescription = 'update_system_description',
@@ -143,6 +148,7 @@ export enum OutCommand {
 
   getUserSettings = 'get_user_settings',
   updateUserSettings = 'update_user_settings',
+  unlinkSignature = 'unlink_signature',
 }
 
 export type OutCommandHandler = <T = any>(event: { type: OutCommand; data: any }) => Promise<T>;

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

@@ -7,6 +7,7 @@ import { SolarSystemConnection } from '@/hooks/Mapper/types/connection.ts';
 
 export type MapUnionTypes = {
   wormholesData: Record<string, WormholeDataRaw>;
+  wormholes: WormholeDataRaw[];
   effects: Record<string, EffectRaw>;
   characters: CharacterTypeRaw[];
   userCharacters: string[];

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

@@ -1,23 +1,13 @@
 import { SolarSystemStaticInfoRaw } from '@/hooks/Mapper/types';
 
-export type SystemSignature = {
-  eve_id: string;
-  kind: string;
-  name: string;
-  description?: string;
-  group: string;
-  linked_system?: SolarSystemStaticInfoRaw;
-  updated_at?: string;
-};
-
 export enum SignatureGroup {
+  CosmicSignature = 'Cosmic Signature',
+  Wormhole = 'Wormhole',
   GasSite = 'Gas Site',
   RelicSite = 'Relic Site',
   DataSite = 'Data Site',
   OreSite = 'Ore Site',
   CombatSite = 'Combat Site',
-  Wormhole = 'Wormhole',
-  CosmicSignature = 'Cosmic Signature',
 }
 
 export type GroupType = {
@@ -26,3 +16,14 @@ export type GroupType = {
   w: number;
   h: number;
 };
+
+export type SystemSignature = {
+  eve_id: string;
+  kind: string;
+  name: string;
+  description?: string;
+  group: SignatureGroup;
+  type: string;
+  linked_system?: SolarSystemStaticInfoRaw;
+  updated_at?: string;
+};

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

@@ -1,3 +1,9 @@
+export enum Respawn {
+  static = 'static',
+  wandering = 'wandering',
+  reverse = 'reverse',
+}
+
 export type WormholeDataRaw = {
   dest: string;
   id: number;
@@ -5,7 +11,7 @@ export type WormholeDataRaw = {
   mass_regen: number;
   max_mass_per_jump: number;
   name: string;
-  sibling_groups: any;
+  respawn: Respawn[];
   src: string[];
   static: boolean;
   total_mass: number;

assets/js/hooks/Mapper/utils/abstractContextProvider.tsx

@@ -0,0 +1,26 @@
+import { createContext, ReactNode, useContext, useState } from 'react';
+
+type ContextType<T> = {
+  value: T;
+  setValue: (newValue: T) => void;
+};
+
+export const createGenericContext = <T,>() => {
+  const context = createContext<ContextType<T> | undefined>(undefined);
+
+  const Provider = ({ children, initialValue }: { children: ReactNode; initialValue: T }) => {
+    const [value, setValue] = useState<T>(initialValue);
+
+    return <context.Provider value={{ value, setValue }}>{children}</context.Provider>;
+  };
+
+  const useContextValue = () => {
+    const contextValue = useContext(context);
+    if (!contextValue) {
+      throw new Error('useContextValue must be used within a Provider');
+    }
+    return contextValue;
+  };
+
+  return { Provider, useContextValue };
+};

assets/package.json

@@ -31,6 +31,7 @@
     "react-event-hook": "^3.1.2",
     "react-flow-renderer": "^10.3.17",
     "react-grid-layout": "^1.3.4",
+    "react-hook-form": "^7.53.1",
     "react-usestateref": "^1.0.9",
     "reactflow": "^11.10.4",
     "rxjs": "^7.8.1",

assets/yarn.lock

@@ -3230,6 +3230,11 @@ react-grid-layout@^1.3.4:
     react-resizable "^3.0.5"
     resize-observer-polyfill "^1.5.1"
 
+react-hook-form@^7.53.1:
+  version "7.53.1"
+  resolved "https://registry.yarnpkg.com/react-hook-form/-/react-hook-form-7.53.1.tgz#3f2cd1ed2b3af99416a4ac674da2d526625add67"
+  integrity sha512-6aiQeBda4zjcuaugWvim9WsGqisoUk+etmFEsSUMm451/Ic8L/UAb7sRtMj3V+Hdzm6mMjU1VhiSzYUZeBm0Vg==
+
 react-is@^16.13.1:
   version "16.13.1"
   resolved "https://registry.npmjs.org/react-is/-/react-is-16.13.1.tgz"

config/runtime.exs

@@ -55,11 +55,11 @@ map_subscriptions_enabled =
 
 map_subscription_characters_limit =
   config_dir
-  |> get_int_from_path_or_env("WANDERER_MAP_SUBSCRIPTION_CHARACTERS_LIMIT", 100)
+  |> get_int_from_path_or_env("WANDERER_MAP_SUBSCRIPTION_CHARACTERS_LIMIT", 10_000)
 
 map_subscription_hubs_limit =
   config_dir
-  |> get_int_from_path_or_env("WANDERER_MAP_SUBSCRIPTION_HUBS_LIMIT", 10)
+  |> get_int_from_path_or_env("WANDERER_MAP_SUBSCRIPTION_HUBS_LIMIT", 100)
 
 wallet_tracking_enabled =
   config_dir

lib/wanderer_app.ex

@@ -7,6 +7,8 @@ defmodule WandererApp do
   if it comes from the database, an external API or others.
   """
 
+  require Logger
+
   @doc """
   When used, dispatch to the appropriate domain service
   """
@@ -32,17 +34,17 @@ defmodule WandererApp do
   end
 
   def log_exception(kind, reason, stacktrace) do
-      reason = Exception.normalize(kind, reason, stacktrace)
+    reason = Exception.normalize(kind, reason, stacktrace)
 
-      crash_reason =
-        case kind do
-          :throw -> {{:nocatch, reason}, stacktrace}
-          _ -> {reason, stacktrace}
-        end
+    crash_reason =
+      case kind do
+        :throw -> {{:nocatch, reason}, stacktrace}
+        _ -> {reason, stacktrace}
+      end
 
-      Logger.error(
-        Exception.format(kind, reason, stacktrace),
-        crash_reason: crash_reason
-      )
-    end
+    Logger.error(
+      Exception.format(kind, reason, stacktrace),
+      crash_reason: crash_reason
+    )
+  end
 end

lib/wanderer_app/api/map_connection.ex

@@ -28,6 +28,7 @@ defmodule WandererApp.Api.MapConnection do
     define(:update_time_status, action: :update_time_status)
     define(:update_ship_size_type, action: :update_ship_size_type)
     define(:update_locked, action: :update_locked)
+    define(:update_custom_info, action: :update_custom_info)
   end
 
   actions do
@@ -87,6 +88,10 @@ defmodule WandererApp.Api.MapConnection do
     update :update_locked do
       accept [:locked]
     end
+
+    update :update_custom_info do
+      accept [:custom_info]
+    end
   end
 
   attributes do
@@ -131,6 +136,10 @@ defmodule WandererApp.Api.MapConnection do
 
     attribute :locked, :boolean
 
+    attribute :custom_info, :string do
+      allow_nil? true
+    end
+
     create_timestamp(:inserted_at)
     update_timestamp(:updated_at)
   end

lib/wanderer_app/api/map_system_signature.ex

@@ -15,6 +15,7 @@ defmodule WandererApp.Api.MapSystemSignature do
     define(:create, action: :create)
     define(:update, action: :update)
     define(:update_linked_system, action: :update_linked_system)
+    define(:update_type, action: :update_type)
 
     define(:by_id,
       get_by: [:id],
@@ -32,7 +33,8 @@ defmodule WandererApp.Api.MapSystemSignature do
       :name,
       :description,
       :kind,
-      :group
+      :group,
+      :type
     ]
 
     defaults [:read, :destroy]
@@ -51,7 +53,8 @@ defmodule WandererApp.Api.MapSystemSignature do
         :name,
         :description,
         :kind,
-        :group
+        :group,
+        :type
       ]
 
       argument :system_id, :uuid, allow_nil?: false
@@ -68,7 +71,7 @@ defmodule WandererApp.Api.MapSystemSignature do
         :description,
         :kind,
         :group,
-        :linked_system_id
+        :type
       ]
 
       primary? true
@@ -79,6 +82,10 @@ defmodule WandererApp.Api.MapSystemSignature do
       accept [:linked_system_id]
     end
 
+    update :update_type do
+      accept [:type]
+    end
+
     read :by_system_id do
       argument(:system_id, :string, allow_nil?: false)
 
@@ -105,6 +112,10 @@ defmodule WandererApp.Api.MapSystemSignature do
       allow_nil? true
     end
 
+    attribute :type, :string do
+      allow_nil? true
+    end
+
     attribute :linked_system_id, :integer do
       allow_nil? true
     end

lib/wanderer_app/api/user_activity.ex

@@ -8,6 +8,10 @@ defmodule WandererApp.Api.UserActivity do
   postgres do
     repo(WandererApp.Repo)
     table("user_activity_v1")
+
+    custom_indexes do
+      index [:entity_id, :event_type, :inserted_at], unique: true
+    end
   end
 
   code_interface do
@@ -104,6 +108,8 @@ defmodule WandererApp.Api.UserActivity do
     update_timestamp(:updated_at)
   end
 
+
+
   relationships do
     belongs_to :character, WandererApp.Api.Character do
       allow_nil? true

lib/wanderer_app/character/tracker.ex

@@ -73,7 +73,8 @@ defmodule WandererApp.Character.Tracker do
         case WandererApp.Esi.get_character_info(eve_id) do
           {:ok, info} ->
             {:ok, character_state} = WandererApp.Character.get_character_state(character_id)
-            update = maybe_update_corporation(character_state, info)
+
+            update = maybe_update_corporation(character_state, eve_id |> String.to_integer())
             WandererApp.Character.update_character_state(character_id, update)
 
             :ok
@@ -103,7 +104,9 @@ defmodule WandererApp.Character.Tracker do
   end
 
   def update_ship(%{character_id: character_id, track_ship: true} = character_state) do
-    case WandererApp.Character.get_character(character_id) do
+    character_id
+    |> WandererApp.Character.get_character()
+    |> case do
       {:ok, %{eve_id: eve_id, access_token: access_token}} when not is_nil(access_token) ->
         WandererApp.Cache.has_key?("character:#{character_id}:ship_forbidden")
         |> case do
@@ -541,12 +544,17 @@ defmodule WandererApp.Character.Tracker do
 
   defp maybe_update_corporation(
          state,
-         %{
-           "corporation_id" => corporation_id
-         } = _info
+         character_eve_id
        )
-       when not is_nil(corporation_id),
-       do: update_corporation(state, corporation_id)
+       when not is_nil(character_eve_id) and is_integer(character_eve_id) do
+    case WandererApp.Esi.post_characters_affiliation([character_eve_id]) do
+      {:ok, [character_aff_info]} when not is_nil(character_aff_info) ->
+        update_corporation(state, character_aff_info |> Map.get("corporation_id"))
+
+      error ->
+        state
+    end
+  end
 
   defp maybe_update_corporation(
          state,

lib/wanderer_app/esi.ex

@@ -5,6 +5,10 @@ defmodule WandererApp.Esi do
   defdelegate get_alliance_info(eve_id, opts \\ []), to: WandererApp.Esi.ApiClient
   defdelegate get_corporation_info(eve_id, opts \\ []), to: WandererApp.Esi.ApiClient
   defdelegate get_character_info(eve_id, opts \\ []), to: WandererApp.Esi.ApiClient
+
+  defdelegate post_characters_affiliation(character_eve_ids, opts \\ []),
+    to: WandererApp.Esi.ApiClient
+
   defdelegate get_character_wallet(character_eve_id, opts \\ []), to: WandererApp.Esi.ApiClient
   defdelegate get_corporation_wallets(corporation_id, opts \\ []), to: WandererApp.Esi.ApiClient
 

lib/wanderer_app/esi/api_client.ex

@@ -53,6 +53,17 @@ defmodule WandererApp.Esi.ApiClient do
     )
   end
 
+  def post_characters_affiliation(character_eve_ids, _opts)
+      when is_list(character_eve_ids) do
+    _post(
+      "#{@base_url}/characters/affiliation/",
+      json: character_eve_ids,
+      params: %{
+        datasource: "tranquility"
+      }
+    )
+  end
+
   def find_routes(map_id, origin, hubs, routes_settings) do
     origin = origin |> String.to_integer()
     hubs = hubs |> Enum.map(&(&1 |> String.to_integer()))

lib/wanderer_app/eve_data_service.ex

@@ -79,7 +79,8 @@ defmodule WandererApp.EveDataService do
         max_mass_per_jump: row["max_mass_per_jump"],
         static: row["static"],
         mass_regen: row["mass_regen"],
-        sibling_groups: row["sibling_groups"]
+        sibling_groups: row["sibling_groups"],
+        respawn: row["respawn"]
       }
     end)
   end

lib/wanderer_app/map/map_position_calculator.ex

@@ -75,7 +75,7 @@ defmodule WandererApp.Map.PositionCalculator do
   def get_available_positions(level, x, y, opts),
     do: adjusted_coordinates(1 + level * 2, x, y, opts)
 
-  defp edge_coordinates(n, opts) when n > 1 do
+  defp edge_coordinates(n, _opts) when n > 1 do
     min = -div(n, 2)
     max = div(n, 2)
     # Top edge

lib/wanderer_app/map/map_server.ex

@@ -207,6 +207,12 @@ defmodule WandererApp.Map.Server do
       |> map_pid!
       |> GenServer.cast({&Impl.update_connection_locked/2, [connection_info]})
 
+  def update_connection_custom_info(map_id, connection_info) when is_binary(map_id),
+    do:
+      map_id
+      |> map_pid!
+      |> GenServer.cast({&Impl.update_connection_custom_info/2, [connection_info]})
+
   @impl true
   def handle_continue(:load_state, state),
     do: {:noreply, state |> Impl.load_state(), {:continue, :start_map}}

lib/wanderer_app/map/map_server_impl.ex

@@ -193,7 +193,9 @@ defmodule WandererApp.Map.Server.Impl do
 
         :ok
       else
-        {:error, _error} ->
+        _error ->
+          {:ok, character} = WandererApp.Character.get_character(character_id)
+          broadcast!(map_id, :character_added, character)
           :ok
       end
     end)
@@ -333,7 +335,7 @@ defmodule WandererApp.Map.Server.Impl do
   end
 
   def delete_systems(
-        %{map_id: map_id, rtree_name: rtree_name, map_opts: map_opts} = state,
+        %{map_id: map_id, rtree_name: rtree_name} = state,
         removed_ids,
         user_id,
         character_id
@@ -352,7 +354,7 @@ defmodule WandererApp.Map.Server.Impl do
     removed_ids
     |> Enum.each(fn solar_system_id ->
       map_id
-      |> WandererApp.MapSystemRepo.remove_from_map(solar_system_id, map_opts)
+      |> WandererApp.MapSystemRepo.remove_from_map(solar_system_id)
       |> case do
         {:ok, _} ->
           :ok
@@ -471,6 +473,12 @@ defmodule WandererApp.Map.Server.Impl do
       ),
       do: _update_connection(state, :update_locked, [:locked], connection_update)
 
+  def update_connection_custom_info(
+        state,
+        connection_update
+      ),
+      do: _update_connection(state, :update_custom_info, [:custom_info], connection_update)
+
   def import_settings(%{map_id: map_id} = state, settings, user_id) do
     WandererApp.Cache.put(
       "map_#{map_id}:importing",
@@ -800,7 +808,7 @@ defmodule WandererApp.Map.Server.Impl do
     }
   end
 
-  def handle_event({:options_updated, options}, %{map: map, map_id: map_id} = state),
+  def handle_event({:options_updated, options}, state),
     do: %{
       state
       | map_opts: [
@@ -1082,12 +1090,13 @@ defmodule WandererApp.Map.Server.Impl do
              map_id,
              update.solar_system_id
            ),
-         {:ok, update_map} <- _get_update_map(update, attributes),
-         {:ok, updated_system} <-
-           apply(WandererApp.MapSystemRepo, update_method, [
-             system,
-             update_map
-           ]) do
+         {:ok, update_map} <- _get_update_map(update, attributes) do
+      {:ok, updated_system} =
+        apply(WandererApp.MapSystemRepo, update_method, [
+          system,
+          update_map
+        ])
+
       if not is_nil(callback_fn) do
         callback_fn.(updated_system)
       end
@@ -1097,7 +1106,7 @@ defmodule WandererApp.Map.Server.Impl do
       state
     else
       error ->
-        @logger.error("Failed to update system: #{inspect(error, pretty: true)}")
+        @logger.error("Fail ed to update system: #{inspect(error, pretty: true)}")
         state
     end
   end
@@ -1114,7 +1123,7 @@ defmodule WandererApp.Map.Server.Impl do
          %{
            solar_system_id: solar_system_id,
            coordinates: coordinates
-         } = _system_info,
+         } = system_info,
          user_id,
          character_id
        ) do
@@ -1134,17 +1143,34 @@ defmodule WandererApp.Map.Server.Impl do
     {:ok, system} =
       case WandererApp.MapSystemRepo.get_by_map_and_solar_system_id(map_id, solar_system_id) do
         {:ok, existing_system} when not is_nil(existing_system) ->
-          @ddrt.insert(
-            {solar_system_id,
-             WandererApp.Map.PositionCalculator.get_system_bounding_rect(%{
-               position_x: x,
-               position_y: y
-             })},
-            rtree_name
-          )
+          use_old_coordinates = Map.get(system_info, :use_old_coordinates, false)
 
-          existing_system
-          |> WandererApp.MapSystemRepo.update_position(%{position_x: x, position_y: y})
+          if use_old_coordinates do
+            @ddrt.insert(
+              {solar_system_id,
+               WandererApp.Map.PositionCalculator.get_system_bounding_rect(%{
+                 position_x: existing_system.position_x,
+                 position_y: existing_system.position_y
+               })},
+              rtree_name
+            )
+
+            {:ok, existing_system}
+          else
+            @ddrt.insert(
+              {solar_system_id,
+               WandererApp.Map.PositionCalculator.get_system_bounding_rect(%{
+                 position_x: x,
+                 position_y: y
+               })},
+              rtree_name
+            )
+
+            existing_system
+            |> WandererApp.MapSystemRepo.update_position!(%{position_x: x, position_y: y})
+            |> WandererApp.MapSystemRepo.cleanup_labels!(map_opts)
+            |> WandererApp.MapSystemRepo.cleanup_tags()
+          end
 
         _ ->
           {:ok, solar_system_info} =
@@ -1186,8 +1212,6 @@ defmodule WandererApp.Map.Server.Impl do
         solar_system_id: solar_system_id
       })
 
-    :telemetry.execute([:wanderer_app, :map, :system, :add], %{count: 1})
-
     state
   end
 
@@ -1587,13 +1611,13 @@ defmodule WandererApp.Map.Server.Impl do
            location.solar_system_id,
            old_location.solar_system_id
          ) do
-      {:ok, connection} ->
+      {:ok, connection} when not is_nil(connection) ->
         :ok = WandererApp.MapConnectionRepo.destroy(map_id, connection)
 
         broadcast!(map_id, :remove_connections, [connection])
         map_id |> WandererApp.Map.remove_connection(connection)
 
-      {:error, _error} ->
+      _error ->
         :ok
     end
   end
@@ -1658,11 +1682,11 @@ defmodule WandererApp.Map.Server.Impl do
 
   defp maybe_add_connection(_map_id, _location, _old_location, _character_id), do: :ok
 
-  defp maybe_add_system(map_id, location, old_location, rtree_name, opts)
+  defp maybe_add_system(map_id, location, old_location, rtree_name, map_opts)
        when not is_nil(location) do
     case WandererApp.Map.check_location(map_id, location) do
       {:ok, location} ->
-        {:ok, position} = calc_new_system_position(map_id, old_location, rtree_name, opts)
+        {:ok, position} = calc_new_system_position(map_id, old_location, rtree_name, map_opts)
 
         case WandererApp.MapSystemRepo.get_by_map_and_solar_system_id(
                map_id,
@@ -1671,10 +1695,12 @@ defmodule WandererApp.Map.Server.Impl do
           {:ok, existing_system} when not is_nil(existing_system) ->
             {:ok, updated_system} =
               existing_system
-              |> WandererApp.MapSystemRepo.update_position(%{
+              |> WandererApp.MapSystemRepo.update_position!(%{
                 position_x: position.x,
                 position_y: position.y
               })
+              |> WandererApp.MapSystemRepo.cleanup_labels!(map_opts)
+              |> WandererApp.MapSystemRepo.cleanup_tags()
 
             @ddrt.insert(
               {existing_system.solar_system_id,
@@ -1696,7 +1722,7 @@ defmodule WandererApp.Map.Server.Impl do
 
           _ ->
             {:ok, solar_system_info} =
-              WandererApp.Api.MapSolarSystem.by_solar_system_id(location.solar_system_id)
+              WandererApp.CachedInfo.get_system_static_info(location.solar_system_id)
 
             WandererApp.MapSystemRepo.create(%{
               map_id: map_id,
@@ -1732,7 +1758,7 @@ defmodule WandererApp.Map.Server.Impl do
     end
   end
 
-  defp maybe_add_system(_map_id, _location, _old_location, _rtree_name, _opts), do: :ok
+  defp maybe_add_system(_map_id, _location, _old_location, _rtree_name, _map_opts), do: :ok
 
   defp calc_new_system_position(map_id, old_location, rtree_name, opts),
     do:

lib/wanderer_app/repositories/map_connection_repo.ex

@@ -29,7 +29,7 @@ defmodule WandererApp.MapConnectionRepo do
 
   def create!(connection), do: connection |> WandererApp.Api.MapConnection.create!()
 
-  def destroy(map_id, connection) do
+  def destroy(map_id, connection) when not is_nil(connection) do
     {:ok, from_connections} =
       get_by_locations(map_id, connection.solar_system_source, connection.solar_system_target)
 
@@ -49,6 +49,8 @@ defmodule WandererApp.MapConnectionRepo do
     end
   end
 
+  def destroy(_map_id, _connection), do: :ok
+
   def destroy!(connection), do: connection |> WandererApp.Api.MapConnection.destroy!()
 
   def bulk_destroy!(connections) do
@@ -82,4 +84,9 @@ defmodule WandererApp.MapConnectionRepo do
     do:
       connection
       |> WandererApp.Api.MapConnection.update_locked(update)
+
+  def update_custom_info(connection, update),
+    do:
+      connection
+      |> WandererApp.Api.MapConnection.update_custom_info(update)
 end

lib/wanderer_app/repositories/map_system_repo.ex

@@ -22,22 +22,18 @@ defmodule WandererApp.MapSystemRepo do
   def get_visible_by_map(map_id),
     do: WandererApp.Api.MapSystem.read_visible_by_map(%{map_id: map_id})
 
-  def remove_from_map(map_id, solar_system_id, opts) do
+  def remove_from_map(map_id, solar_system_id) do
     WandererApp.Api.MapSystem.read_by_map_and_solar_system!(%{
       map_id: map_id,
       solar_system_id: solar_system_id
     })
-    |> cleanup_labels(opts)
-    |> WandererApp.Api.MapSystem.update_tag!(%{
-      tag: nil
-    })
     |> WandererApp.Api.MapSystem.update_visible(%{visible: false})
   rescue
     error ->
       {:error, error}
   end
 
-  def cleanup_labels(%{labels: labels} = system, opts) do
+  def cleanup_labels!(%{labels: labels} = system, opts) do
     store_custom_labels? =
       Keyword.get(opts, :store_custom_labels, "false") |> String.to_existing_atom()
 
@@ -49,11 +45,18 @@ defmodule WandererApp.MapSystemRepo do
     })
   end
 
+  def cleanup_tags(system) do
+    system
+    |> WandererApp.Api.MapSystem.update_tag(%{
+      tag: nil
+    })
+  end
+
   def get_filtered_labels(labels, true) when is_binary(labels) do
     labels
     |> Jason.decode!()
     |> case do
-      %{"customLabel" => customLabel} = labels when is_binary(customLabel) ->
+      %{"customLabel" => customLabel} when is_binary(customLabel) ->
         %{"customLabel" => customLabel, "labels" => []}
         |> Jason.encode!()
 
@@ -98,4 +101,9 @@ defmodule WandererApp.MapSystemRepo do
     do:
       system
       |> WandererApp.Api.MapSystem.update_position(update)
+
+  def update_position!(system, update),
+    do:
+      system
+      |> WandererApp.Api.MapSystem.update_position!(update)
 end

lib/wanderer_app/repositories/map_user_settings_repo.ex

@@ -1,7 +1,11 @@
 defmodule WandererApp.MapUserSettingsRepo do
   use WandererApp, :repository
 
-  @default_form_data %{"select_on_spash" => "false", "link_signature_on_splash" => "false"}
+  @default_form_data %{
+    "select_on_spash" => false,
+    "link_signature_on_splash" => false,
+    "delete_connection_with_sigs" => false
+  }
 
   def get(map_id, user_id) do
     map_id

lib/wanderer_app_web/components/map/map_picker.ex

@@ -12,6 +12,7 @@ defmodule WandererAppWeb.MapPicker do
     {:ok, socket}
   end
 
+  @impl true
   def update(
         %{
           current_user: current_user,
@@ -29,6 +30,7 @@ defmodule WandererAppWeb.MapPicker do
      end)}
   end
 
+  @impl true
   def render(assigns) do
     ~H"""
     <div id={@id}>
@@ -56,6 +58,7 @@ defmodule WandererAppWeb.MapPicker do
     """
   end
 
+  @impl true
   def handle_event("select", %{"map_slug" => map_slug} = _params, socket) do
     notify_to(socket.assigns.notify_to, socket.assigns.event_name, map_slug)
 

lib/wanderer_app_web/components/user_activity.ex

@@ -1,62 +1,92 @@
 defmodule WandererAppWeb.UserActivity do
   use WandererAppWeb, :live_component
+  use LiveViewEvents
 
-  attr(:stream, :any, required: true)
-  attr(:page, :integer, required: true)
-  attr(:end_of_stream?, :boolean, required: true)
+  @impl true
+  def mount(socket) do
+    {:ok, socket}
+  end
 
-  def list(assigns) do
+  @impl true
+  def update(assigns,
+        socket
+      ) do
+    {:ok,
+     socket
+     |> handle_info_or_assign(assigns)}
+  end
+
+  # attr(:can_undo_types, :list, required: false)
+  # attr(:stream, :any, required: true)
+  # attr(:page, :integer, required: true)
+  # attr(:end_of_stream?, :boolean, required: true)
+
+  def render(assigns) do
     ~H"""
-    <span
-      :if={@page > 1}
-      class="text-1xl fixed bottom-10 right-10 bg-zinc-700 text-white rounded-lg p-1 text-center min-w-[65px] z-50 opacity-70"
-    >
-      <%= @page %>
-    </span>
-    <ul
-      id="events"
-      class="space-y-4"
-      phx-update="stream"
-      phx-viewport-top={@page > 1 && "prev-page"}
-      phx-viewport-bottom={!@end_of_stream? && "next-page"}
-      phx-page-loading
-      class={[
-        if(@end_of_stream?, do: "pb-10", else: "pb-[calc(200vh)]"),
-        if(@page == 1, do: "pt-10", else: "pt-[calc(200vh)]")
-      ]}
-    >
-      <li :for={{dom_id, activity} <- @stream} id={dom_id}>
-        <.activity_entry activity={activity} />
-      </li>
-    </ul>
-    <div :if={@end_of_stream?} class="mt-5 text-center">
-      No more activity
+    <div id={@id}>
+      <span
+        :if={@page > 1}
+        class="text-1xl fixed bottom-10 right-10 bg-zinc-700 text-white rounded-lg p-1 text-center min-w-[65px] z-50 opacity-70"
+      >
+        <%= @page %>
+      </span>
+      <ul
+        id="events"
+        class="space-y-4"
+        phx-update="stream"
+        phx-viewport-top={@page > 1 && "prev-page"}
+        phx-viewport-bottom={!@end_of_stream? && "next-page"}
+        phx-page-loading
+        class={[
+          if(@end_of_stream?, do: "pb-10", else: "pb-[calc(200vh)]"),
+          if(@page == 1, do: "pt-10", else: "pt-[calc(200vh)]")
+        ]}
+      >
+        <li :for={{dom_id, activity} <- @stream} id={dom_id}>
+          <.activity_entry activity={activity} can_undo_types={@can_undo_types} />
+        </li>
+      </ul>
+      <div :if={@end_of_stream?} class="mt-5 text-center">
+        No more activity
+      </div>
     </div>
     """
   end
 
   attr(:activity, WandererApp.Api.UserActivity, required: true)
+  attr(:can_undo_types, :list, required: false)
 
   defp activity_entry(%{} = assigns) do
     ~H"""
-    <div class="flex w-full items-center justify-between space-x-2">
-      <div class="flex items-center space-x-3 text-xs">
+    <div class="flex items-center w-full space-x-2 p-1 hover:bg-gray-900">
+      <div class="flex items-center text-xs w-[270px]">
         <p class="flex items-center space-x-1">
           <span class="w-[150px] line-clamp-1 block text-sm font-normal leading-none text-gray-400 dark:text-gray-500">
             <.local_time id={@activity.id} at={@activity.inserted_at} />
           </span>
         </p>
-        <p
-          :if={not is_nil(@activity.character)}
-          class="flex shrink-0 items-center space-x-1 min-w-[200px]"
-        >
-          <.character_item character={@activity.character} />
-        </p>
       </div>
-      <p class="text-sm leading-[150%] text-[var(--color-gray-4)]">
+
+      <.character_item :if={not is_nil(@activity.character)} character={@activity.character} />
+      <p :if={is_nil(@activity.character)} class="text-sm text-[var(--color-gray-4)] w-[150px]">
+        System user / Administrator
+      </p>
+
+      <p class="text-sm text-[var(--color-gray-4)] w-[15%]">
         <%= _get_event_name(@activity.event_type) %>
       </p>
       <.activity_event event_type={@activity.event_type} event_data={@activity.event_data} />
+
+      <div :if={@activity.event_type in @can_undo_types}>
+        <button
+          phx-click="undo"
+          phx-value-event-data={@activity.event_data}
+          phx-value-event-type={@activity.event_type}
+          class="btn btn-sm btn-icon"
+        >
+          <.icon name="hero-arrow-uturn-left-solid" class="h-5 w-5" /> Undo
+        </button>
+      </div>
     </div>
     """
   end
@@ -65,7 +95,7 @@ defmodule WandererAppWeb.UserActivity do
 
   def character_item(assigns) do
     ~H"""
-    <div class="flex items-center gap-3 text-sm">
+    <div class="flex items-center gap-3 text-sm w-[150px]">
       <div class="avatar">
         <div class="rounded-md w-8 h-8">
           <img src={member_icon_url(@character.eve_id)} alt={@character.name} />
@@ -86,11 +116,20 @@ defmodule WandererAppWeb.UserActivity do
         <h6 class="text-base leading-[150%] font-semibold dark:text-white">
           <%= _get_event_data(@event_type, Jason.decode!(@event_data) |> Map.drop(["character_id"])) %>
         </h6>
+
       </div>
     </div>
     """
   end
 
+  @impl true
+  def handle_event("undo", %{"event-data" => event_data} = _params, socket) do
+    # notify_to(socket.assigns.notify_to, socket.assigns.event_name, map_slug)
+    IO.inspect(event_data)
+
+    {:noreply, socket}
+  end
+
   defp _get_event_name(:hub_added), do: "Hub Added"
   defp _get_event_name(:hub_removed), do: "Hub Removed"
   defp _get_event_name(:map_connection_added), do: "Connection Added"

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

@@ -0,0 +1,49 @@
+defmodule WandererAppWeb.MapActivityEventHandler do
+  use WandererAppWeb, :live_component
+  use Phoenix.Component
+  require Logger
+
+  alias WandererAppWeb.{MapEventHandler, MapCoreEventHandler}
+
+  def handle_server_event(
+        %{
+          event: :character_activity,
+          payload: character_activity
+        },
+        socket
+      ),
+      do: socket |> assign(:character_activity, character_activity)
+
+  def handle_server_event(event, socket),
+    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)}
+  end
+
+  def handle_ui_event("hide_activity", _, socket),
+    do: {:noreply, socket |> assign(show_activity?: false)}
+
+  def handle_ui_event(event, body, socket),
+    do: MapCoreEventHandler.handle_ui_event(event, body, socket)
+
+  defp get_character_activity(map_id) do
+    {:ok, jumps} = WandererApp.Api.MapChainPassages.by_map_id(%{map_id: map_id})
+
+    jumps =
+      jumps
+      |> Enum.map(fn p ->
+        %{p | character: p.character |> MapEventHandler.map_ui_character_stat()}
+      end)
+
+    {:ok, %{jumps: jumps}}
+  end
+end

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

@@ -0,0 +1,388 @@
+defmodule WandererAppWeb.MapCharactersEventHandler do
+  use WandererAppWeb, :live_component
+  use Phoenix.Component
+  require Logger
+
+  alias WandererAppWeb.{MapEventHandler, MapCoreEventHandler}
+
+  def handle_server_event(%{event: :character_added, payload: character}, socket) do
+    socket
+    |> MapEventHandler.push_map_event(
+      "character_added",
+      character |> map_ui_character()
+    )
+  end
+
+  def handle_server_event(%{event: :character_removed, payload: character}, socket) do
+    socket
+    |> MapEventHandler.push_map_event(
+      "character_removed",
+      character |> map_ui_character()
+    )
+  end
+
+  def handle_server_event(%{event: :character_updated, payload: character}, socket) do
+    socket
+    |> MapEventHandler.push_map_event(
+      "character_updated",
+      character |> map_ui_character()
+    )
+  end
+
+  def handle_server_event(
+        %{event: :characters_updated},
+        %{
+          assigns: %{
+            map_id: map_id
+          }
+        } = socket
+      ) do
+    characters =
+      map_id
+      |> WandererApp.Map.list_characters()
+      |> Enum.map(&map_ui_character/1)
+
+    socket
+    |> MapEventHandler.push_map_event(
+      "characters_updated",
+      characters
+    )
+  end
+
+  def handle_server_event(
+        %{event: :present_characters_updated, payload: present_character_eve_ids},
+        socket
+      ),
+      do:
+        socket
+        |> MapEventHandler.push_map_event(
+          "present_characters",
+          present_character_eve_ids
+        )
+
+  def handle_server_event(event, socket),
+    do: MapCoreEventHandler.handle_server_event(event, socket)
+
+  def handle_ui_event(
+        "add_character",
+        _,
+        %{
+          assigns: %{
+            current_user: current_user,
+            map_id: map_id,
+            user_permissions: %{track_character: true}
+          }
+        } = socket
+      ) do
+    {:ok, character_settings} =
+      case WandererApp.Api.MapCharacterSettings.read_by_map(%{map_id: map_id}) do
+        {:ok, settings} -> {:ok, settings}
+        _ -> {:ok, []}
+      end
+
+    {:noreply,
+     socket
+     |> assign(
+       show_tracking?: true,
+       character_settings: character_settings
+     )
+     |> assign_async(:characters, fn ->
+       {:ok, map} =
+         map_id
+         |> WandererApp.MapRepo.get([:acls])
+
+       map
+       |> WandererApp.Maps.load_characters(
+         character_settings,
+         current_user.id
+       )
+     end)}
+  end
+
+  def handle_ui_event(
+        "add_character",
+        _,
+        %{
+          assigns: %{
+            user_permissions: %{track_character: false}
+          }
+        } = socket
+      ),
+      do:
+        {:noreply,
+         socket
+         |> put_flash(
+           :error,
+           "You don't have permissions to track characters. Please contact administrator."
+         )}
+
+  def handle_ui_event(
+        "toggle_track",
+        %{"character-id" => character_id},
+        %{
+          assigns: %{
+            map_id: map_id,
+            character_settings: character_settings,
+            current_user: current_user,
+            only_tracked_characters: only_tracked_characters
+          }
+        } = socket
+      ) do
+    socket =
+      case character_settings |> Enum.find(&(&1.character_id == character_id)) do
+        nil ->
+          {:ok, map_character_settings} =
+            WandererApp.Api.MapCharacterSettings.create(%{
+              character_id: character_id,
+              map_id: map_id,
+              tracked: true
+            })
+
+          character = map_character_settings |> Ash.load!(:character) |> Map.get(:character)
+
+          :ok = track_characters([character], map_id, true)
+          :ok = add_characters([character], map_id, true)
+
+          socket
+
+        character_setting ->
+          case character_setting.tracked do
+            true ->
+              {:ok, map_character_settings} =
+                character_setting
+                |> WandererApp.Api.MapCharacterSettings.untrack()
+
+              character = map_character_settings |> Ash.load!(:character) |> Map.get(:character)
+
+              :ok = untrack_characters([character], map_id)
+              :ok = remove_characters([character], map_id)
+
+              if only_tracked_characters do
+                Process.send_after(self(), :not_all_characters_tracked, 10)
+              end
+
+              socket
+
+            _ ->
+              {:ok, map_character_settings} =
+                character_setting
+                |> WandererApp.Api.MapCharacterSettings.track()
+
+              character = map_character_settings |> Ash.load!(:character) |> Map.get(:character)
+
+              :ok = track_characters([character], map_id, true)
+              :ok = add_characters([character], map_id, true)
+
+              socket
+          end
+      end
+
+    %{result: characters} = socket.assigns.characters
+
+    {:ok, map_characters} = get_tracked_map_characters(map_id, current_user)
+
+    user_character_eve_ids = map_characters |> Enum.map(& &1.eve_id)
+
+    {:ok, character_settings} =
+      case WandererApp.Api.MapCharacterSettings.read_by_map(%{map_id: map_id}) do
+        {:ok, settings} -> {:ok, settings}
+        _ -> {:ok, []}
+      end
+
+    characters =
+      characters
+      |> Enum.map(fn c ->
+        WandererApp.Maps.map_character(
+          c,
+          character_settings |> Enum.find(&(&1.character_id == c.id))
+        )
+      end)
+
+    {:noreply,
+     socket
+     |> assign(user_characters: user_character_eve_ids)
+     |> assign(has_tracked_characters?: has_tracked_characters?(user_character_eve_ids))
+     |> assign(character_settings: character_settings)
+     |> assign_async(:characters, fn ->
+       {:ok, %{characters: characters}}
+     end)
+     |> MapEventHandler.push_map_event(
+       "init",
+       %{
+         user_characters: user_character_eve_ids,
+         reset: false
+       }
+     )}
+  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 has_tracked_characters?([]), do: false
+  def has_tracked_characters?(_user_characters), do: true
+
+  def get_tracked_map_characters(map_id, current_user) do
+    case WandererApp.Api.MapCharacterSettings.tracked_by_map(%{
+           map_id: map_id,
+           character_ids: current_user.characters |> Enum.map(& &1.id)
+         }) do
+      {:ok, settings} ->
+        {:ok,
+         settings
+         |> Enum.map(fn s -> s |> Ash.load!(:character) |> Map.get(:character) end)}
+
+      _ ->
+        {:ok, []}
+    end
+  end
+
+  def map_ui_character(character),
+    do:
+      character
+      |> Map.take([
+        :eve_id,
+        :name,
+        :online,
+        :corporation_id,
+        :corporation_name,
+        :corporation_ticker,
+        :alliance_id,
+        :alliance_name,
+        :alliance_ticker
+      ])
+      |> Map.put_new(:ship, WandererApp.Character.get_ship(character))
+      |> Map.put_new(:location, get_location(character))
+
+  def add_characters([], _map_id, _track_character), do: :ok
+
+  def add_characters([character | characters], map_id, track_character) do
+    map_id
+    |> WandererApp.Map.Server.add_character(character, track_character)
+
+    add_characters(characters, map_id, track_character)
+  end
+
+  def remove_characters([], _map_id), do: :ok
+
+  def remove_characters([character | characters], map_id) do
+    map_id
+    |> WandererApp.Map.Server.remove_character(character.id)
+
+    remove_characters(characters, map_id)
+  end
+
+  def untrack_characters(characters, map_id) do
+    characters
+    |> Enum.each(fn character ->
+      WandererAppWeb.Presence.untrack(self(), map_id, character.id)
+
+      WandererApp.Cache.put(
+        "#{inspect(self())}_map_#{map_id}:character_#{character.id}:tracked",
+        false
+      )
+
+      :ok =
+        Phoenix.PubSub.unsubscribe(
+          WandererApp.PubSub,
+          "character:#{character.eve_id}"
+        )
+    end)
+  end
+
+  def track_characters(_, _, false), do: :ok
+
+  def track_characters([], _map_id, _is_track_character?), do: :ok
+
+  def track_characters(
+        [character | characters],
+        map_id,
+        true
+      ) do
+    track_character(character, map_id)
+
+    track_characters(characters, map_id, true)
+  end
+
+  def track_character(
+        %{
+          id: character_id,
+          eve_id: eve_id,
+          corporation_id: corporation_id,
+          alliance_id: alliance_id
+        },
+        map_id
+      ) do
+    WandererAppWeb.Presence.track(self(), map_id, character_id, %{})
+
+    case WandererApp.Cache.lookup!(
+           "#{inspect(self())}_map_#{map_id}:character_#{character_id}:tracked",
+           false
+         ) do
+      true ->
+        :ok
+
+      _ ->
+        :ok =
+          Phoenix.PubSub.subscribe(
+            WandererApp.PubSub,
+            "character:#{eve_id}"
+          )
+
+        :ok =
+          WandererApp.Cache.put(
+            "#{inspect(self())}_map_#{map_id}:character_#{character_id}:tracked",
+            true
+          )
+    end
+
+    case WandererApp.Cache.lookup(
+           "#{inspect(self())}_map_#{map_id}:corporation_#{corporation_id}:tracked",
+           false
+         ) do
+      {:ok, true} ->
+        :ok
+
+      {:ok, false} ->
+        :ok =
+          Phoenix.PubSub.subscribe(
+            WandererApp.PubSub,
+            "corporation:#{corporation_id}"
+          )
+
+        :ok =
+          WandererApp.Cache.put(
+            "#{inspect(self())}_map_#{map_id}:corporation_#{corporation_id}:tracked",
+            true
+          )
+    end
+
+    case WandererApp.Cache.lookup(
+           "#{inspect(self())}_map_#{map_id}:alliance_#{alliance_id}:tracked",
+           false
+         ) do
+      {:ok, true} ->
+        :ok
+
+      {:ok, false} ->
+        :ok =
+          Phoenix.PubSub.subscribe(
+            WandererApp.PubSub,
+            "alliance:#{alliance_id}"
+          )
+
+        :ok =
+          WandererApp.Cache.put(
+            "#{inspect(self())}_map_#{map_id}:alliance_#{alliance_id}:tracked",
+            true
+          )
+    end
+
+    :ok = WandererApp.Character.TrackerManager.start_tracking(character_id)
+  end
+
+  defp get_location(character),
+    do: %{solar_system_id: character.solar_system_id, structure_id: character.structure_id}
+end

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

@@ -0,0 +1,197 @@
+defmodule WandererAppWeb.MapConnectionsEventHandler do
+  use WandererAppWeb, :live_component
+  use Phoenix.Component
+  require Logger
+
+  alias WandererAppWeb.{MapEventHandler, MapCoreEventHandler}
+
+  def handle_server_event(%{event: :update_connection, payload: connection}, socket),
+    do:
+      socket
+      |> MapEventHandler.push_map_event(
+        "update_connection",
+        MapEventHandler.map_ui_connection(connection)
+      )
+
+  def handle_server_event(%{event: :remove_connections, payload: connections}, socket) do
+    connection_ids =
+      connections |> Enum.map(&MapEventHandler.map_ui_connection/1) |> Enum.map(& &1.id)
+
+    socket
+    |> MapEventHandler.push_map_event(
+      "remove_connections",
+      connection_ids
+    )
+  end
+
+  def handle_server_event(%{event: :add_connection, payload: connection}, socket) do
+    connections = [MapEventHandler.map_ui_connection(connection)]
+
+    socket
+    |> MapEventHandler.push_map_event(
+      "add_connections",
+      connections
+    )
+  end
+
+  def handle_server_event(event, socket),
+    do: MapCoreEventHandler.handle_server_event(event, socket)
+
+  def handle_ui_event(
+        "manual_add_connection",
+        %{"source" => solar_system_source_id, "target" => solar_system_target_id} = _event,
+        %{
+          assigns: %{
+            map_id: map_id,
+            current_user: current_user,
+            tracked_character_ids: tracked_character_ids,
+            has_tracked_characters?: true,
+            user_permissions: %{add_connection: true}
+          }
+        } =
+          socket
+      ) do
+    map_id
+    |> WandererApp.Map.Server.add_connection(%{
+      solar_system_source_id: solar_system_source_id |> String.to_integer(),
+      solar_system_target_id: solar_system_target_id |> String.to_integer()
+    })
+
+    {:ok, _} =
+      WandererApp.User.ActivityTracker.track_map_event(:map_connection_added, %{
+        character_id: tracked_character_ids |> List.first(),
+        user_id: current_user.id,
+        map_id: map_id,
+        solar_system_source_id: "#{solar_system_source_id}" |> String.to_integer(),
+        solar_system_target_id: "#{solar_system_target_id}" |> String.to_integer()
+      })
+
+    {:noreply, socket}
+  end
+
+  def handle_ui_event(
+        "manual_delete_connection",
+        %{"source" => solar_system_source_id, "target" => solar_system_target_id} = _event,
+        %{
+          assigns: %{
+            map_id: map_id,
+            current_user: current_user,
+            tracked_character_ids: tracked_character_ids,
+            has_tracked_characters?: true,
+            user_permissions: %{delete_connection: true}
+          }
+        } =
+          socket
+      ) do
+    map_id
+    |> WandererApp.Map.Server.delete_connection(%{
+      solar_system_source_id: solar_system_source_id |> String.to_integer(),
+      solar_system_target_id: solar_system_target_id |> String.to_integer()
+    })
+
+    {:ok, _} =
+      WandererApp.User.ActivityTracker.track_map_event(:map_connection_removed, %{
+        character_id: tracked_character_ids |> List.first(),
+        user_id: current_user.id,
+        map_id: map_id,
+        solar_system_source_id: "#{solar_system_source_id}" |> String.to_integer(),
+        solar_system_target_id: "#{solar_system_target_id}" |> String.to_integer()
+      })
+
+    {:noreply, socket}
+  end
+
+  def handle_ui_event(
+        "update_connection_" <> param,
+        %{
+          "source" => solar_system_source_id,
+          "target" => solar_system_target_id,
+          "value" => value
+        } = _event,
+        %{
+          assigns: %{
+            map_id: map_id,
+            current_user: current_user,
+            tracked_character_ids: tracked_character_ids,
+            has_tracked_characters?: true,
+            user_permissions: %{update_system: true}
+          }
+        } =
+          socket
+      ) do
+    method_atom =
+      case param do
+        "time_status" -> :update_connection_time_status
+        "mass_status" -> :update_connection_mass_status
+        "ship_size_type" -> :update_connection_ship_size_type
+        "locked" -> :update_connection_locked
+        "custom_info" -> :update_connection_custom_info
+        _ -> nil
+      end
+
+    key_atom =
+      case param do
+        "time_status" -> :time_status
+        "mass_status" -> :mass_status
+        "ship_size_type" -> :ship_size_type
+        "locked" -> :locked
+        "custom_info" -> :custom_info
+        _ -> nil
+      end
+
+    {:ok, _} =
+      WandererApp.User.ActivityTracker.track_map_event(:map_connection_updated, %{
+        character_id: tracked_character_ids |> List.first(),
+        user_id: current_user.id,
+        map_id: map_id,
+        solar_system_source_id: "#{solar_system_source_id}" |> String.to_integer(),
+        solar_system_target_id: "#{solar_system_target_id}" |> String.to_integer(),
+        key: key_atom,
+        value: value
+      })
+
+    apply(WandererApp.Map.Server, method_atom, [
+      map_id,
+      %{
+        solar_system_source_id: "#{solar_system_source_id}" |> String.to_integer(),
+        solar_system_target_id: "#{solar_system_target_id}" |> String.to_integer()
+      }
+      |> Map.put_new(key_atom, value)
+    ])
+
+    {:noreply, socket}
+  end
+
+  def handle_ui_event(
+        "get_passages",
+        %{"from" => from, "to" => to} = _event,
+        %{assigns: %{map_id: map_id}} = socket
+      ) do
+    {:ok, passages} = map_id |> get_connection_passages(from, to)
+
+    {:reply, passages, socket}
+  end
+
+  def handle_ui_event(event, body, socket),
+    do: MapCoreEventHandler.handle_ui_event(event, body, socket)
+
+  defp get_connection_passages(map_id, from, to) do
+    {:ok, passages} = WandererApp.MapChainPassagesRepo.by_connection(map_id, from, to)
+
+    passages =
+      passages
+      |> Enum.map(fn p ->
+        %{
+          p
+          | character: p.character |> MapEventHandler.map_ui_character_stat()
+        }
+        |> Map.put_new(
+          :ship,
+          WandererApp.Character.get_ship(%{ship: p.ship_type_id, ship_name: p.ship_name})
+        )
+        |> Map.drop([:ship_type_id, :ship_name])
+      end)
+
+    {:ok, %{passages: passages}}
+  end
+end

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

@@ -0,0 +1,544 @@
+defmodule WandererAppWeb.MapCoreEventHandler do
+  use WandererAppWeb, :live_component
+  use Phoenix.Component
+  require Logger
+
+  alias WandererAppWeb.{MapEventHandler, MapCharactersEventHandler}
+
+  def handle_server_event(:update_permissions, socket) do
+    DebounceAndThrottle.Debounce.apply(
+      Process,
+      :send_after,
+      [self(), :refresh_permissions, 100],
+      "update_permissions_#{inspect(self())}",
+      1000
+    )
+
+    socket
+  end
+
+  def handle_server_event(
+        :refresh_permissions,
+        %{assigns: %{current_user: current_user, map_slug: map_slug}} = socket
+      ) do
+    {:ok, %{id: map_id, user_permissions: user_permissions, owner_id: owner_id}} =
+      map_slug
+      |> WandererApp.Api.Map.get_map_by_slug!()
+      |> Ash.load(:user_permissions, actor: current_user)
+
+    user_permissions =
+      WandererApp.Permissions.get_map_permissions(
+        user_permissions,
+        owner_id,
+        current_user.characters |> Enum.map(& &1.id)
+      )
+
+    case user_permissions do
+      %{view_system: false} ->
+        socket
+        |> Phoenix.LiveView.put_flash(:error, "Your access to the map have been revoked.")
+        |> Phoenix.LiveView.push_navigate(to: ~p"/maps")
+
+      %{track_character: track_character} ->
+        {:ok, map_characters} =
+          case WandererApp.Api.MapCharacterSettings.tracked_by_map(%{
+                 map_id: map_id,
+                 character_ids: current_user.characters |> Enum.map(& &1.id)
+               }) do
+            {:ok, settings} ->
+              {:ok,
+               settings
+               |> Enum.map(fn s -> s |> Ash.load!(:character) |> Map.get(:character) end)}
+
+            _ ->
+              {:ok, []}
+          end
+
+        case track_character do
+          false ->
+            :ok = MapCharactersEventHandler.untrack_characters(map_characters, map_id)
+            :ok = MapCharactersEventHandler.remove_characters(map_characters, map_id)
+
+          _ ->
+            :ok = MapCharactersEventHandler.track_characters(map_characters, map_id, true)
+
+            :ok =
+              MapCharactersEventHandler.add_characters(map_characters, map_id, track_character)
+        end
+
+        socket
+        |> assign(user_permissions: user_permissions)
+        |> MapEventHandler.push_map_event(
+          "user_permissions",
+          user_permissions
+        )
+    end
+  end
+
+  def handle_server_event(
+        %{
+          event: :load_map
+        },
+        %{assigns: %{current_user: current_user, map_slug: map_slug}} = socket
+      ) do
+    ErrorTracker.set_context(%{user_id: current_user.id})
+
+    map_slug
+    |> WandererApp.MapRepo.get_by_slug_with_permissions(current_user)
+    |> case do
+      {:ok, map} ->
+        socket |> init_map(map)
+
+      {:error, _} ->
+        socket
+        |> put_flash(
+          :error,
+          "Something went wrong. Please try one more time or submit an issue."
+        )
+        |> push_navigate(to: ~p"/maps")
+    end
+  end
+
+  def handle_server_event(
+        %{event: :map_server_started},
+        socket
+      ),
+      do: socket |> handle_map_server_started()
+
+  def handle_server_event(%{event: :update_map, payload: map_diff}, socket),
+    do:
+      socket
+      |> MapEventHandler.push_map_event(
+        "map_updated",
+        map_diff
+      )
+
+  def handle_server_event(
+        %{event: "presence_diff"},
+        socket
+      ),
+      do: socket
+
+  def handle_server_event(event, socket) do
+    Logger.warning(fn -> "unhandled map core event: #{inspect(event)}" end)
+    socket
+  end
+
+  def handle_ui_event("ui_loaded", _body, %{assigns: %{map_slug: map_slug} = assigns} = socket) do
+    assigns
+    |> Map.get(:map_id)
+    |> case do
+      map_id when not is_nil(map_id) ->
+        maybe_start_map(map_id)
+
+      _ ->
+        WandererApp.Cache.insert("map_#{map_slug}:ui_loaded", true)
+    end
+
+    {:noreply, socket}
+  end
+
+  def handle_ui_event(
+        "live_select_change",
+        %{"id" => id, "text" => text},
+        socket
+      )
+      when id == "_system_id_live_select_component" do
+    options =
+      WandererApp.Api.MapSolarSystem.find_by_name!(%{name: text})
+      |> Enum.take(100)
+      |> Enum.map(&map_system/1)
+
+    send_update(LiveSelect.Component, options: options, id: id)
+
+    {:noreply, socket}
+  end
+
+  def handle_ui_event("toggle_track_" <> character_id, _, socket),
+    do:
+      MapCharactersEventHandler.handle_ui_event(
+        "toggle_track",
+        %{"character-id" => character_id},
+        socket
+      )
+
+  def handle_ui_event(
+        "get_user_settings",
+        _,
+        %{assigns: %{map_id: map_id, current_user: current_user}} = socket
+      ) do
+    {:ok, user_settings} =
+      WandererApp.MapUserSettingsRepo.get!(map_id, current_user.id)
+      |> WandererApp.MapUserSettingsRepo.to_form_data()
+
+    {:reply, %{user_settings: user_settings}, socket}
+  end
+
+  def handle_ui_event(
+        "update_user_settings",
+        user_settings_form,
+        %{assigns: %{map_id: map_id, current_user: current_user}} = socket
+      ) do
+    settings =
+      user_settings_form
+      |> Map.take(["select_on_spash", "link_signature_on_splash", "delete_connection_with_sigs"])
+      |> Jason.encode!()
+
+    {:ok, user_settings} =
+      WandererApp.MapUserSettingsRepo.create_or_update(map_id, current_user.id, settings)
+
+    {:noreply,
+     socket |> assign(user_settings_form: user_settings_form, map_user_settings: user_settings)}
+  end
+
+  def handle_ui_event(
+        "log_map_error",
+        %{"componentStack" => component_stack, "error" => error},
+        socket
+      ) do
+    Logger.error(fn -> "map_ui_error: #{error}  \n#{component_stack} " end)
+
+    {:noreply,
+     socket
+     |> put_flash(:error, "Something went wrong. Please try refresh page or submit an issue.")
+     |> push_event("js-exec", %{
+       to: "#map-loader",
+       attr: "data-loading",
+       timeout: 100
+     })}
+  end
+
+  def handle_ui_event("noop", _, socket), do: {:noreply, socket}
+
+  def handle_ui_event(
+        _event,
+        _body,
+        %{assigns: %{has_tracked_characters?: false}} =
+          socket
+      ),
+      do:
+        {:noreply,
+         socket
+         |> put_flash(
+           :error,
+           "You should enable tracking for at least one character."
+         )}
+
+  def handle_ui_event(event, body, socket) do
+    Logger.warning(fn -> "unhandled map ui event: #{event} #{inspect(body)}" end)
+    {:noreply, socket}
+  end
+
+  defp maybe_start_map(map_id) do
+    {:ok, map_server_started} = WandererApp.Cache.lookup("map_#{map_id}:started", false)
+
+    if map_server_started do
+      Process.send_after(self(), %{event: :map_server_started}, 10)
+    else
+      WandererApp.Map.Manager.start_map(map_id)
+    end
+  end
+
+  defp init_map(
+         %{assigns: %{current_user: current_user, map_slug: map_slug}} = socket,
+         %{
+           id: map_id,
+           deleted: false,
+           only_tracked_characters: only_tracked_characters,
+           user_permissions: user_permissions,
+           name: map_name,
+           owner_id: owner_id
+         } = map
+       ) do
+    user_permissions =
+      WandererApp.Permissions.get_map_permissions(
+        user_permissions,
+        owner_id,
+        current_user.characters |> Enum.map(& &1.id)
+      )
+
+    {:ok, character_settings} =
+      case WandererApp.Api.MapCharacterSettings.read_by_map(%{map_id: map_id}) do
+        {:ok, settings} -> {:ok, settings}
+        _ -> {:ok, []}
+      end
+
+    {:ok, %{characters: availaible_map_characters}} =
+      WandererApp.Maps.load_characters(map, character_settings, current_user.id)
+
+    can_view? = user_permissions.view_system
+    can_track? = user_permissions.track_character
+
+    tracked_character_ids =
+      availaible_map_characters |> Enum.filter(& &1.tracked) |> Enum.map(& &1.id)
+
+    all_character_tracked? =
+      not (availaible_map_characters |> Enum.empty?()) and
+        availaible_map_characters |> Enum.all?(& &1.tracked)
+
+    cond do
+      (only_tracked_characters and can_track? and all_character_tracked?) or
+          (not only_tracked_characters and can_view?) ->
+        Phoenix.PubSub.subscribe(WandererApp.PubSub, map_id)
+        {:ok, ui_loaded} = WandererApp.Cache.get_and_remove("map_#{map_slug}:ui_loaded", false)
+
+        if ui_loaded do
+          maybe_start_map(map_id)
+        end
+
+        socket
+        |> assign(
+          map_id: map_id,
+          page_title: map_name,
+          user_permissions: user_permissions,
+          tracked_character_ids: tracked_character_ids,
+          only_tracked_characters: only_tracked_characters
+        )
+
+      only_tracked_characters and can_track? and not all_character_tracked? ->
+        Process.send_after(self(), :not_all_characters_tracked, 10)
+        socket
+
+      true ->
+        Process.send_after(self(), :no_permissions, 10)
+        socket
+    end
+  end
+
+  defp init_map(socket, _map) do
+    Process.send_after(self(), :no_access, 10)
+    socket
+  end
+
+  defp handle_map_server_started(
+         %{
+           assigns: %{
+             current_user: current_user,
+             map_id: map_id,
+             user_permissions:
+               %{view_system: true, track_character: track_character} = user_permissions
+           }
+         } = socket
+       ) do
+    with {:ok, _} <- current_user |> WandererApp.Api.User.update_last_map(%{last_map_id: map_id}),
+         {:ok, map_user_settings} <- WandererApp.MapUserSettingsRepo.get(map_id, current_user.id),
+         {:ok, tracked_map_characters} <-
+           MapCharactersEventHandler.get_tracked_map_characters(map_id, current_user),
+         {:ok, characters_limit} <- map_id |> WandererApp.Map.get_characters_limit(),
+         {:ok, present_character_ids} <-
+           WandererApp.Cache.lookup("map_#{map_id}:presence_character_ids", []),
+         {:ok, kills} <- WandererApp.Cache.lookup("map_#{map_id}:zkb_kills", Map.new()) do
+      user_character_eve_ids = tracked_map_characters |> Enum.map(& &1.eve_id)
+
+      events =
+        case tracked_map_characters |> Enum.any?(&(&1.access_token == nil)) do
+          true ->
+            [:invalid_token_message]
+
+          _ ->
+            []
+        end
+
+      events =
+        case tracked_map_characters |> Enum.empty?() do
+          true ->
+            events ++ [:empty_tracked_characters]
+
+          _ ->
+            events
+        end
+
+      events =
+        case present_character_ids |> Enum.count() < characters_limit do
+          true ->
+            events ++ [{:track_characters, tracked_map_characters, track_character}]
+
+          _ ->
+            events ++ [:map_character_limit]
+        end
+
+      initial_data =
+        map_id
+        |> get_map_data()
+        |> Map.merge(%{
+          kills:
+            kills
+            |> Enum.filter(fn {_, kills} -> kills > 0 end)
+            |> Enum.map(&MapEventHandler.map_ui_kill/1),
+          present_characters:
+            present_character_ids
+            |> WandererApp.Character.get_character_eve_ids!(),
+          user_characters: user_character_eve_ids,
+          user_permissions: user_permissions,
+          system_static_infos: nil,
+          wormhole_types: nil,
+          effects: nil,
+          reset: false
+        })
+
+      system_static_infos =
+        map_id
+        |> WandererApp.Map.list_systems!()
+        |> Enum.map(&WandererApp.CachedInfo.get_system_static_info!(&1.solar_system_id))
+        |> Enum.map(&MapEventHandler.map_ui_system_static_info/1)
+
+      initial_data =
+        initial_data
+        |> Map.put(
+          :wormholes,
+          WandererApp.CachedInfo.get_wormhole_types!()
+        )
+        |> Map.put(
+          :effects,
+          WandererApp.CachedInfo.get_effects!()
+        )
+        |> Map.put(
+          :system_static_infos,
+          system_static_infos
+        )
+        |> Map.put(:reset, true)
+
+      socket
+      |> map_start(%{
+        map_id: map_id,
+        map_user_settings: map_user_settings,
+        user_characters: user_character_eve_ids,
+        initial_data: initial_data,
+        events: events
+      })
+    else
+      error ->
+        Logger.error(fn -> "map_start_error: #{error}" end)
+        Process.send_after(self(), :no_access, 10)
+
+        socket
+    end
+  end
+
+  defp handle_map_server_started(socket) do
+    Process.send_after(self(), :no_access, 10)
+    socket
+  end
+
+  defp map_start(
+         socket,
+         %{
+           map_id: map_id,
+           map_user_settings: map_user_settings,
+           user_characters: user_character_eve_ids,
+           initial_data: initial_data,
+           events: events
+         } = _started_data
+       ) do
+    socket =
+      socket
+      |> handle_map_start_events(map_id, events)
+
+    map_characters = map_id |> WandererApp.Map.list_characters()
+
+    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 |> Enum.map(&MapCharactersEventHandler.map_ui_character/1)
+      )
+    )
+    |> push_event("js-exec", %{
+      to: "#map-loader",
+      attr: "data-loaded"
+    })
+  end
+
+  defp handle_map_start_events(socket, map_id, events) do
+    events
+    |> Enum.reduce(socket, fn event, socket ->
+      case event do
+        {:track_characters, map_characters, track_character} ->
+          :ok =
+            MapCharactersEventHandler.track_characters(map_characters, map_id, track_character)
+
+          :ok = MapCharactersEventHandler.add_characters(map_characters, map_id, track_character)
+          socket
+
+        :invalid_token_message ->
+          socket
+          |> put_flash(
+            :error,
+            "One of your characters has expired token. Please refresh it on characters page."
+          )
+
+        :empty_tracked_characters ->
+          socket
+          |> put_flash(
+            :info,
+            "You should enable tracking for at least one character to work with map."
+          )
+
+        :map_character_limit ->
+          socket
+          |> put_flash(
+            :error,
+            "Map reached its character limit, your characters won't be tracked. Please contact administrator."
+          )
+
+        _ ->
+          socket
+      end
+    end)
+  end
+
+  defp get_map_data(map_id, include_static_data? \\ true) do
+    {:ok, hubs} = map_id |> WandererApp.Map.list_hubs()
+    {:ok, connections} = map_id |> WandererApp.Map.list_connections()
+    {:ok, systems} = map_id |> WandererApp.Map.list_systems()
+
+    %{
+      systems:
+        systems
+        |> Enum.map(fn system -> MapEventHandler.map_ui_system(system, include_static_data?) end),
+      hubs: hubs,
+      connections: connections |> Enum.map(&MapEventHandler.map_ui_connection/1)
+    }
+  end
+
+  defp get_tracked_map_characters(map_id, current_user) do
+    case WandererApp.Api.MapCharacterSettings.tracked_by_map(%{
+           map_id: map_id,
+           character_ids: current_user.characters |> Enum.map(& &1.id)
+         }) do
+      {:ok, settings} ->
+        {:ok,
+         settings
+         |> Enum.map(fn s -> s |> Ash.load!(:character) |> Map.get(:character) end)}
+
+      _ ->
+        {:ok, []}
+    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_routes_event_handler.ex

@@ -0,0 +1,131 @@
+defmodule WandererAppWeb.MapRoutesEventHandler do
+  use WandererAppWeb, :live_component
+  use Phoenix.Component
+  require Logger
+
+  alias WandererAppWeb.{MapEventHandler, MapCoreEventHandler}
+
+  def handle_server_event(
+        %{
+          event: :routes,
+          payload: {solar_system_id, %{routes: routes, systems_static_data: systems_static_data}}
+        },
+        socket
+      ),
+      do:
+        socket
+        |> MapEventHandler.push_map_event(
+          "routes",
+          %{
+            solar_system_id: solar_system_id,
+            loading: false,
+            routes: routes,
+            systems_static_data: systems_static_data
+          }
+        )
+
+  def handle_server_event(event, socket),
+    do: MapCoreEventHandler.handle_server_event(event, socket)
+
+  def handle_ui_event(
+        "get_routes",
+        %{"system_id" => solar_system_id, "routes_settings" => routes_settings} = _event,
+        %{assigns: %{map_id: map_id, map_loaded?: true}} = socket
+      ) do
+    Task.async(fn ->
+      {:ok, hubs} = map_id |> WandererApp.Map.list_hubs()
+
+      {:ok, routes} =
+        WandererApp.Maps.find_routes(
+          map_id,
+          hubs,
+          solar_system_id,
+          get_routes_settings(routes_settings)
+        )
+
+      {:routes, {solar_system_id, routes}}
+    end)
+
+    {:noreply, socket}
+  end
+
+  def handle_ui_event(
+        "set_autopilot_waypoint",
+        %{
+          "character_eve_ids" => character_eve_ids,
+          "add_to_beginning" => add_to_beginning,
+          "clear_other_waypoints" => clear_other_waypoints,
+          "destination_id" => destination_id
+        } = _event,
+        %{assigns: %{current_user: current_user, has_tracked_characters?: true}} = socket
+      ) do
+    character_eve_ids
+    |> Task.async_stream(fn character_eve_id ->
+      set_autopilot_waypoint(
+        current_user,
+        character_eve_id,
+        add_to_beginning,
+        clear_other_waypoints,
+        destination_id
+      )
+    end)
+    |> Enum.map(fn _result -> :skip end)
+
+    {:noreply, socket}
+  end
+
+  def handle_ui_event(event, body, socket),
+    do: MapCoreEventHandler.handle_ui_event(event, body, socket)
+
+  defp get_routes_settings(%{
+         "path_type" => path_type,
+         "include_mass_crit" => include_mass_crit,
+         "include_eol" => include_eol,
+         "include_frig" => include_frig,
+         "include_cruise" => include_cruise,
+         "avoid_wormholes" => avoid_wormholes,
+         "avoid_pochven" => avoid_pochven,
+         "avoid_edencom" => avoid_edencom,
+         "avoid_triglavian" => avoid_triglavian,
+         "include_thera" => include_thera,
+         "avoid" => avoid
+       }),
+       do: %{
+         path_type: path_type,
+         include_mass_crit: include_mass_crit,
+         include_eol: include_eol,
+         include_frig: include_frig,
+         include_cruise: include_cruise,
+         avoid_wormholes: avoid_wormholes,
+         avoid_pochven: avoid_pochven,
+         avoid_edencom: avoid_edencom,
+         avoid_triglavian: avoid_triglavian,
+         include_thera: include_thera,
+         avoid: avoid
+       }
+
+  defp get_routes_settings(_), do: %{}
+
+  defp set_autopilot_waypoint(
+         current_user,
+         character_eve_id,
+         add_to_beginning,
+         clear_other_waypoints,
+         destination_id
+       ) do
+    case current_user.characters
+         |> Enum.find(fn c -> c.eve_id == character_eve_id end) do
+      nil ->
+        :skip
+
+      %{id: character_id} = _character ->
+        character_id
+        |> WandererApp.Character.set_autopilot_waypoint(destination_id,
+          add_to_beginning: add_to_beginning,
+          clear_other_waypoints: clear_other_waypoints
+        )
+
+        :skip
+    end
+  end
+end

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

@@ -0,0 +1,350 @@
+defmodule WandererAppWeb.MapSignaturesEventHandler do
+  use WandererAppWeb, :live_component
+  use Phoenix.Component
+  require Logger
+
+  alias WandererAppWeb.{MapEventHandler, MapCoreEventHandler}
+
+  def handle_server_event(
+        %{
+          event: :maybe_link_signature,
+          payload: %{
+            character_id: character_id,
+            solar_system_source: solar_system_source,
+            solar_system_target: solar_system_target
+          }
+        },
+        %{
+          assigns: %{
+            current_user: current_user,
+            map_id: map_id,
+            map_user_settings: map_user_settings
+          }
+        } = socket
+      ) do
+    is_user_character =
+      current_user.characters |> Enum.map(& &1.id) |> Enum.member?(character_id)
+
+    is_link_signature_on_splash =
+      map_user_settings
+      |> WandererApp.MapUserSettingsRepo.to_form_data!()
+      |> WandererApp.MapUserSettingsRepo.get_boolean_setting("link_signature_on_splash")
+
+    {:ok, signatures} =
+      WandererApp.Api.MapSystem.read_by_map_and_solar_system(%{
+        map_id: map_id,
+        solar_system_id: solar_system_source
+      })
+      |> case do
+        {:ok, system} ->
+          {:ok, get_system_signatures(system.id)}
+
+        _ ->
+          {:ok, []}
+      end
+
+    (is_user_character && is_link_signature_on_splash && not (signatures |> Enum.empty?()))
+    |> case do
+      true ->
+        socket
+        |> MapEventHandler.push_map_event("link_signature_to_system", %{
+          solar_system_source: solar_system_source,
+          solar_system_target: solar_system_target
+        })
+
+      false ->
+        socket
+    end
+  end
+
+  def handle_server_event(
+        %{event: :signatures_updated, payload: solar_system_id},
+        socket
+      ),
+      do:
+        socket
+        |> MapEventHandler.push_map_event(
+          "signatures_updated",
+          solar_system_id
+        )
+
+  def handle_server_event(event, socket),
+    do: MapCoreEventHandler.handle_server_event(event, socket)
+
+  def handle_ui_event(
+        "update_signatures",
+        %{
+          "system_id" => solar_system_id,
+          "added" => added_signatures,
+          "updated" => updated_signatures,
+          "removed" => removed_signatures
+        },
+        %{
+          assigns: %{
+            map_id: map_id,
+            map_user_settings: map_user_settings,
+            user_characters: user_characters,
+            user_permissions: %{update_system: true}
+          }
+        } = socket
+      ) do
+    WandererApp.Api.MapSystem.read_by_map_and_solar_system(%{
+      map_id: map_id,
+      solar_system_id: solar_system_id |> String.to_integer()
+    })
+    |> case do
+      {:ok, system} ->
+        first_character_eve_id =
+          user_characters |> List.first()
+
+        case not is_nil(first_character_eve_id) do
+          true ->
+            added_signatures =
+              added_signatures
+              |> parse_signatures(first_character_eve_id, system.id)
+
+            updated_signatures =
+              updated_signatures
+              |> parse_signatures(first_character_eve_id, system.id)
+
+            updated_signatures_eve_ids =
+              updated_signatures
+              |> Enum.map(fn s -> s.eve_id end)
+
+            removed_signatures_eve_ids =
+              removed_signatures
+              |> parse_signatures(first_character_eve_id, system.id)
+              |> Enum.map(fn s -> s.eve_id end)
+
+            delete_connection_with_sigs =
+              map_user_settings
+              |> WandererApp.MapUserSettingsRepo.to_form_data!()
+              |> WandererApp.MapUserSettingsRepo.get_boolean_setting(
+                "delete_connection_with_sigs"
+              )
+
+            WandererApp.Api.MapSystemSignature.by_system_id!(system.id)
+            |> Enum.filter(fn s -> s.eve_id in removed_signatures_eve_ids end)
+            |> Enum.each(fn s ->
+              if delete_connection_with_sigs && not is_nil(s.linked_system_id) do
+                map_id
+                |> WandererApp.Map.Server.delete_connection(%{
+                  solar_system_source_id: solar_system_id |> String.to_integer(),
+                  solar_system_target_id: s.linked_system_id
+                })
+              end
+
+              s
+              |> Ash.destroy!()
+            end)
+
+            WandererApp.Api.MapSystemSignature.by_system_id!(system.id)
+            |> Enum.filter(fn s -> s.eve_id in updated_signatures_eve_ids end)
+            |> Enum.each(fn s ->
+              updated = updated_signatures |> Enum.find(fn u -> u.eve_id == s.eve_id end)
+
+              if not is_nil(updated) do
+                s
+                |> WandererApp.Api.MapSystemSignature.update(updated)
+              end
+            end)
+
+            added_signatures
+            |> Enum.map(fn s ->
+              s |> WandererApp.Api.MapSystemSignature.create!()
+            end)
+
+            Phoenix.PubSub.broadcast!(WandererApp.PubSub, map_id, %{
+              event: :signatures_updated,
+              payload: system.solar_system_id
+            })
+
+            {:reply, %{signatures: get_system_signatures(system.id)}, socket}
+
+          _ ->
+            {:reply, %{signatures: []},
+             socket
+             |> put_flash(
+               :error,
+               "You should enable tracking for at least one character to work with signatures."
+             )}
+        end
+
+      _ ->
+        {:noreply, socket}
+    end
+  end
+
+  def handle_ui_event(
+        "get_signatures",
+        %{"system_id" => solar_system_id},
+        %{
+          assigns: %{
+            map_id: map_id
+          }
+        } = socket
+      ) do
+    case WandererApp.Api.MapSystem.read_by_map_and_solar_system(%{
+           map_id: map_id,
+           solar_system_id: solar_system_id |> String.to_integer()
+         }) do
+      {:ok, system} ->
+        {:reply, %{signatures: get_system_signatures(system.id)}, socket}
+
+      _ ->
+        {:reply, %{signatures: []}, socket}
+    end
+  end
+
+  def handle_ui_event(
+        "link_signature_to_system",
+        %{
+          "signature_eve_id" => signature_eve_id,
+          "solar_system_source" => solar_system_source,
+          "solar_system_target" => solar_system_target
+        },
+        %{
+          assigns: %{
+            map_id: map_id,
+            user_characters: user_characters,
+            user_permissions: %{update_system: true}
+          }
+        } = socket
+      ) do
+    case WandererApp.Api.MapSystem.read_by_map_and_solar_system(%{
+           map_id: map_id,
+           solar_system_id: solar_system_source
+         }) do
+      {:ok, system} ->
+        first_character_eve_id =
+          user_characters |> List.first()
+
+        case not is_nil(first_character_eve_id) do
+          true ->
+            WandererApp.Api.MapSystemSignature.by_system_id!(system.id)
+            |> Enum.filter(fn s -> s.eve_id == signature_eve_id end)
+            |> Enum.each(fn s ->
+              s
+              |> WandererApp.Api.MapSystemSignature.update_linked_system(%{
+                linked_system_id: solar_system_target
+              })
+            end)
+
+            Phoenix.PubSub.broadcast!(WandererApp.PubSub, map_id, %{
+              event: :signatures_updated,
+              payload: solar_system_source
+            })
+
+            {:noreply, socket}
+
+          _ ->
+            {:noreply,
+             socket
+             |> put_flash(
+               :error,
+               "You should enable tracking for at least one character to work with signatures."
+             )}
+        end
+
+      _ ->
+        {:noreply, socket}
+    end
+  end
+
+  def handle_ui_event(
+        "unlink_signature",
+        %{
+          "signature_eve_id" => signature_eve_id,
+          "solar_system_source" => solar_system_source
+        },
+        %{
+          assigns: %{
+            map_id: map_id,
+            user_characters: user_characters,
+            user_permissions: %{update_system: true}
+          }
+        } = socket
+      ) do
+    case WandererApp.Api.MapSystem.read_by_map_and_solar_system(%{
+           map_id: map_id,
+           solar_system_id: solar_system_source
+         }) do
+      {:ok, system} ->
+        first_character_eve_id =
+          user_characters |> List.first()
+
+        case not is_nil(first_character_eve_id) do
+          true ->
+            WandererApp.Api.MapSystemSignature.by_system_id!(system.id)
+            |> Enum.filter(fn s -> s.eve_id == signature_eve_id end)
+            |> Enum.each(fn s ->
+              s
+              |> WandererApp.Api.MapSystemSignature.update_linked_system(%{
+                linked_system_id: nil
+              })
+            end)
+
+            Phoenix.PubSub.broadcast!(WandererApp.PubSub, map_id, %{
+              event: :signatures_updated,
+              payload: solar_system_source
+            })
+
+            {:noreply, socket}
+
+          _ ->
+            {:noreply,
+             socket
+             |> put_flash(
+               :error,
+               "You should enable tracking for at least one character to work with signatures."
+             )}
+        end
+
+      _ ->
+        {:noreply, socket}
+    end
+  end
+
+  def handle_ui_event(event, body, socket),
+    do: MapCoreEventHandler.handle_ui_event(event, body, socket)
+
+  defp get_system_signatures(system_id),
+    do:
+      system_id
+      |> WandererApp.Api.MapSystemSignature.by_system_id!()
+      |> Enum.map(fn %{updated_at: updated_at, linked_system_id: linked_system_id} = s ->
+        s
+        |> Map.take([
+          :eve_id,
+          :name,
+          :description,
+          :kind,
+          :group,
+          :type,
+          :updated_at
+        ])
+        |> Map.put(:linked_system, MapEventHandler.get_system_static_info(linked_system_id))
+        |> Map.put(:updated_at, updated_at |> Calendar.strftime("%Y/%m/%d %H:%M:%S"))
+      end)
+
+  defp parse_signatures(signatures, character_eve_id, system_id),
+    do:
+      signatures
+      |> Enum.map(fn %{
+                       "eve_id" => eve_id,
+                       "name" => name,
+                       "kind" => kind,
+                       "group" => group
+                     } = signature ->
+        %{
+          system_id: system_id,
+          eve_id: eve_id,
+          name: name,
+          description: Map.get(signature, "description"),
+          kind: kind,
+          group: group,
+          type: Map.get(signature, "type"),
+          character_eve_id: character_eve_id
+        }
+      end)
+end

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

@@ -0,0 +1,326 @@
+defmodule WandererAppWeb.MapSystemsEventHandler do
+  use WandererAppWeb, :live_component
+  use Phoenix.Component
+  require Logger
+
+  alias WandererAppWeb.{MapEventHandler, MapCoreEventHandler}
+
+  def handle_server_event(%{event: :add_system, payload: system}, socket),
+    do:
+      socket
+      |> MapEventHandler.push_map_event("add_systems", [MapEventHandler.map_ui_system(system)])
+
+  def handle_server_event(%{event: :update_system, payload: system}, socket),
+    do:
+      socket
+      |> MapEventHandler.push_map_event("update_systems", [MapEventHandler.map_ui_system(system)])
+
+  def handle_server_event(%{event: :systems_removed, payload: solar_system_ids}, socket),
+    do:
+      socket
+      |> 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)
+
+    is_select_on_spash =
+      map_user_settings
+      |> WandererApp.MapUserSettingsRepo.to_form_data!()
+      |> WandererApp.MapUserSettingsRepo.get_boolean_setting("select_on_spash")
+
+    (is_user_character && is_select_on_spash)
+    |> case do
+      true ->
+        socket
+        |> MapEventHandler.push_map_event("select_system", solar_system_id)
+
+      false ->
+        socket
+    end
+  end
+
+  def handle_server_event(%{event: :kills_updated, payload: kills}, socket) do
+    kills =
+      kills
+      |> Enum.map(&MapEventHandler.map_ui_kill/1)
+
+    socket
+    |> MapEventHandler.push_map_event(
+      "kills_updated",
+      kills
+    )
+  end
+
+  def handle_server_event(event, socket),
+    do: MapCoreEventHandler.handle_server_event(event, socket)
+
+  def handle_ui_event(
+        "add_system",
+        %{"system_id" => solar_system_id} = _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)
+
+    WandererApp.Map.Server.add_system(
+      map_id,
+      %{
+        solar_system_id: solar_system_id |> String.to_integer(),
+        coordinates: coordinates
+      },
+      current_user.id,
+      tracked_character_ids |> List.first()
+    )
+
+    {:noreply,
+     socket
+     |> push_patch(to: ~p"/#{map_slug}")}
+  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,
+        %{
+          assigns: %{
+            map_id: map_id,
+            current_user: current_user,
+            tracked_character_ids: tracked_character_ids,
+            has_tracked_characters?: true,
+            user_permissions: %{update_system: true}
+          }
+        } =
+          socket
+      ) do
+    map_id
+    |> WandererApp.Map.Server.add_hub(%{
+      solar_system_id: solar_system_id
+    })
+
+    {:ok, _} =
+      WandererApp.User.ActivityTracker.track_map_event(:hub_added, %{
+        character_id: tracked_character_ids |> List.first(),
+        user_id: current_user.id,
+        map_id: map_id,
+        solar_system_id: solar_system_id
+      })
+
+    {:noreply, socket}
+  end
+
+  def handle_ui_event(
+        "delete_hub",
+        %{"system_id" => solar_system_id} = _event,
+        %{
+          assigns: %{
+            map_id: map_id,
+            current_user: current_user,
+            tracked_character_ids: tracked_character_ids,
+            has_tracked_characters?: true,
+            user_permissions: %{update_system: true}
+          }
+        } =
+          socket
+      ) do
+    map_id
+    |> WandererApp.Map.Server.remove_hub(%{
+      solar_system_id: solar_system_id
+    })
+
+    {:ok, _} =
+      WandererApp.User.ActivityTracker.track_map_event(:hub_removed, %{
+        character_id: tracked_character_ids |> List.first(),
+        user_id: current_user.id,
+        map_id: map_id,
+        solar_system_id: solar_system_id
+      })
+
+    {:noreply, socket}
+  end
+
+  def handle_ui_event(
+        "update_system_position",
+        position,
+        %{
+          assigns: %{
+            map_id: map_id,
+            has_tracked_characters?: true,
+            user_permissions: %{update_system: true}
+          }
+        } = socket
+      ) do
+    map_id
+    |> update_system_position(position)
+
+    {:noreply, socket}
+  end
+
+  def handle_ui_event(
+        "update_system_positions",
+        positions,
+        %{
+          assigns: %{
+            map_id: map_id,
+            has_tracked_characters?: true,
+            user_permissions: %{update_system: true}
+          }
+        } = socket
+      ) do
+    map_id
+    |> update_system_positions(positions)
+
+    {:noreply, socket}
+  end
+
+  def handle_ui_event(
+        "update_system_" <> param,
+        %{"system_id" => solar_system_id, "value" => value} = _event,
+        %{
+          assigns: %{
+            map_id: map_id,
+            current_user: current_user,
+            tracked_character_ids: tracked_character_ids,
+            has_tracked_characters?: true,
+            user_permissions: %{update_system: true}
+          }
+        } =
+          socket
+      ) do
+    method_atom =
+      case param do
+        "name" -> :update_system_name
+        "description" -> :update_system_description
+        "labels" -> :update_system_labels
+        "locked" -> :update_system_locked
+        "tag" -> :update_system_tag
+        "status" -> :update_system_status
+        _ -> nil
+      end
+
+    key_atom =
+      case param do
+        "name" -> :name
+        "description" -> :description
+        "labels" -> :labels
+        "locked" -> :locked
+        "tag" -> :tag
+        "status" -> :status
+        _ -> :none
+      end
+
+    apply(WandererApp.Map.Server, method_atom, [
+      map_id,
+      %{
+        solar_system_id: "#{solar_system_id}" |> String.to_integer()
+      }
+      |> Map.put_new(key_atom, value)
+    ])
+
+    {:ok, _} =
+      WandererApp.User.ActivityTracker.track_map_event(:system_updated, %{
+        character_id: tracked_character_ids |> List.first(),
+        user_id: current_user.id,
+        map_id: map_id,
+        solar_system_id: "#{solar_system_id}" |> String.to_integer(),
+        key: key_atom,
+        value: value
+      })
+
+    {:noreply, socket}
+  end
+
+  def handle_ui_event(
+        "get_system_static_infos",
+        %{"solar_system_ids" => solar_system_ids} = _event,
+        socket
+      ) do
+    system_static_infos =
+      solar_system_ids
+      |> Enum.map(&WandererApp.CachedInfo.get_system_static_info!/1)
+      |> Enum.map(&MapEventHandler.map_ui_system_static_info/1)
+
+    {:reply, %{system_static_infos: system_static_infos}, socket}
+  end
+
+  def handle_ui_event(
+        "delete_systems",
+        solar_system_ids,
+        %{
+          assigns: %{
+            map_id: map_id,
+            current_user: current_user,
+            tracked_character_ids: tracked_character_ids,
+            has_tracked_characters?: true,
+            user_permissions: %{delete_system: true}
+          }
+        } =
+          socket
+      ) do
+    map_id
+    |> WandererApp.Map.Server.delete_systems(
+      solar_system_ids |> Enum.map(&String.to_integer/1),
+      current_user.id,
+      tracked_character_ids |> List.first()
+    )
+
+    {:noreply, socket}
+  end
+
+  def handle_ui_event(event, body, socket),
+    do: MapCoreEventHandler.handle_ui_event(event, body, socket)
+
+  defp update_system_positions(_map_id, []), do: :ok
+
+  defp update_system_positions(map_id, [position | rest]) do
+    update_system_position(map_id, position)
+    update_system_positions(map_id, rest)
+  end
+
+  defp update_system_position(map_id, %{
+         "position" => %{"x" => x, "y" => y},
+         "solar_system_id" => solar_system_id
+       }),
+       do:
+         map_id
+         |> WandererApp.Map.Server.update_system_position(%{
+           solar_system_id: solar_system_id |> String.to_integer(),
+           position_x: x,
+           position_y: y
+         })
+end

lib/wanderer_app_web/live/maps/map_audit_live.ex

@@ -1,6 +1,8 @@
 defmodule WandererAppWeb.MapAuditLive do
   use WandererAppWeb, :live_view
 
+  require Logger
+
   alias WandererAppWeb.UserActivity
 
   def mount(
@@ -37,6 +39,7 @@ defmodule WandererAppWeb.MapAuditLive do
                map_name: map_name,
                map_slug: map_slug,
                activity: activity,
+               can_undo_types: [:systems_removed],
                period: period || "1H",
                page: 1,
                per_page: 25,
@@ -114,11 +117,38 @@ defmodule WandererAppWeb.MapAuditLive do
     end
   end
 
+  def handle_event("undo", %{"event-data" => event_data, "event-type" => "systems_removed"}, %{assigns: %{map_id: map_id, current_user: current_user}} = socket) do
+    {:ok, %{"solar_system_ids" => solar_system_ids}} = Jason.decode(event_data)
+
+    solar_system_ids
+      |> Enum.each(fn solar_system_id ->
+        WandererApp.Map.Server.add_system(
+          map_id,
+          %{
+            solar_system_id: solar_system_id,
+            coordinates: nil,
+            use_old_coordinates: true
+          },
+          current_user.id,
+          nil
+        )
+      end)
+
+
+    {:noreply, socket |> put_flash(:info, "Systems restored!")}
+  end
+
   @impl true
   def handle_event("noop", _, socket) do
     {:noreply, socket}
   end
 
+  @impl true
+  def handle_event(event, body, socket) do
+    Logger.warning(fn -> "unhandled event: #{event} #{inspect(body)}" end)
+    {:noreply, socket}
+  end
+
   defp apply_action(socket, :index, _params) do
     socket
     |> assign(:active_page, :audit)

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

@@ -3,7 +3,16 @@
   class="pt-20 w-full h-full col-span-2 lg:col-span-1 p-4 pl-20 pb-20 overflow-auto"
 >
   <div class="flex flex-col gap-4 w-full">
-    <UserActivity.list stream={@streams.activity} page={@page} end_of_stream?={@end_of_stream?} />
+    <.live_component
+      module={UserActivity}
+      id="user-activity"
+      notify_to={self()}
+      can_undo_types={@can_undo_types}
+      stream={@streams.activity}
+      page={@page}
+      end_of_stream?={@end_of_stream?}
+      event_name="activity_event"
+    />
   </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">

lib/wanderer_app_web/live/maps/map_event_handler.ex

@@ -0,0 +1,292 @@
+defmodule WandererAppWeb.MapEventHandler do
+  use WandererAppWeb, :live_component
+  use Phoenix.Component
+  require Logger
+
+  alias WandererAppWeb.{
+    MapActivityEventHandler,
+    MapCharactersEventHandler,
+    MapConnectionsEventHandler,
+    MapCoreEventHandler,
+    MapRoutesEventHandler,
+    MapSignaturesEventHandler,
+    MapSystemsEventHandler
+  }
+
+  @map_characters_events [
+    :character_added,
+    :character_removed,
+    :character_updated,
+    :characters_updated,
+    :present_characters_updated
+  ]
+
+  @map_characters_ui_events [
+    "add_character",
+    "toggle_track",
+    "hide_tracking"
+  ]
+
+  @map_system_events [
+    :add_system,
+    :update_system,
+    :systems_removed,
+    :maybe_select_system,
+    :kills_updated
+  ]
+
+  @map_system_ui_events [
+    "add_hub",
+    "delete_hub",
+    "add_system",
+    "delete_systems",
+    "manual_add_system",
+    "get_system_static_infos",
+    "update_system_position",
+    "update_system_positions",
+    "update_system_name",
+    "update_system_description",
+    "update_system_labels",
+    "update_system_locked",
+    "update_system_tag",
+    "update_system_status"
+  ]
+
+  @map_connection_events [
+    :add_connection,
+    :remove_connections,
+    :update_connection
+  ]
+
+  @map_connection_ui_events [
+    "manual_add_connection",
+    "manual_delete_connection",
+    "get_passages",
+    "update_connection_time_status",
+    "update_connection_mass_status",
+    "update_connection_ship_size_type",
+    "update_connection_locked",
+    "update_connection_custom_info"
+  ]
+
+  @map_activity_events [
+    :character_activity
+  ]
+
+  @map_activity_ui_events [
+    "show_activity",
+    "hide_activity"
+  ]
+
+  @map_routes_events [
+    :routes
+  ]
+
+  @map_routes_ui_events [
+    "get_routes",
+    "set_autopilot_waypoint"
+  ]
+
+  @map_signatures_events [
+    :maybe_link_signature,
+    :signatures_updated
+  ]
+
+  @map_signatures_ui_events [
+    "update_signatures",
+    "get_signatures",
+    "link_signature_to_system",
+    "unlink_signature"
+  ]
+
+  def handle_event(socket, %{event: event_name} = event)
+      when event_name in @map_characters_events,
+      do: MapCharactersEventHandler.handle_server_event(event, socket)
+
+  def handle_event(socket, %{event: event_name} = event)
+      when event_name in @map_system_events,
+      do: MapSystemsEventHandler.handle_server_event(event, socket)
+
+  def handle_event(socket, %{event: event_name} = event)
+      when event_name in @map_connection_events,
+      do: MapConnectionsEventHandler.handle_server_event(event, socket)
+
+  def handle_event(socket, %{event: event_name} = event)
+      when event_name in @map_activity_events,
+      do: MapActivityEventHandler.handle_server_event(event, socket)
+
+  def handle_event(socket, %{event: event_name} = event)
+      when event_name in @map_routes_events,
+      do: MapRoutesEventHandler.handle_server_event(event, socket)
+
+  def handle_event(socket, %{event: event_name} = event)
+      when event_name in @map_signatures_events,
+      do: MapSignaturesEventHandler.handle_server_event(event, socket)
+
+  def handle_event(socket, {ref, result}) when is_reference(ref) do
+    Process.demonitor(ref, [:flush])
+
+    case result do
+      {:map_error, map_error} ->
+        Process.send_after(self(), map_error, 100)
+        socket
+
+      {event, payload} ->
+        Process.send_after(
+          self(),
+          %{
+            event: event,
+            payload: payload
+          },
+          10
+        )
+
+        socket
+
+      _ ->
+        socket
+    end
+  end
+
+  def handle_event(socket, event),
+    do: MapCoreEventHandler.handle_server_event(event, socket)
+
+  def handle_ui_event(event, body, socket)
+      when event in @map_characters_ui_events,
+      do: MapSystemsEventHandler.handle_ui_event(event, body, socket)
+
+  def handle_ui_event(event, body, socket)
+      when event in @map_system_ui_events,
+      do: MapSystemsEventHandler.handle_ui_event(event, body, socket)
+
+  def handle_ui_event(event, body, socket)
+      when event in @map_connection_ui_events,
+      do: MapConnectionsEventHandler.handle_ui_event(event, body, socket)
+
+  def handle_ui_event(event, body, socket)
+      when event in @map_routes_ui_events,
+      do: MapRoutesEventHandler.handle_ui_event(event, body, socket)
+
+  def handle_ui_event(event, body, socket)
+      when event in @map_signatures_ui_events,
+      do: MapSignaturesEventHandler.handle_ui_event(event, body, socket)
+
+  def handle_ui_event(event, body, socket)
+      when event in @map_activity_ui_events,
+      do: MapActivityEventHandler.handle_ui_event(event, body, socket)
+
+  def handle_ui_event(event, body, socket),
+    do: MapCoreEventHandler.handle_ui_event(event, body, socket)
+
+  def get_system_static_info(nil), do: nil
+
+  def get_system_static_info(solar_system_id) do
+    case WandererApp.CachedInfo.get_system_static_info(solar_system_id) do
+      {:ok, system_static_info} ->
+        map_ui_system_static_info(system_static_info)
+
+      _ ->
+        %{}
+    end
+  end
+
+  def push_map_event(socket, type, body),
+    do:
+      socket
+      |> Phoenix.LiveView.Utils.push_event("map_event", %{
+        type: type,
+        body: body
+      })
+
+  def map_ui_character_stat(character),
+    do:
+      character
+      |> Map.take([
+        :eve_id,
+        :name,
+        :corporation_ticker,
+        :alliance_ticker
+      ])
+
+  def map_ui_connection(
+        %{
+          solar_system_source: solar_system_source,
+          solar_system_target: solar_system_target,
+          mass_status: mass_status,
+          time_status: time_status,
+          ship_size_type: ship_size_type,
+          locked: locked
+        } = _connection
+      ),
+      do: %{
+        id: "#{solar_system_source}_#{solar_system_target}",
+        mass_status: mass_status,
+        time_status: time_status,
+        ship_size_type: ship_size_type,
+        locked: locked,
+        source: "#{solar_system_source}",
+        target: "#{solar_system_target}"
+      }
+
+  def map_ui_system(
+        %{
+          solar_system_id: solar_system_id,
+          name: name,
+          description: description,
+          position_x: position_x,
+          position_y: position_y,
+          locked: locked,
+          tag: tag,
+          labels: labels,
+          status: status,
+          visible: visible
+        } = _system,
+        _include_static_data? \\ true
+      ) do
+    system_static_info = get_system_static_info(solar_system_id)
+
+    %{
+      id: "#{solar_system_id}",
+      position: %{x: position_x, y: position_y},
+      description: description,
+      name: name,
+      system_static_info: system_static_info,
+      labels: labels,
+      locked: locked,
+      status: status,
+      tag: tag,
+      visible: visible
+    }
+  end
+
+  def map_ui_system_static_info(nil), do: %{}
+
+  def map_ui_system_static_info(system_static_info),
+    do:
+      system_static_info
+      |> Map.take([
+        :region_id,
+        :constellation_id,
+        :solar_system_id,
+        :solar_system_name,
+        :solar_system_name_lc,
+        :constellation_name,
+        :region_name,
+        :system_class,
+        :security,
+        :type_description,
+        :class_title,
+        :is_shattered,
+        :effect_name,
+        :effect_power,
+        :statics,
+        :wandering,
+        :triglavian_invasion_status,
+        :sun_type_id
+      ])
+
+  def map_ui_kill({solar_system_id, kills}),
+    do: %{solar_system_id: solar_system_id, kills: kills}
+
+  def map_ui_kill(_kill), do: %{}
+end

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

@@ -104,20 +104,18 @@
       id="characters-tracking-table"
       class="h-[400px] !overflow-y-auto"
       rows={characters}
-      row_click={fn character -> send(self(), "toggle_track_#{character.id}") end}
+
     >
       <:col :let={character} label="Tracked">
-        <div class="flex items-center gap-3">
-          <label>
-            <input
-              type="checkbox"
-              class="checkbox"
-              phx-click="toggle_track"
-              phx-value-character-id={character.id}
-              id={"character-track-#{character.id}"}
-              checked={character.tracked}
-            />
-          </label>
+        <label class="flex items-center gap-3">
+          <input
+            type="checkbox"
+            class="checkbox"
+            phx-click="toggle_track"
+            phx-value-character-id={character.id}
+            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>
@@ -127,7 +125,7 @@
               <div class="text-sm opacity-50"></div>
             </div>
           </div>
-        </div>
+        </label>
       </:col>
     </.table>
   </.async_result>

lib/wanderer_app_web/live/maps/maps_live.ex

@@ -8,11 +8,14 @@ defmodule WandererAppWeb.MapsLive do
   @pubsub_client Application.compile_env(:wanderer_app, :pubsub_client)
 
   @impl true
-  def mount(_params, %{"user_id" => user_id} = _session, socket) when not is_nil(user_id) do
+  def mount(
+        _params,
+        %{"user_id" => user_id} = _session,
+        %{assigns: %{current_user: current_user}} = socket
+      )
+      when not is_nil(user_id) do
     {:ok, active_characters} = WandererApp.Api.Character.active_by_user(%{user_id: user_id})
 
-    current_user = socket.assigns.current_user
-
     user_characters =
       active_characters
       |> Enum.map(&map_character/1)
@@ -601,16 +604,6 @@ defmodule WandererAppWeb.MapsLive do
 
         {added_acls, removed_acls} = map.acls |> Enum.map(& &1.id) |> _get_acls_diff(form["acls"])
 
-        added_acls
-        |> Enum.each(fn acl_id ->
-          :telemetry.execute([:wanderer_app, :map, :acl, :add], %{count: 1})
-        end)
-
-        removed_acls
-        |> Enum.each(fn acl_id ->
-          :telemetry.execute([:wanderer_app, :map, :acl, :remove], %{count: 1})
-        end)
-
         Phoenix.PubSub.broadcast(
           WandererApp.PubSub,
           "maps:#{map.id}",

mix.exs

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

priv/repo/migrations/20240921084636_install_ash-functions_extension_4.exs

@@ -0,0 +1,54 @@
+defmodule WandererApp.Repo.Migrations.InstallAshFunctionsExtension420240921084635 do
+  @moduledoc """
+  Installs any extensions that are mentioned in the repo's `installed_extensions/0` callback
+
+  This file was autogenerated with `mix ash_postgres.generate_migrations`
+  """
+
+  use Ecto.Migration
+
+  def up do
+    execute("""
+    CREATE OR REPLACE FUNCTION uuid_generate_v7()
+    RETURNS UUID
+    AS $$
+    DECLARE
+      timestamp    TIMESTAMPTZ;
+      microseconds INT;
+    BEGIN
+      timestamp    = clock_timestamp();
+      microseconds = (cast(extract(microseconds FROM timestamp)::INT - (floor(extract(milliseconds FROM timestamp))::INT * 1000) AS DOUBLE PRECISION) * 4.096)::INT;
+
+      RETURN encode(
+        set_byte(
+          set_byte(
+            overlay(uuid_send(gen_random_uuid()) placing substring(int8send(floor(extract(epoch FROM timestamp) * 1000)::BIGINT) FROM 3) FROM 1 FOR 6
+          ),
+          6, (b'0111' || (microseconds >> 8)::bit(4))::bit(8)::int
+        ),
+        7, microseconds::bit(8)::int
+      ),
+      'hex')::UUID;
+    END
+    $$
+    LANGUAGE PLPGSQL
+    VOLATILE;
+    """)
+
+    execute("""
+    CREATE OR REPLACE FUNCTION timestamp_from_uuid_v7(_uuid uuid)
+    RETURNS TIMESTAMP WITHOUT TIME ZONE
+    AS $$
+      SELECT to_timestamp(('x0000' || substr(_uuid::TEXT, 1, 8) || substr(_uuid::TEXT, 10, 4))::BIT(64)::BIGINT::NUMERIC / 1000);
+    $$
+    LANGUAGE SQL
+    IMMUTABLE PARALLEL SAFE STRICT;
+    """)
+  end
+
+  def down do
+    # Uncomment this if you actually want to uninstall the extensions
+    # when this migration is rolled back:
+    execute("DROP FUNCTION IF EXISTS uuid_generate_v7(), timestamp_from_uuid_v7(uuid)")
+  end
+end

priv/repo/migrations/20240922080418_add_connection_custom_info.exs

@@ -0,0 +1,21 @@
+defmodule WandererApp.Repo.Migrations.AddConnectionCustomInfo 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
+      add :custom_info, :text
+    end
+  end
+
+  def down do
+    alter table(:map_chain_v1) do
+      remove :custom_info
+    end
+  end
+end

priv/repo/migrations/20241019083102_add_signature_type.exs

@@ -0,0 +1,21 @@
+defmodule WandererApp.Repo.Migrations.AddSignatureType 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_system_signatures_v1) do
+      add :type, :text
+    end
+  end
+
+  def down do
+    alter table(:map_system_signatures_v1) do
+      remove :type
+    end
+  end
+end

priv/repo/migrations/20241022135854_add_user_activity_index.exs

@@ -0,0 +1,17 @@
+defmodule WandererApp.Repo.Migrations.AddUserActivityIndex 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
+    create index(:user_activity_v1, [:entity_id, :event_type, :inserted_at], unique: true)
+  end
+
+  def down do
+    drop_if_exists index(:user_activity_v1, [:entity_id, :event_type, :inserted_at])
+  end
+end

priv/resource_snapshots/repo/map_chain_v1/20240922080418.json

@@ -0,0 +1,168 @@
+{
+  "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": "1",
+      "generated?": false,
+      "primary_key?": false,
+      "references": null,
+      "size": null,
+      "source": "ship_size_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": "D2213536C4FA24865B2977B1544847E583441789FF1F1F07E7ADAEBD238764CF",
+  "identities": [],
+  "multitenancy": {
+    "attribute": null,
+    "global": null,
+    "strategy": null
+  },
+  "repo": "Elixir.WandererApp.Repo",
+  "schema": null,
+  "table": "map_chain_v1"
+}

priv/resource_snapshots/repo/map_system_signatures_v1/20241019083102.json

@@ -0,0 +1,177 @@
+{
+  "attributes": [
+    {
+      "allow_nil?": false,
+      "default": "fragment(\"gen_random_uuid()\")",
+      "generated?": false,
+      "primary_key?": true,
+      "references": null,
+      "size": null,
+      "source": "id",
+      "type": "uuid"
+    },
+    {
+      "allow_nil?": false,
+      "default": "nil",
+      "generated?": false,
+      "primary_key?": false,
+      "references": null,
+      "size": null,
+      "source": "eve_id",
+      "type": "text"
+    },
+    {
+      "allow_nil?": false,
+      "default": "nil",
+      "generated?": false,
+      "primary_key?": false,
+      "references": null,
+      "size": null,
+      "source": "character_eve_id",
+      "type": "text"
+    },
+    {
+      "allow_nil?": true,
+      "default": "nil",
+      "generated?": false,
+      "primary_key?": false,
+      "references": null,
+      "size": null,
+      "source": "name",
+      "type": "text"
+    },
+    {
+      "allow_nil?": true,
+      "default": "nil",
+      "generated?": false,
+      "primary_key?": false,
+      "references": null,
+      "size": null,
+      "source": "description",
+      "type": "text"
+    },
+    {
+      "allow_nil?": true,
+      "default": "nil",
+      "generated?": false,
+      "primary_key?": false,
+      "references": null,
+      "size": null,
+      "source": "type",
+      "type": "text"
+    },
+    {
+      "allow_nil?": true,
+      "default": "nil",
+      "generated?": false,
+      "primary_key?": false,
+      "references": null,
+      "size": null,
+      "source": "linked_system_id",
+      "type": "bigint"
+    },
+    {
+      "allow_nil?": true,
+      "default": "nil",
+      "generated?": false,
+      "primary_key?": false,
+      "references": null,
+      "size": null,
+      "source": "kind",
+      "type": "text"
+    },
+    {
+      "allow_nil?": true,
+      "default": "nil",
+      "generated?": false,
+      "primary_key?": false,
+      "references": null,
+      "size": null,
+      "source": "group",
+      "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_system_signatures_v1_system_id_fkey",
+        "on_delete": null,
+        "on_update": null,
+        "primary_key?": true,
+        "schema": "public",
+        "table": "map_system_v1"
+      },
+      "size": null,
+      "source": "system_id",
+      "type": "uuid"
+    }
+  ],
+  "base_filter": null,
+  "check_constraints": [],
+  "custom_indexes": [],
+  "custom_statements": [],
+  "has_create_action": true,
+  "hash": "740CFD116B778B91E44B8EED8414E4B3B2734FF1D94681B8727484B958958BC7",
+  "identities": [
+    {
+      "all_tenants?": false,
+      "base_filter": null,
+      "index_name": "map_system_signatures_v1_uniq_system_eve_id_index",
+      "keys": [
+        {
+          "type": "atom",
+          "value": "system_id"
+        },
+        {
+          "type": "atom",
+          "value": "eve_id"
+        }
+      ],
+      "name": "uniq_system_eve_id",
+      "nils_distinct?": true,
+      "where": null
+    }
+  ],
+  "multitenancy": {
+    "attribute": null,
+    "global": null,
+    "strategy": null
+  },
+  "repo": "Elixir.WandererApp.Repo",
+  "schema": null,
+  "table": "map_system_signatures_v1"
+}

priv/resource_snapshots/repo/user_activity_v1/20241022135854.json

@@ -0,0 +1,180 @@
+{
+  "attributes": [
+    {
+      "allow_nil?": false,
+      "default": "fragment(\"gen_random_uuid()\")",
+      "generated?": false,
+      "primary_key?": true,
+      "references": null,
+      "size": null,
+      "source": "id",
+      "type": "uuid"
+    },
+    {
+      "allow_nil?": false,
+      "default": "nil",
+      "generated?": false,
+      "primary_key?": false,
+      "references": null,
+      "size": null,
+      "source": "entity_id",
+      "type": "text"
+    },
+    {
+      "allow_nil?": false,
+      "default": "\"map\"",
+      "generated?": false,
+      "primary_key?": false,
+      "references": null,
+      "size": null,
+      "source": "entity_type",
+      "type": "text"
+    },
+    {
+      "allow_nil?": false,
+      "default": "\"custom\"",
+      "generated?": false,
+      "primary_key?": false,
+      "references": null,
+      "size": null,
+      "source": "event_type",
+      "type": "text"
+    },
+    {
+      "allow_nil?": true,
+      "default": "nil",
+      "generated?": false,
+      "primary_key?": false,
+      "references": null,
+      "size": null,
+      "source": "event_data",
+      "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": "user_activity_v1_character_id_fkey",
+        "on_delete": null,
+        "on_update": null,
+        "primary_key?": true,
+        "schema": "public",
+        "table": "character_v1"
+      },
+      "size": null,
+      "source": "character_id",
+      "type": "uuid"
+    },
+    {
+      "allow_nil?": false,
+      "default": "nil",
+      "generated?": false,
+      "primary_key?": true,
+      "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": "user_activity_v1_user_id_fkey",
+        "on_delete": null,
+        "on_update": null,
+        "primary_key?": true,
+        "schema": "public",
+        "table": "user_v1"
+      },
+      "size": null,
+      "source": "user_id",
+      "type": "uuid"
+    }
+  ],
+  "base_filter": null,
+  "check_constraints": [],
+  "custom_indexes": [
+    {
+      "all_tenants?": false,
+      "concurrently": false,
+      "error_fields": [
+        "entity_id",
+        "event_type",
+        "inserted_at"
+      ],
+      "fields": [
+        {
+          "type": "atom",
+          "value": "entity_id"
+        },
+        {
+          "type": "atom",
+          "value": "event_type"
+        },
+        {
+          "type": "atom",
+          "value": "inserted_at"
+        }
+      ],
+      "include": null,
+      "message": null,
+      "name": null,
+      "nulls_distinct": true,
+      "prefix": null,
+      "table": null,
+      "unique": true,
+      "using": null,
+      "where": null
+    }
+  ],
+  "custom_statements": [],
+  "has_create_action": true,
+  "hash": "0A26452A1A1C9A8BE1CFD18F9836FE7B778C984F589BD3C9B0EA2801B3FAC509",
+  "identities": [],
+  "multitenancy": {
+    "attribute": null,
+    "global": null,
+    "strategy": null
+  },
+  "repo": "Elixir.WandererApp.Repo",
+  "schema": null,
+  "table": "user_activity_v1"
+}