feat(Map): Auto delete linked connections

.github/workflows/build.yml

@@ -189,29 +189,6 @@ jobs:
       - name: Image digest
         run: echo ${{ steps.build.outputs.digest }}
 
-      - name: Extract release notes
-        id: extract-release-notes
-        uses: ffurrer2/extract-release-notes@v2
-
-      - name: Get content
-        uses: 2428392/gh-truncate-string-action@v1.3.0
-        id: get-content
-        with:
-          stringToTruncate: |
-            📣 Wanderer new release available 🎉
-
-            **Version**: ${{ steps.get-latest-tag.outputs.tag }}
-
-            ${{ steps.extract-release-notes.outputs.release_notes }}
-          maxLength: 2000
-          truncationSymbol: "..."
-
-      - name: Discord Webhook Action
-        uses: tsickert/discord-webhook@v5.3.0
-        with:
-          webhook-url: ${{ secrets.DISCORD_WEBHOOK_URL }}
-          content: ${{ steps.get-content.outputs.string }}
-
   create-release:
     name: 🏷 Create Release
     runs-on: ubuntu-22.04

CHANGELOG.md

@@ -2,70 +2,6 @@
 
 <!-- changelog -->
 
-## [v1.13.4](https://github.com/wanderer-industries/wanderer/compare/v1.13.3...v1.13.4) (2024-10-28)
-
-
-
-
-## [v1.13.3](https://github.com/wanderer-industries/wanderer/compare/v1.13.2...v1.13.3) (2024-10-28)
-
-
-
-
-## [v1.13.2](https://github.com/wanderer-industries/wanderer/compare/v1.13.1...v1.13.2) (2024-10-28)
-
-
-
-
-## [v1.13.1](https://github.com/wanderer-industries/wanderer/compare/v1.13.0...v1.13.1) (2024-10-28)
-
-
-
-
-## [v1.13.0](https://github.com/wanderer-industries/wanderer/compare/v1.12.11...v1.13.0) (2024-10-28)
-
-
-
-
-### Features:
-
-* Core: Use ESI /characters/affiliation API
-
-## [v1.12.11](https://github.com/wanderer-industries/wanderer/compare/v1.12.10...v1.12.11) (2024-10-25)
-
-
-
-
-## [v1.12.10](https://github.com/wanderer-industries/wanderer/compare/v1.12.9...v1.12.10) (2024-10-24)
-
-
-
-
-## [v1.12.9](https://github.com/wanderer-industries/wanderer/compare/v1.12.8...v1.12.9) (2024-10-24)
-
-
-
-
-## [v1.12.8](https://github.com/wanderer-industries/wanderer/compare/v1.12.7...v1.12.8) (2024-10-24)
-
-
-
-
-## [v1.12.7](https://github.com/wanderer-industries/wanderer/compare/v1.12.6...v1.12.7) (2024-10-24)
-
-
-
-
-## [v1.12.6](https://github.com/wanderer-industries/wanderer/compare/v1.12.5...v1.12.6) (2024-10-24)
-
-
-
-
-## [v1.12.5](https://github.com/wanderer-industries/wanderer/compare/v1.12.4...v1.12.5) (2024-10-22)
-
-
-
-
 ## [v1.12.4](https://github.com/wanderer-industries/wanderer/compare/v1.12.3...v1.12.4) (2024-10-21)
 
 

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

assets/package.json

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

assets/yarn.lock

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

lib/wanderer_app.ex

@@ -32,17 +32,17 @@ defmodule WandererApp do
   end
 
   def log_exception(kind, reason, stacktrace) do
-    reason = Exception.normalize(kind, reason, stacktrace)
+      reason = Exception.normalize(kind, reason, stacktrace)
 
-    crash_reason =
-      case kind do
-        :throw -> {{:nocatch, reason}, stacktrace}
-        _ -> {reason, stacktrace}
-      end
+      crash_reason =
+        case kind do
+          :throw -> {{:nocatch, reason}, stacktrace}
+          _ -> {reason, stacktrace}
+        end
 
-    Logger.error(
-      Exception.format(kind, reason, stacktrace),
-      crash_reason: crash_reason
-    )
-  end
+      Logger.error(
+        Exception.format(kind, reason, stacktrace),
+        crash_reason: crash_reason
+      )
+    end
 end

