chore: release version v1.24.0

feat(Signatures): Added "Lazy delete" option & got rid of update popup
chore: release version v1.23.0
2025-11-18 07:06:34 +00:00 · 2024-11-27 13:28:03 +00:00 · 2024-11-27 14:27:27 +01:00 · 2024-11-26 21:05:58 +00:00 · 2024-11-27 01:05:26 +04:00 · 2024-11-26 19:03:01 +00:00
61 changed files with 3073 additions and 2072 deletions
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,71 @@

 <!-- changelog -->

+## [v1.24.0](https://github.com/wanderer-industries/wanderer/compare/v1.23.0...v1.24.0) (2024-11-27)
+
+
+
+
+### Features:
+
+* Signatures: Added "Lazy delete" option & got rid of update popup
+
+## [v1.23.0](https://github.com/wanderer-industries/wanderer/compare/v1.22.0...v1.23.0) (2024-11-26)
+
+
+
+
+### Features:
+
+* Map: Lock systems available to manager/admin roles only (#75)
+
+* Map: Lock systems available to manager/admin roles only
+
+* Map: Fix add system & add acl member select behaviour
+
+## [v1.22.0](https://github.com/wanderer-industries/wanderer/compare/v1.21.0...v1.22.0) (2024-11-26)
+
+
+
+
+### Features:
+
+* Map: Rework design of checkboxes in Signatures settings dialog. Rework design of checkboxes in Routes settings dialog. Now signature will deleteing by Delete hotkey was Backspace. Fixed size of group column in signatures list. Instead Updated column will be Added, updated may be turn on in settings. (#76)
+
+## [v1.21.0](https://github.com/wanderer-industries/wanderer/compare/v1.20.1...v1.21.0) (2024-11-24)
+
+
+
+
+### Features:
+
+* Map: add new gate design, change EOL placement
+
+## [v1.20.1](https://github.com/wanderer-industries/wanderer/compare/v1.20.0...v1.20.1) (2024-11-22)
+
+
+
+
+## [v1.20.0](https://github.com/wanderer-industries/wanderer/compare/v1.19.3...v1.20.0) (2024-11-22)
+
+
+
+
+### Features:
+
+* Core: Add connection type for Gates, add new Update logic
+
+## [v1.19.3](https://github.com/wanderer-industries/wanderer/compare/v1.19.2...v1.19.3) (2024-11-20)
+
+
+
+
+### Bug Fixes:
+
+* Core: Fix adding systems on splash (#71)
+
+* Core: Fix adding systems on splash
+
 ## [v1.19.2](https://github.com/wanderer-industries/wanderer/compare/v1.19.1...v1.19.2) (2024-11-19)


--- a/assets/css/app.css
+++ b/assets/css/app.css
@@ -466,3 +466,407 @@ body {
    transform: rotate(-360deg);
  }
 }
+
+/* Map refresh */
+.socket {
+  scale: 0.5;
+  width: 150px;
+  height: 150px;
+  left: 50%;
+  /* margin-left: -75px; */
+  top: 50%;
+  /* margin-top: -50px; */
+}
+
+.hex-brick {
+  background: #000;
+  width: 30px;
+  height: 17px;
+  position: absolute;
+  top: 5px;
+  animation-name: fade;
+  animation-duration: 2s;
+  animation-iteration-count: infinite;
+  -webkit-animation-name: fade;
+  -webkit-animation-duration: 2s;
+  -webkit-animation-iteration-count: infinite;
+}
+
+.hex-brick--active {
+  animation-name: fade-active;
+  -webkit-animation-name: fade-active;
+}
+
+.h2 {
+  transform: rotate(60deg);
+  -webkit-transform: rotate(60deg);
+}
+
+.h3 {
+  transform: rotate(-60deg);
+  -webkit-transform: rotate(-60deg);
+}
+
+.gel {
+  height: 30px;
+  width: 30px;
+  transition: all 0.3s;
+  -webkit-transition: all 0.3s;
+  position: absolute;
+  top: 50%;
+  left: 50%;
+}
+
+.center-gel {
+  margin-left: -15px;
+  margin-top: -15px;
+
+  animation-name: pulse-version;
+  animation-duration: 2s;
+  animation-iteration-count: infinite;
+  -webkit-animation-name: pulse-version;
+  -webkit-animation-duration: 2s;
+  -webkit-animation-iteration-count: infinite;
+}
+
+.c1 {
+  margin-left: -47px;
+  margin-top: -15px;
+}
+
+.c2 {
+  margin-left: -31px;
+  margin-top: -43px;
+}
+
+.c3 {
+  margin-left: 1px;
+  margin-top: -43px;
+}
+
+.c4 {
+  margin-left: 17px;
+  margin-top: -15px;
+}
+.c5 {
+  margin-left: -31px;
+  margin-top: 13px;
+}
+
+.c6 {
+  margin-left: 1px;
+  margin-top: 13px;
+}
+
+.c7 {
+  margin-left: -63px;
+  margin-top: -43px;
+}
+
+.c8 {
+  margin-left: 33px;
+  margin-top: -43px;
+}
+
+.c9 {
+  margin-left: -15px;
+  margin-top: 41px;
+}
+
+.c10 {
+  margin-left: -63px;
+  margin-top: 13px;
+}
+
+.c11 {
+  margin-left: 33px;
+  margin-top: 13px;
+}
+
+.c12 {
+  margin-left: -15px;
+  margin-top: -71px;
+}
+
+.c13 {
+  margin-left: -47px;
+  margin-top: -71px;
+}
+
+.c14 {
+  margin-left: 17px;
+  margin-top: -71px;
+}
+
+.c15 {
+  margin-left: -47px;
+  margin-top: 41px;
+}
+
+.c16 {
+  margin-left: 17px;
+  margin-top: 41px;
+}
+
+.c17 {
+  margin-left: -79px;
+  margin-top: -15px;
+}
+
+.c18 {
+  margin-left: 49px;
+  margin-top: -15px;
+}
+
+.c19 {
+  margin-left: -63px;
+  margin-top: -99px;
+}
+
+.c20 {
+  margin-left: 33px;
+  margin-top: -99px;
+}
+
+.c21 {
+  margin-left: 1px;
+  margin-top: -99px;
+}
+
+.c22 {
+  margin-left: -31px;
+  margin-top: -99px;
+}
+
+.c23 {
+  margin-left: -63px;
+  margin-top: 69px;
+}
+
+.c24 {
+  margin-left: 33px;
+  margin-top: 69px;
+}
+
+.c25 {
+  margin-left: 1px;
+  margin-top: 69px;
+}
+
+.c26 {
+  margin-left: -31px;
+  margin-top: 69px;
+}
+
+.c27 {
+  margin-left: -79px;
+  margin-top: -15px;
+}
+
+.c28 {
+  margin-left: -95px;
+  margin-top: -43px;
+}
+
+.c29 {
+  margin-left: -95px;
+  margin-top: 13px;
+}
+
+.c30 {
+  margin-left: 49px;
+  margin-top: 41px;
+}
+
+.c31 {
+  margin-left: -79px;
+  margin-top: -71px;
+}
+
+.c32 {
+  margin-left: -111px;
+  margin-top: -15px;
+}
+
+.c33 {
+  margin-left: 65px;
+  margin-top: -43px;
+}
+
+.c34 {
+  margin-left: 65px;
+  margin-top: 13px;
+}
+
+.c35 {
+  margin-left: -79px;
+  margin-top: 41px;
+}
+
+.c36 {
+  margin-left: 49px;
+  margin-top: -71px;
+}
+
+.c37 {
+  margin-left: 81px;
+  margin-top: -15px;
+}
+
+.r1 {
+  animation-name: pulse-version;
+  animation-duration: 2s;
+  animation-iteration-count: infinite;
+  animation-delay: 0.2s;
+  -webkit-animation-name: pulse-version;
+  -webkit-animation-duration: 2s;
+  -webkit-animation-iteration-count: infinite;
+  -webkit-animation-delay: 0.2s;
+}
+
+.r2 {
+  animation-name: pulse-version;
+  animation-duration: 2s;
+  animation-iteration-count: infinite;
+  animation-delay: 0.4s;
+  -webkit-animation-name: pulse-version;
+  -webkit-animation-duration: 2s;
+  -webkit-animation-iteration-count: infinite;
+  -webkit-animation-delay: 0.4s;
+}
+
+.r3 {
+  animation-name: pulse-version;
+  animation-duration: 2s;
+  animation-iteration-count: infinite;
+  animation-delay: 0.6s;
+  -webkit-animation-name: pulse-version;
+  -webkit-animation-duration: 2s;
+  -webkit-animation-iteration-count: infinite;
+  -webkit-animation-delay: 0.6s;
+}
+
+.r1 > .hex-brick {
+  animation-name: fade;
+  animation-duration: 2s;
+  animation-iteration-count: infinite;
+  animation-delay: 0.2s;
+  -webkit-animation-name: fade;
+  -webkit-animation-duration: 2s;
+  -webkit-animation-iteration-count: infinite;
+  -webkit-animation-delay: 0.2s;
+}
+
+.r1 > .hex-brick--active {
+  animation-name: fade-active;
+  -webkit-animation-name: fade-active;
+}
+
+.r2 > .hex-brick {
+  animation-name: fade;
+  animation-duration: 2s;
+  animation-iteration-count: infinite;
+  animation-delay: 0.4s;
+  -webkit-animation-name: fade;
+  -webkit-animation-duration: 2s;
+  -webkit-animation-iteration-count: infinite;
+  -webkit-animation-delay: 0.4s;
+}
+
+.r2 > .hex-brick--active {
+  animation-name: fade-active;
+  -webkit-animation-name: fade-active;
+}
+
+.r3 > .hex-brick {
+  animation-name: fade;
+  animation-duration: 2s;
+  animation-iteration-count: infinite;
+  animation-delay: 0.6s;
+  -webkit-animation-name: fade;
+  -webkit-animation-duration: 2s;
+  -webkit-animation-iteration-count: infinite;
+  -webkit-animation-delay: 0.6s;
+}
+
+.r3 > .hex-brick--active {
+  animation-name: fade-active;
+  -webkit-animation-name: fade-active;
+}
+
+@keyframes pulse-version {
+  0% {
+    -webkit-transform: scale(1);
+    transform: scale(1);
+  }
+
+  50% {
+    -webkit-transform: scale(0.01);
+    transform: scale(0.01);
+  }
+
+  100% {
+    -webkit-transform: scale(1);
+    transform: scale(1);
+  }
+}
+
+@keyframes fade {
+  0% {
+    background: #09d0e2;
+  }
+
+  50% {
+    background: #8ae6ee;
+  }
+
+  100% {
+    background: #09d0e2;
+  }
+}
+
+@keyframes fade-active {
+  0% {
+    background: #ff52d9;
+  }
+
+  50% {
+    background: #ff52d9;
+  }
+
+  100% {
+    background: #ff52d9;
+  }
+}
+
+@-webkit-keyframes pulse {
+  0% {
+    -webkit-transform: scale(1);
+    transform: scale(1);
+  }
+
+  50% {
+    -webkit-transform: scale(0.01);
+    transform: scale(0.01);
+  }
+
+  100% {
+    -webkit-transform: scale(1);
+    transform: scale(1);
+  }
+}
+
+@-webkit-keyframes fade {
+  0% {
+    background: #abf8ff;
+  }
+
+  50% {
+    background: #389ca6;
+  }
+
+  100% {
+    background: #abf8ff;
+  }
+}
+/* Map refresh END */
--- a/assets/js/hooks/Mapper/components/contexts/ContextMenuSystem/useContextMenuSystemItems.tsx
+++ b/assets/js/hooks/Mapper/components/contexts/ContextMenuSystem/useContextMenuSystemItems.tsx
@@ -6,6 +6,8 @@ import { PrimeIcons } from 'primereact/api';
 import { ContextMenuSystemProps } from '@/hooks/Mapper/components/contexts';
 import { useWaypointMenu } from '@/hooks/Mapper/components/contexts/hooks';
 import { FastSystemActions } from '@/hooks/Mapper/components/contexts/components';
+import { useMapCheckPermissions } from '@/hooks/Mapper/mapRootProvider/hooks/api';
+import { UserPermission } from '@/hooks/Mapper/types/permissions.ts';

 export const useContextMenuSystemItems = ({
  onDeleteSystem,
@@ -25,6 +27,7 @@ export const useContextMenuSystemItems = ({
  const getStatus = useStatusMenu(systems, systemId, onSystemStatus);
  const getLabels = useLabelsMenu(systems, systemId, onSystemLabels, onCustomLabelDialog);
  const getWaypointMenu = useWaypointMenu(onWaypointSet);
+  const canLockSystem = useMapCheckPermissions([UserPermission.LOCK_SYSTEM]);

  return useMemo(() => {
    const system = systemId ? getSystemById(systems, systemId) : undefined;
@@ -58,19 +61,25 @@ export const useContextMenuSystemItems = ({
        command: onHubToggle,
      },
      ...(system.locked
-        ? [
-            {
-              label: 'Unlock',
-              icon: PrimeIcons.LOCK_OPEN,
-              command: onLockToggle,
-            },
-          ]
+        ? canLockSystem
+          ? [
+              {
+                label: 'Unlock',
+                icon: PrimeIcons.LOCK_OPEN,
+                command: onLockToggle,
+              },
+            ]
+          : []
        : [
-            {
-              label: 'Lock',
-              icon: PrimeIcons.LOCK,
-              command: onLockToggle,
-            },
+            ...(canLockSystem
+              ? [
+                  {
+                    label: 'Lock',
+                    icon: PrimeIcons.LOCK,
+                    command: onLockToggle,
+                  },
+                ]
+              : []),
            { separator: true },
            {
              label: 'Delete',
@@ -80,6 +89,7 @@ export const useContextMenuSystemItems = ({
          ]),
    ];
  }, [
+    canLockSystem,
    systems,
    systemId,
    getTags,
--- a/assets/js/hooks/Mapper/components/map/MapProvider.tsx
+++ b/assets/js/hooks/Mapper/components/map/MapProvider.tsx
@@ -32,6 +32,7 @@ const INITIAL_DATA: MapData = {
  visibleNodes: new Set(),
  showKSpaceBG: false,
  isThickConnections: false,
+  userPermissions: {},
 };

 export interface MapContextProps {
--- a/assets/js/hooks/Mapper/components/map/components/ContextMenuConnection/ContextMenuConnection.tsx
+++ b/assets/js/hooks/Mapper/components/map/components/ContextMenuConnection/ContextMenuConnection.tsx
@@ -3,7 +3,7 @@ import { ContextMenu } from 'primereact/contextmenu';
 import { PrimeIcons } from 'primereact/api';
 import { MenuItem } from 'primereact/menuitem';
 import { Edge } from '@reactflow/core/dist/esm/types/edges';
-import { MassState, ShipSizeStatus, SolarSystemConnection, TimeStatus } from '@/hooks/Mapper/types';
+import { ConnectionType, MassState, ShipSizeStatus, SolarSystemConnection, TimeStatus } from '@/hooks/Mapper/types';
 import clsx from 'clsx';
 import classes from './ContextMenuConnection.module.scss';
 import { MASS_STATE_NAMES, MASS_STATE_NAMES_ORDER } from '@/hooks/Mapper/components/map/constants.ts';
@@ -35,36 +35,49 @@ export const ContextMenuConnection: React.FC<ContextMenuConnectionProps> = ({
    }

    const isFrigateSize = edge.data?.ship_size_type === ShipSizeStatus.small;
+    const isWormhole = edge.data?.type !== ConnectionType.gate;

    return [
-      {
-        label: `EOL`,
-        className: clsx({
-          [classes.ConnectionTimeEOL]: edge.data?.time_status === TimeStatus.eol,
-        }),
-        icon: PrimeIcons.CLOCK,
-        command: onChangeTimeState,
-      },
-      {
-        label: `Frigate`,
-        className: clsx({
-          [classes.ConnectionFrigate]: isFrigateSize,
-        }),
-        icon: PrimeIcons.CLOUD,
-        command: () =>
-          onChangeShipSizeStatus(
-            edge.data?.ship_size_type === ShipSizeStatus.small ? ShipSizeStatus.normal : ShipSizeStatus.small,
-          ),
-      },
-      {
-        label: `Save mass`,
-        className: clsx({
-          [classes.ConnectionSave]: edge.data?.locked,
-        }),
-        icon: PrimeIcons.LOCK,
-        command: () => onToggleMassSave(!edge.data?.locked),
-      },
-      ...(!isFrigateSize
+      ...(isWormhole
+        ? [
+            {
+              label: `EOL`,
+              className: clsx({
+                [classes.ConnectionTimeEOL]: edge.data?.time_status === TimeStatus.eol,
+              }),
+              icon: PrimeIcons.CLOCK,
+              command: onChangeTimeState,
+            },
+          ]
+        : []),
+      ...(isWormhole
+        ? [
+            {
+              label: `Frigate`,
+              className: clsx({
+                [classes.ConnectionFrigate]: isFrigateSize,
+              }),
+              icon: PrimeIcons.CLOUD,
+              command: () =>
+                onChangeShipSizeStatus(
+                  edge.data?.ship_size_type === ShipSizeStatus.small ? ShipSizeStatus.normal : ShipSizeStatus.small,
+                ),
+            },
+          ]
+        : []),
+      ...(isWormhole
+        ? [
+            {
+              label: `Save mass`,
+              className: clsx({
+                [classes.ConnectionSave]: edge.data?.locked,
+              }),
+              icon: PrimeIcons.LOCK,
+              command: () => onToggleMassSave(!edge.data?.locked),
+            },
+          ]
+        : []),
+      ...(isWormhole && !isFrigateSize
        ? [
            {
              label: `Mass status`,
--- a/assets/js/hooks/Mapper/components/map/components/ContextMenuConnection/useContextMenuConnectionHandlers.ts
+++ b/assets/js/hooks/Mapper/components/map/components/ContextMenuConnection/useContextMenuConnectionHandlers.ts
@@ -4,7 +4,7 @@ import { ContextMenu } from 'primereact/contextmenu';
 import { useMapState } from '../../MapProvider.tsx';
 import { OutCommand } from '@/hooks/Mapper/types/mapHandlers.ts';
 import { Edge } from '@reactflow/core/dist/esm/types/edges';
-import { MassState, ShipSizeStatus, SolarSystemConnection, TimeStatus } from '@/hooks/Mapper/types';
+import { ConnectionType, MassState, ShipSizeStatus, SolarSystemConnection, TimeStatus } from '@/hooks/Mapper/types';
 import { ctxManager } from '@/hooks/Mapper/utils/contextManager.ts';

 export const useContextMenuConnectionHandlers = () => {
@@ -47,6 +47,23 @@ export const useContextMenuConnectionHandlers = () => {
    setEdge(undefined);
  };

+  const onChangeType = useCallback((type: ConnectionType) => {
+    const { edge, outCommand } = ref.current;
+
+    if (!edge) {
+      return;
+    }
+
+    outCommand({
+      type: OutCommand.updateConnectionType,
+      data: {
+        source: edge.source,
+        target: edge.target,
+        value: type,
+      },
+    });
+  }, []);
+
  const onChangeMassState = useCallback((status: MassState) => {
    const { edge, outCommand } = ref.current;

@@ -118,6 +135,7 @@ export const useContextMenuConnectionHandlers = () => {
    contextMenuRef,
    onDeleteConnection,
    onChangeTimeState,
+    onChangeType,
    onChangeMassState,
    onChangeShipSizeStatus,
    onToggleMassSave,
--- a/assets/js/hooks/Mapper/components/map/components/SolarSystemEdge/SolarSystemEdge.module.scss
+++ b/assets/js/hooks/Mapper/components/map/components/SolarSystemEdge/SolarSystemEdge.module.scss
@@ -24,6 +24,10 @@
    stroke: #d4f0ff;
  }

+  &.Gate {
+    stroke: #1c1e15;
+  }
+
  &.Hovered {
    stroke: #4e5d6c;
    stroke-width: 2px;
@@ -76,6 +80,11 @@
      stroke-width: 6px;
    }
  }
+
+  &.Gate {
+    stroke: #9aff40;
+  }
+
 }

 .ClickPath {
--- a/assets/js/hooks/Mapper/components/map/components/SolarSystemEdge/SolarSystemEdge.tsx
+++ b/assets/js/hooks/Mapper/components/map/components/SolarSystemEdge/SolarSystemEdge.tsx
@@ -1,10 +1,10 @@
 import { useCallback, useMemo, useState } from 'react';

 import classes from './SolarSystemEdge.module.scss';
-import { EdgeLabelRenderer, EdgeProps, getBezierPath, Position, useStore } from 'reactflow';
+import { EdgeLabelRenderer, EdgeProps, getBezierPath, getSmoothStepPath, Position, useStore } from 'reactflow';
 import { getEdgeParams } from '@/hooks/Mapper/components/map/utils.ts';
 import clsx from 'clsx';
-import { MassState, ShipSizeStatus, SolarSystemConnection, TimeStatus } from '@/hooks/Mapper/types';
+import { ConnectionType, MassState, ShipSizeStatus, SolarSystemConnection, TimeStatus } from '@/hooks/Mapper/types';
 import { PrimeIcons } from 'primereact/api';
 import { WdTooltipWrapper } from '@/hooks/Mapper/components/ui-kit/WdTooltipWrapper';
 import { useMapState } from '@/hooks/Mapper/components/map/MapProvider.tsx';
@@ -33,6 +33,7 @@ const MAP_OFFSETS: Record<string, { x: number; y: number }> = {
 export const SolarSystemEdge = ({ id, source, target, markerEnd, style, data }: EdgeProps<SolarSystemConnection>) => {
  const sourceNode = useStore(useCallback(store => store.nodeInternals.get(source), [source]));
  const targetNode = useStore(useCallback(store => store.nodeInternals.get(target), [target]));
+  const isWormhole = data?.type !== ConnectionType.gate;

  const {
    data: { isThickConnections },
@@ -45,7 +46,9 @@ export const SolarSystemEdge = ({ id, source, target, markerEnd, style, data }:

    const offset = isThickConnections ? MAP_OFFSETS_TICK[targetPos] : MAP_OFFSETS[targetPos];

-    const [edgePath, labelX, labelY] = getBezierPath({
+    const method = isWormhole ? getBezierPath : getSmoothStepPath;
+
+    const [edgePath, labelX, labelY] = method({
      sourceX: sx - offset.x,
      sourceY: sy - offset.y,
      sourcePosition: sourcePos,
@@ -53,8 +56,9 @@ export const SolarSystemEdge = ({ id, source, target, markerEnd, style, data }:
      targetX: tx + offset.x,
      targetY: ty + offset.y,
    });
+
    return [edgePath, labelX, labelY, sx, sy, tx, ty, sourcePos, targetPos];
-  }, [isThickConnections, sourceNode, targetNode]);
+  }, [isThickConnections, sourceNode, targetNode, isWormhole]);

  if (!sourceNode || !targetNode || !data) {
    return null;
@@ -66,8 +70,9 @@ export const SolarSystemEdge = ({ id, source, target, markerEnd, style, data }:
        id={`back_${id}`}
        className={clsx(classes.EdgePathBack, {
          [classes.Tick]: isThickConnections,
-          [classes.TimeCrit]: data.time_status === TimeStatus.eol,
+          [classes.TimeCrit]: isWormhole && data.time_status === TimeStatus.eol,
          [classes.Hovered]: hovered,
+          [classes.Gate]: !isWormhole,
        })}
        d={path}
        markerEnd={markerEnd}
@@ -78,9 +83,10 @@ export const SolarSystemEdge = ({ id, source, target, markerEnd, style, data }:
        className={clsx(classes.EdgePathFront, {
          [classes.Tick]: isThickConnections,
          [classes.Hovered]: hovered,
-          [classes.MassVerge]: data.mass_status === MassState.verge,
-          [classes.MassHalf]: data.mass_status === MassState.half,
-          [classes.Frigate]: data.ship_size_type === ShipSizeStatus.small,
+          [classes.MassVerge]: isWormhole && data.mass_status === MassState.verge,
+          [classes.MassHalf]: isWormhole && data.mass_status === MassState.half,
+          [classes.Frigate]: isWormhole && data.ship_size_type === ShipSizeStatus.small,
+          [classes.Gate]: !isWormhole,
        })}
        d={path}
        markerEnd={markerEnd}
@@ -120,7 +126,7 @@ export const SolarSystemEdge = ({ id, source, target, markerEnd, style, data }:
            transform: `translate(-50%, -50%) translate(${labelX}px,${labelY}px)`,
          }}
        >
-          {data.locked && (
+          {isWormhole && data.locked && (
            <WdTooltipWrapper
              content="Save mass"
              className={clsx(
--- a/assets/js/hooks/Mapper/components/map/constants.ts
+++ b/assets/js/hooks/Mapper/components/map/constants.ts
@@ -1,4 +1,4 @@
-import { MassState } from '@/hooks/Mapper/types';
+import { ConnectionType, MassState } from '@/hooks/Mapper/types';

 export enum SOLAR_SYSTEM_CLASS_IDS {
  ccp1 = -1,
@@ -712,6 +712,13 @@ export const STATUS_CLASSES: Record<number, string> = {
  [STATUSES.dangerous]: 'eve-system-status-dangerous',
 };

+export const TYPE_NAMES_ORDER = [ConnectionType.wormhole, ConnectionType.gate];
+
+export const TYPE_NAMES = {
+  [ConnectionType.wormhole]: 'Wormhole',
+  [ConnectionType.gate]: 'Gate',
+};
+
 export const MASS_STATE_NAMES_ORDER = [MassState.verge, MassState.half, MassState.normal];

 export const MASS_STATE_NAMES = {
--- a/assets/js/hooks/Mapper/components/map/hooks/api/useMapAddSystems.ts
+++ b/assets/js/hooks/Mapper/components/map/hooks/api/useMapAddSystems.ts
@@ -12,6 +12,7 @@ export const useMapAddSystems = () => {
  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);
  }, []);
--- a/assets/js/hooks/Mapper/components/map/hooks/useMapHandlers.ts
+++ b/assets/js/hooks/Mapper/components/map/hooks/useMapHandlers.ts
@@ -112,13 +112,17 @@ export const useMapHandlers = (ref: ForwardedRef<MapHandlers>, onSelectionChange
                  connections: [],
                });
                selectSystem(systemId as CommandSelectSystem);
-              }, 100);
+              }, 500);
              break;

            case Commands.routes:
              // do nothing here
              break;

+            case Commands.signaturesUpdated:
+              // do nothing here
+              break;
+
            case Commands.linkSignatureToSystem:
              // do nothing here
              break;
--- a/assets/js/hooks/Mapper/components/mapInterface/MapInterface.tsx
+++ b/assets/js/hooks/Mapper/components/mapInterface/MapInterface.tsx
@@ -48,6 +48,7 @@ const restoreWindowsFromLS = (): WidgetGridItem[] => {
  // eslint-disable-next-line @typescript-eslint/no-unused-vars
  const raw = localStorage.getItem(SESSION_KEY.windows);
  if (!raw) {
+    console.warn('No windows found in local storage!!');
    return DEFAULT_WINDOWS;
  }

@@ -63,7 +64,7 @@ const restoreWindowsFromLS = (): WidgetGridItem[] => {
 };

 export const MapInterface = () => {
-  const [items, setItems] = useState<WidgetGridItem[]>(restoreWindowsFromLS());
+  const [items, setItems] = useState<WidgetGridItem[]>(restoreWindowsFromLS);

  return (
    <WidgetsGrid
--- a/assets/js/hooks/Mapper/components/mapInterface/widgets/RoutesWidget/RoutesSettingsDialog/RoutesSettingsDialog.tsx
+++ b/assets/js/hooks/Mapper/components/mapInterface/widgets/RoutesWidget/RoutesSettingsDialog/RoutesSettingsDialog.tsx
@@ -1,12 +1,11 @@
 import { Dialog } from 'primereact/dialog';
 import { useCallback, useEffect, useRef, useState } from 'react';
 import { Button } from 'primereact/button';
-import { WdCheckbox } from '@/hooks/Mapper/components/ui-kit';
 import {
  RoutesType,
  useRouteProvider,
 } from '@/hooks/Mapper/components/mapInterface/widgets/RoutesWidget/RoutesProvider.tsx';
-import { CheckboxChangeEvent } from 'primereact/checkbox';
+import { PrettySwitchbox } from '@/hooks/Mapper/components/mapRootContent/components/MapSettings/components';

 interface RoutesSettingsDialog {
  visible: boolean;
@@ -38,8 +37,8 @@ export const RoutesSettingsDialog = ({ visible, setVisible }: RoutesSettingsDial
  currentData.current = data;

  const handleChangeEvent = useCallback(
-    (propName: keyof RoutesType) => (event: CheckboxChangeEvent) => {
-      optionsRef.current = { ...optionsRef.current, [propName]: event.checked };
+    (propName: keyof RoutesType) => (event: boolean) => {
+      optionsRef.current = { ...optionsRef.current, [propName]: event };
      updateKey(x => x + 1);
    },
    [],
@@ -71,14 +70,14 @@ export const RoutesSettingsDialog = ({ visible, setVisible }: RoutesSettingsDial
        setVisible(false);
      }}
    >
-      <div className="flex flex-col gap-3">
-        <div className="flex flex-col gap-2">
+      <div className="flex flex-col gap-3 p-2.5">
+        <div className="flex flex-col gap-2 mb-2">
          {checkboxes.map(({ label, propName }) => (
-            <WdCheckbox
+            <PrettySwitchbox
              key={propName}
              label={label}
-              value={optionsRef.current[propName]}
-              onChange={handleChangeEvent(propName)}
+              checked={optionsRef.current[propName]}
+              setChecked={handleChangeEvent(propName)}
            />
          ))}
        </div>
--- a/assets/js/hooks/Mapper/components/mapInterface/widgets/SystemSignatures/SystemSignatureSettingsDialog/SystemSignatureSettingsDialog.tsx
+++ b/assets/js/hooks/Mapper/components/mapInterface/widgets/SystemSignatures/SystemSignatureSettingsDialog/SystemSignatureSettingsDialog.tsx
@@ -1,9 +1,9 @@
 import { Dialog } from 'primereact/dialog';
 import { useCallback, useState } from 'react';
 import { Button } from 'primereact/button';
-import { Checkbox } from 'primereact/checkbox';
 import { TabPanel, TabView } from 'primereact/tabview';
 import styles from './SystemSignatureSettingsDialog.module.scss';
+import { PrettySwitchbox } from '@/hooks/Mapper/components/mapRootContent/components/MapSettings/components';

 export type Setting = { key: string; name: string; value: boolean; isFilter?: boolean };

@@ -41,8 +41,8 @@ export const SystemSignatureSettingsDialog = ({
  }, [onSave, settings]);

  return (
-    <Dialog header="System Signatures Settings" visible={true} onHide={onCancel} className="w-full max-w-lg">
-      <div className="flex flex-col gap-3">
+    <Dialog header="System Signatures Settings" visible={true} onHide={onCancel} className="w-full max-w-lg h-[500px]">
+      <div className="flex flex-col gap-3 justify-between h-full">
        <div className="flex flex-col gap-2">
          <div className={styles.verticalTabsContainer}>
            <TabView
@@ -54,16 +54,12 @@ export const SystemSignatureSettingsDialog = ({
                <div className="w-full h-full flex flex-col gap-1">
                  {filterSettings.map(setting => {
                    return (
-                      <div key={setting.key} className="flex items-center">
-                        <Checkbox
-                          inputId={setting.key}
-                          checked={setting.value}
-                          onChange={() => handleSettingsChange(setting.key)}
-                        />
-                        <label htmlFor={setting.key} className="ml-2">
-                          {setting.name}
-                        </label>
-                      </div>
+                      <PrettySwitchbox
+                        key={setting.key}
+                        label={setting.name}
+                        checked={setting.value}
+                        setChecked={() => handleSettingsChange(setting.key)}
+                      />
                    );
                  })}
                </div>
@@ -72,16 +68,12 @@ export const SystemSignatureSettingsDialog = ({
                <div className="w-full h-full flex flex-col gap-1">
                  {userSettings.map(setting => {
                    return (
-                      <div key={setting.key} className="flex items-center">
-                        <Checkbox
-                          inputId={setting.key}
-                          checked={setting.value}
-                          onChange={() => handleSettingsChange(setting.key)}
-                        />
-                        <label htmlFor={setting.key} className="ml-2">
-                          {setting.name}
-                        </label>
-                      </div>
+                      <PrettySwitchbox
+                        key={setting.key}
+                        label={setting.name}
+                        checked={setting.value}
+                        setChecked={() => handleSettingsChange(setting.key)}
+                      />
                    );
                  })}
                </div>
--- a/assets/js/hooks/Mapper/components/mapInterface/widgets/SystemSignatures/SystemSignatures.tsx
+++ b/assets/js/hooks/Mapper/components/mapInterface/widgets/SystemSignatures/SystemSignatures.tsx
@@ -1,5 +1,11 @@
 import { Widget } from '@/hooks/Mapper/components/mapInterface/components';
-import { InfoDrawer, LayoutEventBlocker, TooltipPosition, WdImgButton } from '@/hooks/Mapper/components/ui-kit';
+import {
+  InfoDrawer,
+  LayoutEventBlocker,
+  TooltipPosition,
+  WdImgButton,
+  WdCheckbox,
+} from '@/hooks/Mapper/components/ui-kit';
 import { SystemSignaturesContent } from './SystemSignaturesContent';
 import {
  Setting,
@@ -14,19 +20,22 @@ import {
 } from './SystemSignatureSettingsDialog';
 import { SignatureGroup } from '@/hooks/Mapper/types';

-import React, { useCallback, useEffect, useState } from 'react';
+import React, { useCallback, useEffect, useState, useMemo } from 'react';

 import { PrimeIcons } from 'primereact/api';

 import { useMapRootState } from '@/hooks/Mapper/mapRootProvider';
+import { CheckboxChangeEvent } from 'primereact/checkbox';

-const SIGNATURE_SETTINGS_KEY = 'wanderer_system_signature_settings_v4_1';
+const SIGNATURE_SETTINGS_KEY = 'wanderer_system_signature_settings_v5';
 export const SHOW_DESCRIPTION_COLUMN_SETTING = 'show_description_column_setting';
-export const SHOW_INSERTED_COLUMN_SETTING = 'show_inserted_column_setting';
+export const SHOW_UPDATED_COLUMN_SETTING = 'SHOW_UPDATED_COLUMN_SETTING';
+export const LAZY_DELETE_SIGNATURES_SETTING = 'LAZY_DELETE_SIGNATURES_SETTING';

 const settings: Setting[] = [
-  { key: SHOW_INSERTED_COLUMN_SETTING, name: 'Show Inserted Column', value: false, isFilter: false },
+  { key: SHOW_UPDATED_COLUMN_SETTING, name: 'Show Updated Column', value: false, isFilter: false },
  { key: SHOW_DESCRIPTION_COLUMN_SETTING, name: 'Show Description Column', value: false, isFilter: false },
+  { key: LAZY_DELETE_SIGNATURES_SETTING, name: 'Lazy Delete Signatures', value: false, isFilter: false },
  { key: COSMIC_ANOMALY, name: 'Show Anomalies', value: true, isFilter: true },
  { key: COSMIC_SIGNATURE, name: 'Show Cosmic Signatures', value: true, isFilter: true },
  { key: DEPLOYABLE, name: 'Show Deployables', value: true, isFilter: true },
@@ -58,12 +67,25 @@ export const SystemSignatures = () => {

  const isNotSelectedSystem = selectedSystems.length !== 1;

+  const lazyDeleteValue = useMemo(() => {
+    return settings.find(setting => setting.key === LAZY_DELETE_SIGNATURES_SETTING)!.value;
+  }, [settings]);
+
  const handleSettingsChange = useCallback((settings: Setting[]) => {
    setSettings(settings);
    localStorage.setItem(SIGNATURE_SETTINGS_KEY, JSON.stringify(settings));
    setVisible(false);
  }, []);

+  const handleLazyDeleteChange = useCallback((event: CheckboxChangeEvent) => {
+    setSettings(settings => {
+      const lazyDelete = settings.find(setting => setting.key === LAZY_DELETE_SIGNATURES_SETTING)!;
+      lazyDelete.value = !!event.checked;
+      localStorage.setItem(SIGNATURE_SETTINGS_KEY, JSON.stringify(settings));
+      return [...settings];
+    });
+  }, []);
+
  useEffect(() => {
    const restoredSettings = localStorage.getItem(SIGNATURE_SETTINGS_KEY);

@@ -79,6 +101,15 @@ export const SystemSignatures = () => {
          <div className="flex gap-1">System Signatures</div>

          <LayoutEventBlocker className="flex gap-2.5">
+            <WdCheckbox
+              size="xs"
+              labelSide="left"
+              label={'Lazy delete'}
+              value={lazyDeleteValue}
+              classNameLabel="text-stone-400 hover:text-stone-200 transition duration-300"
+              onChange={handleLazyDeleteChange}
+            />
+
            <WdImgButton
              className={PrimeIcons.QUESTION_CIRCLE}
              tooltip={{
@@ -102,7 +133,7 @@ export const SystemSignatures = () => {
                    </InfoDrawer>
                    <InfoDrawer title={<b className="text-slate-50">How to delete?</b>}>
                      For delete any signature first of all you need select before
-                      <br /> and then use <b className="text-sky-500">Backspace</b>
+                      <br /> and then use <b className="text-sky-500">Del</b>
                    </InfoDrawer>
                  </div>
                ) as React.ReactNode,
--- a/assets/js/hooks/Mapper/components/mapInterface/widgets/SystemSignatures/SystemSignaturesContent/SystemSignaturesContent.tsx
+++ b/assets/js/hooks/Mapper/components/mapInterface/widgets/SystemSignatures/SystemSignaturesContent/SystemSignaturesContent.tsx
@@ -1,5 +1,4 @@
 import { useMapRootState } from '@/hooks/Mapper/mapRootProvider';
-import { useClipboard } from '@/hooks/Mapper/hooks/useClipboard';
 import { parseSignatures } from '@/hooks/Mapper/helpers';
 import { Commands, OutCommand } from '@/hooks/Mapper/types/mapHandlers.ts';
 import { WdTooltip, WdTooltipHandlers } from '@/hooks/Mapper/components/ui-kit';
@@ -22,10 +21,10 @@ import {
  getRowColorByTimeLeft,
 } from '@/hooks/Mapper/components/mapInterface/widgets/SystemSignatures/helpers';
 import {
+  renderAddedTimeLeft,
  renderDescription,
  renderIcon,
  renderInfoColumn,
-  renderInsertedTimeLeft,
  renderUpdatedTimeLeft,
 } from '@/hooks/Mapper/components/mapInterface/widgets/SystemSignatures/renders';
 import useLocalStorageState from 'use-local-storage-state';
@@ -36,7 +35,8 @@ import { WdTooltipWrapper } from '@/hooks/Mapper/components/ui-kit/WdTooltipWrap
 import { COSMIC_SIGNATURE } from '@/hooks/Mapper/components/mapInterface/widgets/SystemSignatures/SystemSignatureSettingsDialog';
 import {
  SHOW_DESCRIPTION_COLUMN_SETTING,
-  SHOW_INSERTED_COLUMN_SETTING,
+  SHOW_UPDATED_COLUMN_SETTING,
+  LAZY_DELETE_SIGNATURES_SETTING,
 } from '@/hooks/Mapper/components/mapInterface/widgets/SystemSignatures';
 type SystemSignaturesSortSettings = {
  sortField: string;
@@ -44,7 +44,7 @@ type SystemSignaturesSortSettings = {
 };

 const SORT_DEFAULT_VALUES: SystemSignaturesSortSettings = {
-  sortField: 'updated_at',
+  sortField: 'inserted_at',
  sortOrder: -1,
 };

@@ -67,8 +67,6 @@ export const SystemSignaturesContent = ({
  const [signatures, setSignatures, signaturesRef] = useRefState<SystemSignature[]>([]);
  const [selectedSignatures, setSelectedSignatures] = useState<SystemSignature[]>([]);
  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);
@@ -80,10 +78,14 @@ export const SystemSignaturesContent = ({
  const tableRef = useRef<HTMLDivElement>(null);
  const compact = useMaxWidth(tableRef, 260);
  const medium = useMaxWidth(tableRef, 380);
+  const refData = useRef({ selectable });
+  refData.current = { selectable };

  const tooltipRef = useRef<WdTooltipHandlers>(null);

-  const { clipboardContent } = useClipboard();
+  const lazyDeleteValue = useMemo(() => {
+    return settings.find(setting => setting.key === LAZY_DELETE_SIGNATURES_SETTING)!.value;
+  }, [settings]);

  const handleResize = useCallback(() => {
    if (tableRef.current) {
@@ -100,10 +102,7 @@ export const SystemSignaturesContent = ({
    [settings],
  );

-  const showInsertedColumn = useMemo(
-    () => settings.find(s => s.key === SHOW_INSERTED_COLUMN_SETTING)?.value,
-    [settings],
-  );
+  const showUpdatedColumn = useMemo(() => settings.find(s => s.key === SHOW_UPDATED_COLUMN_SETTING)?.value, [settings]);

  const filteredSignatures = useMemo(() => {
    return signatures
@@ -136,13 +135,17 @@ export const SystemSignaturesContent = ({
      data: { system_id: systemId },
    });

-    setAskUser(false);
    setSignatures(signatures);
  }, [outCommand, systemId]);

  const handleUpdateSignatures = useCallback(
-    async (newSignatures: SystemSignature[], updateOnly: boolean) => {
-      const { added, updated, removed } = getActualSigs(signaturesRef.current, newSignatures, updateOnly);
+    async (newSignatures: SystemSignature[], updateOnly: boolean, skipUpdateUntouched?: boolean) => {
+      const { added, updated, removed } = getActualSigs(
+        signaturesRef.current,
+        newSignatures,
+        updateOnly,
+        skipUpdateUntouched,
+      );

      const { signatures: updatedSignatures } = await outCommand({
        type: OutCommand.updateSignatures,
@@ -160,34 +163,32 @@ export const SystemSignaturesContent = ({
    [outCommand, systemId],
  );

-  const handleDeleteSelected = useCallback(async () => {
-    if (selectable) {
-      return;
-    }
-    if (selectedSignatures.length === 0) {
-      return;
-    }
-    const selectedSignaturesEveIds = selectedSignatures.map(x => x.eve_id);
-    await handleUpdateSignatures(
-      signatures.filter(x => !selectedSignaturesEveIds.includes(x.eve_id)),
-      false,
-    );
-  }, [handleUpdateSignatures, selectable, signatures, selectedSignatures]);
+  const handleDeleteSelected = useCallback(
+    async (e: KeyboardEvent) => {
+      if (selectable) {
+        return;
+      }
+      if (selectedSignatures.length === 0) {
+        return;
+      }
+
+      e.preventDefault();
+      e.stopPropagation();
+
+      const selectedSignaturesEveIds = selectedSignatures.map(x => x.eve_id);
+      await handleUpdateSignatures(
+        signatures.filter(x => !selectedSignaturesEveIds.includes(x.eve_id)),
+        false,
+        true,
+      );
+    },
+    [handleUpdateSignatures, selectable, signatures, selectedSignatures],
+  );

  const handleSelectAll = useCallback(() => {
    setSelectedSignatures(signatures);
  }, [signatures]);

-  const handleReplaceAll = useCallback(() => {
-    handleUpdateSignatures(parsedSignatures, false);
-    setAskUser(false);
-  }, [parsedSignatures, handleUpdateSignatures]);
-
-  const handleUpdateOnly = useCallback(() => {
-    handleUpdateSignatures(parsedSignatures, true);
-    setAskUser(false);
-  }, [parsedSignatures, handleUpdateSignatures]);
-
  const handleSelectSignatures = useCallback(
    // TODO still will be good to define types if we use typescript
    // @ts-ignore
@@ -201,12 +202,9 @@ export const SystemSignaturesContent = ({
    [onSelect, selectable],
  );

-  useHotkey(true, ['a'], handleSelectAll);
-
-  useHotkey(false, ['Backspace'], handleDeleteSelected);
-
-  useEffect(() => {
-    if (selectable) {
+  const handlePaste = async () => {
+    const clipboardContent = await navigator.clipboard.readText();
+    if (refData.current.selectable) {
      return;
    }

@@ -219,20 +217,17 @@ export const SystemSignaturesContent = ({
      settings.map(x => x.key),
    );

-    const { removed } = getActualSigs(signaturesRef.current, newSignatures, false);
+    handleUpdateSignatures(newSignatures, !lazyDeleteValue);
+  };

-    if (!signaturesRef.current || !signaturesRef.current.length || !removed.length) {
-      handleUpdateSignatures(newSignatures, false);
-    } else {
-      setParsedSignatures(newSignatures);
-      setAskUser(true);
-    }
-  }, [clipboardContent, selectable]);
+  useHotkey(true, ['a'], handleSelectAll);
+  useHotkey(true, ['v'], handlePaste);
+
+  useHotkey(false, ['Delete'], handleDeleteSelected);

  useEffect(() => {
    if (!systemId) {
      setSignatures([]);
-      setAskUser(false);
      return;
    }

@@ -330,7 +325,7 @@ export const SystemSignaturesContent = ({
                  return clsx(classes.TableRowCompact, 'bg-amber-500/50 hover:bg-amber-500/70 transition duration-200');
                }

-                const dateClass = getRowColorByTimeLeft(row.updated_at ? new Date(row.updated_at) : undefined);
+                const dateClass = getRowColorByTimeLeft(row.inserted_at ? new Date(row.inserted_at) : undefined);
                if (!dateClass) {
                  return clsx(classes.TableRowCompact, 'hover:bg-purple-400/20 transition duration-200');
                }
@@ -357,6 +352,7 @@ export const SystemSignaturesContent = ({
                header="Group"
                bodyClassName="text-ellipsis overflow-hidden whitespace-nowrap"
                hidden={compact}
+                style={{ maxWidth: 110, minWidth: 110, width: 110 }}
                sortable
              ></Column>
              <Column
@@ -378,26 +374,26 @@ export const SystemSignaturesContent = ({
                ></Column>
              )}

-              {showInsertedColumn && (
+              <Column
+                field="inserted_at"
+                header="Added"
+                dataType="date"
+                bodyClassName="w-[70px] text-ellipsis overflow-hidden whitespace-nowrap"
+                body={renderAddedTimeLeft}
+                sortable
+              ></Column>
+
+              {showUpdatedColumn && (
                <Column
-                  field="inserted_at"
-                  header="Inserted"
+                  field="updated_at"
+                  header="Updated"
                  dataType="date"
                  bodyClassName="w-[70px] text-ellipsis overflow-hidden whitespace-nowrap"
-                  body={renderInsertedTimeLeft}
+                  body={renderUpdatedTimeLeft}
                  sortable
                ></Column>
              )}

-              <Column
-                field="updated_at"
-                header="Updated"
-                dataType="date"
-                bodyClassName="w-[70px] text-ellipsis overflow-hidden whitespace-nowrap"
-                body={renderUpdatedTimeLeft}
-                sortable
-              ></Column>
-
              {!selectable && (
                <Column
                  bodyClassName="p-0 pl-1 pr-2"
@@ -424,27 +420,6 @@ export const SystemSignaturesContent = ({
            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">
-              <div className="text-stone-400/80 text-sm">
-                <div className="flex flex-col text-center gap-2">
-                  <button className="p-button p-component p-button-outlined p-button-sm btn-wide">
-                    <span className="p-button-label p-c" onClick={handleUpdateOnly}>
-                      Update
-                    </span>
-                  </button>
-                  <button className="p-button p-component p-button-outlined p-button-sm btn-wide">
-                    <span className="p-button-label p-c" onClick={handleReplaceAll}>
-                      Update & Delete missing
-                    </span>
-                  </button>
-                </div>
-              </div>
-            </div>
-          </div>
-        )}
      </div>
    </>
  );
--- a/assets/js/hooks/Mapper/components/mapInterface/widgets/SystemSignatures/helpers/getActualSigs.ts
+++ b/assets/js/hooks/Mapper/components/mapInterface/widgets/SystemSignatures/helpers/getActualSigs.ts
@@ -6,6 +6,7 @@ export const getActualSigs = (
  oldSignatures: SystemSignature[],
  newSignatures: SystemSignature[],
  updateOnly: boolean,
+  skipUpdateUntouched?: boolean,
 ): { added: SystemSignature[]; updated: SystemSignature[]; removed: SystemSignature[] } => {
  const updated: SystemSignature[] = [];
  const removed: SystemSignature[] = [];
@@ -19,7 +20,7 @@ export const getActualSigs = (
      const isNeedUpgrade = getState(GROUPS_LIST, newSig) > getState(GROUPS_LIST, oldSig);
      if (isNeedUpgrade) {
        updated.push({ ...oldSig, group: newSig.group, name: newSig.name });
-      } else {
+      } else if (!skipUpdateUntouched) {
        updated.push({ ...oldSig });
      }
    } else {
--- a/assets/js/hooks/Mapper/components/mapInterface/widgets/SystemSignatures/renders/index.ts
+++ b/assets/js/hooks/Mapper/components/mapInterface/widgets/SystemSignatures/renders/index.ts
@@ -1,7 +1,7 @@
 export * from './renderIcon';
 export * from './renderDescription';
 export * from './renderName';
-export * from './renderInsertedTimeLeft';
+export * from './renderAddedTimeLeft';
 export * from './renderUpdatedTimeLeft';
 export * from './renderLinkedSystem';
 export * from './renderInfoColumn';
--- a/assets/js/hooks/Mapper/components/mapInterface/widgets/SystemSignatures/renders/renderInsertedTimeLeft.tsx
+++ b/assets/js/hooks/Mapper/components/mapInterface/widgets/SystemSignatures/renders/renderInsertedTimeLeft.tsx
@@ -1,7 +1,7 @@
 import { SystemSignature } from '@/hooks/Mapper/types';
 import { TimeLeft } from '@/hooks/Mapper/components/ui-kit';

-export const renderInsertedTimeLeft = (row: SystemSignature) => {
+export const renderAddedTimeLeft = (row: SystemSignature) => {
  return (
    <div className="flex w-full items-center">
      <TimeLeft cDate={row.inserted_at ? new Date(row.inserted_at) : undefined} />
--- a/assets/js/hooks/Mapper/components/mapRootContent/components/Connections/Connections.tsx
+++ b/assets/js/hooks/Mapper/components/mapRootContent/components/Connections/Connections.tsx
@@ -5,12 +5,14 @@ import { useMapRootState } from '@/hooks/Mapper/mapRootProvider';
 import { VirtualScroller, VirtualScrollerTemplateOptions } from 'primereact/virtualscroller';
 import clsx from 'clsx';
 import {
+  ConnectionType,
  ConnectionOutput,
  ConnectionInfoOutput,
  OutCommand,
  Passage,
  SolarSystemConnection,
 } from '@/hooks/Mapper/types';
+
 import { PassageCard } from './PassageCard';
 import { InfoDrawer, SystemView } from '@/hooks/Mapper/components/ui-kit';
 import { kgToTons } from '@/hooks/Mapper/utils/kgToTons.ts';
@@ -75,8 +77,12 @@ export const Connections = ({ selectedConnection, onHide }: OnTheMapProps) => {
    return connections.find(x => x.source === selectedConnection.source && x.target === selectedConnection.target);
  }, [connections, selectedConnection]);

+  const isWormhole = useMemo(() => {
+    return cnInfo?.type !== ConnectionType.gate;
+  }, [cnInfo]);
+
  const [passages, setPassages] = useState<Passage[]>([]);
-  const [info, setInfo] = useState<ConnectionInfoOutput>(null);
+  const [info, setInfo] = useState<ConnectionInfoOutput | null>(null);

  const loadInfo = useCallback(
    async (connection: SolarSystemConnection) => {
@@ -135,7 +141,7 @@ export const Connections = ({ selectedConnection, onHide }: OnTheMapProps) => {
    >
      <div className={clsx(classes.SidebarContent, '')}>
        {/* Connection Info */}
-        <div className="px-2 pb-3 flex flex-col gap-2">
+        <div className="px-2 flex flex-col gap-2">
          {/* Connection Info Row */}
          <InfoDrawer title="Connection" rightSide>
            <div className="flex justify-end gap-2 items-center">
@@ -153,14 +159,25 @@ export const Connections = ({ selectedConnection, onHide }: OnTheMapProps) => {
            </div>
          </InfoDrawer>

-          {/* Connection Info Row */}
-          <InfoDrawer title="Approximate mass of passages" rightSide>
-            {kgToTons(approximateMass)}
-          </InfoDrawer>
+          <div className="flex justify-between gap-2">
+            {/*Left column*/}
+            <div>
+              {isWormhole && info?.marl_eol_time && (
+                <InfoDrawer title="Mark EOL Time">
+                  <TimeAgo timestamp={info.marl_eol_time} />
+                </InfoDrawer>
+              )}
+            </div>

-          <InfoDrawer title="Mark EOL Time" rightSide>
-            {info?.marl_eol_time ? <TimeAgo timestamp={info.marl_eol_time} /> : ' unknown '}
-          </InfoDrawer>
+            {/*Right column*/}
+            <div>
+              {isWormhole && (
+                <InfoDrawer title="Approximate mass of passages" rightSide>
+                  {kgToTons(approximateMass)}
+                </InfoDrawer>
+              )}
+            </div>
+          </div>

          <div className="flex gap-2"></div>
        </div>
--- a/assets/js/hooks/Mapper/components/mapRootContent/components/SignatureSettings/SignatureSettings.tsx
+++ b/assets/js/hooks/Mapper/components/mapRootContent/components/SignatureSettings/SignatureSettings.tsx
@@ -1,6 +1,5 @@
 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 {
@@ -25,102 +24,106 @@ export const SignatureSettings = ({ systemId, show, onHide, signatureData }: Map
  const { outCommand } = useMapRootState();

  const handleShow = async () => {};
-  const form = useForm<Partial<SystemSignaturePrepared>>({});
+  const signatureForm = useForm<Partial<SystemSignaturePrepared>>({});

-  const handleSave = useCallback(async () => {
-    if (!signatureData) {
-      return;
-    }
+  const handleSave = useCallback(
+    async (e: any) => {
+      e?.preventDefault();
+      if (!signatureData) {
+        return;
+      }

-    const { group, ...values } = form.getValues();
-    let out = { ...signatureData };
+      const { group, ...values } = signatureForm.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,
-            },
-          });
-        }
+      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 (values.type != null) {
+            out = { ...out, type: values.type };
+          }

-        if (signatureData.group !== SignatureGroup.Wormhole) {
-          out = { ...out, name: '' };
-        }
+          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 ?? '' };
-        }
-    }
+          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 };
-    }
+      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! };

-    // 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 },
+        type: OutCommand.updateSignatures,
+        data: {
+          system_id: systemId,
+          added: [],
+          updated: [out],
+          removed: [],
+        },
      });

-      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]);
+      signatureForm.reset();
+      onHide();
+    },
+    [signatureForm, onHide, outCommand, signatureData, systemId],
+  );

  useEffect(() => {
    if (!signatureData) {
-      form.reset();
+      signatureForm.reset();
      return;
    }

    const { linked_system, ...rest } = signatureData;

-    form.reset({
+    signatureForm.reset({
      linked_system: linked_system?.solar_system_id.toString() ?? undefined,
      ...rest,
    });
-  }, [form, signatureData]);
+  }, [signatureForm, signatureData]);

  return (
    <Dialog
@@ -138,32 +141,34 @@ export const SignatureSettings = ({ systemId, show, onHide, signatureData }: Map
      }}
    >
      <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>
+        <FormProvider {...signatureForm}>
+          <form onSubmit={handleSave}>
+            <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 />
+                <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>
+                <label className="grid grid-cols-[100px_250px_1fr] gap-2 items-center text-[14px]">
+                  <span>Description:</span>
+                  <Controller
+                    name="description"
+                    control={signatureForm.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>
-
-            <div className="flex gap-2 justify-end">
-              <Button onClick={handleSave} outlined size="small" label="Save"></Button>
-            </div>
-          </div>
+          </form>
        </FormProvider>
      </SystemsSettingsProvider>
    </Dialog>
--- a/assets/js/hooks/Mapper/hooks/useHotkey.ts
+++ b/assets/js/hooks/Mapper/hooks/useHotkey.ts
@@ -1,6 +1,6 @@
 import { useEffect } from 'react';

-export const useHotkey = (isMetaKey: boolean, hotkeys: string[], callback: () => void) => {
+export const useHotkey = (isMetaKey: boolean, hotkeys: string[], callback: (e: KeyboardEvent) => void) => {
  useEffect(() => {
    const handleKeyDown = (event: KeyboardEvent) => {
      if ((!isMetaKey || event.ctrlKey || event.metaKey) && hotkeys.includes(event.key)) {
@@ -8,14 +8,14 @@ export const useHotkey = (isMetaKey: boolean, hotkeys: string[], callback: () =>
          return;
        }
        event.preventDefault();
-        callback();
+        callback(event);
      }
    };

-    window.addEventListener('keydown', handleKeyDown);
+    window.addEventListener('keydown', handleKeyDown, { capture: true });

    return () => {
-      window.removeEventListener('keydown', handleKeyDown);
+      window.removeEventListener('keydown', handleKeyDown, { capture: true });
    };
  }, [isMetaKey, hotkeys, callback]);
 };
--- a/assets/js/hooks/Mapper/mapRootProvider/MapRootProvider.tsx
+++ b/assets/js/hooks/Mapper/mapRootProvider/MapRootProvider.tsx
@@ -1,6 +1,6 @@
 import { ContextStoreDataUpdate, useContextStore } from '@/hooks/Mapper/utils';
-import { createContext, Dispatch, ForwardedRef, forwardRef, RefObject, SetStateAction, useContext } from 'react';
-import { MapHandlers, MapUnionTypes, OutCommandHandler, SolarSystemConnection } from '@/hooks/Mapper/types';
+import { createContext, Dispatch, ForwardedRef, forwardRef, SetStateAction, useContext } from 'react';
+import { MapUnionTypes, OutCommandHandler, SolarSystemConnection } from '@/hooks/Mapper/types';
 import { useMapRootHandlers } from '@/hooks/Mapper/mapRootProvider/hooks';
 import { WithChildren } from '@/hooks/Mapper/types/common.ts';
 import useLocalStorageState from 'use-local-storage-state';
@@ -25,6 +25,7 @@ const INITIAL_DATA: MapRootData = {

  selectedSystems: [],
  selectedConnections: [],
+  userPermissions: {},
 };

 export enum InterfaceStoredSettingsProps {
--- a/assets/js/hooks/Mapper/mapRootProvider/hooks/api/index.ts
+++ b/assets/js/hooks/Mapper/mapRootProvider/hooks/api/index.ts
@@ -1,5 +1,6 @@
 export * from './useMapInit';
 export * from './useMapUpdated';
+export * from './useMapCheckPermissions';
 export * from './useRoutes';
 export * from './useCommandsConnections';
 export * from './useCommandsSystems';
--- a/assets/js/hooks/Mapper/mapRootProvider/hooks/api/useMapCheckPermissions.ts
+++ b/assets/js/hooks/Mapper/mapRootProvider/hooks/api/useMapCheckPermissions.ts
@@ -0,0 +1,11 @@
+import { useMemo } from 'react';
+import { useMapRootState } from '@/hooks/Mapper/mapRootProvider';
+import { UserPermission } from '@/hooks/Mapper/types/permissions.ts';
+
+export const useMapCheckPermissions = (permissions: UserPermission[]) => {
+  const {
+    data: { userPermissions },
+  } = useMapRootState();
+
+  return useMemo(() => permissions.every(x => userPermissions[x]), [permissions, userPermissions]);
+};
--- a/assets/js/hooks/Mapper/mapRootProvider/hooks/api/useMapInit.ts
+++ b/assets/js/hooks/Mapper/mapRootProvider/hooks/api/useMapInit.ts
@@ -19,6 +19,7 @@ export const useMapInit = () => {
      user_characters,
      present_characters,
      hubs,
+      user_permissions,
    }: CommandInit) => {
      const updateData: Partial<MapRootData> = {};

@@ -51,6 +52,10 @@ export const useMapInit = () => {
        updateData.connections = connections;
      }

+      if (user_permissions) {
+        updateData.userPermissions = user_permissions;
+      }
+
      if (hubs) {
        updateData.hubs = hubs;
      }
--- a/assets/js/hooks/Mapper/mapRootProvider/hooks/useMapRootHandlers.ts
+++ b/assets/js/hooks/Mapper/mapRootProvider/hooks/useMapRootHandlers.ts
@@ -87,6 +87,14 @@ export const useMapRootHandlers = (ref: ForwardedRef<MapHandlers>) => {
              mapRoutes(data as CommandRoutes);
              break;

+            case Commands.signaturesUpdated: // USED
+              // do nothing here
+              break;
+
+            case Commands.linkSignatureToSystem: // USED
+              // do nothing here
+              break;
+
            case Commands.centerSystem: // USED
              // do nothing here
              break;
@@ -95,22 +103,10 @@ export const useMapRootHandlers = (ref: ForwardedRef<MapHandlers>) => {
              // do nothing here
              break;

-            // case Commands.linkSignatureToSystem:
-            //   // TODO command data type lost
-            //   // @ts-ignore
-            //   emitMapEvent({ name: Commands.linkSignatureToSystem, data });
-            //   break;
-
            case Commands.killsUpdated:
              // 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;
--- a/assets/js/hooks/Mapper/types/connection.ts
+++ b/assets/js/hooks/Mapper/types/connection.ts
@@ -1,3 +1,8 @@
+export enum ConnectionType {
+  wormhole,
+  gate,
+}
+
 export enum MassState {
  normal,
  half,
@@ -32,4 +37,6 @@ export type SolarSystemConnection = {

  source: string;
  target: string;
+
+  type?: ConnectionType;
 };
--- a/assets/js/hooks/Mapper/types/index.ts
+++ b/assets/js/hooks/Mapper/types/index.ts
@@ -6,3 +6,4 @@ export * from './system';
 export * from './mapUnionTypes';
 export * from './signatures';
 export * from './connectionPassages';
+export * from './permissions';
--- a/assets/js/hooks/Mapper/types/mapHandlers.ts
+++ b/assets/js/hooks/Mapper/types/mapHandlers.ts
@@ -4,6 +4,7 @@ import { WormholeDataRaw } from '@/hooks/Mapper/types/wormholes.ts';
 import { CharacterTypeRaw } from '@/hooks/Mapper/types/character.ts';
 import { RoutesList } from '@/hooks/Mapper/types/routes.ts';
 import { Kill } from '@/hooks/Mapper/types/kills.ts';
+import { UserPermissions } from '@/hooks/Mapper/types';

 export enum Commands {
  init = 'init',
@@ -58,7 +59,7 @@ export type CommandInit = {
  characters: CharacterTypeRaw[];
  present_characters: string[];
  user_characters: string[];
-  user_permissions: any;
+  user_permissions: UserPermissions;
  hubs: string[];
  routes: RoutesList;
  reset?: boolean;
@@ -120,6 +121,7 @@ export enum OutCommand {
  getSystemStaticInfos = 'get_system_static_infos',
  getConnectionInfo = 'get_connection_info',
  updateConnectionTimeStatus = 'update_connection_time_status',
+  updateConnectionType = 'update_connection_type',
  updateConnectionMassStatus = 'update_connection_mass_status',
  updateConnectionShipSizeType = 'update_connection_ship_size_type',
  updateConnectionLocked = 'update_connection_locked',
--- a/assets/js/hooks/Mapper/types/mapUnionTypes.ts
+++ b/assets/js/hooks/Mapper/types/mapUnionTypes.ts
@@ -4,6 +4,7 @@ import { CharacterTypeRaw } from '@/hooks/Mapper/types/character.ts';
 import { SolarSystemRawType } from '@/hooks/Mapper/types/system.ts';
 import { RoutesList } from '@/hooks/Mapper/types/routes.ts';
 import { SolarSystemConnection } from '@/hooks/Mapper/types/connection.ts';
+import { UserPermissions } from '@/hooks/Mapper/types';

 export type MapUnionTypes = {
  wormholesData: Record<string, WormholeDataRaw>;
@@ -17,4 +18,5 @@ export type MapUnionTypes = {
  routes?: RoutesList;
  kills: Record<number, number>;
  connections: SolarSystemConnection[];
+  userPermissions: Partial<UserPermissions>;
 };
--- a/assets/js/hooks/Mapper/types/permissions.ts
+++ b/assets/js/hooks/Mapper/types/permissions.ts
@@ -0,0 +1,19 @@
+export enum UserPermission {
+  ADMIN_MAP = 'admin_map',
+  MANAGE_MAP = 'manage_map',
+  VIEW_SYSTEM = 'view_system',
+  VIEW_CHARACTER = 'view_character',
+  VIEW_CONNECTION = 'view_connection',
+  ADD_SYSTEM = 'add_system',
+  ADD_CONNECTION = 'add_connection',
+  UPDATE_SYSTEM = 'update_system',
+  TRACK_CHARACTER = 'track_character',
+  DELETE_CONNECTION = 'delete_connection',
+  DELETE_SYSTEM = 'delete_system',
+  LOCK_SYSTEM = 'lock_system',
+  ADD_ACL = 'add_acl',
+  DELETE_ACL = 'delete_acl',
+  DELETE_MAP = 'delete_map',
+}
+
+export type UserPermissions = Record<UserPermission, boolean>;
--- a/assets/js/hooks/newVersionUpdate.ts
+++ b/assets/js/hooks/newVersionUpdate.ts
@@ -4,13 +4,26 @@ export default {
  mounted() {
    const hook = this;

-    const button = hook.el.querySelector('.update-button');
+    const refreshZone = hook.el.querySelector('#refresh-area');

-    button.addEventListener('click', function () {
-      const lastVersion = hook.el.dataset.version;
-      localStorage.setItem(LAST_VERSION_KEY, lastVersion);
-      window.location.reload();
-    });
+    const handleUpdate = function (e: Event) {
+      const hexBricks = hook.el.querySelectorAll('.hex-brick');
+
+      // Add a new class to each element
+      hexBricks.forEach(el => {
+        el.classList.add('hex-brick--active');
+      });
+
+      setTimeout(() => {
+        const lastVersion = hook.el.dataset.version;
+        localStorage.setItem(LAST_VERSION_KEY, lastVersion);
+
+        window.location.reload();
+      }, 2000);
+    };
+
+    refreshZone.addEventListener('click', handleUpdate);
+    refreshZone.addEventListener('mouseover', handleUpdate);

    this.updated();
  },
--- a/assets/package.json
+++ b/assets/package.json
@@ -13,8 +13,6 @@
  },
  "dependencies": {
    "@formkit/auto-animate": "0.7.0",
-    "@react-rxjs/core": "^0.10.7",
-    "@react-rxjs/utils": "^0.9.7",
    "@shopify/draggable": "^1.1.3",
    "clsx": "^2.1.1",
    "daisyui": "^4.11.1",
@@ -34,7 +32,6 @@
    "react-hook-form": "^7.53.1",
    "react-usestateref": "^1.0.9",
    "reactflow": "^11.11.4",
-    "rxjs": "^7.8.1",
    "tailwindcss": "^3.3.6",
    "topbar": "^3.0.0",
    "use-local-storage-state": "^19.3.1"
--- a/assets/yarn.lock
+++ b/assets/yarn.lock
@@ -469,19 +469,6 @@
  resolved "https://registry.npmjs.org/@pkgr/core/-/core-0.1.1.tgz"
  integrity sha512-cq8o4cWH0ibXh9VGi5P20Tu9XF/0fFXl9EUinr9QfTM7a7p0oTA4iJRCQWppXR1Pg8dSM0UCItCkPwsk9qWWYA==

-"@react-rxjs/core@^0.10.7":
-  version "0.10.7"
-  resolved "https://registry.npmjs.org/@react-rxjs/core/-/core-0.10.7.tgz"
-  integrity sha512-dornp8pUs9OcdqFKKRh9+I2FVe21gWufNun6RYU1ddts7kUy9i4Thvl0iqcPFbGY61cJQMAJF7dxixWMSD/A/A==
-  dependencies:
-    "@rx-state/core" "0.1.4"
-    use-sync-external-store "^1.0.0"
-
-"@react-rxjs/utils@^0.9.7":
-  version "0.9.7"
-  resolved "https://registry.npmjs.org/@react-rxjs/utils/-/utils-0.9.7.tgz"
-  integrity sha512-m9CUTdRsglObvUAlYfB24QvN+QH4XqCGEKnCdSILIeOx7mMqSi9TTFp2zrj5XqtMiLnj4ReAdDxrXegLPB73bQ==
-
 "@reactflow/background@11.3.14":
  version "11.3.14"
  resolved "https://registry.npmjs.org/@reactflow/background/-/background-11.3.14.tgz"
@@ -650,11 +637,6 @@
  resolved "https://registry.yarnpkg.com/@rollup/rollup-win32-x64-msvc/-/rollup-win32-x64-msvc-4.17.2.tgz#5a2d08b81e8064b34242d5cc9973ef8dd1e60503"
  integrity sha512-TGGO7v7qOq4CYmSBVEYpI1Y5xDuCEnbVC5Vth8mOsW0gDSzxNrVERPc790IGHsrT2dQSimgMr9Ub3Y1Jci5/8w==

-"@rx-state/core@0.1.4":
-  version "0.1.4"
-  resolved "https://registry.npmjs.org/@rx-state/core/-/core-0.1.4.tgz"
-  integrity sha512-Z+3hjU2xh1HisLxt+W5hlYX/eGSDaXXP+ns82gq/PLZpkXLu0uwcNUh9RLY3Clq4zT+hSsA3vcpIGt6+UAb8rQ==
-
 "@shopify/draggable@^1.1.3":
  version "1.1.3"
  resolved "https://registry.npmjs.org/@shopify/draggable/-/draggable-1.1.3.tgz"
@@ -3421,13 +3403,6 @@ run-parallel@^1.1.9:
  dependencies:
    queue-microtask "^1.2.2"

-rxjs@^7.8.1:
-  version "7.8.1"
-  resolved "https://registry.npmjs.org/rxjs/-/rxjs-7.8.1.tgz"
-  integrity sha512-AA3TVj+0A2iuIoQkWEK/tqFjBq2j+6PO6Y0zJcvzLAFhEFIO3HL0vls9hWLncZbAAbK0mar7oZ4V079I/qPMxg==
-  dependencies:
-    tslib "^2.1.0"
-
 safe-array-concat@^1.1.2:
  version "1.1.2"
  resolved "https://registry.npmjs.org/safe-array-concat/-/safe-array-concat-1.1.2.tgz"
@@ -3732,7 +3707,7 @@ ts-interface-checker@^0.1.9:
  resolved "https://registry.npmjs.org/ts-interface-checker/-/ts-interface-checker-0.1.13.tgz"
  integrity sha512-Y/arvbn+rrz3JCKl9C4kVNfTfSm2/mEp5FSz5EsZSANGPSlQrpRI5M4PKF+mJnE52jOO90PnPSc3Ur3bTQw0gA==

-tslib@^2.1.0, tslib@^2.6.2:
+tslib@^2.6.2:
  version "2.6.2"
  resolved "https://registry.npmjs.org/tslib/-/tslib-2.6.2.tgz"
  integrity sha512-AEYxH93jGFPn/a2iVAwW87VuUIkR1FVUKB77NwMF7nBTDkDrrT/Hpt/IrCJ0QXhW27jTBDcf5ZY7w6RiqTMw2Q==
@@ -3838,7 +3813,7 @@ use-local-storage-state@^19.3.1:
  resolved "https://registry.npmjs.org/use-local-storage-state/-/use-local-storage-state-19.3.1.tgz"
  integrity sha512-y3Z1dODXvZXZB4qtLDNN8iuXbsYD6TAxz61K58GWB9/yKwrNG9ynI0GzCTHi/Je1rMiyOwMimz0oyFsZn+Kj7Q==

-use-sync-external-store@1.2.0, use-sync-external-store@^1.0.0:
+use-sync-external-store@1.2.0:
  version "1.2.0"
  resolved "https://registry.npmjs.org/use-sync-external-store/-/use-sync-external-store-1.2.0.tgz"
  integrity sha512-eEgnFxGQ1Ife9bzYs6VLi8/4X6CObHMw9Qr9tPY43iKwsPw8xE8+EFsf/2cFZ5S3esXgpWgtSCtLNS41F+sKPA==
--- a/lib/wanderer_app/api/map_connection.ex
+++ b/lib/wanderer_app/api/map_connection.ex
@@ -29,13 +29,16 @@ defmodule WandererApp.Api.MapConnection do
    define(:update_ship_size_type, action: :update_ship_size_type)
    define(:update_locked, action: :update_locked)
    define(:update_custom_info, action: :update_custom_info)
+    define(:update_type, action: :update_type)
+    define(:update_wormhole_type, action: :update_wormhole_type)
  end

  actions do
    default_accept [
      :map_id,
      :solar_system_source,
-      :solar_system_target
+      :solar_system_target,
+      :type
    ]

    defaults [:create, :read, :update, :destroy]
@@ -92,6 +95,14 @@ defmodule WandererApp.Api.MapConnection do
    update :update_custom_info do
      accept [:custom_info]
    end
+
+    update :update_type do
+      accept [:type]
+    end
+
+    update :update_wormhole_type do
+      accept [:wormhole_type]
+    end
  end

  attributes do
@@ -126,6 +137,14 @@ defmodule WandererApp.Api.MapConnection do
      allow_nil?(true)
    end

+    # where 0 - Wormhole
+    # where 1 - Gate
+    attribute :type, :integer do
+      default(0)
+
+      allow_nil?(true)
+    end
+
    attribute :wormhole_type, :string

    attribute :count_of_passage, :integer do
--- a/lib/wanderer_app/api/map_system_signature.ex
+++ b/lib/wanderer_app/api/map_system_signature.ex
@@ -17,7 +17,6 @@ defmodule WandererApp.Api.MapSystemSignature do
    define(:update_linked_system, action: :update_linked_system)
    define(:update_type, action: :update_type)
    define(:update_group, action: :update_group)
-    define(:update_custom_info, action: :update_custom_info)

    define(:by_id,
      get_by: [:id],
@@ -41,6 +40,10 @@ defmodule WandererApp.Api.MapSystemSignature do

    defaults [:read, :destroy]

+    read :all_active do
+      prepare build(sort: [updated_at: :desc])
+    end
+
    create :create do
      primary? true

@@ -60,16 +63,6 @@ defmodule WandererApp.Api.MapSystemSignature do
      change manage_relationship(:system_id, :system, on_lookup: :relate, on_no_match: nil)
    end

-    read :all_active do
-      prepare build(sort: [updated_at: :desc])
-    end
-
-    read :by_system_id do
-      argument(:system_id, :string, allow_nil?: false)
-
-      filter(expr(system_id == ^arg(:system_id)))
-    end
-
    update :update do
      accept [
        :system_id,
@@ -99,8 +92,10 @@ defmodule WandererApp.Api.MapSystemSignature do
      accept [:group]
    end

-    update :update_custom_info do
-      accept [:custom_info]
+    read :by_system_id do
+      argument(:system_id, :string, allow_nil?: false)
+
+      filter(expr(system_id == ^arg(:system_id)))
    end
  end

@@ -134,10 +129,6 @@ defmodule WandererApp.Api.MapSystemSignature do
    attribute :kind, :string
    attribute :group, :string

-    attribute :custom_info, :string do
-      allow_nil? true
-    end
-
    attribute :updated, :integer

    create_timestamp(:inserted_at)
--- a/lib/wanderer_app/character.ex
+++ b/lib/wanderer_app/character.ex
@@ -61,12 +61,18 @@ defmodule WandererApp.Character do
    end)
  end

-  def get_character_state(character_id) do
+  def get_character_state(character_id, init_if_empty? \\ true) do
    case Cachex.get(:character_state_cache, character_id) do
      {:ok, nil} ->
-        character_state = WandererApp.Character.Tracker.init(character_id: character_id)
-        Cachex.put(:character_state_cache, character_id, character_state)
-        {:ok, character_state}
+        case init_if_empty? do
+          true ->
+            character_state = WandererApp.Character.Tracker.init(character_id: character_id)
+            Cachex.put(:character_state_cache, character_id, character_state)
+            {:ok, character_state}
+
+          _ ->
+            {:ok, nil}
+        end

      {:ok, character_state} ->
        {:ok, character_state}
--- a/lib/wanderer_app/character/tracker_manager_impl.ex
+++ b/lib/wanderer_app/character/tracker_manager_impl.ex
@@ -83,22 +83,28 @@ defmodule WandererApp.Character.TrackerManager.Impl do
  end

  def stop_tracking(%__MODULE__{} = state, character_id) do
-    {:ok, %{start_time: start_time}} = WandererApp.Character.get_character_state(character_id)
+    {:ok, character_state} = WandererApp.Character.get_character_state(character_id, false)

-    duration = DateTime.diff(DateTime.utc_now(), start_time, :second)
-    :telemetry.execute([:wanderer_app, :character, :tracker, :running], %{duration: duration})
-    :telemetry.execute([:wanderer_app, :character, :tracker, :stopped], %{count: 1})
-    Logger.debug(fn -> "Shutting down character tracker: #{inspect(character_id)}" end)
+    case character_state do
+      nil ->
+        state

-    WandererApp.Cache.delete("character:#{character_id}:location_started")
-    WandererApp.Cache.delete("character:#{character_id}:start_solar_system_id")
-    WandererApp.Character.delete_character_state(character_id)
+      %{start_time: start_time} ->
+        duration = DateTime.diff(DateTime.utc_now(), start_time, :second)
+        :telemetry.execute([:wanderer_app, :character, :tracker, :running], %{duration: duration})
+        :telemetry.execute([:wanderer_app, :character, :tracker, :stopped], %{count: 1})
+        Logger.debug(fn -> "Shutting down character tracker: #{inspect(character_id)}" end)

-    tracked_characters = state.characters |> Enum.reject(fn c_id -> c_id == character_id end)
+        WandererApp.Cache.delete("character:#{character_id}:location_started")
+        WandererApp.Cache.delete("character:#{character_id}:start_solar_system_id")
+        WandererApp.Character.delete_character_state(character_id)

-    WandererApp.Cache.insert("tracked_characters", tracked_characters)
+        tracked_characters = state.characters |> Enum.reject(fn c_id -> c_id == character_id end)

-    %{state | characters: tracked_characters}
+        WandererApp.Cache.insert("tracked_characters", tracked_characters)
+
+        %{state | characters: tracked_characters}
+    end
  end

  def update_track_settings(
@@ -429,8 +435,19 @@ defmodule WandererApp.Character.TrackerManager.Impl do
  end

  def handle_info({:stop_track, character_id}, state) do
-    @logger.debug(fn -> "Stopping character tracker: #{inspect(character_id)}" end)
-    stop_tracking(state, character_id)
+    WandererApp.Cache.has_key?("character:#{character_id}:is_stop_tracking")
+    |> case do
+      false ->
+        WandererApp.Cache.insert("character:#{character_id}:is_stop_tracking", true)
+        Logger.debug(fn -> "Stopping character tracker: #{inspect(character_id)}" end)
+        state = state |> stop_tracking(character_id)
+        WandererApp.Cache.delete("character:#{character_id}:is_stop_tracking")
+
+        state
+
+      _ ->
+        state
+    end
  end

  def handle_info(_event, state),
--- a/lib/wanderer_app/map/map_server.ex
+++ b/lib/wanderer_app/map/map_server.ex
@@ -195,6 +195,12 @@ defmodule WandererApp.Map.Server do
      |> map_pid!
      |> GenServer.cast({&Impl.update_connection_time_status/2, [connection_info]})

+  def update_connection_type(map_id, connection_info) when is_binary(map_id),
+    do:
+      map_id
+      |> map_pid!
+      |> GenServer.cast({&Impl.update_connection_type/2, [connection_info]})
+
  def update_connection_mass_status(map_id, connection_info) when is_binary(map_id),
    do:
      map_id
--- a/lib/wanderer_app/map/map_server_impl.ex
+++ b/lib/wanderer_app/map/map_server_impl.ex
--- a/lib/wanderer_app/map/server/map_server_acls_impl.ex
+++ b/lib/wanderer_app/map/server/map_server_acls_impl.ex
@@ -0,0 +1,180 @@
+defmodule WandererApp.Map.Server.AclsImpl do
+  @moduledoc false
+
+  require Logger
+
+  alias WandererApp.Map.Server.Impl
+
+  @pubsub_client Application.compile_env(:wanderer_app, :pubsub_client)
+
+  def handle_map_acl_updated(%{map_id: map_id, map: old_map} = state, added_acls, removed_acls) do
+    {:ok, map} =
+      WandererApp.MapRepo.get(map_id,
+        acls: [
+          :owner_id,
+          members: [:role, :eve_character_id, :eve_corporation_id, :eve_alliance_id]
+        ]
+      )
+
+    track_acls(added_acls)
+
+    result =
+      (added_acls ++ removed_acls)
+      |> Task.async_stream(
+        fn acl_id ->
+          update_acl(acl_id)
+        end,
+        max_concurrency: 10,
+        timeout: :timer.seconds(15)
+      )
+      |> Enum.reduce(
+        %{
+          eve_alliance_ids: [],
+          eve_character_ids: [],
+          eve_corporation_ids: []
+        },
+        fn result, acc ->
+          case result do
+            {:ok, val} ->
+              {:ok,
+               %{
+                 eve_alliance_ids: eve_alliance_ids,
+                 eve_character_ids: eve_character_ids,
+                 eve_corporation_ids: eve_corporation_ids
+               }} = val
+
+              %{
+                acc
+                | eve_alliance_ids: eve_alliance_ids ++ acc.eve_alliance_ids,
+                  eve_character_ids: eve_character_ids ++ acc.eve_character_ids,
+                  eve_corporation_ids: eve_corporation_ids ++ acc.eve_corporation_ids
+              }
+
+            error ->
+              Logger.error("Failed to update map #{map_id} acl: #{inspect(error, pretty: true)}")
+
+              acc
+          end
+        end
+      )
+
+    map_update = %{acls: map.acls, scope: map.scope}
+
+    WandererApp.Map.update_map(map_id, map_update)
+
+    broadcast_acl_updates({:ok, result}, map_id)
+
+    %{state | map: Map.merge(old_map, map_update)}
+  end
+
+  def handle_acl_updated(map_id, acl_id) do
+    {:ok, map} =
+      WandererApp.MapRepo.get(map_id,
+        acls: [
+          :owner_id,
+          members: [:role, :eve_character_id, :eve_corporation_id, :eve_alliance_id]
+        ]
+      )
+
+    if map.acls |> Enum.map(& &1.id) |> Enum.member?(acl_id) do
+      WandererApp.Map.update_map(map_id, %{acls: map.acls})
+
+      :ok =
+        acl_id
+        |> update_acl()
+        |> broadcast_acl_updates(map_id)
+    end
+  end
+
+  def track_acls([]), do: :ok
+
+  def track_acls([acl_id | rest]) do
+    track_acl(acl_id)
+    track_acls(rest)
+  end
+
+  defp track_acl(acl_id),
+    do: @pubsub_client.subscribe(WandererApp.PubSub, "acls:#{acl_id}")
+
+  defp broadcast_acl_updates(
+         {:ok,
+          %{
+            eve_character_ids: eve_character_ids,
+            eve_corporation_ids: eve_corporation_ids,
+            eve_alliance_ids: eve_alliance_ids
+          }},
+         map_id
+       ) do
+    eve_character_ids
+    |> Enum.uniq()
+    |> Enum.each(fn eve_character_id ->
+      @pubsub_client.broadcast(
+        WandererApp.PubSub,
+        "character:#{eve_character_id}",
+        :update_permissions
+      )
+    end)
+
+    eve_corporation_ids
+    |> Enum.uniq()
+    |> Enum.each(fn eve_corporation_id ->
+      @pubsub_client.broadcast(
+        WandererApp.PubSub,
+        "corporation:#{eve_corporation_id}",
+        :update_permissions
+      )
+    end)
+
+    eve_alliance_ids
+    |> Enum.uniq()
+    |> Enum.each(fn eve_alliance_id ->
+      @pubsub_client.broadcast(
+        WandererApp.PubSub,
+        "alliance:#{eve_alliance_id}",
+        :update_permissions
+      )
+    end)
+
+    character_ids =
+      map_id
+      |> WandererApp.Map.get_map!()
+      |> Map.get(:characters, [])
+
+    WandererApp.Cache.insert("map_#{map_id}:invalidate_character_ids", character_ids)
+
+    :ok
+  end
+
+  defp broadcast_acl_updates(_, _map_id), do: :ok
+
+  defp update_acl(acl_id) do
+    {:ok, %{owner: owner, members: members}} =
+      WandererApp.AccessListRepo.get(acl_id, [:owner, :members])
+
+    result =
+      members
+      |> Enum.reduce(
+        %{eve_character_ids: [owner.eve_id], eve_corporation_ids: [], eve_alliance_ids: []},
+        fn member, acc ->
+          case member do
+            %{eve_character_id: eve_character_id} when not is_nil(eve_character_id) ->
+              acc
+              |> Map.put(:eve_character_ids, [eve_character_id | acc.eve_character_ids])
+
+            %{eve_corporation_id: eve_corporation_id} when not is_nil(eve_corporation_id) ->
+              acc
+              |> Map.put(:eve_corporation_ids, [eve_corporation_id | acc.eve_corporation_ids])
+
+            %{eve_alliance_id: eve_alliance_id} when not is_nil(eve_alliance_id) ->
+              acc
+              |> Map.put(:eve_alliance_ids, [eve_alliance_id | acc.eve_alliance_ids])
+
+            _ ->
+              acc
+          end
+        end
+      )
+
+    {:ok, result}
+  end
+end
--- a/lib/wanderer_app/map/server/map_server_characters_impl.ex
+++ b/lib/wanderer_app/map/server/map_server_characters_impl.ex
@@ -0,0 +1,459 @@
+defmodule WandererApp.Map.Server.CharactersImpl do
+  @moduledoc false
+
+  require Logger
+
+  alias WandererApp.Map.Server.{Impl, ConnectionsImpl, SystemsImpl}
+
+  def get_characters(%{map_id: map_id} = _state),
+    do: {:ok, map_id |> WandererApp.Map.list_characters()}
+
+  def add_character(%{map_id: map_id} = state, %{id: character_id} = character, track_character) do
+    Task.start_link(fn ->
+      with :ok <- map_id |> WandererApp.Map.add_character(character),
+           {:ok, _} <-
+             WandererApp.MapCharacterSettingsRepo.create(%{
+               character_id: character_id,
+               map_id: map_id,
+               tracked: track_character
+             }),
+           {:ok, character} <- WandererApp.Character.get_character(character_id) do
+        Impl.broadcast!(map_id, :character_added, character)
+
+        :telemetry.execute([:wanderer_app, :map, :character, :added], %{count: 1})
+
+        :ok
+      else
+        _error ->
+          {:ok, character} = WandererApp.Character.get_character(character_id)
+          Impl.broadcast!(map_id, :character_added, character)
+          :ok
+      end
+    end)
+
+    state
+  end
+
+  def remove_character(map_id, character_id) do
+    Task.start_link(fn ->
+      with :ok <- WandererApp.Map.remove_character(map_id, character_id),
+           {:ok, character} <- WandererApp.Character.get_character(character_id) do
+        Impl.broadcast!(map_id, :character_removed, character)
+
+        :telemetry.execute([:wanderer_app, :map, :character, :removed], %{count: 1})
+
+        :ok
+      else
+        {:error, _error} ->
+          :ok
+      end
+    end)
+  end
+
+  def update_tracked_characters(map_id) do
+    Task.start_link(fn ->
+      {:ok, map_tracked_character_ids} =
+        map_id
+        |> WandererApp.MapCharacterSettingsRepo.get_tracked_by_map_all()
+        |> case do
+          {:ok, settings} -> {:ok, settings |> Enum.map(&Map.get(&1, :character_id))}
+          _ -> {:ok, []}
+        end
+
+      {:ok, tracked_characters} = WandererApp.Cache.lookup("tracked_characters", [])
+
+      map_active_tracked_characters =
+        map_tracked_character_ids
+        |> Enum.filter(fn character -> character in tracked_characters end)
+
+      WandererApp.Cache.insert("maps:#{map_id}:tracked_characters", map_active_tracked_characters)
+
+      :ok
+    end)
+  end
+
+  def untrack_characters(map_id, character_ids),
+    do:
+      character_ids
+      |> Enum.each(fn character_id ->
+        WandererApp.Character.TrackerManager.update_track_settings(character_id, %{
+          map_id: map_id,
+          track: false
+        })
+      end)
+
+  def cleanup_characters(map_id, owner_id) do
+    {:ok, invalidate_character_ids} =
+      WandererApp.Cache.lookup(
+        "map_#{map_id}:invalidate_character_ids",
+        []
+      )
+
+    invalidate_character_ids
+    |> Task.async_stream(
+      fn character_id ->
+        character_id
+        |> WandererApp.Character.get_character()
+        |> case do
+          {:ok, character} ->
+            acls =
+              map_id
+              |> WandererApp.Map.get_map!()
+              |> Map.get(:acls, [])
+
+            [character_permissions] =
+              WandererApp.Permissions.check_characters_access([character], acls)
+
+            map_permissions =
+              WandererApp.Permissions.get_map_permissions(
+                character_permissions,
+                owner_id,
+                [character_id]
+              )
+
+            case map_permissions do
+              %{view_system: false} ->
+                {:remove_character, character_id}
+
+              %{track_character: false} ->
+                {:remove_character, character_id}
+
+              _ ->
+                :ok
+            end
+
+          _ ->
+            :ok
+        end
+      end,
+      timeout: :timer.seconds(60),
+      max_concurrency: System.schedulers_online(),
+      on_timeout: :kill_task
+    )
+    |> Enum.each(fn
+      {:ok, {:remove_character, character_id}} ->
+        remove_and_untrack_characters(map_id, [character_id])
+        :ok
+
+      {:ok, _result} ->
+        :ok
+
+      {:error, reason} ->
+        Logger.error("Error in cleanup_characters: #{inspect(reason)}")
+    end)
+
+    WandererApp.Cache.insert(
+      "map_#{map_id}:invalidate_character_ids",
+      []
+    )
+  end
+
+  defp remove_and_untrack_characters(map_id, character_ids) do
+    Logger.debug(fn ->
+      "Map #{map_id} - remove and untrack characters #{inspect(character_ids)}"
+    end)
+
+    map_id
+    |> untrack_characters(character_ids)
+
+    map_id
+    |> WandererApp.MapCharacterSettingsRepo.get_tracked_by_map_filtered(character_ids)
+    |> case do
+      {:ok, settings} ->
+        settings
+        |> Enum.each(fn s ->
+          WandererApp.MapCharacterSettingsRepo.untrack(s)
+          remove_character(map_id, s.character_id)
+        end)
+
+      _ ->
+        :ok
+    end
+  end
+
+  def track_characters(_map_id, []), do: :ok
+
+  def track_characters(map_id, [character_id | rest]) do
+    track_character(map_id, character_id)
+    track_characters(map_id, rest)
+  end
+
+  def update_characters(%{map_id: map_id} = state) do
+    WandererApp.Cache.lookup!("maps:#{map_id}:tracked_characters", [])
+    |> Enum.map(fn character_id ->
+      Task.start_link(fn ->
+        character_updates =
+          maybe_update_online(map_id, character_id) ++
+            maybe_update_location(map_id, character_id) ++
+            maybe_update_ship(map_id, character_id) ++
+            maybe_update_alliance(map_id, character_id) ++
+            maybe_update_corporation(map_id, character_id)
+
+        character_updates
+        |> Enum.filter(fn update -> update != :skip end)
+        |> Enum.map(fn update ->
+          update
+          |> case do
+            {:character_location, location_info, old_location_info} ->
+              update_location(
+                character_id,
+                location_info,
+                old_location_info,
+                state
+              )
+
+              :broadcast
+
+            {:character_ship, _info} ->
+              :broadcast
+
+            {:character_online, _info} ->
+              :broadcast
+
+            {:character_alliance, _info} ->
+              WandererApp.Cache.insert_or_update(
+                "map_#{map_id}:invalidate_character_ids",
+                [character_id],
+                fn ids ->
+                  [character_id | ids]
+                end
+              )
+
+              :broadcast
+
+            {:character_corporation, _info} ->
+              WandererApp.Cache.insert_or_update(
+                "map_#{map_id}:invalidate_character_ids",
+                [character_id],
+                fn ids ->
+                  [character_id | ids]
+                end
+              )
+
+              :broadcast
+
+            _ ->
+              :skip
+          end
+        end)
+        |> Enum.filter(fn update -> update != :skip end)
+        |> Enum.uniq()
+        |> Enum.each(fn update ->
+          case update do
+            :broadcast ->
+              update_character(map_id, character_id)
+
+            _ ->
+              :ok
+          end
+        end)
+
+        :ok
+      end)
+    end)
+  end
+
+  defp update_character(map_id, character_id) do
+    {:ok, character} = WandererApp.Character.get_character(character_id)
+    Impl.broadcast!(map_id, :character_updated, character)
+  end
+
+  defp update_location(
+         character_id,
+         location,
+         old_location,
+         %{map: map, map_id: map_id, rtree_name: rtree_name, map_opts: map_opts} = _state
+       ) do
+    case is_nil(old_location.solar_system_id) and
+           ConnectionsImpl.can_add_location(map.scope, location.solar_system_id) do
+      true ->
+        :ok = SystemsImpl.maybe_add_system(map_id, location, nil, rtree_name, map_opts)
+
+      _ ->
+        ConnectionsImpl.is_connection_valid(
+          map.scope,
+          old_location.solar_system_id,
+          location.solar_system_id
+        )
+        |> case do
+          true ->
+            :ok =
+              SystemsImpl.maybe_add_system(map_id, location, old_location, rtree_name, map_opts)
+
+            :ok =
+              SystemsImpl.maybe_add_system(map_id, old_location, location, rtree_name, map_opts)
+
+            :ok =
+              ConnectionsImpl.maybe_add_connection(map_id, location, old_location, character_id)
+
+          _ ->
+            :ok
+        end
+    end
+  end
+
+  defp track_character(map_id, character_id),
+    do:
+      WandererApp.Character.TrackerManager.update_track_settings(character_id, %{
+        map_id: map_id,
+        track: true,
+        track_online: true,
+        track_location: true,
+        track_ship: true
+      })
+
+  defp maybe_update_online(map_id, character_id) do
+    with {:ok, old_online} <-
+           WandererApp.Cache.lookup("map:#{map_id}:character:#{character_id}:online"),
+         {:ok, %{online: online}} <-
+           WandererApp.Character.get_character(character_id) do
+      case old_online != online do
+        true ->
+          WandererApp.Cache.insert(
+            "map:#{map_id}:character:#{character_id}:online",
+            online
+          )
+
+          [{:character_online, %{online: online}}]
+
+        _ ->
+          [:skip]
+      end
+    else
+      error ->
+        Logger.error("Failed to update online: #{inspect(error, pretty: true)}")
+        [:skip]
+    end
+  end
+
+  defp maybe_update_ship(map_id, character_id) do
+    with {:ok, old_ship_type_id} <-
+           WandererApp.Cache.lookup("map:#{map_id}:character:#{character_id}:ship_type_id"),
+         {:ok, old_ship_name} <-
+           WandererApp.Cache.lookup("map:#{map_id}:character:#{character_id}:ship_name"),
+         {:ok, %{ship: ship_type_id, ship_name: ship_name}} <-
+           WandererApp.Character.get_character(character_id) do
+      case old_ship_type_id != ship_type_id or
+             old_ship_name != ship_name do
+        true ->
+          WandererApp.Cache.insert(
+            "map:#{map_id}:character:#{character_id}:ship_type_id",
+            ship_type_id
+          )
+
+          WandererApp.Cache.insert(
+            "map:#{map_id}:character:#{character_id}:ship_name",
+            ship_name
+          )
+
+          [{:character_ship, %{ship: ship_type_id, ship_name: ship_name}}]
+
+        _ ->
+          [:skip]
+      end
+    else
+      error ->
+        Logger.error("Failed to update ship: #{inspect(error, pretty: true)}")
+        [:skip]
+    end
+  end
+
+  defp maybe_update_location(map_id, character_id) do
+    WandererApp.Cache.lookup!(
+      "character:#{character_id}:location_started",
+      false
+    )
+    |> case do
+      true ->
+        {:ok, old_solar_system_id} =
+          WandererApp.Cache.lookup("map:#{map_id}:character:#{character_id}:solar_system_id")
+
+        {:ok, %{solar_system_id: solar_system_id}} =
+          WandererApp.Character.get_character(character_id)
+
+        WandererApp.Cache.insert(
+          "map:#{map_id}:character:#{character_id}:solar_system_id",
+          solar_system_id
+        )
+
+        case solar_system_id != old_solar_system_id do
+          true ->
+            [
+              {:character_location, %{solar_system_id: solar_system_id},
+               %{solar_system_id: old_solar_system_id}}
+            ]
+
+          _ ->
+            [:skip]
+        end
+
+      false ->
+        {:ok, old_solar_system_id} =
+          WandererApp.Cache.lookup("map:#{map_id}:character:#{character_id}:solar_system_id")
+
+        {:ok, %{solar_system_id: solar_system_id} = _character} =
+          WandererApp.Character.get_character(character_id)
+
+        WandererApp.Cache.insert(
+          "map:#{map_id}:character:#{character_id}:solar_system_id",
+          solar_system_id
+        )
+
+        if is_nil(old_solar_system_id) or solar_system_id != old_solar_system_id do
+          [
+            {:character_location, %{solar_system_id: solar_system_id}, %{solar_system_id: nil}}
+          ]
+        else
+          [:skip]
+        end
+    end
+  end
+
+  defp maybe_update_alliance(map_id, character_id) do
+    with {:ok, old_alliance_id} <-
+           WandererApp.Cache.lookup("map:#{map_id}:character:#{character_id}:alliance_id"),
+         {:ok, %{alliance_id: alliance_id}} <-
+           WandererApp.Character.get_character(character_id) do
+      case old_alliance_id != alliance_id do
+        true ->
+          WandererApp.Cache.insert(
+            "map:#{map_id}:character:#{character_id}:alliance_id",
+            alliance_id
+          )
+
+          [{:character_alliance, %{alliance_id: alliance_id}}]
+
+        _ ->
+          [:skip]
+      end
+    else
+      error ->
+        Logger.error("Failed to update alliance: #{inspect(error, pretty: true)}")
+        [:skip]
+    end
+  end
+
+  defp maybe_update_corporation(map_id, character_id) do
+    with {:ok, old_corporation_id} <-
+           WandererApp.Cache.lookup("map:#{map_id}:character:#{character_id}:corporation_id"),
+         {:ok, %{corporation_id: corporation_id}} <-
+           WandererApp.Character.get_character(character_id) do
+      case old_corporation_id != corporation_id do
+        true ->
+          WandererApp.Cache.insert(
+            "map:#{map_id}:character:#{character_id}:corporation_id",
+            corporation_id
+          )
+
+          [{:character_corporation, %{corporation_id: corporation_id}}]
+
+        _ ->
+          [:skip]
+      end
+    else
+      error ->
+        Logger.error("Failed to update corporation: #{inspect(error, pretty: true)}")
+        [:skip]
+    end
+  end
+end
--- a/lib/wanderer_app/map/server/map_server_connections_impl.ex
+++ b/lib/wanderer_app/map/server/map_server_connections_impl.ex
@@ -0,0 +1,511 @@
+defmodule WandererApp.Map.Server.ConnectionsImpl do
+  @moduledoc false
+
+  require Logger
+
+  alias WandererApp.Map.Server.Impl
+
+  # @ccp1 -1
+  @c1 1
+  @c2 2
+  @c3 3
+  @c4 4
+  @c5 5
+  @c6 6
+  @hs 7
+  @ls 8
+  @ns 9
+  # @ccp2 10
+  # @ccp3 11
+  @thera 12
+  @c13 13
+  @sentinel 14
+  @baribican 15
+  @vidette 16
+  @conflux 17
+  @redoubt 18
+  @a1 19
+  @a2 20
+  @a3 21
+  @a4 22
+  @a5 23
+  @ccp4 24
+  # @pochven 25
+  # @zarzakh 10100
+
+  @jita 30_000_142
+
+  @wh_space [
+    @c1,
+    @c2,
+    @c3,
+    @c4,
+    @c5,
+    @c6,
+    @c13,
+    @thera,
+    @sentinel,
+    @baribican,
+    @vidette,
+    @conflux,
+    @redoubt
+  ]
+
+  @known_space [@hs, @ls, @ns]
+
+  @prohibited_systems [@jita]
+  @prohibited_system_classes [
+    @a1,
+    @a2,
+    @a3,
+    @a4,
+    @a5,
+    @ccp4
+  ]
+
+  # this class of systems will guaranty that no one real class will take that place
+  # @unknown 100_100
+  #
+  @connection_time_status_eol 1
+  @connection_auto_eol_hours 21
+  @connection_auto_expire_hours 24
+  @connection_eol_expire_timeout :timer.hours(3) + :timer.minutes(30)
+
+  @connection_type_wormhole 0
+  @connection_type_stargate 1
+
+  def init_eol_cache(map_id, connections_eol_time) do
+    connections_eol_time
+    |> Enum.each(fn {connection_id, connection_eol_time} ->
+      WandererApp.Cache.put(
+        "map_#{map_id}:conn_#{connection_id}:mark_eol_time",
+        connection_eol_time,
+        ttl: @connection_eol_expire_timeout
+      )
+    end)
+  end
+
+  def add_connection(
+        %{map_id: map_id} = state,
+        %{
+          solar_system_source_id: solar_system_source_id,
+          solar_system_target_id: solar_system_target_id,
+          character_id: character_id
+        } = _connection_info
+      ) do
+    :ok =
+      maybe_add_connection(
+        map_id,
+        %{solar_system_id: solar_system_target_id},
+        %{
+          solar_system_id: solar_system_source_id
+        },
+        character_id
+      )
+
+    state
+  end
+
+  def delete_connection(
+        %{map_id: map_id} = state,
+        %{
+          solar_system_source_id: solar_system_source_id,
+          solar_system_target_id: solar_system_target_id
+        } = _connection_info
+      ) do
+    :ok =
+      maybe_remove_connection(map_id, %{solar_system_id: solar_system_target_id}, %{
+        solar_system_id: solar_system_source_id
+      })
+
+    state
+  end
+
+  def get_connection_info(
+        %{map_id: map_id} = _state,
+        %{
+          solar_system_source_id: solar_system_source_id,
+          solar_system_target_id: solar_system_target_id
+        } = _connection_info
+      ) do
+    WandererApp.Map.find_connection(
+      map_id,
+      solar_system_source_id,
+      solar_system_target_id
+    )
+    |> case do
+      {:ok, %{id: connection_id}} ->
+        connection_mark_eol_time = get_connection_mark_eol_time(map_id, connection_id, nil)
+        {:ok, %{marl_eol_time: connection_mark_eol_time}}
+
+      _ ->
+        {:error, :not_found}
+    end
+  end
+
+  def update_connection_time_status(
+        %{map_id: map_id} = state,
+        connection_update
+      ),
+      do:
+        update_connection(state, :update_time_status, [:time_status], connection_update, fn
+          %{id: connection_id, time_status: time_status} ->
+            case time_status == @connection_time_status_eol do
+              true ->
+                WandererApp.Cache.put(
+                  "map_#{map_id}:conn_#{connection_id}:mark_eol_time",
+                  DateTime.utc_now(),
+                  ttl: @connection_eol_expire_timeout
+                )
+
+              _ ->
+                WandererApp.Cache.delete("map_#{map_id}:conn_#{connection_id}:mark_eol_time")
+            end
+        end)
+
+  def update_connection_type(
+        state,
+        connection_update
+      ),
+      do: update_connection(state, :update_type, [:type], connection_update)
+
+  def update_connection_mass_status(
+        state,
+        connection_update
+      ),
+      do: update_connection(state, :update_mass_status, [:mass_status], connection_update)
+
+  def update_connection_ship_size_type(
+        state,
+        connection_update
+      ),
+      do: update_connection(state, :update_ship_size_type, [:ship_size_type], connection_update)
+
+  def update_connection_locked(
+        state,
+        connection_update
+      ),
+      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 cleanup_connections(%{map_id: map_id} = state) do
+    state =
+      map_id
+      |> WandererApp.Map.list_connections!()
+      |> Enum.filter(fn %{
+                          inserted_at: inserted_at,
+                          solar_system_source: solar_system_source_id,
+                          solar_system_target: solar_system_target_id,
+                          type: type
+                        } ->
+        type != @connection_type_stargate &&
+          DateTime.diff(DateTime.utc_now(), inserted_at, :hour) >=
+            @connection_auto_eol_hours &&
+          is_connection_valid(
+            :wormholes,
+            solar_system_source_id,
+            solar_system_target_id
+          )
+      end)
+      |> Enum.reduce(state, fn %{
+                                 solar_system_source: solar_system_source_id,
+                                 solar_system_target: solar_system_target_id
+                               },
+                               state ->
+        state
+        |> update_connection_time_status(%{
+          solar_system_source_id: solar_system_source_id,
+          solar_system_target_id: solar_system_target_id,
+          time_status: @connection_time_status_eol
+        })
+      end)
+
+    state =
+      map_id
+      |> WandererApp.Map.list_connections!()
+      |> Enum.filter(fn %{
+                          id: connection_id,
+                          inserted_at: inserted_at,
+                          solar_system_source: solar_system_source_id,
+                          solar_system_target: solar_system_target_id,
+                          type: type
+                        } ->
+        connection_mark_eol_time =
+          get_connection_mark_eol_time(map_id, connection_id)
+
+        reverse_connection =
+          WandererApp.Map.get_connection(
+            map_id,
+            solar_system_target_id,
+            solar_system_source_id
+          )
+
+        is_connection_exist =
+          is_connection_exist(
+            map_id,
+            solar_system_source_id,
+            solar_system_target_id
+          ) || not is_nil(reverse_connection)
+
+        is_connection_valid =
+          is_connection_valid(
+            :wormholes,
+            solar_system_source_id,
+            solar_system_target_id
+          )
+
+        not is_connection_exist ||
+          (type != @connection_type_stargate && is_connection_valid &&
+             (DateTime.diff(DateTime.utc_now(), inserted_at, :hour) >=
+                @connection_auto_expire_hours ||
+                DateTime.diff(DateTime.utc_now(), connection_mark_eol_time, :hour) >=
+                  @connection_auto_expire_hours - @connection_auto_eol_hours))
+      end)
+      |> Enum.reduce(state, fn %{
+                                 solar_system_source: solar_system_source_id,
+                                 solar_system_target: solar_system_target_id
+                               },
+                               state ->
+        state
+        |> delete_connection(%{
+          solar_system_source_id: solar_system_source_id,
+          solar_system_target_id: solar_system_target_id
+        })
+      end)
+
+    state
+  end
+
+  def maybe_add_connection(map_id, location, old_location, character_id)
+      when not is_nil(location) and not is_nil(old_location) and
+             not is_nil(old_location.solar_system_id) and
+             location.solar_system_id != old_location.solar_system_id do
+    character_id
+    |> WandererApp.Character.get_character!()
+    |> case do
+      nil ->
+        :ok
+
+      character ->
+        :telemetry.execute([:wanderer_app, :map, :character, :jump], %{count: 1}, %{})
+
+        {:ok, _} =
+          WandererApp.Api.MapChainPassages.new(%{
+            map_id: map_id,
+            character_id: character_id,
+            ship_type_id: character.ship,
+            ship_name: character.ship_name,
+            solar_system_source_id: old_location.solar_system_id,
+            solar_system_target_id: location.solar_system_id
+          })
+    end
+
+    case WandererApp.Map.check_connection(map_id, location, old_location) do
+      :ok ->
+        connection_type =
+          is_connection_valid(
+            :stargates,
+            old_location.solar_system_id,
+            location.solar_system_id
+          )
+          |> case do
+            true ->
+              @connection_type_stargate
+
+            _ ->
+              @connection_type_wormhole
+          end
+
+        {:ok, connection} =
+          WandererApp.MapConnectionRepo.create(%{
+            map_id: map_id,
+            solar_system_source: old_location.solar_system_id,
+            solar_system_target: location.solar_system_id,
+            type: connection_type
+          })
+
+        WandererApp.Map.add_connection(map_id, connection)
+
+        Impl.broadcast!(map_id, :maybe_select_system, %{
+          character_id: character_id,
+          solar_system_id: location.solar_system_id
+        })
+
+        Impl.broadcast!(map_id, :add_connection, connection)
+
+        Impl.broadcast!(map_id, :maybe_link_signature, %{
+          character_id: character_id,
+          solar_system_source: old_location.solar_system_id,
+          solar_system_target: location.solar_system_id
+        })
+
+        :ok
+
+      {:error, error} ->
+        Logger.debug(fn -> "Failed to add connection: #{inspect(error, pretty: true)}" end)
+        :ok
+    end
+  end
+
+  def maybe_add_connection(_map_id, _location, _old_location, _character_id), do: :ok
+
+  def can_add_location(_scope, nil), do: false
+
+  def can_add_location(:all, _solar_system_id), do: true
+
+  def can_add_location(:none, _solar_system_id), do: false
+
+  def can_add_location(scope, solar_system_id) do
+    system_static_info =
+      case WandererApp.CachedInfo.get_system_static_info(solar_system_id) do
+        {:ok, system_static_info} when not is_nil(system_static_info) ->
+          system_static_info
+
+        _ ->
+          %{system_class: nil}
+      end
+
+    case scope do
+      :wormholes ->
+        not (@prohibited_system_classes |> Enum.member?(system_static_info.system_class)) and
+          not (@prohibited_systems |> Enum.member?(solar_system_id)) and
+          @wh_space |> Enum.member?(system_static_info.system_class)
+
+      :stargates ->
+        not (@prohibited_system_classes |> Enum.member?(system_static_info.system_class)) and
+          @known_space |> Enum.member?(system_static_info.system_class)
+
+      _ ->
+        false
+    end
+  end
+
+  def is_connection_exist(map_id, from_solar_system_id, to_solar_system_id),
+    do:
+      not is_nil(
+        WandererApp.Map.find_system_by_location(
+          map_id,
+          %{solar_system_id: from_solar_system_id}
+        )
+      ) &&
+        not is_nil(
+          WandererApp.Map.find_system_by_location(
+            map_id,
+            %{solar_system_id: to_solar_system_id}
+          )
+        )
+
+  def is_connection_valid(_scope, nil, _to_solar_system_id), do: false
+
+  def is_connection_valid(:all, _from_solar_system_id, _to_solar_system_id), do: true
+
+  def is_connection_valid(:none, _from_solar_system_id, _to_solar_system_id), do: false
+
+  def is_connection_valid(scope, from_solar_system_id, to_solar_system_id) do
+    {:ok, known_jumps} =
+      WandererApp.Api.MapSolarSystemJumps.find(%{
+        before_system_id: from_solar_system_id,
+        current_system_id: to_solar_system_id
+      })
+
+    system_static_info =
+      case WandererApp.CachedInfo.get_system_static_info(to_solar_system_id) do
+        {:ok, system_static_info} when not is_nil(system_static_info) ->
+          system_static_info
+
+        _ ->
+          %{system_class: nil}
+      end
+
+    case scope do
+      :wormholes ->
+        not (@prohibited_system_classes |> Enum.member?(system_static_info.system_class)) and
+          not (@prohibited_systems |> Enum.member?(to_solar_system_id)) and
+          known_jumps |> Enum.empty?() and to_solar_system_id != @jita and
+          from_solar_system_id != @jita
+
+      :stargates ->
+        not (@prohibited_system_classes |> Enum.member?(system_static_info.system_class)) and
+          not (known_jumps |> Enum.empty?())
+    end
+  end
+
+  def get_connection_mark_eol_time(map_id, connection_id, default \\ DateTime.utc_now()) do
+    WandererApp.Cache.get("map_#{map_id}:conn_#{connection_id}:mark_eol_time")
+    |> case do
+      nil ->
+        default
+
+      value ->
+        value
+    end
+  end
+
+  defp maybe_remove_connection(map_id, location, old_location)
+       when not is_nil(location) and not is_nil(old_location) and
+              location.solar_system_id != old_location.solar_system_id do
+    case WandererApp.Map.find_connection(
+           map_id,
+           location.solar_system_id,
+           old_location.solar_system_id
+         ) do
+      {:ok, connection} when not is_nil(connection) ->
+        :ok = WandererApp.MapConnectionRepo.destroy(map_id, connection)
+
+        Impl.broadcast!(map_id, :remove_connections, [connection])
+        map_id |> WandererApp.Map.remove_connection(connection)
+
+      _error ->
+        :ok
+    end
+  end
+
+  defp maybe_remove_connection(_map_id, _location, _old_location), do: :ok
+
+  defp update_connection(
+         %{map_id: map_id} = state,
+         update_method,
+         attributes,
+         %{
+           solar_system_source_id: solar_system_source_id,
+           solar_system_target_id: solar_system_target_id
+         } = update,
+         callback_fn \\ nil
+       ) do
+    with {:ok, connection} <-
+           WandererApp.Map.find_connection(
+             map_id,
+             solar_system_source_id,
+             solar_system_target_id
+           ),
+         {:ok, update_map} <- Impl.get_update_map(update, attributes),
+         {:ok, updated_connection} <-
+           apply(WandererApp.MapConnectionRepo, update_method, [
+             connection,
+             update_map
+           ]),
+         :ok <-
+           WandererApp.Map.update_connection(
+             map_id,
+             connection |> Map.merge(update_map)
+           ) do
+      if not is_nil(callback_fn) do
+        callback_fn.(updated_connection)
+      end
+
+      Impl.broadcast!(map_id, :update_connection, updated_connection)
+
+      state
+    else
+      {:error, error} ->
+        Logger.error("Failed to update connection: #{inspect(error, pretty: true)}")
+
+        state
+    end
+  end
+end
--- a/lib/wanderer_app/map/server/map_server_systems_impl.ex
+++ b/lib/wanderer_app/map/server/map_server_systems_impl.ex
@@ -0,0 +1,493 @@
+defmodule WandererApp.Map.Server.SystemsImpl do
+  @moduledoc false
+
+  require Logger
+
+  alias WandererApp.Map.Server.{Impl}
+
+  @ddrt Application.compile_env(:wanderer_app, :ddrt)
+  @system_auto_expire_minutes 15
+  @system_inactive_timeout :timer.minutes(15)
+
+  def init_last_activity_cache(map_id, systems_last_activity) do
+    systems_last_activity
+    |> Enum.each(fn {system_id, last_activity} ->
+      WandererApp.Cache.put(
+        "map_#{map_id}:system_#{system_id}:last_activity",
+        last_activity,
+        ttl: @system_inactive_timeout
+      )
+    end)
+  end
+
+  def init_map_systems(state, [] = _systems), do: state
+
+  def init_map_systems(%{map_id: map_id, rtree_name: rtree_name} = state, systems) do
+    systems
+    |> Enum.each(fn %{id: system_id, solar_system_id: solar_system_id} = system ->
+      @ddrt.insert(
+        {solar_system_id, WandererApp.Map.PositionCalculator.get_system_bounding_rect(system)},
+        rtree_name
+      )
+
+      WandererApp.Cache.put(
+        "map_#{map_id}:system_#{system_id}:last_activity",
+        DateTime.utc_now(),
+        ttl: @system_inactive_timeout
+      )
+    end)
+
+    state
+  end
+
+  def add_system(
+        %{map_id: map_id} = state,
+        %{
+          solar_system_id: solar_system_id
+        } = system_info,
+        user_id,
+        character_id
+      ) do
+    case map_id |> WandererApp.Map.check_location(%{solar_system_id: solar_system_id}) do
+      {:ok, _location} ->
+        state |> _add_system(system_info, user_id, character_id)
+
+      {:error, :already_exists} ->
+        state
+    end
+  end
+
+  def cleanup_systems(%{map_id: map_id} = state) do
+    expired_systems =
+      map_id
+      |> WandererApp.Map.list_systems!()
+      |> Enum.filter(fn %{
+                          id: system_id,
+                          visible: system_visible,
+                          locked: system_locked,
+                          solar_system_id: solar_system_id
+                        } = _system ->
+        last_updated_time =
+          WandererApp.Cache.get("map_#{map_id}:system_#{system_id}:last_activity")
+
+        if system_visible and not system_locked and
+             (is_nil(last_updated_time) or
+                DateTime.diff(DateTime.utc_now(), last_updated_time, :minute) >=
+                  @system_auto_expire_minutes) do
+          no_active_connections? =
+            map_id
+            |> WandererApp.Map.find_connections(solar_system_id)
+            |> Enum.empty?()
+
+          no_active_characters? =
+            map_id |> WandererApp.Map.get_system_characters(solar_system_id) |> Enum.empty?()
+
+          no_active_connections? and no_active_characters?
+        else
+          false
+        end
+      end)
+      |> Enum.map(& &1.solar_system_id)
+
+    case expired_systems |> Enum.empty?() do
+      false ->
+        state |> delete_systems(expired_systems, nil, nil)
+
+      _ ->
+        state
+    end
+  end
+
+  def update_system_name(
+        state,
+        update
+      ),
+      do: state |> update_system(:update_name, [:name], update)
+
+  def update_system_description(
+        state,
+        update
+      ),
+      do: state |> update_system(:update_description, [:description], update)
+
+  def update_system_status(
+        state,
+        update
+      ),
+      do: state |> update_system(:update_status, [:status], update)
+
+  def update_system_tag(
+        state,
+        update
+      ),
+      do: state |> update_system(:update_tag, [:tag], update)
+
+  def update_system_locked(
+        state,
+        update
+      ),
+      do: state |> update_system(:update_locked, [:locked], update)
+
+  def update_system_labels(
+        state,
+        update
+      ),
+      do: state |> update_system(:update_labels, [:labels], update)
+
+  def update_system_position(
+        %{rtree_name: rtree_name} = state,
+        update
+      ),
+      do:
+        state
+        |> update_system(
+          :update_position,
+          [:position_x, :position_y],
+          update,
+          fn updated_system ->
+            @ddrt.update(
+              updated_system.solar_system_id,
+              WandererApp.Map.PositionCalculator.get_system_bounding_rect(updated_system),
+              rtree_name
+            )
+          end
+        )
+
+  def add_hub(
+        %{map_id: map_id} = state,
+        hub_info
+      ) do
+    with :ok <- WandererApp.Map.add_hub(map_id, hub_info),
+         {:ok, hubs} = map_id |> WandererApp.Map.list_hubs(),
+         {:ok, _} <-
+           WandererApp.MapRepo.update_hubs(map_id, hubs) do
+      Impl.broadcast!(map_id, :update_map, %{hubs: hubs})
+      state
+    else
+      error ->
+        Logger.error("Failed to add hub: #{inspect(error, pretty: true)}")
+        state
+    end
+  end
+
+  def remove_hub(
+        %{map_id: map_id} = state,
+        hub_info
+      ) do
+    with :ok <- WandererApp.Map.remove_hub(map_id, hub_info),
+         {:ok, hubs} = map_id |> WandererApp.Map.list_hubs(),
+         {:ok, _} <-
+           WandererApp.MapRepo.update_hubs(map_id, hubs) do
+      Impl.broadcast!(map_id, :update_map, %{hubs: hubs})
+      state
+    else
+      error ->
+        Logger.error("Failed to remove hub: #{inspect(error, pretty: true)}")
+        state
+    end
+  end
+
+  def delete_systems(
+        %{map_id: map_id, rtree_name: rtree_name} = state,
+        removed_ids,
+        user_id,
+        character_id
+      ) do
+    connections_to_remove =
+      removed_ids
+      |> Enum.map(fn solar_system_id ->
+        WandererApp.Map.find_connections(map_id, solar_system_id)
+      end)
+      |> List.flatten()
+      |> Enum.uniq_by(& &1.id)
+
+    :ok = WandererApp.Map.remove_connections(map_id, connections_to_remove)
+    :ok = WandererApp.Map.remove_systems(map_id, removed_ids)
+
+    removed_ids
+    |> Enum.each(fn solar_system_id ->
+      map_id
+      |> WandererApp.MapSystemRepo.remove_from_map(solar_system_id)
+      |> case do
+        {:ok, _} ->
+          :ok
+
+        {:error, error} ->
+          Logger.error("Failed to remove system from map: #{inspect(error, pretty: true)}")
+          :ok
+      end
+    end)
+
+    connections_to_remove
+    |> Enum.each(fn connection ->
+      Logger.debug(fn -> "Removing connection from map: #{inspect(connection)}" end)
+      WandererApp.MapConnectionRepo.destroy(map_id, connection)
+    end)
+
+    @ddrt.delete(removed_ids, rtree_name)
+
+    Impl.broadcast!(map_id, :remove_connections, connections_to_remove)
+    Impl.broadcast!(map_id, :systems_removed, removed_ids)
+
+    case not is_nil(user_id) do
+      true ->
+        {:ok, _} =
+          WandererApp.User.ActivityTracker.track_map_event(:systems_removed, %{
+            character_id: character_id,
+            user_id: user_id,
+            map_id: map_id,
+            solar_system_ids: removed_ids
+          })
+
+        :telemetry.execute(
+          [:wanderer_app, :map, :systems, :remove],
+          %{count: removed_ids |> Enum.count()}
+        )
+
+        :ok
+
+      _ ->
+        :ok
+    end
+
+    state
+  end
+
+  def 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, map_opts)
+
+        case WandererApp.MapSystemRepo.get_by_map_and_solar_system_id(
+               map_id,
+               location.solar_system_id
+             ) do
+          {:ok, existing_system} when not is_nil(existing_system) ->
+            {:ok, updated_system} =
+              existing_system
+              |> WandererApp.MapSystemRepo.update_position!(%{
+                position_x: position.x,
+                position_y: position.y
+              })
+              |> WandererApp.MapSystemRepo.cleanup_labels!(map_opts)
+              |> WandererApp.MapSystemRepo.update_visible!(%{visible: true})
+              |> WandererApp.MapSystemRepo.cleanup_tags()
+
+            @ddrt.insert(
+              {existing_system.solar_system_id,
+               WandererApp.Map.PositionCalculator.get_system_bounding_rect(%{
+                 position_x: position.x,
+                 position_y: position.y
+               })},
+              rtree_name
+            )
+
+            WandererApp.Cache.put(
+              "map_#{map_id}:system_#{updated_system.id}:last_activity",
+              DateTime.utc_now(),
+              ttl: @system_inactive_timeout
+            )
+
+            WandererApp.Map.add_system(map_id, updated_system)
+
+            Impl.broadcast!(map_id, :add_system, updated_system)
+            :ok
+
+          _ ->
+            {:ok, solar_system_info} =
+              WandererApp.CachedInfo.get_system_static_info(location.solar_system_id)
+
+            WandererApp.MapSystemRepo.create(%{
+              map_id: map_id,
+              solar_system_id: location.solar_system_id,
+              name: solar_system_info.solar_system_name,
+              position_x: position.x,
+              position_y: position.y
+            })
+            |> case do
+              {:ok, new_system} ->
+                @ddrt.insert(
+                  {new_system.solar_system_id,
+                   WandererApp.Map.PositionCalculator.get_system_bounding_rect(new_system)},
+                  rtree_name
+                )
+
+                WandererApp.Cache.put(
+                  "map_#{map_id}:system_#{new_system.id}:last_activity",
+                  DateTime.utc_now(),
+                  ttl: @system_inactive_timeout
+                )
+
+                WandererApp.Map.add_system(map_id, new_system)
+                Impl.broadcast!(map_id, :add_system, new_system)
+
+                :ok
+
+              error ->
+                Logger.warning("Failed to create system: #{inspect(error, pretty: true)}")
+                :ok
+            end
+        end
+
+      error ->
+        Logger.debug("Skip adding system: #{inspect(error, pretty: true)}")
+        :ok
+    end
+  end
+
+  def maybe_add_system(_map_id, _location, _old_location, _rtree_name, _map_opts), do: :ok
+
+  defp _add_system(
+         %{map_id: map_id, map_opts: map_opts, rtree_name: rtree_name} = state,
+         %{
+           solar_system_id: solar_system_id,
+           coordinates: coordinates
+         } = system_info,
+         user_id,
+         character_id
+       ) do
+    %{"x" => x, "y" => y} =
+      coordinates
+      |> case do
+        %{"x" => x, "y" => y} ->
+          %{"x" => x, "y" => y}
+
+        _ ->
+          %{x: x, y: y} =
+            WandererApp.Map.PositionCalculator.get_new_system_position(nil, rtree_name, map_opts)
+
+          %{"x" => x, "y" => y}
+      end
+
+    {: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) ->
+          use_old_coordinates = Map.get(system_info, :use_old_coordinates, false)
+
+          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
+            )
+
+            existing_system
+            |> WandererApp.MapSystemRepo.update_visible(%{visible: true})
+          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!()
+            |> WandererApp.MapSystemRepo.update_visible(%{visible: true})
+          end
+
+        _ ->
+          {:ok, solar_system_info} =
+            WandererApp.CachedInfo.get_system_static_info(solar_system_id)
+
+          @ddrt.insert(
+            {solar_system_id,
+             WandererApp.Map.PositionCalculator.get_system_bounding_rect(%{
+               position_x: x,
+               position_y: y
+             })},
+            rtree_name
+          )
+
+          WandererApp.MapSystemRepo.create(%{
+            map_id: map_id,
+            solar_system_id: solar_system_id,
+            name: solar_system_info.solar_system_name,
+            position_x: x,
+            position_y: y
+          })
+      end
+
+    :ok = map_id |> WandererApp.Map.add_system(system)
+
+    WandererApp.Cache.put(
+      "map_#{map_id}:system_#{system.id}:last_activity",
+      DateTime.utc_now(),
+      ttl: @system_inactive_timeout
+    )
+
+    Impl.broadcast!(map_id, :add_system, system)
+
+    {:ok, _} =
+      WandererApp.User.ActivityTracker.track_map_event(:system_added, %{
+        character_id: character_id,
+        user_id: user_id,
+        map_id: map_id,
+        solar_system_id: solar_system_id
+      })
+
+    state
+  end
+
+  defp calc_new_system_position(map_id, old_location, rtree_name, opts),
+    do:
+      {:ok,
+       map_id
+       |> WandererApp.Map.find_system_by_location(old_location)
+       |> WandererApp.Map.PositionCalculator.get_new_system_position(rtree_name, opts)}
+
+  defp update_system(
+         %{map_id: map_id} = state,
+         update_method,
+         attributes,
+         update,
+         callback_fn \\ nil
+       ) do
+    with :ok <- WandererApp.Map.update_system_by_solar_system_id(map_id, update),
+         {:ok, system} <-
+           WandererApp.MapSystemRepo.get_by_map_and_solar_system_id(
+             map_id,
+             update.solar_system_id
+           ),
+         {:ok, update_map} <- Impl.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
+
+      update_map_system_last_activity(map_id, updated_system)
+
+      state
+    else
+      error ->
+        Logger.error("Fail ed to update system: #{inspect(error, pretty: true)}")
+        state
+    end
+  end
+
+  defp update_map_system_last_activity(
+         map_id,
+         updated_system
+       ) do
+    WandererApp.Cache.put(
+      "map_#{map_id}:system_#{updated_system.id}:last_activity",
+      DateTime.utc_now(),
+      ttl: @system_inactive_timeout
+    )
+
+    Impl.broadcast!(map_id, :update_system, updated_system)
+  end
+end
--- a/lib/wanderer_app/permissions.ex
+++ b/lib/wanderer_app/permissions.ex
@@ -15,6 +15,8 @@ defmodule WandererApp.Permissions do
  @add_acl 1024
  @delete_acl 2048
  @delete_map 4096
+  @manage_map 8192
+  @admin_map 16384

  @viewer_role [@view_system, @view_character, @view_connection]
  @member_role @viewer_role ++
@@ -24,11 +26,10 @@ defmodule WandererApp.Permissions do
                   @update_system,
                   @track_character,
                   @delete_connection,
-                   @delete_system,
-                   @lock_system
+                   @delete_system
                 ]
-  @manager_role @member_role
-  @admin_role @manager_role ++ [@add_acl, @delete_acl, @delete_map]
+  @manager_role @member_role ++ [@lock_system, @manage_map]
+  @admin_role @manager_role ++ [@add_acl, @delete_acl, @delete_map, @admin_map]

  @viewer_role_mask @viewer_role |> Enum.reduce(0, fn x, acc -> x ||| acc end)
  @member_role_mask @member_role |> Enum.reduce(0, fn x, acc -> x ||| acc end)
@@ -72,6 +73,8 @@ defmodule WandererApp.Permissions do

  def get_permissions(user_permissions) do
    %{
+      admin_map: check_permission(user_permissions, @admin_map),
+      manage_map: check_permission(user_permissions, @manage_map),
      view_system: check_permission(user_permissions, @view_system),
      view_character: check_permission(user_permissions, @view_character),
      view_connection: check_permission(user_permissions, @view_connection),
--- a/lib/wanderer_app/repositories/map_connection_repo.ex
+++ b/lib/wanderer_app/repositories/map_connection_repo.ex
@@ -27,6 +27,7 @@ defmodule WandererApp.MapConnectionRepo do
    end
  end

+  def create(connection), do: connection |> WandererApp.Api.MapConnection.create()
  def create!(connection), do: connection |> WandererApp.Api.MapConnection.create!()

  def destroy(map_id, connection) when not is_nil(connection) do
@@ -70,6 +71,11 @@ defmodule WandererApp.MapConnectionRepo do
      connection
      |> WandererApp.Api.MapConnection.update_time_status(update)

+  def update_type(connection, update),
+    do:
+      connection
+      |> WandererApp.Api.MapConnection.update_type(update)
+
  def update_mass_status(connection, update),
    do:
      connection
--- a/lib/wanderer_app_web/components/core_components.ex
+++ b/lib/wanderer_app_web/components/core_components.ex
@@ -146,7 +146,12 @@ defmodule WandererAppWeb.CoreComponents do
      class="flex flex-col p-4 items-center absolute bottom-16 left-1 gap-2 tooltip tooltip-right"
      data-tip="server: Tranquility"
    >
-      <div class={"block w-4 h-4 rounded-full shadow-inner  #{if @online, do: " bg-green-500 animate-pulse", else: "bg-red-500"}"}>
+      <div
+        :if={@online}
+        class="absolute block w-4 h-4 rounded-full shadow-inner bg-green-500 animate-ping"
+      >
+      </div>
+      <div class={"block w-4 h-4 rounded-full shadow-inner  #{if @online, do: " bg-green-500", else: "bg-red-500"}"}>
      </div>
    </div>
    """
--- a/lib/wanderer_app_web/components/layouts.ex
+++ b/lib/wanderer_app_web/components/layouts.ex
@@ -30,25 +30,35 @@ defmodule WandererAppWeb.Layouts do
      phx-hook="NewVersionUpdate"
      phx-update="ignore"
      data-version={@app_version}
-      class="!z-100 hidden group alert items-center fixed bottom-52 left-2 fade-in-scale text-white !bg-opacity-70 w-10 h-10 hover:w-[250px] hover:h-[70px] rounded p-px overflow-hidden"
+      class="!z-1000 hidden absolute top-0 left-0 w-full h-full group items-center fade-in-scale text-white !bg-opacity-70 rounded p-px overflow-hidden flex items-center"
    >
-      <div class="group animate-rotate absolute inset-0 h-full w-full rounded-full bg-[conic-gradient(#0ea5e9_20deg,transparent_120deg)] group-hover:bg-[#0ea5e9]" />
-
-      <div class="!bg-black  rounded w-9 h-9 hover:m-0 group-hover:w-[246px] group-hover:h-[66px] flex items-center justify-center p-2 relative z-20">
-        <.icon name="hero-bell-alert" class="animate-pulse group-hover:hidden absolute top-2 h-5 w-5" />
-        <div class="opacity-0 group-hover:opacity-100 flex flex-col items-center justify-center w-[250px] h-full">
-          <div class="text-white text-nowrap text-sm">
-            New Version Available
-          </div>
-          <a href="/changelog" target="_blank" class="text-sm link-secondary">What's new?</a>
+      <div class="hs-overlay-backdrop transition duration absolute left-0 top-0 w-full h-full bg-gray-900 bg-opacity-50 dark:bg-opacity-80 dark:bg-neutral-900">
+      </div>
+      <div class="absolute top-[50%] left-[50%] translate-x-[-50%] translate-y-[-50%] flex items-center">
+        <div class="rounded w-9 h-9 w-[80px] h-[66px] flex items-center justify-center relative z-20">
+          <.icon name="hero-chevron-double-right" class="w-9 h-9 mr-[-40px]" />
+        </div>
+        <div id="refresh-area">
+          <.live_component module={WandererAppWeb.MapRefresh} id="map-refresh" />
        </div>

-        <button
-          type="button"
-          class="invisible group-hover:visible update-button p-button p-component p-button-outlined p-button-sm p-0 px-1 w-[76px]"
-        >
-          Update
-        </button>
+        <div class="rounded h-[66px] flex items-center justify-center relative z-20">
+          <div class=" flex items-center w-[200px] h-full">
+            <.icon name="hero-chevron-double-left" class="w-9 h-9 mr-[20px]" />
+            <div class=" flex flex-col items-center justify-center h-full">
+              <div class="text-white text-nowrap text-sm [text-shadow:_0_1px_0_rgb(0_0_0_/_40%)]">
+                Update Required
+              </div>
+              <a
+                href="/changelog"
+                target="_blank"
+                class="text-sm link-secondary [text-shadow:_0_1px_0_rgb(0_0_0_/_40%)]"
+              >
+                What's new?
+              </a>
+            </div>
+          </div>
+        </div>
      </div>
    </div>
    """
--- a/lib/wanderer_app_web/components/map/map_refresh.ex
+++ b/lib/wanderer_app_web/components/map/map_refresh.ex
@@ -0,0 +1,197 @@
+defmodule WandererAppWeb.MapRefresh do
+  use WandererAppWeb, :live_component
+
+  def render(assigns) do
+    ~H"""
+    <div id="map-refresh" class="socket">
+      <div class="gel center-gel">
+        <div class="hex-brick h1"></div>
+        <div class="hex-brick h2"></div>
+        <div class="hex-brick h3"></div>
+      </div>
+      <div class="gel c1 r1">
+        <div class="hex-brick h1"></div>
+        <div class="hex-brick h2"></div>
+        <div class="hex-brick h3"></div>
+      </div>
+      <div class="gel c2 r1">
+        <div class="hex-brick h1"></div>
+        <div class="hex-brick h2"></div>
+        <div class="hex-brick h3"></div>
+      </div>
+      <div class="gel c3 r1">
+        <div class="hex-brick h1"></div>
+        <div class="hex-brick h2"></div>
+        <div class="hex-brick h3"></div>
+      </div>
+      <div class="gel c4 r1">
+        <div class="hex-brick h1"></div>
+        <div class="hex-brick h2"></div>
+        <div class="hex-brick h3"></div>
+      </div>
+      <div class="gel c5 r1">
+        <div class="hex-brick h1"></div>
+        <div class="hex-brick h2"></div>
+        <div class="hex-brick h3"></div>
+      </div>
+      <div class="gel c6 r1">
+        <div class="hex-brick h1"></div>
+        <div class="hex-brick h2"></div>
+        <div class="hex-brick h3"></div>
+      </div>
+
+      <div class="gel c7 r2">
+        <div class="hex-brick h1"></div>
+        <div class="hex-brick h2"></div>
+        <div class="hex-brick h3"></div>
+      </div>
+
+      <div class="gel c8 r2">
+        <div class="hex-brick h1"></div>
+        <div class="hex-brick h2"></div>
+        <div class="hex-brick h3"></div>
+      </div>
+      <div class="gel c9 r2">
+        <div class="hex-brick h1"></div>
+        <div class="hex-brick h2"></div>
+        <div class="hex-brick h3"></div>
+      </div>
+      <div class="gel c10 r2">
+        <div class="hex-brick h1"></div>
+        <div class="hex-brick h2"></div>
+        <div class="hex-brick h3"></div>
+      </div>
+      <div class="gel c11 r2">
+        <div class="hex-brick h1"></div>
+        <div class="hex-brick h2"></div>
+        <div class="hex-brick h3"></div>
+      </div>
+      <div class="gel c12 r2">
+        <div class="hex-brick h1"></div>
+        <div class="hex-brick h2"></div>
+        <div class="hex-brick h3"></div>
+      </div>
+      <div class="gel c13 r2">
+        <div class="hex-brick h1"></div>
+        <div class="hex-brick h2"></div>
+        <div class="hex-brick h3"></div>
+      </div>
+      <div class="gel c14 r2">
+        <div class="hex-brick h1"></div>
+        <div class="hex-brick h2"></div>
+        <div class="hex-brick h3"></div>
+      </div>
+      <div class="gel c15 r2">
+        <div class="hex-brick h1"></div>
+        <div class="hex-brick h2"></div>
+        <div class="hex-brick h3"></div>
+      </div>
+      <div class="gel c16 r2">
+        <div class="hex-brick h1"></div>
+        <div class="hex-brick h2"></div>
+        <div class="hex-brick h3"></div>
+      </div>
+      <div class="gel c17 r2">
+        <div class="hex-brick h1"></div>
+        <div class="hex-brick h2"></div>
+        <div class="hex-brick h3"></div>
+      </div>
+      <div class="gel c18 r2">
+        <div class="hex-brick h1"></div>
+        <div class="hex-brick h2"></div>
+        <div class="hex-brick h3"></div>
+      </div>
+      <div class="gel c19 r3">
+        <div class="hex-brick h1"></div>
+        <div class="hex-brick h2"></div>
+        <div class="hex-brick h3"></div>
+      </div>
+      <div class="gel c20 r3">
+        <div class="hex-brick h1"></div>
+        <div class="hex-brick h2"></div>
+        <div class="hex-brick h3"></div>
+      </div>
+      <div class="gel c21 r3">
+        <div class="hex-brick h1"></div>
+        <div class="hex-brick h2"></div>
+        <div class="hex-brick h3"></div>
+      </div>
+      <div class="gel c22 r3">
+        <div class="hex-brick h1"></div>
+        <div class="hex-brick h2"></div>
+        <div class="hex-brick h3"></div>
+      </div>
+      <div class="gel c23 r3">
+        <div class="hex-brick h1"></div>
+        <div class="hex-brick h2"></div>
+        <div class="hex-brick h3"></div>
+      </div>
+      <div class="gel c24 r3">
+        <div class="hex-brick h1"></div>
+        <div class="hex-brick h2"></div>
+        <div class="hex-brick h3"></div>
+      </div>
+      <div class="gel c25 r3">
+        <div class="hex-brick h1"></div>
+        <div class="hex-brick h2"></div>
+        <div class="hex-brick h3"></div>
+      </div>
+      <div class="gel c26 r3">
+        <div class="hex-brick h1"></div>
+        <div class="hex-brick h2"></div>
+        <div class="hex-brick h3"></div>
+      </div>
+      <div class="gel c28 r3">
+        <div class="hex-brick h1"></div>
+        <div class="hex-brick h2"></div>
+        <div class="hex-brick h3"></div>
+      </div>
+      <div class="gel c29 r3">
+        <div class="hex-brick h1"></div>
+        <div class="hex-brick h2"></div>
+        <div class="hex-brick h3"></div>
+      </div>
+      <div class="gel c30 r3">
+        <div class="hex-brick h1"></div>
+        <div class="hex-brick h2"></div>
+        <div class="hex-brick h3"></div>
+      </div>
+      <div class="gel c31 r3">
+        <div class="hex-brick h1"></div>
+        <div class="hex-brick h2"></div>
+        <div class="hex-brick h3"></div>
+      </div>
+      <div class="gel c32 r3">
+        <div class="hex-brick h1"></div>
+        <div class="hex-brick h2"></div>
+        <div class="hex-brick h3"></div>
+      </div>
+      <div class="gel c33 r3">
+        <div class="hex-brick h1"></div>
+        <div class="hex-brick h2"></div>
+        <div class="hex-brick h3"></div>
+      </div>
+      <div class="gel c34 r3">
+        <div class="hex-brick h1"></div>
+        <div class="hex-brick h2"></div>
+        <div class="hex-brick h3"></div>
+      </div>
+      <div class="gel c35 r3">
+        <div class="hex-brick h1"></div>
+        <div class="hex-brick h2"></div>
+        <div class="hex-brick h3"></div>
+      </div>
+      <div class="gel c36 r3">
+        <div class="hex-brick h1"></div>
+        <div class="hex-brick h2"></div>
+        <div class="hex-brick h3"></div>
+      </div>
+      <div class="gel c37 r3">
+        <div class="hex-brick h1"></div>
+        <div class="hex-brick h2"></div>
+        <div class="hex-brick h3"></div>
+      </div>
+    </div>
+    """
+  end
+end
--- a/lib/wanderer_app_web/live/access_lists/access_lists_live.ex
+++ b/lib/wanderer_app_web/live/access_lists/access_lists_live.ex
@@ -222,7 +222,7 @@ defmodule WandererAppWeb.AccessListsLive do

  def handle_event(
        "add_members",
-        %{"member_id" => member_id} = _params,
+        %{"member_id" => [member_id]} = _params,
        %{assigns: assigns} = socket
      )
      when is_binary(member_id) and member_id != "" do
--- a/lib/wanderer_app_web/live/access_lists/access_lists_live.html.heex
+++ b/lib/wanderer_app_web/live/access_lists/access_lists_live.html.heex
@@ -228,6 +228,7 @@
      available_option_class="w-full"
      debounce={250}
      update_min_len={3}
+      mode={:tags}
      options={@member_search_options}
      placeholder="Search a character/corporation/alliance"
    >
--- a/lib/wanderer_app_web/live/maps/event_handlers/map_characters_event_handler.ex
+++ b/lib/wanderer_app_web/live/maps/event_handlers/map_characters_event_handler.ex
@@ -74,23 +74,20 @@ defmodule WandererAppWeb.MapCharactersEventHandler do
          }
        } = socket
      ) do
-    {:ok, character_settings} =
-      case WandererApp.MapCharacterSettingsRepo.get_all_by_map(map_id) do
-        {:ok, settings} -> {:ok, settings}
-        _ -> {:ok, []}
-      end
-
    {:noreply,
     socket
-     |> assign(
-       show_tracking?: true,
-       character_settings: character_settings
-     )
+     |> assign(show_tracking?: true)
     |> assign_async(:characters, fn ->
       {:ok, map} =
         map_id
         |> WandererApp.MapRepo.get([:acls])

+       {:ok, character_settings} =
+         case WandererApp.MapCharacterSettingsRepo.get_all_by_map(map_id) do
+           {:ok, settings} -> {:ok, settings}
+           _ -> {:ok, []}
+         end
+
       map
       |> WandererApp.Maps.load_characters(
         character_settings,
@@ -122,12 +119,17 @@ defmodule WandererAppWeb.MapCharactersEventHandler do
        %{
          assigns: %{
            map_id: map_id,
-            character_settings: character_settings,
            current_user: current_user,
            only_tracked_characters: only_tracked_characters
          }
        } = socket
      ) do
+    {:ok, character_settings} =
+      case WandererApp.MapCharacterSettingsRepo.get_all_by_map(map_id) do
+        {:ok, settings} -> {:ok, settings}
+        _ -> {:ok, []}
+      end
+
    socket =
      case character_settings |> Enum.find(&(&1.character_id == character_id)) do
        nil ->
@@ -202,7 +204,6 @@ defmodule WandererAppWeb.MapCharactersEventHandler do
     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)
--- a/lib/wanderer_app_web/live/maps/event_handlers/map_connections_event_handler.ex
+++ b/lib/wanderer_app_web/live/maps/event_handlers/map_connections_event_handler.ex
@@ -54,7 +54,8 @@ defmodule WandererAppWeb.MapConnectionsEventHandler 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()
+      solar_system_target_id: solar_system_target_id |> String.to_integer(),
+      character_id: tracked_character_ids |> List.first()
    })

    {:ok, _} =
@@ -122,6 +123,7 @@ defmodule WandererAppWeb.MapConnectionsEventHandler do
    method_atom =
      case param do
        "time_status" -> :update_connection_time_status
+        "type" -> :update_connection_type
        "mass_status" -> :update_connection_mass_status
        "ship_size_type" -> :update_connection_ship_size_type
        "locked" -> :update_connection_locked
@@ -132,6 +134,7 @@ defmodule WandererAppWeb.MapConnectionsEventHandler do
    key_atom =
      case param do
        "time_status" -> :time_status
+        "type" -> :type
        "mass_status" -> :mass_status
        "ship_size_type" -> :ship_size_type
        "locked" -> :locked
--- a/lib/wanderer_app_web/live/maps/event_handlers/map_signatures_event_handler.ex
+++ b/lib/wanderer_app_web/live/maps/event_handlers/map_signatures_event_handler.ex
@@ -328,8 +328,7 @@ defmodule WandererAppWeb.MapSignaturesEventHandler do
          :description,
          :kind,
          :group,
-          :type,
-          :custom_info
+          :type
        ])
        |> Map.put(:linked_system, MapEventHandler.get_system_static_info(linked_system_id))
        |> Map.put(:inserted_at, inserted_at |> Calendar.strftime("%Y/%m/%d %H:%M:%S"))
@@ -353,7 +352,6 @@ defmodule WandererAppWeb.MapSignaturesEventHandler do
          kind: kind,
          group: group,
          type: Map.get(signature, "type"),
-          custom_info: Map.get(signature, "custom_info"),
          character_eve_id: character_eve_id
        }
      end)
--- a/lib/wanderer_app_web/live/maps/event_handlers/map_systems_event_handler.ex
+++ b/lib/wanderer_app_web/live/maps/event_handlers/map_systems_event_handler.ex
@@ -66,7 +66,7 @@ defmodule WandererAppWeb.MapSystemsEventHandler do

  def handle_ui_event(
        "add_system",
-        %{"system_id" => solar_system_id} = _event,
+        %{"system_id" => [solar_system_id]} = _event,
        %{
          assigns:
            %{
@@ -217,7 +217,7 @@ defmodule WandererAppWeb.MapSystemsEventHandler do
            current_user: current_user,
            tracked_character_ids: tracked_character_ids,
            has_tracked_characters?: true,
-            user_permissions: %{update_system: true}
+            user_permissions: %{update_system: true} = user_permissions
          }
        } =
          socket
@@ -244,23 +244,25 @@ defmodule WandererAppWeb.MapSystemsEventHandler do
        _ -> :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)
-    ])
+    if can_update_system?(key_atom, user_permissions) do
+      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
-      })
+      {: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
+        })
+    end

    {:noreply, socket}
  end
@@ -305,6 +307,9 @@ defmodule WandererAppWeb.MapSystemsEventHandler do
  def handle_ui_event(event, body, socket),
    do: MapCoreEventHandler.handle_ui_event(event, body, socket)

+  defp can_update_system?(:locked, %{lock_system: false} = _user_permissions), do: false
+  defp can_update_system?(_key, _user_permissions), do: true
+
  defp update_system_positions(_map_id, []), do: :ok

  defp update_system_positions(map_id, [position | rest]) do
--- a/lib/wanderer_app_web/live/maps/map_event_handler.ex
+++ b/lib/wanderer_app_web/live/maps/map_event_handler.ex
@@ -64,6 +64,7 @@ defmodule WandererAppWeb.MapEventHandler do
    "get_connection_info",
    "get_passages",
    "update_connection_time_status",
+    "update_connection_type",
    "update_connection_mass_status",
    "update_connection_ship_size_type",
    "update_connection_locked",
@@ -215,6 +216,7 @@ defmodule WandererAppWeb.MapEventHandler do
          solar_system_target: solar_system_target,
          mass_status: mass_status,
          time_status: time_status,
+          type: type,
          ship_size_type: ship_size_type,
          locked: locked
        } = _connection
@@ -223,6 +225,7 @@ defmodule WandererAppWeb.MapEventHandler do
        id: "#{solar_system_source}_#{solar_system_target}",
        mass_status: mass_status,
        time_status: time_status,
+        type: type,
        ship_size_type: ship_size_type,
        locked: locked,
        source: "#{solar_system_source}",
--- a/lib/wanderer_app_web/live/maps/map_live.html.heex
+++ b/lib/wanderer_app_web/live/maps/map_live.html.heex
@@ -46,6 +46,7 @@
      update_min_len={2}
      available_option_class="w-full text-sm"
      debounce={200}
+      mode={:tags}
    >
      <:option :let={option}>
        <div class="gap-1 w-full flex flex-align-center p-autocomplete-item  text-sm">
@@ -96,7 +97,7 @@
  on_cancel={JS.push("hide_tracking")}
 >
  <.async_result :let={characters} assign={@characters}>
-    <:loading>Loading...</:loading>
+    <:loading><span class="loading loading-dots loading-xs" />.</:loading>
    <:failed :let={reason}><%= reason %></:failed>

    <.table
@@ -104,7 +105,6 @@
      id="characters-tracking-table"
      class="h-[400px] !overflow-y-auto"
      rows={characters}
-
    >
      <:col :let={character} label="Tracked">
        <label class="flex items-center gap-3">
--- a/mix.exs
+++ b/mix.exs
@@ -2,7 +2,7 @@ defmodule WandererApp.MixProject do
  use Mix.Project

  @source_url "https://github.com/wanderer-industries/wanderer"
-  @version "1.19.2"
+  @version "1.24.0"

  def project do
    [
--- a/priv/repo/migrations/20241116164457_add_signature_custom_info.exs
+++ b/priv/repo/migrations/20241116164457_add_signature_custom_info.exs
@@ -1,4 +1,4 @@
-defmodule WandererApp.Repo.Migrations.AddSignatureCustomInfo do
+defmodule WandererApp.Repo.Migrations.AddConnectionType do
  @moduledoc """
  Updates resources based on their most recent snapshots.

@@ -8,14 +8,14 @@ defmodule WandererApp.Repo.Migrations.AddSignatureCustomInfo do
  use Ecto.Migration

  def up do
-    alter table(:map_system_signatures_v1) do
-      add :custom_info, :text
+    alter table(:map_chain_v1) do
+      add :type, :bigint, default: 0
    end
  end

  def down do
-    alter table(:map_system_signatures_v1) do
-      remove :custom_info
+    alter table(:map_chain_v1) do
+      remove :type
    end
  end
 end
--- a/priv/resource_snapshots/repo/map_system_signatures_v1/20241116164457.json
+++ b/priv/resource_snapshots/repo/map_system_signatures_v1/20241116164457.json
@@ -10,26 +10,6 @@
      "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",
@@ -37,37 +17,7 @@
      "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",
+      "source": "solar_system_source",
      "type": "bigint"
    },
    {
@@ -77,8 +27,48 @@
      "primary_key?": false,
      "references": null,
      "size": null,
-      "source": "kind",
-      "type": "text"
+      "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": "0",
+      "generated?": false,
+      "primary_key?": false,
+      "references": null,
+      "size": null,
+      "source": "type",
+      "type": "bigint"
    },
    {
      "allow_nil?": true,
@@ -87,9 +77,29 @@
      "primary_key?": false,
      "references": null,
      "size": null,
-      "source": "group",
+      "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",
@@ -138,15 +148,15 @@
          "global": null,
          "strategy": null
        },
-        "name": "map_system_signatures_v1_system_id_fkey",
+        "name": "map_chain_v1_map_id_fkey",
        "on_delete": null,
        "on_update": null,
        "primary_key?": true,
        "schema": "public",
-        "table": "map_system_v1"
+        "table": "maps_v1"
      },
      "size": null,
-      "source": "system_id",
+      "source": "map_id",
      "type": "uuid"
    }
  ],
@@ -155,27 +165,8 @@
  "custom_indexes": [],
  "custom_statements": [],
  "has_create_action": true,
-  "hash": "1EF4562557231FE7B0D1E0CC56B2CFB44BBEB015371777F72121AF7FB4DFCAA9",
-  "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
-    }
-  ],
+  "hash": "D9587518CE16355CA4FB501321848465A3E1DDD7800563069242249DA0B4C389",
+  "identities": [],
  "multitenancy": {
    "attribute": null,
    "global": null,
@@ -183,5 +174,5 @@
  },
  "repo": "Elixir.WandererApp.Repo",
  "schema": null,
-  "table": "map_system_signatures_v1"
+  "table": "map_chain_v1"
 }
Author	SHA1	Message	Date
CI	099650420d	chore: release version v1.24.0 Some checks are pending Build / 🚀 Deploy to test env (fly.io) (push) Waiting to run Details Build / 🛠 Build (1.17, 18.x, 27) (push) Waiting to run Details Build / 🛠 Build Docker Images (linux/amd64) (push) Blocked by required conditions Details Build / 🏷 Create Release (push) Blocked by required conditions Details	2024-11-27 13:28:03 +00:00
Dmitry Popov	8ccf7fffa5	feat(Signatures): Added "Lazy delete" option & got rid of update popup	2024-11-27 14:27:27 +01:00
CI	b97a055bf7	chore: release version v1.23.0 Some checks are pending Build / 🚀 Deploy to test env (fly.io) (push) Waiting to run Details Build / 🛠 Build (1.17, 18.x, 27) (push) Waiting to run Details Build / 🛠 Build Docker Images (linux/amd64) (push) Blocked by required conditions Details Build / 🏷 Create Release (push) Blocked by required conditions Details	2024-11-26 21:05:58 +00:00
Dmitry Popov	663fee6699	feat(Map): Lock systems available to manager/admin roles only (#75 ) * feat(Map): Lock systems available to manager/admin roles only * feat(Map): Fix add system & add acl member select behaviour	2024-11-27 01:05:26 +04:00
CI	33d5f3938b	chore: release version v1.22.0	2024-11-26 19:03:01 +00:00
Aleksei Chichenkov	ef6b45d7a1	feat(Map): Rework design of checkboxes in Signatures settings dialog. Rework design of checkboxes in Routes settings dialog. Now signature will deleteing by Delete hotkey was Backspace. Fixed size of group column in signatures list. Instead Updated column will be Added, updated may be turn on in settings. (#76 ) Co-authored-by: achichenkov <aleksei.chichenkov@telleqt.ai>	2024-11-26 23:02:30 +04:00
CI	c1ecd3690e	chore: release version v1.21.0 Some checks failed Build / 🚀 Deploy to test env (fly.io) (push) Has been cancelled Details Build / 🛠 Build (1.17, 18.x, 27) (push) Has been cancelled Details Build / 🛠 Build Docker Images (linux/amd64) (push) Has been cancelled Details Build / 🏷 Create Release (push) Has been cancelled Details	2024-11-24 15:55:38 +00:00
Aleksei Chichenkov	3250fe1ec6	Merge pull request #74 from wanderer-industries/dessign-issues-2 feat(Map): add new gate design, change EOL placement	2024-11-24 18:55:12 +03:00
achichenkov	48e8cd93b9	feat(Map): add new gate design, change EOL placement	2024-11-24 18:30:40 +03:00
CI	afacbb16b6	chore: release version v1.20.1 Some checks failed Build / 🚀 Deploy to test env (fly.io) (push) Has been cancelled Details Build / 🛠 Build (1.17, 18.x, 27) (push) Has been cancelled Details Build / 🛠 Build Docker Images (linux/amd64) (push) Has been cancelled Details Build / 🏷 Create Release (push) Has been cancelled Details	2024-11-22 12:42:02 +00:00
Dmitry Popov	dfad127f32	Merge branch 'main' of github.com:wanderer-industries/wanderer	2024-11-22 13:41:35 +01:00
Dmitry Popov	300c1b5a18	chore: release version v1.19.3	2024-11-22 13:41:30 +01:00
CI	bb38e1710b	chore: release version v1.20.0 Some checks are pending Build / 🚀 Deploy to test env (fly.io) (push) Waiting to run Details Build / 🛠 Build (1.17, 18.x, 27) (push) Waiting to run Details Build / 🛠 Build Docker Images (linux/amd64) (push) Blocked by required conditions Details Build / 🏷 Create Release (push) Blocked by required conditions Details	2024-11-22 12:27:53 +00:00
Dmitry Popov	0857a82de5	feat(Core): Add connection type for Gates, add new Update logic fixes #73	2024-11-22 13:27:17 +01:00
CI	da5afcc91c	chore: release version v1.19.3 Some checks failed Build / 🚀 Deploy to test env (fly.io) (push) Has been cancelled Details Build / 🛠 Build (1.17, 18.x, 27) (push) Has been cancelled Details Build / 🛠 Build Docker Images (linux/amd64) (push) Has been cancelled Details Build / 🏷 Create Release (push) Has been cancelled Details	2024-11-20 14:09:27 +00:00
Dmitry Popov	0002979fda	fix(Core): Fix adding systems on splash (#71 ) * fix(Core): Fix adding systems on splash	2024-11-20 18:08:59 +04:00