lib/wanderer_app/api/map_connection.ex

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

lib/wanderer_app/api/map_system_signature.ex

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

lib/wanderer_app/api/user_activity.ex

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

lib/wanderer_app/character/tracker.ex

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

lib/wanderer_app/esi.ex

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

lib/wanderer_app/esi/api_client.ex

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

lib/wanderer_app/eve_data_service.ex

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

lib/wanderer_app/map/map_server.ex

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

lib/wanderer_app/map/map_server_impl.ex

@@ -333,7 +333,7 @@ defmodule WandererApp.Map.Server.Impl do
   end
 
   def delete_systems(
-        %{map_id: map_id, rtree_name: rtree_name} = state,
+        %{map_id: map_id, rtree_name: rtree_name, map_opts: map_opts} = state,
         removed_ids,
         user_id,
         character_id
@@ -352,7 +352,7 @@ defmodule WandererApp.Map.Server.Impl do
     removed_ids
     |> Enum.each(fn solar_system_id ->
       map_id
-      |> WandererApp.MapSystemRepo.remove_from_map(solar_system_id)
+      |> WandererApp.MapSystemRepo.remove_from_map(solar_system_id, map_opts)
       |> case do
         {:ok, _} ->
           :ok
@@ -471,12 +471,6 @@ defmodule WandererApp.Map.Server.Impl do
       ),
       do: _update_connection(state, :update_locked, [:locked], connection_update)
 
-  def update_connection_custom_info(
-        state,
-        connection_update
-      ),
-      do: _update_connection(state, :update_custom_info, [:custom_info], connection_update)
-
   def import_settings(%{map_id: map_id} = state, settings, user_id) do
     WandererApp.Cache.put(
       "map_#{map_id}:importing",
@@ -1088,13 +1082,12 @@ defmodule WandererApp.Map.Server.Impl do
              map_id,
              update.solar_system_id
            ),
-         {:ok, update_map} <- _get_update_map(update, attributes) do
-      {:ok, updated_system} =
-        apply(WandererApp.MapSystemRepo, update_method, [
-          system,
-          update_map
-        ])
-
+         {:ok, update_map} <- _get_update_map(update, attributes),
+         {:ok, updated_system} <-
+           apply(WandererApp.MapSystemRepo, update_method, [
+             system,
+             update_map
+           ]) do
       if not is_nil(callback_fn) do
         callback_fn.(updated_system)
       end
@@ -1104,7 +1097,7 @@ defmodule WandererApp.Map.Server.Impl do
       state
     else
       error ->
-        @logger.error("Fail ed to update system: #{inspect(error, pretty: true)}")
+        @logger.error("Failed to update system: #{inspect(error, pretty: true)}")
         state
     end
   end
@@ -1121,7 +1114,7 @@ defmodule WandererApp.Map.Server.Impl do
          %{
            solar_system_id: solar_system_id,
            coordinates: coordinates
-         } = system_info,
+         } = _system_info,
          user_id,
          character_id
        ) do
@@ -1141,35 +1134,17 @@ defmodule WandererApp.Map.Server.Impl do
     {:ok, system} =
       case WandererApp.MapSystemRepo.get_by_map_and_solar_system_id(map_id, solar_system_id) do
         {:ok, existing_system} when not is_nil(existing_system) ->
-          use_old_coordinates = Map.get(system_info, :use_old_coordinates, false)
+          @ddrt.insert(
+            {solar_system_id,
+             WandererApp.Map.PositionCalculator.get_system_bounding_rect(%{
+               position_x: x,
+               position_y: y
+             })},
+            rtree_name
+          )
 
-          if use_old_coordinates do
-            @ddrt.insert(
-              {solar_system_id,
-               WandererApp.Map.PositionCalculator.get_system_bounding_rect(%{
-                 position_x: existing_system.position_x,
-                 position_y: existing_system.position_y
-               })},
-              rtree_name
-            )
-
-            {:ok, existing_system}
-          else
-            @ddrt.insert(
-              {solar_system_id,
-               WandererApp.Map.PositionCalculator.get_system_bounding_rect(%{
-                 position_x: x,
-                 position_y: y
-               })},
-              rtree_name
-            )
-
-            {:ok,
-             existing_system
-             |> WandererApp.MapSystemRepo.update_position!(%{position_x: x, position_y: y})
-             |> WandererApp.MapSystemRepo.cleanup_labels(map_opts)
-             |> WandererApp.MapSystemRepo.cleanup_tags()}
-          end
+          existing_system
+          |> WandererApp.MapSystemRepo.update_position(%{position_x: x, position_y: y})
 
         _ ->
           {:ok, solar_system_info} =
@@ -1612,13 +1587,13 @@ defmodule WandererApp.Map.Server.Impl do
            location.solar_system_id,
            old_location.solar_system_id
          ) do
-      {:ok, connection} when not is_nil(connection) ->
+      {:ok, connection} ->
         :ok = WandererApp.MapConnectionRepo.destroy(map_id, connection)
 
         broadcast!(map_id, :remove_connections, [connection])
         map_id |> WandererApp.Map.remove_connection(connection)
 
-      _error ->
+      {:error, _error} ->
         :ok
     end
   end

lib/wanderer_app/repositories/map_connection_repo.ex

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

lib/wanderer_app/repositories/map_system_repo.ex

@@ -22,11 +22,15 @@ defmodule WandererApp.MapSystemRepo do
   def get_visible_by_map(map_id),
     do: WandererApp.Api.MapSystem.read_visible_by_map(%{map_id: map_id})
 
-  def remove_from_map(map_id, solar_system_id) do
+  def remove_from_map(map_id, solar_system_id, opts) do
     WandererApp.Api.MapSystem.read_by_map_and_solar_system!(%{
       map_id: map_id,
       solar_system_id: solar_system_id
     })
+    |> cleanup_labels(opts)
+    |> WandererApp.Api.MapSystem.update_tag!(%{
+      tag: nil
+    })
     |> WandererApp.Api.MapSystem.update_visible(%{visible: false})
   rescue
     error ->
@@ -45,13 +49,6 @@ defmodule WandererApp.MapSystemRepo do
     })
   end
 
-  def cleanup_tags(system) do
-    system
-    |> WandererApp.Api.MapSystem.update_tag!(%{
-      tag: nil
-    })
-  end
-
   def get_filtered_labels(labels, true) when is_binary(labels) do
     labels
     |> Jason.decode!()
@@ -101,9 +98,4 @@ defmodule WandererApp.MapSystemRepo do
     do:
       system
       |> WandererApp.Api.MapSystem.update_position(update)
-
-  def update_position!(system, update),
-    do:
-      system
-      |> WandererApp.Api.MapSystem.update_position!(update)
 end

lib/wanderer_app/repositories/map_user_settings_repo.ex

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

lib/wanderer_app_web/components/user_activity.ex

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

lib/wanderer_app_web/live/maps/map_audit_live.ex

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

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

@@ -3,16 +3,7 @@
   class="pt-20 w-full h-full col-span-2 lg:col-span-1 p-4 pl-20 pb-20 overflow-auto"
 >
   <div class="flex flex-col gap-4 w-full">
-    <.live_component
-      module={UserActivity}
-      id="user-activity"
-      notify_to={self()}
-      can_undo_types={@can_undo_types}
-      stream={@streams.activity}
-      page={@page}
-      end_of_stream?={@end_of_stream?}
-      event_name="activity_event"
-    />
+    <UserActivity.list stream={@streams.activity} page={@page} end_of_stream?={@end_of_stream?} />
   </div>
 </main>
 <nav class="fixed top-0 z-100 px-6 pl-20 flex items-center justify-between w-full h-12 pointer-events-auto border-b border-gray-900  bg-opacity-70 bg-neutral-900">

lib/wanderer_app_web/live/maps/map_live.ex

@@ -5,23 +5,32 @@ defmodule WandererAppWeb.MapLive do
   require Logger
 
   @impl true
-  def mount(%{"slug" => map_slug} = params, _session, socket) when is_connected?(socket) do
-    Process.send_after(self(), {:load_map, map_slug}, Enum.random(10..500))
+  def mount(params, _session, socket) when is_connected?(socket) do
+    socket =
+      with %{"slug" => map_slug} <- params do
+        Process.send_after(self(), {:load_map, map_slug}, Enum.random(10..500))
+
+        socket
+        |> assign(map_slug: map_slug)
+        |> push_event("js-exec", %{
+          to: "#map-loader",
+          attr: "data-loading",
+          timeout: 2000
+        })
+      else
+        _ ->
+          socket
+          |> assign(map_slug: nil)
+      end
 
     {:ok,
      socket
      |> assign(
-       map_slug: map_slug,
        map_loaded?: false,
        server_online: false,
        selected_subscription: nil,
        user_permissions: nil
-     )
-     |> push_event("js-exec", %{
-       to: "#map-loader",
-       attr: "data-loading",
-       timeout: 2000
-     })}
+     )}
   end
 
   @impl true
@@ -29,7 +38,6 @@ defmodule WandererAppWeb.MapLive do
     {:ok,
      socket
      |> assign(
-       map_slug: nil,
        map_loaded?: false,
        server_online: false,
        selected_subscription: nil,
@@ -391,19 +399,6 @@ defmodule WandererAppWeb.MapLive do
     end
   end
 
-  @impl true
-  def handle_info(
-        %{event: :signatures_updated, payload: solar_system_id},
-        socket
-      ),
-      do:
-        {:noreply,
-         socket
-         |> push_map_event(
-           "signatures_updated",
-           solar_system_id
-         )}
-
   def handle_info(:no_access, socket),
     do:
       {:noreply,
@@ -679,7 +674,6 @@ defmodule WandererAppWeb.MapLive do
         "mass_status" -> :update_connection_mass_status
         "ship_size_type" -> :update_connection_ship_size_type
         "locked" -> :update_connection_locked
-        "custom_info" -> :update_connection_custom_info
         _ -> nil
       end
 
@@ -689,7 +683,6 @@ defmodule WandererAppWeb.MapLive do
         "mass_status" -> :mass_status
         "ship_size_type" -> :ship_size_type
         "locked" -> :locked
-        "custom_info" -> :custom_info
         _ -> nil
       end
 
@@ -765,13 +758,12 @@ defmodule WandererAppWeb.MapLive do
             delete_connection_with_sigs =
               map_user_settings
               |> WandererApp.MapUserSettingsRepo.to_form_data!()
-              |> WandererApp.MapUserSettingsRepo.get_boolean_setting(
-                "delete_connection_with_sigs"
-              )
+              |> WandererApp.MapUserSettingsRepo.get_boolean_setting("delete_connection_with_sigs")
 
             WandererApp.Api.MapSystemSignature.by_system_id!(system.id)
             |> Enum.filter(fn s -> s.eve_id in removed_signatures_eve_ids end)
             |> Enum.each(fn s ->
+
               if delete_connection_with_sigs && not is_nil(s.linked_system_id) do
                 map_id
                 |> WandererApp.Map.Server.delete_connection(%{
@@ -800,11 +792,6 @@ defmodule WandererAppWeb.MapLive do
               s |> WandererApp.Api.MapSystemSignature.create!()
             end)
 
-            Phoenix.PubSub.broadcast!(WandererApp.PubSub, map_id, %{
-              event: :signatures_updated,
-              payload: system.solar_system_id
-            })
-
             {:reply, %{signatures: get_system_signatures(system.id)}, socket}
 
           _ ->
@@ -1271,9 +1258,9 @@ defmodule WandererAppWeb.MapLive do
         } = socket
       ) do
     case WandererApp.Api.MapSystem.read_by_map_and_solar_system(%{
-           map_id: map_id,
-           solar_system_id: solar_system_source
-         }) do
+            map_id: map_id,
+            solar_system_id: solar_system_source
+          }) do
       {:ok, system} ->
         first_character_eve_id =
           user_characters |> List.first()
@@ -1289,75 +1276,15 @@ defmodule WandererAppWeb.MapLive do
               })
             end)
 
-            Phoenix.PubSub.broadcast!(WandererApp.PubSub, map_id, %{
-              event: :signatures_updated,
-              payload: solar_system_source
-            })
-
             {:noreply, socket}
 
           _ ->
             {:noreply,
-             socket
-             |> put_flash(
-               :error,
-               "You should enable tracking for at least one character to work with signatures."
-             )}
-        end
-
-      _ ->
-        {:noreply, socket}
-    end
-  end
-
-  @impl true
-  def handle_event(
-        "unlink_signature",
-        %{
-          "signature_eve_id" => signature_eve_id,
-          "solar_system_source" => solar_system_source
-        },
-        %{
-          assigns: %{
-            map_id: map_id,
-            user_characters: user_characters,
-            user_permissions: %{update_system: true}
-          }
-        } = socket
-      ) do
-    case WandererApp.Api.MapSystem.read_by_map_and_solar_system(%{
-           map_id: map_id,
-           solar_system_id: solar_system_source
-         }) do
-      {:ok, system} ->
-        first_character_eve_id =
-          user_characters |> List.first()
-
-        case not is_nil(first_character_eve_id) do
-          true ->
-            WandererApp.Api.MapSystemSignature.by_system_id!(system.id)
-            |> Enum.filter(fn s -> s.eve_id == signature_eve_id end)
-            |> Enum.each(fn s ->
-              s
-              |> WandererApp.Api.MapSystemSignature.update_linked_system(%{
-                linked_system_id: nil
-              })
-            end)
-
-            Phoenix.PubSub.broadcast!(WandererApp.PubSub, map_id, %{
-              event: :signatures_updated,
-              payload: solar_system_source
-            })
-
-            {:noreply, socket}
-
-          _ ->
-            {:noreply,
-             socket
-             |> put_flash(
-               :error,
-               "You should enable tracking for at least one character to work with signatures."
-             )}
+              socket
+              |> put_flash(
+                :error,
+                "You should enable tracking for at least one character to work with signatures."
+              )}
         end
 
       _ ->
@@ -1807,12 +1734,13 @@ defmodule WandererAppWeb.MapLive do
       |> Enum.map(fn %{updated_at: updated_at, linked_system_id: linked_system_id} = s ->
         s
         |> Map.take([
+          :system_id,
           :eve_id,
+          :character_eve_id,
           :name,
           :description,
           :kind,
           :group,
-          :type,
           :updated_at
         ])
         |> Map.put(:linked_system, get_system_static_info(linked_system_id))
@@ -2001,7 +1929,6 @@ defmodule WandererAppWeb.MapLive do
           description: Map.get(signature, "description"),
           kind: kind,
           group: group,
-          type: Map.get(signature, "type"),
           character_eve_id: character_eve_id
         }
       end)

mix.exs

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

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

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

priv/repo/migrations/20240922080418_add_connection_custom_info.exs

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

priv/repo/migrations/20241019083102_add_signature_type.exs

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

priv/repo/migrations/20241022135854_add_user_activity_index.exs

@@ -1,17 +0,0 @@
-defmodule WandererApp.Repo.Migrations.AddUserActivityIndex do
-  @moduledoc """
-  Updates resources based on their most recent snapshots.
-
-  This file was autogenerated with `mix ash_postgres.generate_migrations`
-  """
-
-  use Ecto.Migration
-
-  def up do
-    create index(:user_activity_v1, [:entity_id, :event_type, :inserted_at], unique: true)
-  end
-
-  def down do
-    drop_if_exists index(:user_activity_v1, [:entity_id, :event_type, :inserted_at])
-  end
-end

priv/resource_snapshots/repo/map_chain_v1/20240922080418.json

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

priv/resource_snapshots/repo/map_system_signatures_v1/20241019083102.json

@@ -1,177 +0,0 @@
-{
-  "attributes": [
-    {
-      "allow_nil?": false,
-      "default": "fragment(\"gen_random_uuid()\")",
-      "generated?": false,
-      "primary_key?": true,
-      "references": null,
-      "size": null,
-      "source": "id",
-      "type": "uuid"
-    },
-    {
-      "allow_nil?": false,
-      "default": "nil",
-      "generated?": false,
-      "primary_key?": false,
-      "references": null,
-      "size": null,
-      "source": "eve_id",
-      "type": "text"
-    },
-    {
-      "allow_nil?": false,
-      "default": "nil",
-      "generated?": false,
-      "primary_key?": false,
-      "references": null,
-      "size": null,
-      "source": "character_eve_id",
-      "type": "text"
-    },
-    {
-      "allow_nil?": true,
-      "default": "nil",
-      "generated?": false,
-      "primary_key?": false,
-      "references": null,
-      "size": null,
-      "source": "name",
-      "type": "text"
-    },
-    {
-      "allow_nil?": true,
-      "default": "nil",
-      "generated?": false,
-      "primary_key?": false,
-      "references": null,
-      "size": null,
-      "source": "description",
-      "type": "text"
-    },
-    {
-      "allow_nil?": true,
-      "default": "nil",
-      "generated?": false,
-      "primary_key?": false,
-      "references": null,
-      "size": null,
-      "source": "type",
-      "type": "text"
-    },
-    {
-      "allow_nil?": true,
-      "default": "nil",
-      "generated?": false,
-      "primary_key?": false,
-      "references": null,
-      "size": null,
-      "source": "linked_system_id",
-      "type": "bigint"
-    },
-    {
-      "allow_nil?": true,
-      "default": "nil",
-      "generated?": false,
-      "primary_key?": false,
-      "references": null,
-      "size": null,
-      "source": "kind",
-      "type": "text"
-    },
-    {
-      "allow_nil?": true,
-      "default": "nil",
-      "generated?": false,
-      "primary_key?": false,
-      "references": null,
-      "size": null,
-      "source": "group",
-      "type": "text"
-    },
-    {
-      "allow_nil?": false,
-      "default": "fragment(\"(now() AT TIME ZONE 'utc')\")",
-      "generated?": false,
-      "primary_key?": false,
-      "references": null,
-      "size": null,
-      "source": "inserted_at",
-      "type": "utc_datetime_usec"
-    },
-    {
-      "allow_nil?": false,
-      "default": "fragment(\"(now() AT TIME ZONE 'utc')\")",
-      "generated?": false,
-      "primary_key?": false,
-      "references": null,
-      "size": null,
-      "source": "updated_at",
-      "type": "utc_datetime_usec"
-    },
-    {
-      "allow_nil?": true,
-      "default": "nil",
-      "generated?": false,
-      "primary_key?": false,
-      "references": {
-        "deferrable": false,
-        "destination_attribute": "id",
-        "destination_attribute_default": null,
-        "destination_attribute_generated": null,
-        "index?": false,
-        "match_type": null,
-        "match_with": null,
-        "multitenancy": {
-          "attribute": null,
-          "global": null,
-          "strategy": null
-        },
-        "name": "map_system_signatures_v1_system_id_fkey",
-        "on_delete": null,
-        "on_update": null,
-        "primary_key?": true,
-        "schema": "public",
-        "table": "map_system_v1"
-      },
-      "size": null,
-      "source": "system_id",
-      "type": "uuid"
-    }
-  ],
-  "base_filter": null,
-  "check_constraints": [],
-  "custom_indexes": [],
-  "custom_statements": [],
-  "has_create_action": true,
-  "hash": "740CFD116B778B91E44B8EED8414E4B3B2734FF1D94681B8727484B958958BC7",
-  "identities": [
-    {
-      "all_tenants?": false,
-      "base_filter": null,
-      "index_name": "map_system_signatures_v1_uniq_system_eve_id_index",
-      "keys": [
-        {
-          "type": "atom",
-          "value": "system_id"
-        },
-        {
-          "type": "atom",
-          "value": "eve_id"
-        }
-      ],
-      "name": "uniq_system_eve_id",
-      "nils_distinct?": true,
-      "where": null
-    }
-  ],
-  "multitenancy": {
-    "attribute": null,
-    "global": null,
-    "strategy": null
-  },
-  "repo": "Elixir.WandererApp.Repo",
-  "schema": null,
-  "table": "map_system_signatures_v1"
-}

priv/resource_snapshots/repo/user_activity_v1/20241022135854.json

@@ -1,180 +0,0 @@
-{
-  "attributes": [
-    {
-      "allow_nil?": false,
-      "default": "fragment(\"gen_random_uuid()\")",
-      "generated?": false,
-      "primary_key?": true,
-      "references": null,
-      "size": null,
-      "source": "id",
-      "type": "uuid"
-    },
-    {
-      "allow_nil?": false,
-      "default": "nil",
-      "generated?": false,
-      "primary_key?": false,
-      "references": null,
-      "size": null,
-      "source": "entity_id",
-      "type": "text"
-    },
-    {
-      "allow_nil?": false,
-      "default": "\"map\"",
-      "generated?": false,
-      "primary_key?": false,
-      "references": null,
-      "size": null,
-      "source": "entity_type",
-      "type": "text"
-    },
-    {
-      "allow_nil?": false,
-      "default": "\"custom\"",
-      "generated?": false,
-      "primary_key?": false,
-      "references": null,
-      "size": null,
-      "source": "event_type",
-      "type": "text"
-    },
-    {
-      "allow_nil?": true,
-      "default": "nil",
-      "generated?": false,
-      "primary_key?": false,
-      "references": null,
-      "size": null,
-      "source": "event_data",
-      "type": "text"
-    },
-    {
-      "allow_nil?": false,
-      "default": "fragment(\"(now() AT TIME ZONE 'utc')\")",
-      "generated?": false,
-      "primary_key?": false,
-      "references": null,
-      "size": null,
-      "source": "inserted_at",
-      "type": "utc_datetime_usec"
-    },
-    {
-      "allow_nil?": false,
-      "default": "fragment(\"(now() AT TIME ZONE 'utc')\")",
-      "generated?": false,
-      "primary_key?": false,
-      "references": null,
-      "size": null,
-      "source": "updated_at",
-      "type": "utc_datetime_usec"
-    },
-    {
-      "allow_nil?": true,
-      "default": "nil",
-      "generated?": false,
-      "primary_key?": false,
-      "references": {
-        "deferrable": false,
-        "destination_attribute": "id",
-        "destination_attribute_default": null,
-        "destination_attribute_generated": null,
-        "index?": false,
-        "match_type": null,
-        "match_with": null,
-        "multitenancy": {
-          "attribute": null,
-          "global": null,
-          "strategy": null
-        },
-        "name": "user_activity_v1_character_id_fkey",
-        "on_delete": null,
-        "on_update": null,
-        "primary_key?": true,
-        "schema": "public",
-        "table": "character_v1"
-      },
-      "size": null,
-      "source": "character_id",
-      "type": "uuid"
-    },
-    {
-      "allow_nil?": false,
-      "default": "nil",
-      "generated?": false,
-      "primary_key?": true,
-      "references": {
-        "deferrable": false,
-        "destination_attribute": "id",
-        "destination_attribute_default": null,
-        "destination_attribute_generated": null,
-        "index?": false,
-        "match_type": null,
-        "match_with": null,
-        "multitenancy": {
-          "attribute": null,
-          "global": null,
-          "strategy": null
-        },
-        "name": "user_activity_v1_user_id_fkey",
-        "on_delete": null,
-        "on_update": null,
-        "primary_key?": true,
-        "schema": "public",
-        "table": "user_v1"
-      },
-      "size": null,
-      "source": "user_id",
-      "type": "uuid"
-    }
-  ],
-  "base_filter": null,
-  "check_constraints": [],
-  "custom_indexes": [
-    {
-      "all_tenants?": false,
-      "concurrently": false,
-      "error_fields": [
-        "entity_id",
-        "event_type",
-        "inserted_at"
-      ],
-      "fields": [
-        {
-          "type": "atom",
-          "value": "entity_id"
-        },
-        {
-          "type": "atom",
-          "value": "event_type"
-        },
-        {
-          "type": "atom",
-          "value": "inserted_at"
-        }
-      ],
-      "include": null,
-      "message": null,
-      "name": null,
-      "nulls_distinct": true,
-      "prefix": null,
-      "table": null,
-      "unique": true,
-      "using": null,
-      "where": null
-    }
-  ],
-  "custom_statements": [],
-  "has_create_action": true,
-  "hash": "0A26452A1A1C9A8BE1CFD18F9836FE7B778C984F589BD3C9B0EA2801B3FAC509",
-  "identities": [],
-  "multitenancy": {
-    "attribute": null,
-    "global": null,
-    "strategy": null
-  },
-  "repo": "Elixir.WandererApp.Repo",
-  "schema": null,
-  "table": "user_activity_v1"
-}