chore: release version v1.59.1

* feat (api): update character activity and api to allow date range

.devcontainer/Dockerfile

@@ -1,6 +1,27 @@
 FROM elixir:1.17-otp-27
 
 RUN apt install -yq curl gnupg
+# Install OS packages and Node.js (via nodesource),
+# plus inotify-tools and yarn
+RUN apt-get update && apt-get install -y --no-install-recommends \
+    sudo \
+    curl \
+    make \
+    git \
+    bash \
+    build-essential \
+    ca-certificates \
+    jq \
+    vim \
+    net-tools \
+    procps \
+    # Optionally add any other tools you need, e.g. vim, wget...
+    && curl -sL https://deb.nodesource.com/setup_18.x | bash - \
+    && apt-get install -y --no-install-recommends nodejs inotify-tools \
+    && npm install -g yarn \
+    && apt-get clean \
+    && rm -rf /var/lib/apt/lists/*
+
 RUN apt --fix-broken install
 
 RUN mix local.hex --force

.devcontainer/devcontainer.json

@@ -1,20 +1,30 @@
 {
   "name": "wanderer-dev",
   "dockerComposeFile": ["./docker-compose.yml"],
-  "extensions": [
-    "jakebecker.elixir-ls",
-    "JakeBecker.elixir-ls",
-    "dbaeumer.vscode-eslint",
-    "esbenp.prettier-vscode"
-  ],
+  "customizations": {
+    "vscode": {
+      "extensions": [
+        "jakebecker.elixir-ls",
+        "JakeBecker.elixir-ls",
+        "dbaeumer.vscode-eslint",
+        "esbenp.prettier-vscode"
+      ],
+      "settings": {
+        "editor.formatOnSave": true,
+        "search.exclude": {
+          "**/doc": true
+        },
+        "elixirLS.dialyzerEnabled": false
+      }
+    }
+  },
   "service": "wanderer",
   "workspaceFolder": "/app",
   "shutdownAction": "stopCompose",
-  "settings": {
-    "editor.formatOnSave": true,
-    "search.exclude": {
-      "**/doc": true
-    },
-    "elixirLS.dialyzerEnabled": false
-  }
+  "features": {
+    "ghcr.io/devcontainers/features/common-utils:2": {
+      "networkArgs": ["--add-host=host.docker.internal:host-gateway"]
+    }
+  },
+  "forwardPorts": [4444]
 }

.devcontainer/docker-compose.yml

@@ -14,15 +14,15 @@ services:
 
   wanderer:
     environment:
-      PORT: 8000
+      PORT: 4444
       DB_HOST: db
-      WEB_APP_URL: "http://localhost:8000"
+      WEB_APP_URL: "http://localhost:4444"
       ERL_AFLAGS: "-kernel shell_history enabled"
     build:
       context: .
       dockerfile: Dockerfile
     ports:
-      - 8000:8000
+      - 4444:4444
     volumes:
       - ..:/app:delegated
       - ~/.gitconfig:/root/.gitconfig

CHANGELOG.md

@@ -2,6 +2,169 @@
 
 <!-- changelog -->
 
+## [v1.59.1](https://github.com/wanderer-industries/wanderer/compare/v1.59.0...v1.59.1) (2025-03-26)
+
+
+
+
+### Bug Fixes:
+
+* doc: improve bot setup instructions (#309)
+
+## [v1.59.0](https://github.com/wanderer-industries/wanderer/compare/v1.58.0...v1.59.0) (2025-03-23)
+
+
+
+
+### Features:
+
+* Core: added handling cases when wrong connections created
+
+## [v1.58.0](https://github.com/wanderer-industries/wanderer/compare/v1.57.1...v1.58.0) (2025-03-22)
+
+
+
+
+### Features:
+
+* Core: Show online state on map characters page
+
+* api: update character activity and api to allow date range (#299)
+
+* api: update character activity and api to allow date range
+
+## [v1.57.1](https://github.com/wanderer-industries/wanderer/compare/v1.57.0...v1.57.1) (2025-03-20)
+
+
+
+
+## [v1.57.0](https://github.com/wanderer-industries/wanderer/compare/v1.56.6...v1.57.0) (2025-03-19)
+
+
+
+
+### Features:
+
+* doc: update bot news (#294)
+
+## [v1.56.6](https://github.com/wanderer-industries/wanderer/compare/v1.56.5...v1.56.6) (2025-03-19)
+
+
+
+
+## [v1.56.5](https://github.com/wanderer-industries/wanderer/compare/v1.56.4...v1.56.5) (2025-03-19)
+
+
+
+
+## [v1.56.4](https://github.com/wanderer-industries/wanderer/compare/v1.56.3...v1.56.4) (2025-03-19)
+
+
+
+
+## [v1.56.3](https://github.com/wanderer-industries/wanderer/compare/v1.56.2...v1.56.3) (2025-03-19)
+
+
+
+
+### Bug Fixes:
+
+* cloak key error behavior (#288)
+
+## [v1.56.2](https://github.com/wanderer-industries/wanderer/compare/v1.56.1...v1.56.2) (2025-03-18)
+
+
+
+
+### Bug Fixes:
+
+* show signature tooltip on top
+
+## [v1.56.1](https://github.com/wanderer-industries/wanderer/compare/v1.56.0...v1.56.1) (2025-03-18)
+
+
+
+
+### Bug Fixes:
+
+* update activity api (#284)
+
+* qol updates for dev (#283)
+
+## [v1.56.0](https://github.com/wanderer-industries/wanderer/compare/v1.55.2...v1.56.0) (2025-03-17)
+
+
+
+
+### Features:
+
+* add static wh info (#262)
+
+* add static wh info
+
+* api: add character activity api (#263)
+
+* api: add character activity api
+
+### Bug Fixes:
+
+* character activity hide error
+
+* character added to map on follow (#272)
+
+## [v1.55.2](https://github.com/wanderer-industries/wanderer/compare/v1.55.1...v1.55.2) (2025-03-16)
+
+
+
+
+### Bug Fixes:
+
+* Core: fixed lazy delete reset state
+
+## [v1.55.1](https://github.com/wanderer-industries/wanderer/compare/v1.55.0...v1.55.1) (2025-03-16)
+
+
+
+
+### Bug Fixes:
+
+* Core: fixed lazy delete timeouts
+
+* Core: fixed lazy delete settings
+
+* keep character api off by default (#258)
+
+## [v1.55.0](https://github.com/wanderer-industries/wanderer/compare/v1.54.1...v1.55.0) (2025-03-15)
+
+
+
+
+### Features:
+
+* News: added map subscription news
+
+* Api: added map audit base API. Added comments server validations.
+
+* enhance character activty and summmarize by user (#206)
+
+* enhance character activty and summmarize by user (#206)
+
+### Bug Fixes:
+
+* Core: updated balance top up instructions
+
+* updated connections cleanup logic
+
+* removed placeholder favicon (#240)
+
+* fixed activity aggregation and new user tracking (#230)
+
+* fixed activity aggregation and new user tracking (#230)
+
+* fixed activity aggregation and new user tracking (#230)
+
+* fixed activity aggregation and new user tracking (#230)
+
 ## [v1.54.1](https://github.com/wanderer-industries/wanderer/compare/v1.54.0...v1.54.1) (2025-03-06)
 
 

Makefile

@@ -1,4 +1,4 @@
-.PHONY: deploy install cleanup start yarn migrate format test coverage versions
+.PHONY: deploy install cleanup start yarn migrate format test coverage versions standalone-tests
 
 ROOT_DIR:=$(shell dirname $(realpath $(firstword $(MAKEFILE_LIST))))
 SHELL := /bin/bash
@@ -35,6 +35,11 @@ test t:
 coverage cover co:
 	mix test --cover
 
+unit-tests ut:
+	@echo "Running unit tests..."
+	@find test/unit -name "*.exs" -exec elixir {} \;
+	@echo "All unit tests completed."
+
 versions v:
 	@echo "Tool Versions"
 	@cat .tool-versions

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

@@ -67,16 +67,22 @@
   }
 }
 
-.p-sortable-column {
-  font-size: 12px;
-  font-weight: bold;
-  padding: 3px 4px;
+.p-datatable-thead {
+  th, th.p-sortable-column {
+    font-size: 12px;
+    font-weight: bold;
+    padding: 3px 4px;
+  }
 }
 
 .p-selectable-row td {
   padding: 4px 4px;
 }
 
+.p-datatable.p-datatable-sm .p-datatable-tbody > tr > td {
+  padding: 3px 4px;
+}
+
 .p-sortable-column > .p-column-header-content > span:last-child {
   transform: scale(0.7);
 

assets/js/hooks/Mapper/common-styles/prime-fixes/fix-popup.scss

@@ -0,0 +1,45 @@
+.p-confirm-popup {
+  display: flex;
+  flex-direction: column;
+  gap: 6px;
+  @apply p-[12px];
+
+  &::before, &::after {
+    display: none;
+  }
+
+  .p-confirm-popup-content, .p-confirm-popup-footer {
+    @apply p-0 m-0;
+  }
+
+  .p-confirm-popup-content {
+    display: flex;
+    gap: 6px;
+  }
+
+  .p-confirm-popup-footer {
+    display: flex;
+    justify-content: flex-end;
+    gap: 4px;
+  }
+
+  .p-confirm-popup-icon {
+    font-size: 14px;
+  }
+
+  .p-confirm-popup-message {
+    @apply m-0;
+    font-size: 12px;
+  }
+
+  .p-confirm-popup-reject.p-button-sm,
+  .p-confirm-popup-accept.p-button-sm {
+    @apply px-1.5 py-1 m-0;
+
+    & > span {
+      font-size: 12px;
+      line-height: 12px;
+    }
+  }
+
+}

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

@@ -1,4 +1,5 @@
 @import "fix-dialog";
+@import "fix-popup";
 //@import "fix-input";
 
 //@import "theme";

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

@@ -53,7 +53,7 @@ const MapContext = createContext<MapContextProps>({
   outCommand: async () => void 0,
 });
 
-export const MapProvider: React.FC<MapProviderProps> = ({ children, onCommand }) => {
+export const MapProvider = ({ children, onCommand }: MapProviderProps) => {
   const { update, ref } = useContextStore<MapData>({ ...INITIAL_DATA });
 
   return (

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

@@ -2,7 +2,6 @@ import React, { RefObject, useMemo } from 'react';
 import { ContextMenu } from 'primereact/contextmenu';
 import { PrimeIcons } from 'primereact/api';
 import { MenuItem } from 'primereact/menuitem';
-import { Edge } from '@reactflow/core/dist/esm/types/edges';
 import { ConnectionType, MassState, ShipSizeStatus, SolarSystemConnection, TimeStatus } from '@/hooks/Mapper/types';
 import clsx from 'clsx';
 import classes from './ContextMenuConnection.module.scss';
@@ -14,6 +13,7 @@ import {
   SHIP_SIZES_NAMES_SHORT,
   SHIP_SIZES_SIZE,
 } from '@/hooks/Mapper/components/map/constants.ts';
+import { Edge } from 'reactflow';
 
 export interface ContextMenuConnectionProps {
   contextMenuRef: RefObject<ContextMenu>;

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

@@ -1,9 +1,8 @@
-import { EdgeMouseHandler } from 'reactflow';
+import { Edge, EdgeMouseHandler } from 'reactflow';
 import { useCallback, useRef, useState } from 'react';
 import { ContextMenu } from 'primereact/contextmenu';
 import { useMapState } from '../../MapProvider.tsx';
 import { OutCommand } from '@/hooks/Mapper/types/mapHandlers.ts';
-import { Edge } from '@reactflow/core/dist/esm/types/edges';
 import { ConnectionType, MassState, ShipSizeStatus, SolarSystemConnection, TimeStatus } from '@/hooks/Mapper/types';
 import { ctxManager } from '@/hooks/Mapper/utils/contextManager.ts';
 

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

@@ -0,0 +1,52 @@
+import { MarkdownComment } from '@/hooks/Mapper/components/mapInterface/components/Comments/components';
+import { useEffect, useRef, useState } from 'react';
+import { CommentType } from '@/hooks/Mapper/types';
+import { useMapRootState } from '@/hooks/Mapper/mapRootProvider';
+
+export interface CommentsProps {}
+
+// eslint-disable-next-line no-empty-pattern
+export const Comments = ({}: CommentsProps) => {
+  const [commentsList, setCommentsList] = useState<CommentType[]>([]);
+
+  const {
+    data: { selectedSystems },
+    comments: { loadComments, comments, lastUpdateKey },
+  } = useMapRootState();
+
+  const [systemId] = selectedSystems;
+
+  const ref = useRef({ loadComments, systemId });
+  ref.current = { loadComments, systemId };
+
+  useEffect(() => {
+    const commentsBySystem = comments.get(systemId);
+    if (!commentsBySystem) {
+      return;
+    }
+
+    const els = [...commentsBySystem.comments].sort((a, b) => +new Date(b.updated_at) - +new Date(a.updated_at));
+
+    setCommentsList(els);
+  }, [systemId, lastUpdateKey, comments]);
+
+  useEffect(() => {
+    ref.current.loadComments(systemId);
+  }, [systemId]);
+
+  if (commentsList.length === 0) {
+    return (
+      <div className="w-full h-full flex justify-center items-center select-none text-stone-400/80 text-sm">
+        Not comments found here
+      </div>
+    );
+  }
+
+  return (
+    <div className="flex flex-col gap-1 mt-1 whitespace-nowrap overflow-auto text-ellipsis custom-scrollbar">
+      {commentsList.map(({ id, text, updated_at, characterEveId }) => (
+        <MarkdownComment key={id} text={text} time={updated_at} characterEveId={characterEveId} id={id} />
+      ))}
+    </div>
+  );
+};

assets/js/hooks/Mapper/components/mapInterface/components/Comments/components/MarkdownComment/MarkdownComment.module.scss

@@ -0,0 +1,70 @@
+.MarkdownCommentRoot {
+  border-left-width: 3px;
+
+  @apply text-[12px] leading-[1.2] text-stone-300 break-words;
+  @apply bg-gradient-to-r from-stone-600/40 via-stone-600/10 to-stone-600/0;
+
+  .h1 {
+    @apply text-[12px] font-normal m-0 p-0 border-none break-words whitespace-normal;
+  }
+
+  .h2 {
+    @apply text-[12px] font-normal m-0 p-0 border-none break-words whitespace-normal;
+  }
+
+  .h3 {
+    @apply text-[12px] font-normal m-0 p-0 border-none break-words whitespace-normal;
+  }
+
+  .h4 {
+    @apply text-[12px] font-normal m-0 p-0 border-none break-words whitespace-normal;
+  }
+
+  .h5 {
+    @apply text-[12px] font-normal m-0 p-0 border-none break-words whitespace-normal;
+  }
+
+  .h6 {
+    @apply text-[12px] font-normal m-0 p-0 border-none break-words whitespace-normal;
+  }
+
+  p {
+    @apply m-0 p-0 break-words whitespace-normal;
+  }
+
+  ul, ol {
+    @apply m-0 p-0 list-none;
+  }
+
+  li {
+    @apply m-0 break-words whitespace-normal;
+  }
+
+  blockquote {
+    @apply border-l-4 border-cyan-400 p-2 m-0 font-normal text-stone-300 italic break-words whitespace-normal;
+  }
+
+  a {
+    @apply text-violet-400 cursor-pointer transition-colors duration-200 break-words whitespace-normal;
+
+    &:hover {
+      @apply underline;
+    }
+  }
+
+  b, strong {
+    @apply font-bold text-green-400 break-words whitespace-normal;
+  }
+
+  i, em {
+    @apply italic text-pink-400 break-words whitespace-normal;
+  }
+
+  del {
+    @apply line-through text-stone-500 break-words whitespace-normal;
+  }
+
+  hr {
+    @apply border-none h-[1px] bg-cyan-400 opacity-50 my-2;
+  }
+}

assets/js/hooks/Mapper/components/mapInterface/components/Comments/components/MarkdownComment/MarkdownComment.tsx

@@ -0,0 +1,95 @@
+import classes from './MarkdownComment.module.scss';
+import clsx from 'clsx';
+import Markdown from 'react-markdown';
+import remarkGfm from 'remark-gfm';
+import { InfoDrawer, TimeAgo, TooltipPosition, WdImgButton } from '@/hooks/Mapper/components/ui-kit';
+import remarkBreaks from 'remark-breaks';
+import { useGetCacheCharacter } from '@/hooks/Mapper/mapRootProvider/hooks/api';
+import { useCallback, useRef, useState } from 'react';
+import { WdTransition } from '@/hooks/Mapper/components/ui-kit/WdTransition/WdTransition.tsx';
+import { PrimeIcons } from 'primereact/api';
+import { ConfirmPopup } from 'primereact/confirmpopup';
+import { useMapRootState } from '@/hooks/Mapper/mapRootProvider';
+import { OutCommand } from '@/hooks/Mapper/types';
+
+const TOOLTIP_PROPS = { content: 'Remove comment', position: TooltipPosition.top };
+const REMARK_PLUGINS = [remarkGfm, remarkBreaks];
+
+export interface MarkdownCommentProps {
+  text: string;
+  time: string;
+  characterEveId: string;
+  id: string;
+}
+
+export const MarkdownComment = ({ text, time, characterEveId, id }: MarkdownCommentProps) => {
+  const char = useGetCacheCharacter(characterEveId);
+  const [hovered, setHovered] = useState(false);
+
+  const cpRemoveBtnRef = useRef<HTMLElement>();
+  const [cpRemoveVisible, setCpRemoveVisible] = useState(false);
+
+  const { outCommand } = useMapRootState();
+  const ref = useRef({ outCommand, id });
+  ref.current = { outCommand, id };
+
+  const handleDelete = useCallback(async () => {
+    await ref.current.outCommand({
+      type: OutCommand.deleteSystemComment,
+      data: ref.current.id,
+    });
+  }, []);
+
+  const handleMouseEnter = useCallback(() => setHovered(true), []);
+  const handleMouseLeave = useCallback(() => setHovered(false), []);
+
+  const handleShowCP = useCallback(() => setCpRemoveVisible(true), []);
+  const handleHideCP = useCallback(() => setCpRemoveVisible(false), []);
+
+  return (
+    <>
+      <InfoDrawer
+        labelClassName="mb-[3px]"
+        className={clsx(classes.MarkdownCommentRoot, 'p-1 bg-stone-700/20 ')}
+        onMouseEnter={handleMouseEnter}
+        onMouseLeave={handleMouseLeave}
+        title={
+          <div className="flex items-center justify-between">
+            <div>
+              <span className="text-stone-500">
+                by <span className="text-orange-300/70">{char?.data?.name ?? ''}</span>
+              </span>
+            </div>
+
+            <WdTransition active={hovered} timeout={100}>
+              <div className="text-stone-500 max-h-[12px]">
+                {!hovered && <TimeAgo timestamp={time} />}
+                {hovered && (
+                  // @ts-ignore
+                  <div ref={cpRemoveBtnRef}>
+                    <WdImgButton
+                      className={clsx(PrimeIcons.TRASH, 'hover:text-red-400')}
+                      tooltip={TOOLTIP_PROPS}
+                      onClick={handleShowCP}
+                    />
+                  </div>
+                )}
+              </div>
+            </WdTransition>
+          </div>
+        }
+      >
+        <Markdown remarkPlugins={REMARK_PLUGINS}>{text}</Markdown>
+      </InfoDrawer>
+
+      <ConfirmPopup
+        target={cpRemoveBtnRef.current}
+        visible={cpRemoveVisible}
+        onHide={handleHideCP}
+        message="Are you sure you want to delete?"
+        icon="pi pi-exclamation-triangle"
+        accept={handleDelete}
+      />
+    </>
+  );
+};

assets/js/hooks/Mapper/components/mapInterface/components/Comments/components/MarkdownComment/index.ts

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

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

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

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

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

assets/js/hooks/Mapper/components/mapInterface/components/Comments/markdownexample.ts

@@ -0,0 +1,26 @@
+export const markdown = `
+  # Heading 1
+  ## Heading 2
+  ### Heading 3
+  #### Heading 4
+  ##### Heading 5
+  ###### Heading 6
+
+  ---
+
+  ## Paragraphs
+  This is a regular text paragraph.
+
+  Another paragraph, but with **bold** and *italic* text, as well as ~~strikethrough~~.
+
+  > This is a block quote.
+  > Second line of the quote.
+
+  ## Links
+  [Link to Google](https://www.google.com)
+
+  ## Horizontal Line
+  A block quote with ~strikethrough~ and a URL: https://reactjs.org.
+  ---
+
+  `;

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

@@ -0,0 +1,72 @@
+import { TooltipPosition, WdImageSize, WdImgButton } from '@/hooks/Mapper/components/ui-kit';
+import clsx from 'clsx';
+import { PrimeIcons } from 'primereact/api';
+import { MarkdownEditor } from '@/hooks/Mapper/components/mapInterface/components/MarkdownEditor';
+import { useHotkey } from '@/hooks/Mapper/hooks';
+import { useCallback, useRef, useState } from 'react';
+import { OutCommand } from '@/hooks/Mapper/types';
+import { useMapRootState } from '@/hooks/Mapper/mapRootProvider';
+
+export interface CommentsEditorProps {}
+
+export const CommentsEditor = ({}: CommentsEditorProps) => {
+  const [textVal, setTextVal] = useState('');
+
+  const {
+    data: { selectedSystems },
+    outCommand,
+  } = useMapRootState();
+
+  const [systemId] = selectedSystems;
+
+  const ref = useRef({ outCommand, systemId, textVal });
+  ref.current = { outCommand, systemId, textVal };
+
+  const handleFinishEdit = useCallback(async () => {
+    if (ref.current.textVal === '') {
+      return;
+    }
+
+    await ref.current.outCommand({
+      type: OutCommand.addSystemComment,
+      data: {
+        solarSystemId: ref.current.systemId,
+        value: ref.current.textVal,
+      },
+    });
+    setTextVal('');
+  }, []);
+
+  const handleClick = async () => {
+    await handleFinishEdit();
+  };
+
+  useHotkey(true, ['Enter'], async () => {
+    await handleFinishEdit();
+  });
+
+  return (
+    <MarkdownEditor
+      value={textVal}
+      onChange={setTextVal}
+      overlayContent={
+        <div className="w-full h-full flex justify-end items-end pointer-events-none pb-[1px] pr-[8px]">
+          <WdImgButton
+            disabled={textVal.length === 0}
+            tooltip={{
+              position: TooltipPosition.bottom,
+              content: (
+                <span>
+                  Also you may use <span className="text-cyan-400">Meta + Enter</span> hotkey.
+                </span>
+              ),
+            }}
+            textSize={WdImageSize.large}
+            className={clsx(PrimeIcons.SEND, 'text-[14px]')}
+            onClick={handleClick}
+          />
+        </div>
+      }
+    />
+  );
+};

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

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

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

@@ -0,0 +1,40 @@
+.CERoot {
+  @apply border border-stone-400/30 rounded-[2px];
+
+  :global {
+    .cm-content {
+      @apply bg-stone-600/40;
+    }
+
+    .cm-scroller {
+      scrollbar-width: thin;
+      scrollbar-color: rgba(255, 255, 255, 0.5) transparent;
+    }
+
+    .cm-scroller::-webkit-scrollbar {
+      width: 10px;
+    }
+
+    .cm-scroller::-webkit-scrollbar-track {
+      background: transparent;
+    }
+
+    .cm-scroller::-webkit-scrollbar-thumb {
+      background-color: rgba(255, 255, 255, 0.5);
+      border-radius: 5px;
+      border: 2px solid transparent;
+      background-clip: content-box;
+    }
+
+    .cm-scroller::-webkit-scrollbar-thumb:hover {
+      background-color: rgba(255, 255, 255, 0.7);
+    }
+
+    .cm-scroller::-webkit-scrollbar-button {
+      display: none;
+      height: 0;
+      width: 0;
+    }
+
+  }
+}

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

@@ -0,0 +1,87 @@
+import { ReactNode, useCallback, useRef, useState } from 'react';
+import CodeMirror, { ViewPlugin } from '@uiw/react-codemirror';
+import { markdown } from '@codemirror/lang-markdown';
+import { oneDark } from '@codemirror/theme-one-dark';
+import { EditorView, type ViewUpdate } from '@codemirror/view';
+
+import classes from './MarkdownEditor.module.scss';
+import clsx from 'clsx';
+
+// TODO special plugin which force CodeMirror using capture for paste event
+const stopEventPropagationPlugin = ViewPlugin.fromClass(
+  class {
+    constructor(view: EditorView) {
+      // @ts-ignore
+      this.view = view;
+
+      // @ts-ignore
+      this.pasteHandler = (event: Event) => {
+        console.log('Paste done in editor, stopping global listeners.');
+        event.stopPropagation();
+      };
+
+      // @ts-ignore
+      view.dom.addEventListener('paste', this.pasteHandler);
+    }
+
+    destroy() {
+      // @ts-ignore
+      this.view.dom.removeEventListener('paste', this.pasteHandler);
+    }
+  },
+);
+
+const CODE_MIRROR_EXTENSIONS = [
+  markdown(),
+  EditorView.lineWrapping,
+  EditorView.theme({
+    '&': { backgroundColor: 'transparent !important' },
+    '& .cm-gutterElement': { display: 'none' },
+  }),
+  stopEventPropagationPlugin,
+];
+
+export interface MarkdownEditorProps {
+  overlayContent?: ReactNode;
+  value: string;
+  onChange: (value: string) => void;
+}
+
+export const MarkdownEditor = ({ value, onChange, overlayContent }: MarkdownEditorProps) => {
+  const [hasShift, setHasShift] = useState(false);
+
+  const refData = useRef({ onChange });
+  refData.current = { onChange };
+
+  const handleOnChange = useCallback((value: string, viewUpdate: ViewUpdate) => {
+    // Rerender happens after change
+    setTimeout(() => {
+      const scrollDOM = viewUpdate.view.scrollDOM;
+      setHasShift(scrollDOM.scrollHeight > scrollDOM.clientHeight);
+    }, 0);
+
+    refData.current.onChange(value);
+  }, []);
+
+  return (
+    <div className={clsx(classes.MarkdownEditor, 'relative')}>
+      <CodeMirror
+        value={value}
+        height="70px"
+        extensions={CODE_MIRROR_EXTENSIONS}
+        className={classes.CERoot}
+        theme={oneDark}
+        onChange={handleOnChange}
+        placeholder="Start typing..."
+      />
+      <div
+        className={clsx('absolute top-0 left-0 h-full pointer-events-none', {
+          'w-full': !hasShift,
+          'w-[calc(100%-10px)]': hasShift,
+        })}
+      >
+        {overlayContent}
+      </div>
+    </div>
+  );
+};

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

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

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

@@ -1,17 +1,10 @@
-import { useCallback, useRef, useMemo } from 'react';
+import { useCallback, useMemo, useRef } from 'react';
 import { Dialog } from 'primereact/dialog';
 
 import { OutCommand } from '@/hooks/Mapper/types/mapHandlers.ts';
-import { SystemSignature, TimeStatus } from '@/hooks/Mapper/types';
+import { CommandLinkSignatureToSystem, SignatureGroup, SystemSignature, TimeStatus } from '@/hooks/Mapper/types';
 import { useMapRootState } from '@/hooks/Mapper/mapRootProvider';
-import { CommandLinkSignatureToSystem } from '@/hooks/Mapper/types';
 import { SystemSignaturesContent } from '@/hooks/Mapper/components/mapInterface/widgets/SystemSignatures/SystemSignaturesContent';
-import { SHOW_DESCRIPTION_COLUMN_SETTING } from '@/hooks/Mapper/components/mapInterface/widgets/SystemSignatures/SystemSignatures';
-import {
-  Setting,
-  COSMIC_SIGNATURE,
-} from '@/hooks/Mapper/components/mapInterface/widgets/SystemSignatures/SystemSignatureSettingsDialog';
-import { SignatureGroup } from '@/hooks/Mapper/types';
 import { parseSignatureCustomInfo } from '@/hooks/Mapper/helpers/parseSignatureCustomInfo';
 import { getWhSize } from '@/hooks/Mapper/helpers/getWhSize';
 import { useSystemInfo } from '@/hooks/Mapper/components/hooks';
@@ -21,6 +14,10 @@ import {
   WORMHOLES_ADDITIONAL_INFO_BY_SHORT_NAME,
 } from '@/hooks/Mapper/components/map/constants.ts';
 import { K162_TYPES_MAP } from '@/hooks/Mapper/constants.ts';
+import {
+  SETTINGS_KEYS,
+  SignatureSettingsType,
+} from '@/hooks/Mapper/components/mapInterface/widgets/SystemSignatures/constants.ts';
 
 const K162_SIGNATURE_TYPE = WORMHOLES_ADDITIONAL_INFO_BY_SHORT_NAME['K162'].shortName;
 
@@ -29,11 +26,11 @@ interface SystemLinkSignatureDialogProps {
   setVisible: (visible: boolean) => void;
 }
 
-const signatureSettings: Setting[] = [
-  { key: COSMIC_SIGNATURE, name: 'Show Cosmic Signatures', value: true },
-  { key: SignatureGroup.Wormhole, name: 'Wormhole', value: true },
-  { key: SHOW_DESCRIPTION_COLUMN_SETTING, name: 'Show Description Column', value: true, isFilter: false },
-];
+export const LINK_SIGNTATURE_SETTINGS: SignatureSettingsType = {
+  [SETTINGS_KEYS.COSMIC_SIGNATURE]: true,
+  [SETTINGS_KEYS.WORMHOLE]: true,
+  [SETTINGS_KEYS.SHOW_DESCRIPTION_COLUMN]: true,
+};
 
 // Extend the SignatureCustomInfo type to include k162Type
 interface ExtendedSignatureCustomInfo {
@@ -175,7 +172,7 @@ export const SystemLinkSignatureDialog = ({ data, setVisible }: SystemLinkSignat
       <SystemSignaturesContent
         systemId={`${data.solar_system_source}`}
         hideLinkedSignatures
-        settings={signatureSettings}
+        settings={LINK_SIGNTATURE_SETTINGS}
         onSelect={handleSelect}
         selectable={true}
         filterSignature={filterSignature}

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

@@ -7,8 +7,9 @@ import {
   SystemStructures,
   SystemKills,
 } from '@/hooks/Mapper/components/mapInterface/widgets';
+import { CommentsWidget } from '@/hooks/Mapper/components/mapInterface/widgets/CommentsWidget';
 
-export const CURRENT_WINDOWS_VERSION = 8;
+export const CURRENT_WINDOWS_VERSION = 9;
 export const WINDOWS_LOCAL_STORE_KEY = 'windows:settings:v2';
 
 export enum WidgetsIds {
@@ -18,6 +19,7 @@ export enum WidgetsIds {
   routes = 'routes',
   structures = 'structures',
   kills = 'kills',
+  comments = 'comments',
 }
 
 export const STORED_VISIBLE_WIDGETS_DEFAULT = [
@@ -70,6 +72,13 @@ export const DEFAULT_WIDGETS: WindowProps[] = [
     zIndex: 0,
     content: () => <SystemKills />,
   },
+  {
+    id: WidgetsIds.comments,
+    position: { x: 10, y: 10 },
+    size: { width: 250, height: 300 },
+    zIndex: 0,
+    content: () => <CommentsWidget />,
+  },
 ];
 
 type WidgetsCheckboxesType = {
@@ -102,4 +111,8 @@ export const WIDGETS_CHECKBOXES_PROPS: WidgetsCheckboxesType = [
     id: WidgetsIds.kills,
     label: 'Kills',
   },
+  {
+    id: WidgetsIds.comments,
+    label: 'Comments',
+  },
 ];

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

@@ -0,0 +1,82 @@
+import { Widget } from '@/hooks/Mapper/components/mapInterface/components';
+import { Comments } from '@/hooks/Mapper/components/mapInterface/components/Comments';
+import { InfoDrawer, SystemView, TooltipPosition, WdImgButton } from '@/hooks/Mapper/components/ui-kit';
+import { useRef } from 'react';
+import useMaxWidth from '@/hooks/Mapper/hooks/useMaxWidth.ts';
+import { COMPACT_MAX_WIDTH } from '@/hooks/Mapper/components/mapInterface/widgets/SystemSignatures/constants.ts';
+import { useMapRootState } from '@/hooks/Mapper/mapRootProvider';
+import clsx from 'clsx';
+import { CommentsEditor } from '@/hooks/Mapper/components/mapInterface/components/CommentsEditor';
+import { PrimeIcons } from 'primereact/api';
+
+export const CommentsWidgetContent = () => {
+  const {
+    data: { selectedSystems },
+  } = useMapRootState();
+
+  const isNotSelectedSystem = selectedSystems.length !== 1;
+
+  if (isNotSelectedSystem) {
+    return (
+      <div className="w-full h-full flex justify-center items-center select-none text-stone-400/80 text-sm">
+        System is not selected
+      </div>
+    );
+  }
+
+  return (
+    <div className={clsx('h-full grid grid-rows-[1fr_auto] gap-1 px-[4px]')}>
+      <Comments />
+      <CommentsEditor />
+    </div>
+  );
+};
+
+export const CommentsWidget = () => {
+  const containerRef = useRef<HTMLDivElement>(null);
+  const isCompact = useMaxWidth(containerRef, COMPACT_MAX_WIDTH);
+
+  const {
+    data: { selectedSystems, isSubscriptionActive },
+  } = useMapRootState();
+  const [systemId] = selectedSystems;
+  const isNotSelectedSystem = selectedSystems.length !== 1;
+
+  return (
+    <Widget
+      label={
+        <div ref={containerRef} className="flex justify-between items-center gap-1 text-xs w-full">
+          <div className="flex items-center gap-1">
+            {!isCompact && (
+              <div className="flex whitespace-nowrap text-ellipsis overflow-hidden text-stone-400">
+                Comments {isNotSelectedSystem ? '' : 'in'}
+              </div>
+            )}
+            {!isNotSelectedSystem && <SystemView systemId={systemId} className="select-none text-center" hideRegion />}
+          </div>
+          <WdImgButton
+            className={PrimeIcons.QUESTION_CIRCLE}
+            tooltip={{
+              position: TooltipPosition.left,
+              content: (
+                <div className="flex flex-col gap-1">
+                  <InfoDrawer title={<b className="text-slate-50">How to add/delete comment?</b>}>
+                    It is possible to use markdown formating. <br />
+                    Only users with tracking permission can add/delete comments. <br />
+                  </InfoDrawer>
+                  <InfoDrawer title={<b className="text-slate-50">Limitations</b>}>
+                    Each comment length is limited to <b>500</b> characters. <br />
+                    No more than <b>{isSubscriptionActive ? '500' : '30'}</b> comments are allowed per system*. <br />
+                    <small>* based on active map subscription.</small>
+                  </InfoDrawer>
+                </div>
+              ),
+            }}
+          />
+        </div>
+      }
+    >
+      <CommentsWidgetContent />
+    </Widget>
+  );
+};

assets/js/hooks/Mapper/components/mapInterface/widgets/CommentsWidget/index.ts

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

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

@@ -13,6 +13,7 @@ export const LocalCharactersItemTemplate = ({ showShipName, ...options }: LocalC
       className={clsx(
         classes.CharacterRow,
         'box-border flex items-center w-full whitespace-nowrap overflow-hidden text-ellipsis min-w-[0px]',
+        'px-1',
         {
           'surface-hover': options.odd,
           'border-b border-gray-600 border-opacity-20': !options.last,

assets/js/hooks/Mapper/components/mapInterface/widgets/SystemKills/SystemKillsContent/SystemKillsContent.module.scss

@@ -2,8 +2,6 @@
 .scrollerContent {
   overflow-x: hidden;
   overflow-y: auto;
-  padding-right: 8px;
-  padding-left: 8px;
   height: 100% !important;
 }
 
@@ -13,11 +11,11 @@
   display: flex !important;
   flex-direction: column !important;
   height: 100% !important;
-  
+
   // Target this specific VirtualScroller instance
   &:global(.p-virtualscroller) {
     height: 100% !important;
-    
+
     :global(.p-virtualscroller-content) {
       height: 100% !important;
     }

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

@@ -10,12 +10,12 @@ export interface SignatureViewProps {
 export const SignatureView = ({ signature, showCharacterPortrait = false }: SignatureViewProps) => {
   const isWormhole = signature?.group === SignatureGroup.Wormhole;
   const hasCharacterInfo = showCharacterPortrait && signature.character_eve_id;
-  const groupDisplay = isWormhole ? SignatureGroup.Wormhole : signature?.group ?? SignatureGroup.CosmicSignature;
+  const groupDisplay = isWormhole ? SignatureGroup.Wormhole : (signature?.group ?? SignatureGroup.CosmicSignature);
   const characterName = signature.character_name || 'Unknown character';
 
   return (
     <div className="flex flex-col gap-2">
-      <div className="flex gap-2 items-center">
+      <div className="flex gap-2 items-center px-2">
         {renderIcon(signature)}
         <div>{signature?.eve_id}</div>
         <div>{groupDisplay}</div>

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

@@ -1,15 +1,21 @@
-import React from 'react';
-import { SystemView, WdCheckbox, WdImgButton, TooltipPosition } from '@/hooks/Mapper/components/ui-kit';
+import { useRef } from 'react';
+import {
+  InfoDrawer,
+  LayoutEventBlocker,
+  SystemView,
+  TooltipPosition,
+  WdCheckbox,
+  WdImgButton,
+} from '@/hooks/Mapper/components/ui-kit';
 import { PrimeIcons } from 'primereact/api';
 import { CheckboxChangeEvent } from 'primereact/checkbox';
-import { InfoDrawer, LayoutEventBlocker } from '@/hooks/Mapper/components/ui-kit';
 import { WdTooltipWrapper } from '@/hooks/Mapper/components/ui-kit/WdTooltipWrapper';
+import useMaxWidth from '@/hooks/Mapper/hooks/useMaxWidth.ts';
+import { COMPACT_MAX_WIDTH } from '@/hooks/Mapper/components/mapInterface/widgets/SystemSignatures/constants.ts';
+import { useMapRootState } from '@/hooks/Mapper/mapRootProvider';
 
 export type HeaderProps = {
-  systemId: string;
-  isNotSelectedSystem: boolean;
   sigCount: number;
-  isCompact: boolean;
   lazyDeleteValue: boolean;
   onLazyDeleteChange: (checked: boolean) => void;
   pendingCount: number;
@@ -18,18 +24,25 @@ export type HeaderProps = {
   onSettingsClick: () => void;
 };
 
-function HeaderImpl({
-  systemId,
-  isNotSelectedSystem,
+export const SystemSignaturesHeader = ({
   sigCount,
-  isCompact,
   lazyDeleteValue,
   onLazyDeleteChange,
   pendingCount,
   pendingTimeRemaining,
   onUndoClick,
   onSettingsClick,
-}: HeaderProps) {
+}: HeaderProps) => {
+  const {
+    data: { selectedSystems },
+  } = useMapRootState();
+
+  const [systemId] = selectedSystems;
+  const isNotSelectedSystem = selectedSystems.length !== 1;
+
+  const containerRef = useRef<HTMLDivElement>(null);
+  const isCompact = useMaxWidth(containerRef, COMPACT_MAX_WIDTH);
+
   // Format time remaining as seconds
   const formatTimeRemaining = () => {
     if (!pendingTimeRemaining) return '';
@@ -38,71 +51,68 @@ function HeaderImpl({
   };
 
   return (
-    <div className="flex justify-between items-center text-xs w-full h-full">
-      <div className="flex justify-between items-center gap-1">
-        {!isCompact && (
-          <div className="flex whitespace-nowrap text-ellipsis overflow-hidden text-stone-400">
-            {sigCount ? `[${sigCount}] ` : ''}Signatures {isNotSelectedSystem ? '' : 'in'}
-          </div>
-        )}
-        {!isNotSelectedSystem && <SystemView systemId={systemId} className="select-none text-center" hideRegion />}
-      </div>
+    <div ref={containerRef} className="w-full">
+      <div className="flex justify-between items-center text-xs w-full h-full">
+        <div className="flex justify-between items-center gap-1">
+          {!isCompact && (
+            <div className="flex whitespace-nowrap text-ellipsis overflow-hidden text-stone-400">
+              {sigCount ? `[${sigCount}] ` : ''}Signatures {isNotSelectedSystem ? '' : 'in'}
+            </div>
+          )}
+          {!isNotSelectedSystem && <SystemView systemId={systemId} className="select-none text-center" hideRegion />}
+        </div>
 
-      <LayoutEventBlocker className="flex gap-2.5">
-        <WdTooltipWrapper content="Enable Lazy delete">
-          <WdCheckbox
-            size="xs"
-            labelSide="left"
-            label={isCompact ? '' : 'Lazy delete'}
-            value={lazyDeleteValue}
-            classNameLabel="text-stone-400 hover:text-stone-200 transition duration-300 whitespace-nowrap text-ellipsis overflow-hidden"
-            onChange={(event: CheckboxChangeEvent) => onLazyDeleteChange(!!event.checked)}
-          />
-        </WdTooltipWrapper>
+        <LayoutEventBlocker className="flex gap-2.5">
+          <WdTooltipWrapper content="Enable Lazy delete">
+            <WdCheckbox
+              size="xs"
+              labelSide="left"
+              label={isCompact ? '' : 'Lazy delete'}
+              value={lazyDeleteValue}
+              classNameLabel="text-stone-400 hover:text-stone-200 transition duration-300 whitespace-nowrap text-ellipsis overflow-hidden"
+              onChange={(event: CheckboxChangeEvent) => onLazyDeleteChange(!!event.checked)}
+            />
+          </WdTooltipWrapper>
+
+          {pendingCount > 0 && (
+            <WdImgButton
+              className={PrimeIcons.UNDO}
+              style={{ color: 'red' }}
+              tooltip={{ content: `Undo pending changes (${pendingCount})${formatTimeRemaining()}` }}
+              onClick={onUndoClick}
+            />
+          )}
 
-        {pendingCount > 0 && (
           <WdImgButton
-            className={PrimeIcons.UNDO}
-            style={{ color: 'red' }}
+            className={PrimeIcons.QUESTION_CIRCLE}
             tooltip={{
-              content: `Undo pending changes (${pendingCount})${formatTimeRemaining()}`,
-              position: TooltipPosition.top,
+              position: TooltipPosition.left,
+              content: (
+                <div className="flex flex-col gap-1">
+                  <InfoDrawer title={<b className="text-slate-50">How to add/update signature?</b>}>
+                    In game you need to select one or more signatures <br /> in the list in{' '}
+                    <b className="text-sky-500">Probe scanner</b>. <br /> Use next hotkeys:
+                    <br />
+                    <b className="text-sky-500">Shift + LMB</b> or <b className="text-sky-500">Ctrl + LMB</b>
+                    <br /> or <b className="text-sky-500">Ctrl + A</b> for select all
+                    <br /> and then use <b className="text-sky-500">Ctrl + C</b>, after you need to go <br />
+                    here, select Solar system and paste it with <b className="text-sky-500">Ctrl + V</b>
+                  </InfoDrawer>
+                  <InfoDrawer title={<b className="text-slate-50">How to select?</b>}>
+                    For selecting any signature, click on it <br /> with hotkeys{' '}
+                    <b className="text-sky-500">Shift + LMB</b> or <b className="text-sky-500">Ctrl + LMB</b>
+                  </InfoDrawer>
+                  <InfoDrawer title={<b className="text-slate-50">How to delete?</b>}>
+                    To delete any signature, first select it <br /> and then press <b className="text-sky-500">Del</b>
+                  </InfoDrawer>
+                </div>
+              ),
             }}
-            onClick={onUndoClick}
           />
-        )}
 
-        <WdImgButton
-          className={PrimeIcons.QUESTION_CIRCLE}
-          tooltip={{
-            position: TooltipPosition.left,
-            content: (
-              <div className="flex flex-col gap-1">
-                <InfoDrawer title={<b className="text-slate-50">How to add/update signature?</b>}>
-                  In game you need to select one or more signatures <br /> in the list in{' '}
-                  <b className="text-sky-500">Probe scanner</b>. <br /> Use next hotkeys:
-                  <br />
-                  <b className="text-sky-500">Shift + LMB</b> or <b className="text-sky-500">Ctrl + LMB</b>
-                  <br /> or <b className="text-sky-500">Ctrl + A</b> for select all
-                  <br /> and then use <b className="text-sky-500">Ctrl + C</b>, after you need to go <br />
-                  here, select Solar system and paste it with <b className="text-sky-500">Ctrl + V</b>
-                </InfoDrawer>
-                <InfoDrawer title={<b className="text-slate-50">How to select?</b>}>
-                  For selecting any signature, click on it <br /> with hotkeys{' '}
-                  <b className="text-sky-500">Shift + LMB</b> or <b className="text-sky-500">Ctrl + LMB</b>
-                </InfoDrawer>
-                <InfoDrawer title={<b className="text-slate-50">How to delete?</b>}>
-                  To delete any signature, first select it <br /> and then press <b className="text-sky-500">Del</b>
-                </InfoDrawer>
-              </div>
-            ),
-          }}
-        />
-
-        <WdImgButton className={PrimeIcons.SLIDERS_H} onClick={onSettingsClick} />
-      </LayoutEventBlocker>
+          <WdImgButton className={PrimeIcons.SLIDERS_H} onClick={onSettingsClick} />
+        </LayoutEventBlocker>
+      </div>
     </div>
   );
-}
-
-export const SystemSignaturesHeader = React.memo(HeaderImpl);
+};

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

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

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

@@ -5,26 +5,16 @@ import { TabPanel, TabView } from 'primereact/tabview';
 import styles from './SystemSignatureSettingsDialog.module.scss';
 import { PrettySwitchbox } from '@/hooks/Mapper/components/mapRootContent/components/MapSettings/components';
 import { Dropdown } from 'primereact/dropdown';
-
-export type Setting = {
-  key: string;
-  name: string;
-  value: boolean | number;
-  isFilter?: boolean;
-  options?: { label: string; value: number }[];
-};
-
-export const COSMIC_SIGNATURE = 'Cosmic Signature';
-export const COSMIC_ANOMALY = 'Cosmic Anomaly';
-export const DEPLOYABLE = 'Deployable';
-export const STRUCTURE = 'Structure';
-export const STARBASE = 'Starbase';
-export const SHIP = 'Ship';
-export const DRONE = 'Drone';
+import {
+  Setting,
+  SettingsTypes,
+  SIGNATURE_SETTINGS,
+  SignatureSettingsType,
+} from '@/hooks/Mapper/components/mapInterface/widgets/SystemSignatures/constants.ts';
 
 interface SystemSignatureSettingsDialogProps {
-  settings: Setting[];
-  onSave: (settings: Setting[]) => void;
+  settings: SignatureSettingsType;
+  onSave: (settings: SignatureSettingsType) => void;
   onCancel: () => void;
 }
 
@@ -34,21 +24,18 @@ export const SystemSignatureSettingsDialog = ({
   onCancel,
 }: SystemSignatureSettingsDialogProps) => {
   const [activeIndex, setActiveIndex] = useState(0);
-  const [settings, setSettings] = useState<Setting[]>(defaultSettings);
+  const [settings, setSettings] = useState<SignatureSettingsType>(defaultSettings);
 
-  const filterSettings = settings.filter(setting => setting.isFilter);
-  const userSettings = settings.filter(setting => !setting.isFilter);
-
-  const handleSettingsChange = (key: string) => {
-    setSettings(prevState =>
-      prevState.map(item =>
-        item.key === key ? { ...item, value: typeof item.value === 'boolean' ? !item.value : item.value } : item,
-      ),
-    );
-  };
-
-  const handleDropdownChange = (key: string, value: number) => {
-    setSettings(prevState => prevState.map(item => (item.key === key ? { ...item, value } : item)));
+  const handleSettingsChange = ({ key, type }: Setting, value?: unknown) => {
+    setSettings(prev => {
+      switch (type) {
+        case SettingsTypes.dropdown:
+          return { ...prev, [key]: value };
+        case SettingsTypes.flag:
+          return { ...prev, [key]: !prev[key] };
+      }
+      return prev;
+    });
   };
 
   const handleSave = useCallback(() => {
@@ -56,17 +43,15 @@ export const SystemSignatureSettingsDialog = ({
   }, [onSave, settings]);
 
   const renderSetting = (setting: Setting) => {
+    const val = settings[setting.key];
     if (setting.options) {
       return (
         <div key={setting.key} className="flex items-center justify-between gap-2 mb-2">
           <label className="text-[#b8b8b8] text-[13px] select-none">{setting.name}</label>
           <Dropdown
-            value={setting.value}
-            options={setting.options.map(opt => ({
-              ...opt,
-              label: opt.label.split(' ')[0], // Just take the first part (e.g., "0s" from "Immediate (0s)")
-            }))}
-            onChange={e => handleDropdownChange(setting.key, e.value)}
+            value={val}
+            options={setting.options}
+            onChange={e => handleSettingsChange(setting, e.value)}
             className="w-40"
           />
         </div>
@@ -77,8 +62,8 @@ export const SystemSignatureSettingsDialog = ({
       <PrettySwitchbox
         key={setting.key}
         label={setting.name}
-        checked={!!setting.value}
-        setChecked={() => handleSettingsChange(setting.key)}
+        checked={!!val}
+        setChecked={() => handleSettingsChange(setting)}
       />
     );
   };
@@ -94,15 +79,15 @@ export const SystemSignatureSettingsDialog = ({
               className={styles.verticalTabView}
             >
               <TabPanel header="Filters" headerClassName={styles.verticalTabHeader}>
-                <div className="w-full h-full flex flex-col gap-1">{filterSettings.map(renderSetting)}</div>
+                <div className="w-full h-full flex flex-col gap-1">
+                  {SIGNATURE_SETTINGS.filterFlags.map(renderSetting)}
+                </div>
               </TabPanel>
               <TabPanel header="User Interface" headerClassName={styles.verticalTabHeader}>
                 <div className="w-full h-full flex flex-col gap-1">
-                  {userSettings.filter(setting => !setting.options).map(renderSetting)}
-                  {userSettings.some(setting => setting.options) && (
-                    <div className="my-2 border-t border-stone-700/50"></div>
-                  )}
-                  {userSettings.filter(setting => setting.options).map(renderSetting)}
+                  {SIGNATURE_SETTINGS.uiFlags.map(renderSetting)}
+                  <div className="my-2 border-t border-stone-700/50"></div>
+                  {SIGNATURE_SETTINGS.uiOther.map(renderSetting)}
                 </div>
               </TabPanel>
             </TabView>

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

@@ -1,130 +1,37 @@
-import React, { useCallback, useEffect, useMemo, useRef, useState } from 'react';
+import { useCallback, useEffect, useRef, useState } from 'react';
 import { Widget } from '@/hooks/Mapper/components/mapInterface/components';
 import { SystemSignaturesContent } from './SystemSignaturesContent';
-import {
-  COSMIC_ANOMALY,
-  COSMIC_SIGNATURE,
-  DEPLOYABLE,
-  DRONE,
-  Setting,
-  SHIP,
-  STARBASE,
-  STRUCTURE,
-  SystemSignatureSettingsDialog,
-} from './SystemSignatureSettingsDialog';
-import { SignatureGroup, SystemSignature } from '@/hooks/Mapper/types';
+import { SystemSignatureSettingsDialog } from './SystemSignatureSettingsDialog';
+import { ExtendedSystemSignature, SystemSignature } from '@/hooks/Mapper/types';
 import { useMapRootState } from '@/hooks/Mapper/mapRootProvider';
-import useMaxWidth from '@/hooks/Mapper/hooks/useMaxWidth';
 import { useHotkey } from '@/hooks/Mapper/hooks';
+import { SystemSignaturesHeader } from './SystemSignatureHeader';
+import useLocalStorageState from 'use-local-storage-state';
 import {
-  COMPACT_MAX_WIDTH,
-  DELETION_TIMING_DEFAULT,
-  DELETION_TIMING_EXTENDED,
-  DELETION_TIMING_IMMEDIATE,
-  DELETION_TIMING_SETTING_KEY,
-} from './constants';
-import { renderHeaderLabel } from './renders';
+  SETTINGS_KEYS,
+  SETTINGS_VALUES,
+  SIGNATURE_DELETION_TIMEOUTS,
+  SIGNATURE_SETTING_STORE_KEY,
+  SIGNATURE_WINDOW_ID,
+  SIGNATURES_DELETION_TIMING,
+  SignatureSettingsType,
+} from '@/hooks/Mapper/components/mapInterface/widgets/SystemSignatures/constants.ts';
+import { calculateTimeRemaining } from './helpers';
 
-const SIGNATURE_SETTINGS_KEY = 'wanderer_system_signature_settings_v5_5';
-export const SIGNATURE_WINDOW_ID = 'system_signatures_window';
-export const SHOW_DESCRIPTION_COLUMN_SETTING = 'show_description_column_setting';
-export const SHOW_UPDATED_COLUMN_SETTING = 'SHOW_UPDATED_COLUMN_SETTING';
-export const SHOW_CHARACTER_COLUMN_SETTING = 'SHOW_CHARACTER_COLUMN_SETTING';
-export const LAZY_DELETE_SIGNATURES_SETTING = 'LAZY_DELETE_SIGNATURES_SETTING';
-export const KEEP_LAZY_DELETE_SETTING = 'KEEP_LAZY_DELETE_ENABLED_SETTING';
-// eslint-disable-next-line react-refresh/only-export-components
-export const DELETION_TIMING_SETTING = DELETION_TIMING_SETTING_KEY;
-export const COLOR_BY_TYPE_SETTING = 'COLOR_BY_TYPE_SETTING';
-export const SHOW_CHARACTER_PORTRAIT_SETTING = 'SHOW_CHARACTER_PORTRAIT_SETTING';
+export const SystemSignatures = () => {
+  const [visible, setVisible] = useState(false);
+  const [sigCount, setSigCount] = useState<number>(0);
+  const [pendingSigs, setPendingSigs] = useState<SystemSignature[]>([]);
+  const [pendingTimeRemaining, setPendingTimeRemaining] = useState<number | undefined>();
+  const undoPendingFnRef = useRef<() => void>(() => {});
 
-// Extend the Setting type to include options for dropdown settings
-type ExtendedSetting = Setting & {
-  options?: { label: string; value: number }[];
-};
-
-const SETTINGS: ExtendedSetting[] = [
-  { key: SHOW_UPDATED_COLUMN_SETTING, name: 'Show Updated Column', value: false, isFilter: false },
-  { key: SHOW_DESCRIPTION_COLUMN_SETTING, name: 'Show Description Column', value: false, isFilter: false },
-  { key: SHOW_CHARACTER_COLUMN_SETTING, name: 'Show Character Column', value: false, isFilter: false },
-  { key: SHOW_CHARACTER_PORTRAIT_SETTING, name: 'Show Character Portrait in Tooltip', value: false, isFilter: false },
-  { key: LAZY_DELETE_SIGNATURES_SETTING, name: 'Lazy Delete Signatures', value: false, isFilter: false },
-  { key: KEEP_LAZY_DELETE_SETTING, name: 'Keep "Lazy Delete" Enabled', value: false, isFilter: false },
-  { key: COLOR_BY_TYPE_SETTING, name: 'Color Signatures by Type', value: false, isFilter: false },
-  {
-    key: DELETION_TIMING_SETTING,
-    name: 'Deletion Timing',
-    value: DELETION_TIMING_DEFAULT,
-    isFilter: false,
-    options: [
-      { label: '0s', value: DELETION_TIMING_IMMEDIATE },
-      { label: '10s', value: DELETION_TIMING_DEFAULT },
-      { label: '30s', value: DELETION_TIMING_EXTENDED },
-    ],
-  },
-
-  { key: COSMIC_ANOMALY, name: 'Show Anomalies', value: true, isFilter: true },
-  { key: COSMIC_SIGNATURE, name: 'Show Cosmic Signatures', value: true, isFilter: true },
-  { key: DEPLOYABLE, name: 'Show Deployables', value: true, isFilter: true },
-  { key: STRUCTURE, name: 'Show Structures', value: true, isFilter: true },
-  { key: STARBASE, name: 'Show Starbase', value: true, isFilter: true },
-  { key: SHIP, name: 'Show Ships', value: true, isFilter: true },
-  { key: DRONE, name: 'Show Drones And Charges', value: true, isFilter: true },
-  { key: SignatureGroup.Wormhole, name: 'Show Wormholes', value: true, isFilter: true },
-  { key: SignatureGroup.RelicSite, name: 'Show Relic Sites', value: true, isFilter: true },
-  { key: SignatureGroup.DataSite, name: 'Show Data Sites', value: true, isFilter: true },
-  { key: SignatureGroup.OreSite, name: 'Show Ore Sites', value: true, isFilter: true },
-  { key: SignatureGroup.GasSite, name: 'Show Gas Sites', value: true, isFilter: true },
-  { key: SignatureGroup.CombatSite, name: 'Show Combat Sites', value: true, isFilter: true },
-];
-
-function getDefaultSettings(): ExtendedSetting[] {
-  return [...SETTINGS];
-}
-
-function getInitialSettings(): ExtendedSetting[] {
-  const stored = localStorage.getItem(SIGNATURE_SETTINGS_KEY);
-  if (stored) {
-    try {
-      const parsedSettings = JSON.parse(stored) as ExtendedSetting[];
-      // Merge stored settings with default settings to ensure new settings are included
-      const defaultSettings = getDefaultSettings();
-      const mergedSettings = defaultSettings.map(defaultSetting => {
-        const storedSetting = parsedSettings.find(s => s.key === defaultSetting.key);
-        if (storedSetting) {
-          // Keep the stored value but ensure options are from default settings
-          return {
-            ...defaultSetting,
-            value: storedSetting.value,
-          };
-        }
-        return defaultSetting;
-      });
-      return mergedSettings;
-    } catch (error) {
-      console.error('Error parsing stored settings', error);
-    }
-  }
-  return getDefaultSettings();
-}
-
-export const SystemSignatures: React.FC = () => {
   const {
     data: { selectedSystems },
   } = useMapRootState();
 
-  const [visible, setVisible] = useState(false);
-
-  const [currentSettings, setCurrentSettings] = useState<ExtendedSetting[]>(getInitialSettings);
-
-  useEffect(() => {
-    localStorage.setItem(SIGNATURE_SETTINGS_KEY, JSON.stringify(currentSettings));
-  }, [currentSettings]);
-
-  const [sigCount, setSigCount] = useState<number>(0);
-  const [pendingSigs, setPendingSigs] = useState<SystemSignature[]>([]);
-  const [minPendingTimeRemaining, setMinPendingTimeRemaining] = useState<number | undefined>(undefined);
-
-  const undoPendingFnRef = useRef<() => void>(() => {});
+  const [currentSettings, setCurrentSettings] = useLocalStorageState(SIGNATURE_SETTING_STORE_KEY, {
+    defaultValue: SETTINGS_VALUES,
+  });
 
   const handleSigCountChange = useCallback((count: number) => {
     setSigCount(count);
@@ -133,108 +40,73 @@ export const SystemSignatures: React.FC = () => {
   const [systemId] = selectedSystems;
   const isNotSelectedSystem = selectedSystems.length !== 1;
 
-  const lazyDeleteValue = useMemo(() => {
-    const setting = currentSettings.find(setting => setting.key === LAZY_DELETE_SIGNATURES_SETTING);
-    return typeof setting?.value === 'boolean' ? setting.value : false;
-  }, [currentSettings]);
-
-  const deletionTimingValue = useMemo(() => {
-    const setting = currentSettings.find(setting => setting.key === DELETION_TIMING_SETTING);
-    return typeof setting?.value === 'number' ? setting.value : DELETION_TIMING_IMMEDIATE;
-  }, [currentSettings]);
-
-  const colorByTypeValue = useMemo(() => {
-    const setting = currentSettings.find(setting => setting.key === COLOR_BY_TYPE_SETTING);
-    return typeof setting?.value === 'boolean' ? setting.value : false;
-  }, [currentSettings]);
-
-  const handleSettingsChange = useCallback((newSettings: Setting[]) => {
-    setCurrentSettings(newSettings as ExtendedSetting[]);
+  const handleSettingsChange = useCallback((newSettings: SignatureSettingsType) => {
+    setCurrentSettings(newSettings);
     setVisible(false);
   }, []);
 
   const handleLazyDeleteChange = useCallback((value: boolean) => {
-    setCurrentSettings(prevSettings =>
-      prevSettings.map(setting => (setting.key === LAZY_DELETE_SIGNATURES_SETTING ? { ...setting, value } : setting)),
-    );
+    setCurrentSettings(prev => ({ ...prev, [SETTINGS_KEYS.LAZY_DELETE_SIGNATURES]: value }));
   }, []);
 
-  const containerRef = useRef<HTMLDivElement>(null);
-  const isCompact = useMaxWidth(containerRef, COMPACT_MAX_WIDTH);
-
   useHotkey(true, ['z'], event => {
     if (pendingSigs.length > 0) {
       event.preventDefault();
       event.stopPropagation();
       undoPendingFnRef.current();
       setPendingSigs([]);
-      setMinPendingTimeRemaining(undefined);
+      setPendingTimeRemaining(undefined);
     }
   });
 
   const handleUndoClick = useCallback(() => {
     undoPendingFnRef.current();
     setPendingSigs([]);
-    setMinPendingTimeRemaining(undefined);
+    setPendingTimeRemaining(undefined);
   }, []);
 
   const handleSettingsButtonClick = useCallback(() => {
     setVisible(true);
   }, []);
 
-  const handlePendingChange = useCallback((newPending: SystemSignature[], newUndo: () => void) => {
-    setPendingSigs(prev => {
-      if (newPending.length === prev.length && newPending.every(np => prev.some(pp => pp.eve_id === np.eve_id))) {
-        return prev;
-      }
-      return newPending;
-    });
-    undoPendingFnRef.current = newUndo;
-  }, []);
+  const handlePendingChange = useCallback(
+    (pending: React.MutableRefObject<Record<string, ExtendedSystemSignature>>, newUndo: () => void) => {
+      setPendingSigs(() => {
+        return Object.values(pending.current).filter(sig => sig.pendingDeletion);
+      });
+      undoPendingFnRef.current = newUndo;
+    },
+    [],
+  );
 
   // Calculate the minimum time remaining for any pending signature
   useEffect(() => {
     if (pendingSigs.length === 0) {
-      setMinPendingTimeRemaining(undefined);
+      setPendingTimeRemaining(undefined);
       return;
     }
 
-    const calculateTimeRemaining = () => {
-      const now = Date.now();
-      let minTime: number | undefined = undefined;
-
-      pendingSigs.forEach(sig => {
-        const extendedSig = sig as unknown as { pendingUntil?: number };
-        if (extendedSig.pendingUntil && (minTime === undefined || extendedSig.pendingUntil - now < minTime)) {
-          minTime = extendedSig.pendingUntil - now;
-        }
-      });
-
-      setMinPendingTimeRemaining(minTime && minTime > 0 ? minTime : undefined);
+    const calculate = () => {
+      setPendingTimeRemaining(() => calculateTimeRemaining(pendingSigs));
     };
 
-    calculateTimeRemaining();
-    const interval = setInterval(calculateTimeRemaining, 1000);
+    calculate();
+    const interval = setInterval(calculate, 1000);
     return () => clearInterval(interval);
   }, [pendingSigs]);
 
   return (
     <Widget
       label={
-        <div ref={containerRef} className="w-full">
-          {renderHeaderLabel({
-            systemId,
-            isNotSelectedSystem,
-            isCompact,
-            sigCount,
-            lazyDeleteValue,
-            pendingCount: pendingSigs.length,
-            pendingTimeRemaining: minPendingTimeRemaining,
-            onLazyDeleteChange: handleLazyDeleteChange,
-            onUndoClick: handleUndoClick,
-            onSettingsClick: handleSettingsButtonClick,
-          })}
-        </div>
+        <SystemSignaturesHeader
+          sigCount={sigCount}
+          lazyDeleteValue={currentSettings[SETTINGS_KEYS.LAZY_DELETE_SIGNATURES] as boolean}
+          pendingCount={pendingSigs.length}
+          pendingTimeRemaining={pendingTimeRemaining}
+          onLazyDeleteChange={handleLazyDeleteChange}
+          onUndoClick={handleUndoClick}
+          onSettingsClick={handleSettingsButtonClick}
+        />
       }
       windowId={SIGNATURE_WINDOW_ID}
     >
@@ -246,11 +118,15 @@ export const SystemSignatures: React.FC = () => {
         <SystemSignaturesContent
           systemId={systemId}
           settings={currentSettings}
+          deletionTiming={
+            SIGNATURE_DELETION_TIMEOUTS[
+              (currentSettings[SETTINGS_KEYS.DELETION_TIMING] as keyof typeof SIGNATURE_DELETION_TIMEOUTS) ||
+                SIGNATURES_DELETION_TIMING.DEFAULT
+            ] as number
+          }
           onLazyDeleteChange={handleLazyDeleteChange}
           onCountChange={handleSigCountChange}
           onPendingChange={handlePendingChange}
-          deletionTiming={deletionTimingValue}
-          colorByType={colorByTypeValue}
         />
       )}
       {visible && (

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

@@ -1,29 +1,30 @@
-import { useEffect, useMemo, useRef, useState, useCallback } from 'react';
-import { DataTable, DataTableRowClickEvent, DataTableRowMouseEvent, SortOrder } from 'primereact/datatable';
-import { Column } from 'primereact/column';
 import { PrimeIcons } from 'primereact/api';
+import { Column } from 'primereact/column';
+import {
+  DataTable,
+  DataTableRowClickEvent,
+  DataTableRowMouseEvent,
+  DataTableStateEvent,
+  SortOrder,
+} from 'primereact/datatable';
+import { useCallback, useEffect, useMemo, useRef, useState } from 'react';
 import useLocalStorageState from 'use-local-storage-state';
 
-import { SignatureGroup, SystemSignature } from '@/hooks/Mapper/types';
-import { SignatureSettings } from '@/hooks/Mapper/components/mapRootContent/components/SignatureSettings';
-import { WdTooltip, WdTooltipHandlers, WdTooltipWrapper } from '@/hooks/Mapper/components/ui-kit';
 import { SignatureView } from '@/hooks/Mapper/components/mapInterface/widgets/SystemSignatures/SignatureView';
 import {
   COMPACT_MAX_WIDTH,
+  getGroupIdByRawGroup,
   GROUPS_LIST,
   MEDIUM_MAX_WIDTH,
   OTHER_COLUMNS_WIDTH,
-  getGroupIdByRawGroup,
-} from '@/hooks/Mapper/components/mapInterface/widgets/SystemSignatures/constants';
-import {
-  SHOW_DESCRIPTION_COLUMN_SETTING,
-  SHOW_UPDATED_COLUMN_SETTING,
-  SHOW_CHARACTER_COLUMN_SETTING,
+  SETTINGS_KEYS,
   SIGNATURE_WINDOW_ID,
-  SHOW_CHARACTER_PORTRAIT_SETTING,
-} from '../SystemSignatures';
+  SignatureSettingsType,
+} from '@/hooks/Mapper/components/mapInterface/widgets/SystemSignatures/constants';
+import { SignatureSettings } from '@/hooks/Mapper/components/mapRootContent/components/SignatureSettings';
+import { TooltipPosition, WdTooltip, WdTooltipHandlers, WdTooltipWrapper } from '@/hooks/Mapper/components/ui-kit';
+import { ExtendedSystemSignature, SignatureGroup, SignatureKind, SystemSignature } from '@/hooks/Mapper/types';
 
-import { COSMIC_SIGNATURE } from '../SystemSignatureSettingsDialog';
 import {
   renderAddedTimeLeft,
   renderDescription,
@@ -31,11 +32,12 @@ import {
   renderInfoColumn,
   renderUpdatedTimeLeft,
 } from '@/hooks/Mapper/components/mapInterface/widgets/SystemSignatures/renders';
-import { ExtendedSystemSignature } from '../helpers/contentHelpers';
-import { useSystemSignaturesData } from '../hooks/useSystemSignaturesData';
-import { getSignatureRowClass } from '../helpers/rowStyles';
-import useMaxWidth from '@/hooks/Mapper/hooks/useMaxWidth';
 import { useClipboard, useHotkey } from '@/hooks/Mapper/hooks';
+import useMaxWidth from '@/hooks/Mapper/hooks/useMaxWidth';
+import { getSignatureRowClass } from '../helpers/rowStyles';
+import { useSystemSignaturesData } from '../hooks/useSystemSignaturesData';
+
+const renderColIcon = (sig: SystemSignature) => renderIcon(sig);
 
 type SystemSignaturesSortSettings = {
   sortField: string;
@@ -49,21 +51,21 @@ const SORT_DEFAULT_VALUES: SystemSignaturesSortSettings = {
 
 interface SystemSignaturesContentProps {
   systemId: string;
-  settings: { key: string; value: boolean | number }[];
+  settings: SignatureSettingsType;
   hideLinkedSignatures?: boolean;
   selectable?: boolean;
   onSelect?: (signature: SystemSignature) => void;
   onLazyDeleteChange?: (value: boolean) => void;
   onCountChange?: (count: number) => void;
-  onPendingChange?: (pending: ExtendedSystemSignature[], undo: () => void) => void;
+  onPendingChange?: (
+    pending: React.MutableRefObject<Record<string, ExtendedSystemSignature>>,
+    undo: () => void,
+  ) => void;
   deletionTiming?: number;
-  colorByType?: boolean;
   filterSignature?: (signature: SystemSignature) => boolean;
 }
 
-const headerInlineStyle = { padding: '2px', fontSize: '12px', lineHeight: '1.333' };
-
-export function SystemSignaturesContent({
+export const SystemSignaturesContent = ({
   systemId,
   settings,
   hideLinkedSignatures,
@@ -73,9 +75,26 @@ export function SystemSignaturesContent({
   onCountChange,
   onPendingChange,
   deletionTiming,
-  colorByType,
   filterSignature,
-}: SystemSignaturesContentProps) {
+}: SystemSignaturesContentProps) => {
+  const [selectedSignatureForDialog, setSelectedSignatureForDialog] = useState<SystemSignature | null>(null);
+  const [showSignatureSettings, setShowSignatureSettings] = useState(false);
+  const [nameColumnWidth, setNameColumnWidth] = useState('auto');
+  const [hoveredSignature, setHoveredSignature] = useState<SystemSignature | null>(null);
+
+  const tableRef = useRef<HTMLDivElement>(null);
+  const tooltipRef = useRef<WdTooltipHandlers>(null);
+
+  const isCompact = useMaxWidth(tableRef, COMPACT_MAX_WIDTH);
+  const isMedium = useMaxWidth(tableRef, MEDIUM_MAX_WIDTH);
+
+  const { clipboardContent, setClipboardContent } = useClipboard();
+
+  const [sortSettings, setSortSettings] = useLocalStorageState<{ sortField: string; sortOrder: SortOrder }>(
+    'window:signatures:sort',
+    { defaultValue: SORT_DEFAULT_VALUES },
+  );
+
   const { signatures, selectedSignatures, setSelectedSignatures, handleDeleteSelected, handleSelectAll, handlePaste } =
     useSystemSignaturesData({
       systemId,
@@ -86,19 +105,6 @@ export function SystemSignaturesContent({
       deletionTiming,
     });
 
-  const [sortSettings, setSortSettings] = useLocalStorageState<{ sortField: string; sortOrder: SortOrder }>(
-    'window:signatures:sort',
-    { defaultValue: SORT_DEFAULT_VALUES },
-  );
-
-  const tableRef = useRef<HTMLDivElement>(null);
-  const tooltipRef = useRef<WdTooltipHandlers>(null);
-  const [hoveredSignature, setHoveredSignature] = useState<SystemSignature | null>(null);
-
-  const isCompact = useMaxWidth(tableRef, COMPACT_MAX_WIDTH);
-  const isMedium = useMaxWidth(tableRef, MEDIUM_MAX_WIDTH);
-
-  const { clipboardContent, setClipboardContent } = useClipboard();
   useEffect(() => {
     if (selectable) return;
     if (!clipboardContent?.text) return;
@@ -109,6 +115,7 @@ export function SystemSignaturesContent({
   }, [selectable, clipboardContent, handlePaste, setClipboardContent]);
 
   useHotkey(true, ['a'], handleSelectAll);
+
   useHotkey(false, ['Backspace', 'Delete'], (event: KeyboardEvent) => {
     const targetWindow = (event.target as HTMLHtmlElement)?.closest(`[data-window-id="${SIGNATURE_WINDOW_ID}"]`);
 
@@ -121,50 +128,45 @@ export function SystemSignaturesContent({
     handleDeleteSelected();
   });
 
-  const [nameColumnWidth, setNameColumnWidth] = useState('auto');
   const handleResize = useCallback(() => {
     if (!tableRef.current) return;
-    const tableWidth = tableRef.current.offsetWidth;
-    const otherColumnsWidth = OTHER_COLUMNS_WIDTH;
-    setNameColumnWidth(`${tableWidth - otherColumnsWidth}px`);
+
+    setNameColumnWidth(`${tableRef.current.offsetWidth - OTHER_COLUMNS_WIDTH}px`);
   }, []);
+
   useEffect(() => {
     if (!tableRef.current) return;
+
     const observer = new ResizeObserver(handleResize);
     observer.observe(tableRef.current);
     handleResize();
+
     return () => {
       observer.disconnect();
     };
   }, [handleResize]);
 
-  const [selectedSignatureForDialog, setSelectedSignatureForDialog] = useState<SystemSignature | null>(null);
-  const [showSignatureSettings, setShowSignatureSettings] = useState(false);
-
-  const handleRowClick = (e: DataTableRowClickEvent) => {
+  const handleRowClick = useCallback((e: DataTableRowClickEvent) => {
     setSelectedSignatureForDialog(e.data as SystemSignature);
     setShowSignatureSettings(true);
-  };
+  }, []);
 
   const handleSelectSignatures = useCallback(
     (e: { value: SystemSignature[] }) => {
-      if (selectable) {
-        onSelect?.(e.value[0]);
-      } else {
-        setSelectedSignatures(e.value as ExtendedSystemSignature[]);
-      }
+      selectable ? onSelect?.(e.value[0]) : setSelectedSignatures(e.value as ExtendedSystemSignature[]);
     },
-    [selectable, onSelect, setSelectedSignatures],
+    [selectable],
   );
 
-  const showDescriptionColumn = settings.find(s => s.key === SHOW_DESCRIPTION_COLUMN_SETTING)?.value;
-  const showUpdatedColumn = settings.find(s => s.key === SHOW_UPDATED_COLUMN_SETTING)?.value;
-  const showCharacterColumn = settings.find(s => s.key === SHOW_CHARACTER_COLUMN_SETTING)?.value;
-  const showCharacterPortrait = settings.find(s => s.key === SHOW_CHARACTER_PORTRAIT_SETTING)?.value;
-
-  const enabledGroups = settings
-    .filter(s => GROUPS_LIST.includes(s.key as SignatureGroup) && s.value === true)
-    .map(s => s.key);
+  const { showDescriptionColumn, showUpdatedColumn, showCharacterColumn, showCharacterPortrait } = useMemo(
+    () => ({
+      showDescriptionColumn: settings[SETTINGS_KEYS.SHOW_DESCRIPTION_COLUMN] as boolean,
+      showUpdatedColumn: settings[SETTINGS_KEYS.SHOW_UPDATED_COLUMN] as boolean,
+      showCharacterColumn: settings[SETTINGS_KEYS.SHOW_CHARACTER_COLUMN] as boolean,
+      showCharacterPortrait: settings[SETTINGS_KEYS.SHOW_CHARACTER_PORTRAIT] as boolean,
+    }),
+    [settings],
+  );
 
   const filteredSignatures = useMemo<ExtendedSystemSignature[]>(() => {
     return signatures.filter(sig => {
@@ -175,21 +177,57 @@ export function SystemSignaturesContent({
       if (hideLinkedSignatures && sig.linked_system) {
         return false;
       }
-      const isCosmicSignature = sig.kind === COSMIC_SIGNATURE;
 
-      if (isCosmicSignature) {
-        const showCosmic = settings.find(y => y.key === COSMIC_SIGNATURE)?.value;
-        if (!showCosmic) return false;
-        if (sig.group) {
-          const preparedGroup = getGroupIdByRawGroup(sig.group);
-          return enabledGroups.includes(preparedGroup);
+      if (sig.kind === SignatureKind.CosmicSignature) {
+        if (!settings[SETTINGS_KEYS.COSMIC_SIGNATURE]) {
+          return false;
         }
+
+        if (sig.group) {
+          const enabledGroups = Object.keys(settings).filter(
+            x => GROUPS_LIST.includes(x as SignatureGroup) && settings[x as SETTINGS_KEYS],
+          );
+
+          return enabledGroups.includes(getGroupIdByRawGroup(sig.group));
+        }
+
         return true;
-      } else {
-        return settings.find(y => y.key === sig.kind)?.value;
       }
+
+      return settings[sig.kind];
     });
-  }, [signatures, hideLinkedSignatures, settings, enabledGroups, filterSignature]);
+  }, [signatures, hideLinkedSignatures, settings, filterSignature]);
+
+  const onRowMouseEnter = useCallback((e: DataTableRowMouseEvent) => {
+    setHoveredSignature(e.data as SystemSignature);
+    tooltipRef.current?.show(e.originalEvent);
+  }, []);
+
+  const onRowMouseLeave = useCallback(() => {
+    setHoveredSignature(null);
+    tooltipRef.current?.hide();
+  }, []);
+
+  const refVars = useRef({ settings, selectedSignatures, setSortSettings });
+  refVars.current = { settings, selectedSignatures, setSortSettings };
+
+  // @ts-ignore
+  const getRowClassName = useCallback(rowData => {
+    if (!rowData) {
+      return null;
+    }
+
+    return getSignatureRowClass(
+      rowData as ExtendedSystemSignature,
+      refVars.current.selectedSignatures,
+      refVars.current.settings[SETTINGS_KEYS.COLOR_BY_TYPE] as boolean,
+    );
+  }, []);
+
+  const handleSortSettings = useCallback(
+    (e: DataTableStateEvent) => refVars.current.setSortSettings({ sortField: e.sortField, sortOrder: e.sortOrder }),
+    [],
+  );
 
   return (
     <div ref={tableRef} className="h-full">
@@ -213,31 +251,22 @@ export function SystemSignaturesContent({
           onRowDoubleClick={handleRowClick}
           sortField={sortSettings.sortField}
           sortOrder={sortSettings.sortOrder}
-          onSort={e => setSortSettings({ sortField: e.sortField, sortOrder: e.sortOrder })}
-          onRowMouseEnter={(e: DataTableRowMouseEvent) => {
-            setHoveredSignature(e.data as SystemSignature);
-            tooltipRef.current?.show(e.originalEvent);
-          }}
-          onRowMouseLeave={() => {
-            setHoveredSignature(null);
-            tooltipRef.current?.hide();
-          }}
-          rowClassName={rowData =>
-            getSignatureRowClass(rowData as ExtendedSystemSignature, selectedSignatures, colorByType)
-          }
+          onSort={handleSortSettings}
+          onRowMouseEnter={onRowMouseEnter}
+          onRowMouseLeave={onRowMouseLeave}
+          // @ts-ignore
+          rowClassName={getRowClassName}
         >
           <Column
             field="icon"
             header=""
-            headerStyle={headerInlineStyle}
-            body={sig => renderIcon(sig)}
+            body={renderColIcon}
             bodyClassName="p-0 px-1"
             style={{ maxWidth: 26, minWidth: 26, width: 26 }}
           />
           <Column
             field="eve_id"
             header="Id"
-            headerStyle={headerInlineStyle}
             bodyClassName="text-ellipsis overflow-hidden whitespace-nowrap"
             style={{ maxWidth: 72, minWidth: 72, width: 72 }}
             sortable
@@ -245,7 +274,6 @@ export function SystemSignaturesContent({
           <Column
             field="group"
             header="Group"
-            headerStyle={headerInlineStyle}
             bodyClassName="text-ellipsis overflow-hidden whitespace-nowrap"
             style={{ maxWidth: 110, minWidth: 110, width: 110 }}
             body={sig => sig.group ?? ''}
@@ -255,7 +283,6 @@ export function SystemSignaturesContent({
           <Column
             field="info"
             header="Info"
-            headerStyle={headerInlineStyle}
             bodyClassName="text-ellipsis overflow-hidden whitespace-nowrap"
             style={{ maxWidth: nameColumnWidth }}
             hidden={isCompact || isMedium}
@@ -265,7 +292,6 @@ export function SystemSignaturesContent({
             <Column
               field="description"
               header="Description"
-              headerStyle={headerInlineStyle}
               bodyClassName="text-ellipsis overflow-hidden whitespace-nowrap"
               hidden={isCompact}
               body={renderDescription}
@@ -275,18 +301,16 @@ export function SystemSignaturesContent({
           <Column
             field="inserted_at"
             header="Added"
-            headerStyle={headerInlineStyle}
             dataType="date"
             body={renderAddedTimeLeft}
             style={{ minWidth: 70, maxWidth: 80 }}
-            bodyClassName="text-ellipsis overflow-hidden whitespace-nowrap"
+            bodyClassName="ssc-header text-ellipsis overflow-hidden whitespace-nowrap"
             sortable
           />
           {showUpdatedColumn && (
             <Column
               field="updated_at"
               header="Updated"
-              headerStyle={headerInlineStyle}
               dataType="date"
               body={renderUpdatedTimeLeft}
               style={{ minWidth: 70, maxWidth: 80 }}
@@ -307,7 +331,6 @@ export function SystemSignaturesContent({
           {!selectable && (
             <Column
               header=""
-              headerStyle={headerInlineStyle}
               body={() => (
                 <div className="flex justify-end items-center gap-2 mr-[4px]">
                   <WdTooltipWrapper content="Double-click a row to edit signature">
@@ -325,9 +348,10 @@ export function SystemSignaturesContent({
       <WdTooltip
         className="bg-stone-900/95 text-slate-50"
         ref={tooltipRef}
+        position={TooltipPosition.top}
         content={
           hoveredSignature ? (
-            <SignatureView signature={hoveredSignature} showCharacterPortrait={!!showCharacterPortrait} />
+            <SignatureView signature={hoveredSignature} showCharacterPortrait={showCharacterPortrait} />
           ) : null
         }
       />
@@ -342,4 +366,4 @@ export function SystemSignaturesContent({
       )}
     </div>
   );
-}
+};

assets/js/hooks/Mapper/components/mapInterface/widgets/SystemSignatures/constants.ts

@@ -9,17 +9,11 @@ import {
 } from '@/hooks/Mapper/types';
 
 export const TIME_ONE_MINUTE = 1000 * 60;
-export const TIME_TEN_MINUTES = 1000 * 60 * 10;
-export const TIME_ONE_DAY = 24 * 60 * 60 * 1000;
+export const TIME_TEN_MINUTES = TIME_ONE_MINUTE * 10;
+export const TIME_ONE_DAY = 24 * 60 * TIME_ONE_MINUTE;
 export const TIME_ONE_WEEK = 7 * TIME_ONE_DAY;
 export const FINAL_DURATION_MS = 10000;
 
-// Signature deletion timing options
-export const DELETION_TIMING_IMMEDIATE = 0;
-export const DELETION_TIMING_DEFAULT = 10000;
-export const DELETION_TIMING_EXTENDED = 30000;
-export const DELETION_TIMING_SETTING_KEY = 'DELETION_TIMING_SETTING';
-
 export const COMPACT_MAX_WIDTH = 260;
 export const MEDIUM_MAX_WIDTH = 380;
 export const OTHER_COLUMNS_WIDTH = 276;
@@ -85,3 +79,132 @@ export const MAPPING_TYPE_TO_ENG = {
 };
 
 export const getGroupIdByRawGroup = (val: string) => MAPPING_GROUP_TO_ENG[val as SignatureGroup];
+
+export const SIGNATURE_WINDOW_ID = 'system_signatures_window';
+export const SIGNATURE_SETTING_STORE_KEY = 'wanderer_system_signature_settings_v6_5';
+
+export enum SETTINGS_KEYS {
+  SHOW_DESCRIPTION_COLUMN = 'show_description_column',
+  SHOW_UPDATED_COLUMN = 'show_updated_column',
+  SHOW_CHARACTER_COLUMN = 'show_character_column',
+  LAZY_DELETE_SIGNATURES = 'lazy_delete_signatures',
+  KEEP_LAZY_DELETE = 'keep_lazy_delete_enabled',
+  DELETION_TIMING = 'deletion_timing',
+  COLOR_BY_TYPE = 'color_by_type',
+  SHOW_CHARACTER_PORTRAIT = 'show_character_portrait',
+
+  // From SignatureKind
+  COSMIC_ANOMALY = SignatureKind.CosmicAnomaly,
+  COSMIC_SIGNATURE = SignatureKind.CosmicSignature,
+  DEPLOYABLE = SignatureKind.Deployable,
+  STRUCTURE = SignatureKind.Structure,
+  STARBASE = SignatureKind.Starbase,
+  SHIP = SignatureKind.Ship,
+  DRONE = SignatureKind.Drone,
+
+  // From SignatureGroup
+  WORMHOLE = SignatureGroup.Wormhole,
+  RELIC_SITE = SignatureGroup.RelicSite,
+  DATA_SITE = SignatureGroup.DataSite,
+  ORE_SITE = SignatureGroup.OreSite,
+  GAS_SITE = SignatureGroup.GasSite,
+  COMBAT_SITE = SignatureGroup.CombatSite,
+}
+
+export enum SettingsTypes {
+  flag,
+  dropdown,
+}
+
+export type SignatureSettingsType = { [key in SETTINGS_KEYS]?: unknown };
+
+export type Setting = {
+  key: SETTINGS_KEYS;
+  name: string;
+  type: SettingsTypes;
+  isSeparator?: boolean;
+  options?: { label: string; value: any }[];
+};
+
+export enum SIGNATURES_DELETION_TIMING {
+  IMMEDIATE,
+  DEFAULT,
+  EXTENDED,
+}
+
+export type SignatureDeletionTimingType = { [key in SIGNATURES_DELETION_TIMING]?: unknown };
+
+export const SIGNATURE_SETTINGS = {
+  filterFlags: [
+    { type: SettingsTypes.flag, key: SETTINGS_KEYS.COSMIC_ANOMALY, name: 'Show Anomalies' },
+    { type: SettingsTypes.flag, key: SETTINGS_KEYS.COSMIC_SIGNATURE, name: 'Show Cosmic Signatures' },
+    { type: SettingsTypes.flag, key: SETTINGS_KEYS.DEPLOYABLE, name: 'Show Deployables' },
+    { type: SettingsTypes.flag, key: SETTINGS_KEYS.STRUCTURE, name: 'Show Structures' },
+    { type: SettingsTypes.flag, key: SETTINGS_KEYS.STARBASE, name: 'Show Starbase' },
+    { type: SettingsTypes.flag, key: SETTINGS_KEYS.SHIP, name: 'Show Ships' },
+    { type: SettingsTypes.flag, key: SETTINGS_KEYS.DRONE, name: 'Show Drones And Charges' },
+    { type: SettingsTypes.flag, key: SETTINGS_KEYS.WORMHOLE, name: 'Show Wormholes' },
+    { type: SettingsTypes.flag, key: SETTINGS_KEYS.RELIC_SITE, name: 'Show Relic Sites' },
+    { type: SettingsTypes.flag, key: SETTINGS_KEYS.DATA_SITE, name: 'Show Data Sites' },
+    { type: SettingsTypes.flag, key: SETTINGS_KEYS.ORE_SITE, name: 'Show Ore Sites' },
+    { type: SettingsTypes.flag, key: SETTINGS_KEYS.GAS_SITE, name: 'Show Gas Sites' },
+    { type: SettingsTypes.flag, key: SETTINGS_KEYS.COMBAT_SITE, name: 'Show Combat Sites' },
+  ],
+  uiFlags: [
+    { type: SettingsTypes.flag, key: SETTINGS_KEYS.SHOW_UPDATED_COLUMN, name: 'Show Updated Column' },
+    { type: SettingsTypes.flag, key: SETTINGS_KEYS.SHOW_DESCRIPTION_COLUMN, name: 'Show Description Column' },
+    { type: SettingsTypes.flag, key: SETTINGS_KEYS.SHOW_CHARACTER_COLUMN, name: 'Show Character Column' },
+    { type: SettingsTypes.flag, key: SETTINGS_KEYS.LAZY_DELETE_SIGNATURES, name: 'Lazy Delete Signatures' },
+    { type: SettingsTypes.flag, key: SETTINGS_KEYS.KEEP_LAZY_DELETE, name: 'Keep "Lazy Delete" Enabled' },
+    {
+      type: SettingsTypes.flag,
+      key: SETTINGS_KEYS.SHOW_CHARACTER_PORTRAIT,
+      name: 'Show Character Portrait in Tooltip',
+    },
+    { type: SettingsTypes.flag, key: SETTINGS_KEYS.COLOR_BY_TYPE, name: 'Color Signatures by Type' },
+  ],
+  uiOther: [
+    {
+      type: SettingsTypes.dropdown,
+      key: SETTINGS_KEYS.DELETION_TIMING,
+      name: 'Deletion Timing',
+      options: [
+        { value: SIGNATURES_DELETION_TIMING.IMMEDIATE, label: '0s' },
+        { value: SIGNATURES_DELETION_TIMING.DEFAULT, label: '10s' },
+        { value: SIGNATURES_DELETION_TIMING.EXTENDED, label: '30s' },
+      ],
+    },
+  ],
+};
+
+export const SETTINGS_VALUES: SignatureSettingsType = {
+  [SETTINGS_KEYS.SHOW_UPDATED_COLUMN]: true,
+  [SETTINGS_KEYS.SHOW_DESCRIPTION_COLUMN]: true,
+  [SETTINGS_KEYS.SHOW_CHARACTER_COLUMN]: true,
+  [SETTINGS_KEYS.LAZY_DELETE_SIGNATURES]: true,
+  [SETTINGS_KEYS.KEEP_LAZY_DELETE]: false,
+  [SETTINGS_KEYS.DELETION_TIMING]: SIGNATURES_DELETION_TIMING.DEFAULT,
+  [SETTINGS_KEYS.COLOR_BY_TYPE]: true,
+  [SETTINGS_KEYS.SHOW_CHARACTER_PORTRAIT]: true,
+
+  [SETTINGS_KEYS.COSMIC_ANOMALY]: true,
+  [SETTINGS_KEYS.COSMIC_SIGNATURE]: true,
+  [SETTINGS_KEYS.DEPLOYABLE]: true,
+  [SETTINGS_KEYS.STRUCTURE]: true,
+  [SETTINGS_KEYS.STARBASE]: true,
+  [SETTINGS_KEYS.SHIP]: true,
+  [SETTINGS_KEYS.DRONE]: true,
+
+  [SETTINGS_KEYS.WORMHOLE]: true,
+  [SETTINGS_KEYS.RELIC_SITE]: true,
+  [SETTINGS_KEYS.DATA_SITE]: true,
+  [SETTINGS_KEYS.ORE_SITE]: true,
+  [SETTINGS_KEYS.GAS_SITE]: true,
+  [SETTINGS_KEYS.COMBAT_SITE]: true,
+};
+
+export const SIGNATURE_DELETION_TIMEOUTS: SignatureDeletionTimingType = {
+  [SIGNATURES_DELETION_TIMING.DEFAULT]: 10_000,
+  [SIGNATURES_DELETION_TIMING.IMMEDIATE]: 0,
+  [SIGNATURES_DELETION_TIMING.EXTENDED]: 30_000,
+};

assets/js/hooks/Mapper/components/mapInterface/widgets/SystemSignatures/helpers/contentHelpers.ts

@@ -1,12 +1,6 @@
-import { SystemSignature } from '@/hooks/Mapper/types';
+import { ExtendedSystemSignature, SystemSignature } from '@/hooks/Mapper/types';
 import { FINAL_DURATION_MS } from '../constants';
 
-export interface ExtendedSystemSignature extends SystemSignature {
-  pendingDeletion?: boolean;
-  pendingAddition?: boolean;
-  pendingUntil?: number;
-}
-
 export function prepareUpdatePayload(
   systemId: string,
   added: ExtendedSystemSignature[],
@@ -55,40 +49,56 @@ export function schedulePendingAdditionForSig(
   );
 }
 
-export function mergeLocalPendingAdditions(
+export function mergeLocalPending(
+  pendingMapRef: React.MutableRefObject<Record<string, ExtendedSystemSignature>>,
   serverSigs: ExtendedSystemSignature[],
-  localSigs: ExtendedSystemSignature[],
 ): ExtendedSystemSignature[] {
   const now = Date.now();
-  const pendingAdditions = localSigs.filter(sig => sig.pendingAddition && sig.pendingUntil && sig.pendingUntil > now);
+  const pendingDeletions = Object.values(pendingMapRef.current).filter(
+    sig => sig.pendingDeletion && sig.pendingUntil && sig.pendingUntil > now,
+  );
   const mergedMap = new Map<string, ExtendedSystemSignature>();
   serverSigs.forEach(sig => mergedMap.set(sig.eve_id, sig));
-  pendingAdditions.forEach(sig => {
-    if (!mergedMap.has(sig.eve_id)) {
+
+  pendingDeletions.forEach(sig => {
+    if (mergedMap.has(sig.eve_id)) {
       mergedMap.set(sig.eve_id, sig);
     }
   });
   return Array.from(mergedMap.values());
 }
 
-export function scheduleLazyDeletionTimers(
-  toRemove: ExtendedSystemSignature[],
-  setPendingMap: React.Dispatch<React.SetStateAction<Record<string, { finalUntil: number; finalTimeoutId: number }>>>,
-  finalizeRemoval: (sig: ExtendedSystemSignature) => Promise<void>,
+export function scheduleLazyTimers(
+  signatures: ExtendedSystemSignature[],
+  pendingMapRef: React.MutableRefObject<Record<string, ExtendedSystemSignature>>,
+  finalizeFn: (sig: ExtendedSystemSignature) => Promise<void>,
   finalDuration = FINAL_DURATION_MS,
 ) {
-  const now = Date.now();
-  toRemove.forEach(sig => {
+  signatures.forEach(sig => {
     const finalTimeoutId = window.setTimeout(async () => {
-      await finalizeRemoval(sig);
+      await finalizeFn(sig);
     }, finalDuration);
 
-    setPendingMap(prev => ({
-      ...prev,
+    pendingMapRef.current = {
+      ...pendingMapRef.current,
       [sig.eve_id]: {
-        finalUntil: now + finalDuration,
+        ...sig,
         finalTimeoutId,
       },
-    }));
+    };
   });
 }
+
+export const calculateTimeRemaining = (pendingSigs: SystemSignature[]) => {
+  const now = Date.now();
+  let minTime: number | undefined = undefined;
+
+  pendingSigs.forEach(sig => {
+    const extendedSig = sig as unknown as { pendingUntil?: number };
+    if (extendedSig.pendingUntil && (minTime === undefined || extendedSig.pendingUntil - now < minTime)) {
+      minTime = extendedSig.pendingUntil - now;
+    }
+  });
+
+  return minTime && minTime > 0 ? minTime : undefined;
+};

assets/js/hooks/Mapper/components/mapInterface/widgets/SystemSignatures/helpers/getRowBackgroundColor.ts

@@ -12,11 +12,11 @@ export const getRowBackgroundColor = (date: Date | undefined): string => {
   const diff = currentDate.getTime() + currentDate.getTimezoneOffset() * TIME_ONE_MINUTE - date.getTime();
 
   if (diff < TIME_ONE_MINUTE) {
-    return 'bg-lime-600/40 transition hover:bg-lime-600/50';
+    return '[&_.ssc-header]:text-amber-300 [&_.ssc-header]:hover:text-amber-200 [&_.ssc-header]:font-bold';
   }
 
   if (diff < TIME_TEN_MINUTES) {
-    return 'bg-lime-700/30 transition hover:bg-lime-700/40';
+    return '[&_.ssc-header]:text-amber-500 [&_.ssc-header]:hover:text-amber-500 [&_.ssc-header]:font-bold';
   }
 
   return '';

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

@@ -1,36 +1,4 @@
-.pendingDeletion {
-  background-color: rgba(248, 113, 113, 0.4);
-  transition: background-color 0.2s ease;
-}
-
-.pendingDeletion td {
-  background-color: rgba(248, 113, 113, 0.4);
-  transition: background-color 0.2s ease;
-}
-
-.pendingDeletion:hover {
-  background-color: rgba(248, 113, 113, 0.5);
-}
-
-.pendingDeletion:hover td {
-  background-color: rgba(248, 113, 113, 0.5);
-}
-
-.Table thead tr {
-  font-size: 12px !important;    
-  line-height: 1.333;     
-}
-
 .TableRowCompact {
   font-size: 12px !important;
   line-height: 1.333;
 }
-
-.Table td {
-  padding: 2px;
-  height: 25px;  
-  border: 1px solid #383838;
-  box-sizing: border-box;
-}
-
-

assets/js/hooks/Mapper/components/mapInterface/widgets/SystemSignatures/helpers/rowStyles.ts

@@ -1,6 +1,5 @@
 import clsx from 'clsx';
-import { SignatureGroup } from '@/hooks/Mapper/types';
-import { ExtendedSystemSignature } from './contentHelpers';
+import { ExtendedSystemSignature, SignatureGroup } from '@/hooks/Mapper/types';
 import { getRowBackgroundColor } from './getRowBackgroundColor';
 import classes from './rowStyles.module.scss';
 
@@ -11,63 +10,39 @@ export function getSignatureRowClass(
 ): string {
   const isSelected = selectedSignatures.some(s => s.eve_id === row.eve_id);
 
+  const baseCls = [
+    classes.TableRowCompact,
+    getRowBackgroundColor(row.inserted_at ? new Date(row.inserted_at) : undefined),
+    'transition duration-200 my-2 hover:bg-purple-400/20',
+  ];
+
   if (isSelected) {
-    return clsx(
-      classes.TableRowCompact,
-      'p-selectable-row',
-      'bg-amber-500/50 hover:bg-amber-500/70 transition duration-200 text-xs',
-    );
+    return clsx([...baseCls, 'bg-violet-400/40 hover:bg-violet-300/40']);
   }
 
   if (row.pendingDeletion) {
-    return clsx(classes.TableRowCompact, 'p-selectable-row', classes.pendingDeletion);
+    return clsx([...baseCls, 'bg-red-400/40 hover:bg-red-400/50']);
   }
 
   // Apply color by type styling if enabled
   if (colorByType) {
-    if (row.group === SignatureGroup.Wormhole) {
-      return clsx(
-        classes.TableRowCompact,
-        'p-selectable-row',
-        'bg-blue-400/20 hover:bg-blue-400/20 transition duration-200 text-xs',
-      );
-    }
-
-    if (row.group === SignatureGroup.CosmicSignature) {
-      return clsx(
-        classes.TableRowCompact,
-        'p-selectable-row',
-        'bg-red-400/20 hover:bg-red-400/20 transition duration-200 text-xs',
-      );
-    }
-
-    if (
-      row.group === SignatureGroup.RelicSite ||
-      row.group === SignatureGroup.DataSite ||
-      row.group === SignatureGroup.GasSite ||
-      row.group === SignatureGroup.OreSite ||
-      row.group === SignatureGroup.CombatSite
-    ) {
-      return clsx(
-        classes.TableRowCompact,
-        'p-selectable-row',
-        'bg-green-400/20 hover:bg-green-400/20 transition duration-200 text-xs',
-      );
+    switch (row.group) {
+      case SignatureGroup.CosmicSignature:
+        return clsx([...baseCls, '[&_td:nth-child(-n+3)]:text-rose-400 [&_td:nth-child(-n+3)]:hover:text-rose-300']);
+      case SignatureGroup.Wormhole:
+        return clsx([...baseCls, '[&_td:nth-child(-n+3)]:text-sky-300 [&_td:nth-child(-n+3)]:hover:text-sky-200']);
+      case SignatureGroup.CombatSite:
+      case SignatureGroup.RelicSite:
+      case SignatureGroup.DataSite:
+      case SignatureGroup.GasSite:
+      case SignatureGroup.OreSite:
+        return clsx([...baseCls, '[&_td:nth-child(-n+4)]:text-lime-400 [&_td:nth-child(-n+4)]:hover:text-lime-300']);
     }
 
     // Default for color by type - apply same color as CosmicSignature (red) and small text size
-    return clsx(
-      classes.TableRowCompact,
-      'p-selectable-row',
-      'bg-red-400/20 hover:bg-red-400/20 transition duration-200 text-xs',
-    );
+    return clsx([...baseCls, '[&_td:nth-child(-n+3)]:text-rose-400/100']);
   }
 
   // Original styling when color by type is disabled
-  return clsx(
-    classes.TableRowCompact,
-    'p-selectable-row',
-    !row.pendingDeletion && getRowBackgroundColor(row.inserted_at ? new Date(row.inserted_at) : undefined),
-    !row.pendingDeletion && 'hover:bg-purple-400/20 transition duration-200',
-  );
+  return clsx(...baseCls);
 }

assets/js/hooks/Mapper/components/mapInterface/widgets/SystemSignatures/hooks/types.ts

@@ -1,11 +1,15 @@
-import { ExtendedSystemSignature } from '../helpers/contentHelpers';
+import { SignatureSettingsType } from '@/hooks/Mapper/components/mapInterface/widgets/SystemSignatures/constants.ts';
+import { ExtendedSystemSignature } from '@/hooks/Mapper/types';
 
 export interface UseSystemSignaturesDataProps {
   systemId: string;
-  settings: { key: string; value: boolean | number }[];
+  settings: SignatureSettingsType;
   hideLinkedSignatures?: boolean;
   onCountChange?: (count: number) => void;
-  onPendingChange?: (pending: ExtendedSystemSignature[], undo: () => void) => void;
+  onPendingChange?: (
+    pending: React.MutableRefObject<Record<string, ExtendedSystemSignature>>,
+    undo: () => void,
+  ) => void;
   onLazyDeleteChange?: (value: boolean) => void;
   deletionTiming?: number;
 }
@@ -14,16 +18,21 @@ export interface UseFetchingParams {
   systemId: string;
   signaturesRef: React.MutableRefObject<ExtendedSystemSignature[]>;
   setSignatures: React.Dispatch<React.SetStateAction<ExtendedSystemSignature[]>>;
-  localPendingDeletions: ExtendedSystemSignature[];
+  pendingDeletionMapRef: React.MutableRefObject<Record<string, ExtendedSystemSignature>>;
 }
 
 export interface UsePendingDeletionParams {
   systemId: string;
-  setSignatures: React.Dispatch<React.SetStateAction<ExtendedSystemSignature[]>>;
   deletionTiming?: number;
+  setSignatures: React.Dispatch<React.SetStateAction<ExtendedSystemSignature[]>>;
+  onPendingChange?: (
+    pending: React.MutableRefObject<Record<string, ExtendedSystemSignature>>,
+    undo: () => void,
+  ) => void;
 }
 
 export interface UsePendingAdditionParams {
+  systemId: string;
   setSignatures: React.Dispatch<React.SetStateAction<ExtendedSystemSignature[]>>;
   deletionTiming?: number;
 }

assets/js/hooks/Mapper/components/mapInterface/widgets/SystemSignatures/hooks/usePendingAdditions.ts

@@ -1,69 +0,0 @@
-import { useState, useCallback, useRef } from 'react';
-import { ExtendedSystemSignature, schedulePendingAdditionForSig } from '../helpers/contentHelpers';
-import { UsePendingAdditionParams } from './types';
-import { FINAL_DURATION_MS } from '../constants';
-
-export function usePendingAdditions({ setSignatures, deletionTiming }: UsePendingAdditionParams) {
-  const [pendingUndoAdditions, setPendingUndoAdditions] = useState<ExtendedSystemSignature[]>([]);
-  const pendingAdditionMapRef = useRef<Record<string, { finalUntil: number; finalTimeoutId: number }>>({});
-
-  // Use the provided deletion timing or fall back to the default
-  const finalDuration = deletionTiming !== undefined ? deletionTiming : FINAL_DURATION_MS;
-
-  const processAddedSignatures = useCallback(
-    (added: ExtendedSystemSignature[]) => {
-      if (!added.length) return;
-
-      // If duration is 0, don't show pending state
-      if (finalDuration === 0) {
-        setSignatures(prev => [
-          ...prev,
-          ...added.map(sig => ({
-            ...sig,
-            pendingAddition: false,
-          })),
-        ]);
-        return;
-      }
-
-      const now = Date.now();
-      setSignatures(prev => [
-        ...prev,
-        ...added.map(sig => ({
-          ...sig,
-          pendingAddition: true,
-          pendingUntil: now + finalDuration,
-        })),
-      ]);
-      added.forEach(sig => {
-        schedulePendingAdditionForSig(
-          sig,
-          finalDuration,
-          setSignatures,
-          pendingAdditionMapRef,
-          setPendingUndoAdditions,
-        );
-      });
-    },
-    [setSignatures, finalDuration],
-  );
-
-  const clearPendingAdditions = useCallback(() => {
-    Object.values(pendingAdditionMapRef.current).forEach(({ finalTimeoutId }) => {
-      clearTimeout(finalTimeoutId);
-    });
-    pendingAdditionMapRef.current = {};
-    setSignatures(prev =>
-      prev.map(x => (x.pendingAddition ? { ...x, pendingAddition: false, pendingUntil: undefined } : x)),
-    );
-    setPendingUndoAdditions([]);
-  }, [setSignatures]);
-
-  return {
-    pendingUndoAdditions,
-    setPendingUndoAdditions,
-    pendingAdditionMapRef,
-    processAddedSignatures,
-    clearPendingAdditions,
-  };
-}

assets/js/hooks/Mapper/components/mapInterface/widgets/SystemSignatures/hooks/usePendingDeletions.ts

@@ -1,16 +1,19 @@
-import { useState, useCallback } from 'react';
+import { useCallback, useRef, useEffect } from 'react';
 import { OutCommand } from '@/hooks/Mapper/types/mapHandlers';
-import { ExtendedSystemSignature, prepareUpdatePayload, scheduleLazyDeletionTimers } from '../helpers';
+import { prepareUpdatePayload, scheduleLazyTimers } from '../helpers';
 import { UsePendingDeletionParams } from './types';
 import { FINAL_DURATION_MS } from '../constants';
 import { useMapRootState } from '@/hooks/Mapper/mapRootProvider';
+import { ExtendedSystemSignature } from '@/hooks/Mapper/types';
 
-export function usePendingDeletions({ systemId, setSignatures, deletionTiming }: UsePendingDeletionParams) {
+export function usePendingDeletions({
+  systemId,
+  setSignatures,
+  deletionTiming,
+  onPendingChange,
+}: UsePendingDeletionParams) {
   const { outCommand } = useMapRootState();
-  const [localPendingDeletions, setLocalPendingDeletions] = useState<ExtendedSystemSignature[]>([]);
-  const [pendingDeletionMap, setPendingDeletionMap] = useState<
-    Record<string, { finalUntil: number; finalTimeoutId: number }>
-  >({});
+  const pendingDeletionMapRef = useRef<Record<string, ExtendedSystemSignature>>({});
 
   // Use the provided deletion timing or fall back to the default
   const finalDuration = deletionTiming !== undefined ? deletionTiming : FINAL_DURATION_MS;
@@ -36,15 +39,17 @@ export function usePendingDeletions({ systemId, setSignatures, deletionTiming }:
       const processedRemoved = removed.map(r => ({
         ...r,
         pendingDeletion: true,
-        pendingAddition: false,
         pendingUntil: now + finalDuration,
       }));
-      setLocalPendingDeletions(prev => [...prev, ...processedRemoved]);
+      pendingDeletionMapRef.current = {
+        ...pendingDeletionMapRef.current,
+        ...processedRemoved.reduce((acc: any, sig) => {
+          acc[sig.eve_id] = sig;
+          return acc;
+        }, {}),
+      };
 
-      outCommand({
-        type: OutCommand.updateSignatures,
-        data: prepareUpdatePayload(systemId, added, updated, []),
-      });
+      onPendingChange?.(pendingDeletionMapRef, clearPendingDeletions);
 
       setSignatures(prev =>
         prev.map(sig => {
@@ -55,37 +60,35 @@ export function usePendingDeletions({ systemId, setSignatures, deletionTiming }:
         }),
       );
 
-      scheduleLazyDeletionTimers(
+      scheduleLazyTimers(
         processedRemoved,
-        setPendingDeletionMap,
+        pendingDeletionMapRef,
         async sig => {
           await outCommand({
             type: OutCommand.updateSignatures,
             data: prepareUpdatePayload(systemId, [], [], [sig]),
           });
-          setLocalPendingDeletions(prev => prev.filter(x => x.eve_id !== sig.eve_id));
+          delete pendingDeletionMapRef.current[sig.eve_id];
           setSignatures(prev => prev.filter(x => x.eve_id !== sig.eve_id));
+          onPendingChange?.(pendingDeletionMapRef, clearPendingDeletions);
         },
         finalDuration,
       );
     },
-    [systemId, outCommand, setSignatures, finalDuration],
+    [systemId, outCommand, finalDuration],
   );
 
   const clearPendingDeletions = useCallback(() => {
-    Object.values(pendingDeletionMap).forEach(({ finalTimeoutId }) => clearTimeout(finalTimeoutId));
-    setPendingDeletionMap({});
-    setSignatures(prev =>
-      prev.map(x => (x.pendingDeletion ? { ...x, pendingDeletion: false, pendingUntil: undefined } : x)),
-    );
-    setLocalPendingDeletions([]);
-  }, [pendingDeletionMap, setSignatures]);
+    Object.values(pendingDeletionMapRef.current).forEach(({ finalTimeoutId }) => {
+      clearTimeout(finalTimeoutId);
+    });
+    pendingDeletionMapRef.current = {};
+    setSignatures(prev => prev.map(x => (x.pendingDeletion ? { ...x, pendingDeletion: false } : x)));
+    onPendingChange?.(pendingDeletionMapRef, clearPendingDeletions);
+  }, []);
 
   return {
-    localPendingDeletions,
-    setLocalPendingDeletions,
-    pendingDeletionMap,
-    setPendingDeletionMap,
+    pendingDeletionMapRef,
     processRemovedSignatures,
     clearPendingDeletions,
   };

assets/js/hooks/Mapper/components/mapInterface/widgets/SystemSignatures/hooks/useSignatureFetching.ts

@@ -1,17 +1,16 @@
 import { useCallback } from 'react';
-import { SystemSignature } from '@/hooks/Mapper/types';
+import { ExtendedSystemSignature, SystemSignature } from '@/hooks/Mapper/types';
 import { OutCommand } from '@/hooks/Mapper/types/mapHandlers';
-import { ExtendedSystemSignature, prepareUpdatePayload, getActualSigs, mergeLocalPendingAdditions } from '../helpers';
+import { prepareUpdatePayload, getActualSigs, mergeLocalPending } from '../helpers';
 import { UseFetchingParams } from './types';
-import { FINAL_DURATION_MS } from '../constants';
 import { useMapRootState } from '@/hooks/Mapper/mapRootProvider';
 
-export function useSignatureFetching({
+export const useSignatureFetching = ({
   systemId,
   signaturesRef,
   setSignatures,
-  localPendingDeletions,
-}: UseFetchingParams) {
+  pendingDeletionMapRef,
+}: UseFetchingParams) => {
   const {
     data: { characters },
     outCommand,
@@ -22,9 +21,6 @@ export function useSignatureFetching({
       setSignatures([]);
       return;
     }
-    if (localPendingDeletions.length) {
-      return;
-    }
     const resp = await outCommand({
       type: OutCommand.getSignatures,
       data: { system_id: systemId },
@@ -36,8 +32,8 @@ export function useSignatureFetching({
       character_name: characters.find(c => c.eve_id === s.character_eve_id)?.name,
     })) as ExtendedSystemSignature[];
 
-    setSignatures(prev => mergeLocalPendingAdditions(extended, prev));
-  }, [characters, systemId, localPendingDeletions, outCommand, setSignatures]);
+    setSignatures(() => mergeLocalPending(pendingDeletionMapRef, extended));
+  }, [characters, systemId, outCommand]);
 
   const handleUpdateSignatures = useCallback(
     async (newList: ExtendedSystemSignature[], updateOnly: boolean, skipUpdateUntouched?: boolean) => {
@@ -48,28 +44,16 @@ export function useSignatureFetching({
         skipUpdateUntouched,
       );
 
-      if (added.length > 0) {
-        const now = Date.now();
-        setSignatures(prev => [
-          ...prev,
-          ...added.map(a => ({
-            ...a,
-            pendingAddition: true,
-            pendingUntil: now + FINAL_DURATION_MS,
-          })),
-        ]);
-      }
-
       await outCommand({
         type: OutCommand.updateSignatures,
         data: prepareUpdatePayload(systemId, added, updated, removed),
       });
     },
-    [systemId, outCommand, signaturesRef, setSignatures],
+    [systemId, outCommand, signaturesRef],
   );
 
   return {
     handleGetSignatures,
     handleUpdateSignatures,
   };
-}
+};

assets/js/hooks/Mapper/components/mapInterface/widgets/SystemSignatures/hooks/useSystemSignaturesData.ts

@@ -1,75 +1,64 @@
 import { useCallback, useEffect, useState } from 'react';
 import useRefState from 'react-usestateref';
 import { useMapEventListener } from '@/hooks/Mapper/events';
-import { Commands, SystemSignature } from '@/hooks/Mapper/types';
+import { Commands, ExtendedSystemSignature, SignatureKind } from '@/hooks/Mapper/types';
 import { OutCommand } from '@/hooks/Mapper/types/mapHandlers';
 import { parseSignatures } from '@/hooks/Mapper/helpers';
-import {
-  KEEP_LAZY_DELETE_SETTING,
-  LAZY_DELETE_SIGNATURES_SETTING,
-} from '@/hooks/Mapper/components/mapInterface/widgets';
-import { ExtendedSystemSignature, getActualSigs, mergeLocalPendingAdditions } from '../helpers';
+
+import { getActualSigs } from '../helpers';
 import { useSignatureFetching } from './useSignatureFetching';
-import { usePendingAdditions } from './usePendingAdditions';
 import { usePendingDeletions } from './usePendingDeletions';
 import { UseSystemSignaturesDataProps } from './types';
 import { useMapRootState } from '@/hooks/Mapper/mapRootProvider';
+import { SETTINGS_KEYS } from '@/hooks/Mapper/components/mapInterface/widgets/SystemSignatures/constants.ts';
 
-export function useSystemSignaturesData({
+export const useSystemSignaturesData = ({
   systemId,
   settings,
   onCountChange,
   onPendingChange,
   onLazyDeleteChange,
   deletionTiming,
-}: UseSystemSignaturesDataProps) {
+}: UseSystemSignaturesDataProps) => {
   const { outCommand } = useMapRootState();
   const [signatures, setSignatures, signaturesRef] = useRefState<ExtendedSystemSignature[]>([]);
   const [selectedSignatures, setSelectedSignatures] = useState<ExtendedSystemSignature[]>([]);
 
-  const { localPendingDeletions, setLocalPendingDeletions, processRemovedSignatures, clearPendingDeletions } =
-    usePendingDeletions({
-      systemId,
-      setSignatures,
-      deletionTiming,
-    });
-  const { pendingUndoAdditions, setPendingUndoAdditions, processAddedSignatures, clearPendingAdditions } =
-    usePendingAdditions({
-      setSignatures,
-      deletionTiming,
-    });
+  const { pendingDeletionMapRef, processRemovedSignatures, clearPendingDeletions } = usePendingDeletions({
+    systemId,
+    setSignatures,
+    deletionTiming,
+    onPendingChange,
+  });
 
   const { handleGetSignatures, handleUpdateSignatures } = useSignatureFetching({
     systemId,
     signaturesRef,
     setSignatures,
-    localPendingDeletions,
+    pendingDeletionMapRef,
   });
 
   const handlePaste = useCallback(
     async (clipboardString: string) => {
-      const lazyDeleteValue = settings.find(s => s.key === LAZY_DELETE_SIGNATURES_SETTING)?.value ?? false;
+      const lazyDeleteValue = settings[SETTINGS_KEYS.LAZY_DELETE_SIGNATURES] as boolean;
 
       const incomingSignatures = parseSignatures(
         clipboardString,
-        settings.map(s => s.key),
+        Object.keys(settings).filter(skey => skey in SignatureKind),
       ) as ExtendedSystemSignature[];
 
-      const current = signaturesRef.current;
       const currentNonPending = lazyDeleteValue
-        ? current.filter(sig => !sig.pendingDeletion)
-        : current.filter(sig => !sig.pendingDeletion && !sig.pendingAddition);
+        ? signaturesRef.current.filter(sig => !sig.pendingDeletion)
+        : signaturesRef.current.filter(sig => !sig.pendingDeletion || !sig.pendingAddition);
 
       const { added, updated, removed } = getActualSigs(currentNonPending, incomingSignatures, !lazyDeleteValue, true);
 
-      if (added.length > 0) {
-        processAddedSignatures(added);
-      }
-
       if (removed.length > 0) {
         await processRemovedSignatures(removed, added, updated);
-      } else {
-        const resp = await outCommand({
+      }
+
+      if (updated.length !== 0 || added.length !== 0) {
+        await outCommand({
           type: OutCommand.updateSignatures,
           data: {
             system_id: systemId,
@@ -78,34 +67,14 @@ export function useSystemSignaturesData({
             removed: [],
           },
         });
-        if (resp) {
-          const finalSigs = (resp.signatures ?? []) as SystemSignature[];
-          setSignatures(prev =>
-            mergeLocalPendingAdditions(
-              finalSigs.map(x => ({ ...x })),
-              prev,
-            ),
-          );
-        }
       }
 
-      const keepLazy = settings.find(s => s.key === KEEP_LAZY_DELETE_SETTING)?.value ?? false;
+      const keepLazy = settings[SETTINGS_KEYS.KEEP_LAZY_DELETE] as boolean;
       if (lazyDeleteValue && !keepLazy) {
-        setTimeout(() => {
-          onLazyDeleteChange?.(false);
-        }, 0);
+        onLazyDeleteChange?.(false);
       }
     },
-    [
-      settings,
-      signaturesRef,
-      processAddedSignatures,
-      processRemovedSignatures,
-      outCommand,
-      systemId,
-      setSignatures,
-      onLazyDeleteChange,
-    ],
+    [settings, signaturesRef, processRemovedSignatures, outCommand, systemId, onLazyDeleteChange],
   );
 
   const handleDeleteSelected = useCallback(async () => {
@@ -115,7 +84,7 @@ export function useSystemSignaturesData({
 
     await handleUpdateSignatures(finalList, false, true);
     setSelectedSignatures([]);
-  }, [selectedSignatures, signatures, handleUpdateSignatures]);
+  }, [selectedSignatures, signatures]);
 
   const handleSelectAll = useCallback(() => {
     setSelectedSignatures(signatures);
@@ -123,42 +92,7 @@ export function useSystemSignaturesData({
 
   const undoPending = useCallback(() => {
     clearPendingDeletions();
-    clearPendingAdditions();
-    setSignatures(prev =>
-      prev.map(x => (x.pendingDeletion ? { ...x, pendingDeletion: false, pendingUntil: undefined } : x)),
-    );
-
-    if (pendingUndoAdditions.length) {
-      pendingUndoAdditions.forEach(async sig => {
-        await outCommand({
-          type: OutCommand.updateSignatures,
-          data: {
-            system_id: systemId,
-            added: [],
-            updated: [],
-            removed: [sig],
-          },
-        });
-      });
-      setSignatures(prev => prev.filter(x => !pendingUndoAdditions.some(u => u.eve_id === x.eve_id)));
-      setPendingUndoAdditions([]);
-    }
-    setLocalPendingDeletions([]);
-  }, [
-    clearPendingDeletions,
-    clearPendingAdditions,
-    pendingUndoAdditions,
-    setPendingUndoAdditions,
-    setLocalPendingDeletions,
-    setSignatures,
-    outCommand,
-    systemId,
-  ]);
-
-  useEffect(() => {
-    const combined = [...localPendingDeletions, ...pendingUndoAdditions];
-    onPendingChange?.(combined, undoPending);
-  }, [localPendingDeletions, pendingUndoAdditions, onPendingChange, undoPending]);
+  }, [clearPendingDeletions]);
 
   useMapEventListener(event => {
     if (event.name === Commands.signaturesUpdated && String(event.data) === String(systemId)) {
@@ -170,14 +104,15 @@ export function useSystemSignaturesData({
   useEffect(() => {
     if (!systemId) {
       setSignatures([]);
+      undoPending();
       return;
     }
     handleGetSignatures();
-  }, [systemId, handleGetSignatures, setSignatures]);
+  }, [systemId]);
 
   useEffect(() => {
     onCountChange?.(signatures.length);
-  }, [signatures, onCountChange]);
+  }, [signatures]);
 
   return {
     signatures,
@@ -187,4 +122,4 @@ export function useSystemSignaturesData({
     handleSelectAll,
     handlePaste,
   };
-}
+};

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

@@ -5,4 +5,3 @@ export * from './renderAddedTimeLeft';
 export * from './renderUpdatedTimeLeft';
 export * from './renderLinkedSystem';
 export * from './renderInfoColumn';
-export * from './renderHeaderLabel';

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

@@ -1,5 +0,0 @@
-import { SystemSignaturesHeader, HeaderProps } from '../SystemSignatureHeader/SystemSignatureHeader';
-
-export function renderHeaderLabel(props: HeaderProps) {
-  return <SystemSignaturesHeader {...props} />;
-}

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

@@ -8,7 +8,7 @@ import { OnTheMap, RightBar } from '@/hooks/Mapper/components/mapRootContent/com
 import { MapContextMenu } from '@/hooks/Mapper/components/mapRootContent/components/MapContextMenu/MapContextMenu.tsx';
 import { useSkipContextMenu } from '@/hooks/Mapper/hooks/useSkipContextMenu';
 import { MapSettings } from '@/hooks/Mapper/components/mapRootContent/components/MapSettings';
-import { CharacterActivity } from '@/hooks/Mapper/components/mapRootContent/components/CharacterActivity/CharacterActivity';
+import { CharacterActivity } from '@/hooks/Mapper/components/mapRootContent/components/CharacterActivity';
 import { TrackAndFollow } from '@/hooks/Mapper/components/mapRootContent/components/TrackAndFollow/TrackAndFollow';
 import { useCharacterActivityHandlers } from './hooks/useCharacterActivityHandlers';
 import { useTrackAndFollowHandlers } from './hooks/useTrackAndFollowHandlers';

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

@@ -1,58 +0,0 @@
-:global {
-  .p-datatable .p-datatable-thead > tr > th {
-    text-align: center;
-    white-space: normal;
-    overflow: visible;
-    height: auto;
-  }
-
-  .p-datatable .p-datatable-tbody > tr > td {
-    padding: 2px;
-  }
-
-  .p-datatable {
-    width: 100%;
-    border: none;
-  }
-
-  .p-datatable-wrapper {
-    border: none !important;
-  }
-}
-
-.spinnerContainer {
-  width: 50px;
-  height: 50px;
-}
-
-.columnHeader {
-  text-align: center;
-  font-weight: 600;
-  font-size: 0.75rem; /* text-xs */
-  white-space: normal !important;
-  overflow: visible !important;
-}
-
-.numericColumnHeader {
-  padding: 2px !important;
-}
-
-.dataTable {
-  width: 100%;
-  border: none;
-}
-
-.cellContent {
-  display: flex;
-  align-items: center;
-  width: 100%;
-  overflow: hidden;
-  padding: 2px;
-}
-
-.numericValueCell {
-  text-align: center;
-  font-size: 0.75rem; /* text-xs */
-  font-weight: 500;
-  white-space: nowrap;
-}

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

@@ -1,10 +1,9 @@
-import { useState, useEffect, useMemo } from 'react';
+import { useEffect, useMemo, useState } from 'react';
 import { Dialog } from 'primereact/dialog';
 import { DataTable } from 'primereact/datatable';
 import { Column } from 'primereact/column';
 import { useMapRootState } from '@/hooks/Mapper/mapRootProvider';
 import { ProgressSpinner } from 'primereact/progressspinner';
-import classes from './CharacterActivity.module.scss';
 import { CharacterCard } from '../../../ui-kit';
 import { CharacterTypeRaw } from '@/hooks/Mapper/types';
 
@@ -20,18 +19,14 @@ interface CharacterActivityProps {
   onHide: () => void;
 }
 
-const getRowClassName = () => ['text-xs', 'leading-tight', 'p-selectable-row'];
+const getRowClassName = () => ['text-xs', 'leading-tight'];
 
 const renderCharacterTemplate = (rowData: ActivitySummary) => {
-  return (
-    <div className={classes.cellContent}>
-      <CharacterCard showShipName={false} showSystem={false} compact isOwn {...rowData.character} />
-    </div>
-  );
+  return <CharacterCard compact isOwn {...rowData.character} />;
 };
 
 const renderValueTemplate = (rowData: ActivitySummary, field: keyof ActivitySummary) => {
-  return <div className={`${classes.numericValueCell} tabular-nums`}>{rowData[field] as number}</div>;
+  return <div className="tabular-nums">{rowData[field] as number}</div>;
 };
 
 export const CharacterActivity = ({ visible, onHide }: CharacterActivityProps) => {
@@ -53,7 +48,7 @@ export const CharacterActivity = ({ visible, onHide }: CharacterActivityProps) =
     if (loading) {
       return (
         <div className="flex flex-col items-center justify-center h-[400px] w-full">
-          <ProgressSpinner className={classes.spinnerContainer} strokeWidth="4" />
+          <ProgressSpinner className="w-[50px] h-[50px]" strokeWidth="4" />
           <div className="mt-4 text-text-color-secondary text-sm">Loading character activity data...</div>
         </div>
       );
@@ -73,11 +68,10 @@ export const CharacterActivity = ({ visible, onHide }: CharacterActivityProps) =
         resizableColumns
         columnResizeMode="fit"
         className="w-full"
-        tableClassName={classes.dataTable}
+        tableClassName="w-full border-0"
         emptyMessage="No character activity data available"
         sortField="passages"
         sortOrder={-1}
-        responsiveLayout="scroll"
         size="small"
         rowClassName={getRowClassName}
         rowHover
@@ -87,10 +81,10 @@ export const CharacterActivity = ({ visible, onHide }: CharacterActivityProps) =
           header="Character"
           body={renderCharacterTemplate}
           sortable
-          headerStyle={{ minWidth: '75px', height: 'auto', overflow: 'visible' }}
-          bodyStyle={{ minWidth: '75px' }}
-          className={classes.characterColumn}
-          headerClassName={`${classes.columnHeader} ${classes.characterHeader}`}
+          // headerStyle={{ minWidth: '75px', height: 'auto', overflow: 'visible' }}
+          // bodyStyle={{ minWidth: '75px' }}
+          // className={classes.characterColumn}
+          // headerClassName={classes.columnHeader}
         />
 
         <Column
@@ -98,30 +92,30 @@ export const CharacterActivity = ({ visible, onHide }: CharacterActivityProps) =
           header="Passages"
           body={rowData => renderValueTemplate(rowData, 'passages')}
           sortable
-          headerStyle={{ width: '120px', textAlign: 'center', height: 'auto', overflow: 'visible' }}
-          bodyStyle={{ width: '120px', textAlign: 'center' }}
-          className={classes.numericColumn}
-          headerClassName={`${classes.columnHeader} ${classes.numericColumnHeader}`}
+          // headerStyle={{ width: '120px', textAlign: 'center', height: 'auto', overflow: 'visible' }}
+          // bodyStyle={{ width: '120px', textAlign: 'center' }}
+          // className={classes.numericColumn}
+          // headerClassName={classes.columnHeader}
         />
         <Column
           field="connections"
           header="Connections"
           body={rowData => renderValueTemplate(rowData, 'connections')}
           sortable
-          headerStyle={{ width: '120px', textAlign: 'center', height: 'auto', overflow: 'visible' }}
-          bodyStyle={{ width: '120px', textAlign: 'center' }}
-          className={classes.numericColumn}
-          headerClassName={`${classes.columnHeader} ${classes.numericColumnHeader}`}
+          // headerStyle={{ width: '120px', textAlign: 'center', height: 'auto', overflow: 'visible' }}
+          // bodyStyle={{ width: '120px', textAlign: 'center' }}
+          // className={classes.numericColumn}
+          // headerClassName={classes.columnHeader}
         />
         <Column
           field="signatures"
           header="Signatures"
           body={rowData => renderValueTemplate(rowData, 'signatures')}
           sortable
-          headerStyle={{ width: '120px', textAlign: 'center', height: 'auto', overflow: 'visible' }}
-          bodyStyle={{ width: '120px', textAlign: 'center' }}
-          className={classes.numericColumn}
-          headerClassName={`${classes.columnHeader} ${classes.numericColumnHeader}`}
+          // headerStyle={{ width: '120px', textAlign: 'center', height: 'auto', overflow: 'visible' }}
+          // bodyStyle={{ width: '120px', textAlign: 'center' }}
+          // className={classes.numericColumn}
+          // headerClassName={classes.columnHeader}
         />
       </DataTable>
     );

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

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

assets/js/hooks/Mapper/components/mapRootContent/components/Connections/PassageCard/PassageCard.tsx

@@ -68,7 +68,7 @@ export const PassageCard = ({ inserted_at, character: char, ship }: PassageCardT
               <div className="grid gap-1 grid-cols-[1fr_1px_auto]">
                 {ship.ship_name && (
                   <>
-                    <span className="text-ellipsis overflow-hidden whitespace-nowrap">
+                    <span className="text-ellipsis overflow-hidden whitespace-nowrap flex justify-end text-neutral-400">
                       {getShipName(ship.ship_name)}
                     </span>
                     <div className="h-3 border-r border-neutral-500 my-0.5"></div>

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

@@ -26,7 +26,7 @@ const STORED_DEFAULT_VALUES: WindowLocalSettingsType = {
 const itemTemplate = (item: CharacterTypeRaw & WithIsOwnCharacter, options: VirtualScrollerTemplateOptions) => {
   return (
     <div
-      className={clsx(classes.CharacterRow, 'w-full box-border', {
+      className={clsx(classes.CharacterRow, 'w-full box-border px-2 py-1', {
         'surface-hover': options.odd,
         ['border-b border-gray-600 border-opacity-20']: !options.last,
         ['bg-green-500 hover:bg-green-700 transition duration-300 bg-opacity-10 hover:bg-opacity-10']: item.online,

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

@@ -1,109 +1,72 @@
-import { useState, useEffect, useMemo } from 'react';
+import { useCallback, useMemo } from 'react';
 import { Dialog } from 'primereact/dialog';
 import { VirtualScroller } from 'primereact/virtualscroller';
 import { useMapRootState } from '@/hooks/Mapper/mapRootProvider';
+import { TrackingCharacter } from './types';
 import { OutCommand } from '@/hooks/Mapper/types/mapHandlers';
 import { TrackingCharacterWrapper } from './TrackingCharacterWrapper';
-import { TrackingCharacter } from './types';
-import classes from './TrackAndFollow.module.scss';
 
 interface TrackAndFollowProps {
   visible: boolean;
   onHide: () => void;
 }
 
-const renderHeader = () => {
-  return (
-    <div className="dialog-header">
-      <span>Track & Follow</span>
-    </div>
-  );
-};
-
 export const TrackAndFollow = ({ visible, onHide }: TrackAndFollowProps) => {
-  const [trackedCharacters, setTrackedCharacters] = useState<string[]>([]);
-  const [followedCharacter, setFollowedCharacter] = useState<string | null>(null);
   const { outCommand, data } = useMapRootState();
   const { trackingCharactersData } = data;
+
   const characters = useMemo(() => trackingCharactersData || [], [trackingCharactersData]);
 
-  useEffect(() => {
-    if (trackingCharactersData) {
-      const newTrackedCharacters = trackingCharactersData.filter(tc => tc.tracked).map(tc => tc.character.eve_id);
-
-      setTrackedCharacters(newTrackedCharacters);
-
-      const followedChar = trackingCharactersData.find(tc => tc.followed);
-
-      if (followedChar?.character?.eve_id !== followedCharacter) {
-        setFollowedCharacter(followedChar?.character?.eve_id || null);
-      }
-    }
-  }, [followedCharacter, trackingCharactersData]);
-
-  const handleTrackToggle = (characterId: string) => {
-    const isCurrentlyTracked = trackedCharacters.includes(characterId);
-
-    if (isCurrentlyTracked) {
-      setTrackedCharacters(prev => prev.filter(id => id !== characterId));
-    } else {
-      setTrackedCharacters(prev => [...prev, characterId]);
-    }
-
-    outCommand({
-      type: OutCommand.toggleTrack,
-      data: { 'character-id': characterId },
-    });
-  };
-
-  const handleFollowToggle = (characterId: string) => {
-    const isCurrentlyFollowed = followedCharacter === characterId;
-    const isCurrentlyTracked = trackedCharacters.includes(characterId);
-
-    // If not followed and not tracked, we need to track it first
-    if (!isCurrentlyFollowed && !isCurrentlyTracked) {
-      setTrackedCharacters(prev => [...prev, characterId]);
-
-      // Send track command first
-      outCommand({
-        type: OutCommand.toggleTrack,
-        data: { 'character-id': characterId },
-      });
-
-      // Then send follow command after a short delay
-      setTimeout(() => {
-        outCommand({
-          type: OutCommand.toggleFollow,
-          data: { 'character-id': characterId },
+  const handleTrackToggle = useCallback(
+    async (characterId: string) => {
+      try {
+        await outCommand({
+          type: OutCommand.toggleTrack,
+          data: { character_id: characterId },
         });
-      }, 100);
+      } catch (error) {
+        console.error('Error toggling track:', error);
+      }
+    },
+    [outCommand],
+  );
 
-      return;
-    }
-
-    // Otherwise just toggle follow
-    outCommand({
-      type: OutCommand.toggleFollow,
-      data: { 'character-id': characterId },
-    });
-  };
+  const handleFollowToggle = useCallback(
+    async (characterId: string) => {
+      try {
+        await outCommand({
+          type: OutCommand.toggleFollow,
+          data: { character_id: characterId },
+        });
+      } catch (error) {
+        console.error('Error toggling follow:', error);
+      }
+    },
+    [outCommand],
+  );
 
   const rowTemplate = (tc: TrackingCharacter) => {
+    const characterEveId = tc.character.eve_id;
+
     return (
       <TrackingCharacterWrapper
-        key={tc.character.eve_id}
+        key={characterEveId}
         character={tc.character}
-        isTracked={trackedCharacters.includes(tc.character.eve_id)}
-        isFollowed={followedCharacter === tc.character.eve_id}
-        onTrackToggle={() => handleTrackToggle(tc.character.eve_id)}
-        onFollowToggle={() => handleFollowToggle(tc.character.eve_id)}
+        isTracked={tc.tracked}
+        isFollowed={tc.followed}
+        onTrackToggle={() => handleTrackToggle(characterEveId)}
+        onFollowToggle={() => handleFollowToggle(characterEveId)}
       />
     );
   };
 
   return (
     <Dialog
-      header={renderHeader()}
+      header={
+        <div className="dialog-header">
+          <span>Track & Follow</span>
+        </div>
+      }
       visible={visible}
       onHide={onHide}
       className="w-[500px] text-text-color"

assets/js/hooks/Mapper/components/mapRootContent/components/TrackAndFollow/TrackingCharacterWrapper.tsx

@@ -1,7 +1,9 @@
 import { WdCheckbox } from '@/hooks/Mapper/components/ui-kit/WdCheckbox/WdCheckbox';
-import WdRadioButton from '@/hooks/Mapper/components/ui-kit/WdRadioButton';
-import { CharacterCard, TooltipPosition, WdTooltipWrapper } from '../../../ui-kit';
+import { WdTooltipWrapper } from '@/hooks/Mapper/components/ui-kit';
+import { TooltipPosition } from '@/hooks/Mapper/components/ui-kit/WdTooltip/WdTooltip';
+import { CharacterCard } from '@/hooks/Mapper/components/ui-kit';
 import { CharacterTypeRaw } from '@/hooks/Mapper/types';
+import WdRadioButton from '@/hooks/Mapper/components/ui-kit/WdRadioButton';
 
 interface TrackingCharacterWrapperProps {
   character: CharacterTypeRaw;
@@ -22,11 +24,11 @@ export const TrackingCharacterWrapper = ({
   const followRadioId = `follow-${character.eve_id}`;
 
   return (
-    <div className="p-selectable-row grid grid-cols-[80px_80px_1fr] items-center min-h-8 hover:bg-neutral-800  border-b border-[#383838]">
+    <div className="grid grid-cols-[80px_80px_1fr] items-center min-h-8 hover:bg-neutral-800  border-b border-[#383838]">
       <div className="flex justify-center items-center p-0.5 text-center">
         <WdTooltipWrapper content="Track this character on the map" position={TooltipPosition.top}>
           <div className="flex justify-center items-center w-full">
-            <WdCheckbox id={trackCheckboxId} label="" value={isTracked} onChange={() => onTrackToggle()} />
+            <WdCheckbox id={trackCheckboxId} label="" value={isTracked} onChange={onTrackToggle} />
           </div>
         </WdTooltipWrapper>
       </div>

assets/js/hooks/Mapper/components/mapRootContent/hooks/useCharacterActivityHandlers.ts

@@ -18,13 +18,7 @@ export const useCharacterActivityHandlers = () => {
       ...state,
       showCharacterActivity: false,
     }));
-
-    // Send the command to the server
-    outCommand({
-      type: OutCommand.hideActivity,
-      data: {},
-    });
-  }, [outCommand, update]);
+  }, [update]);
 
   /**
    * Handle showing the character activity dialog
@@ -56,7 +50,7 @@ export const useCharacterActivityHandlers = () => {
       // Update local state with the activity data
       update(state => ({
         ...state,
-        characterActivityData: activityData.activity,
+        characterActivityData: activityData,
         showCharacterActivity: true,
       }));
     },

assets/js/hooks/Mapper/components/mapRootContent/hooks/useTrackAndFollowHandlers.ts

@@ -13,18 +13,12 @@ export const useTrackAndFollowHandlers = () => {
    * Handle hiding the track and follow dialog
    */
   const handleHideTracking = useCallback(() => {
-    // Send the command to the server first
-    outCommand({
-      type: OutCommand.hideTracking,
-      data: {},
-    });
-    
     // Then update local state to hide the dialog
     update(state => ({
       ...state,
       showTrackAndFollow: false,
     }));
-  }, [outCommand, update]);
+  }, [update]);
 
   /**
    * Handle showing the track and follow dialog
@@ -101,7 +95,6 @@ export const useTrackAndFollowHandlers = () => {
     [outCommand],
   );
 
-
   /**
    * Handle user settings updates
    */

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

@@ -99,20 +99,17 @@ export const MapWrapper = () => {
     [outCommand],
   );
 
-  const handleSystemContextMenu = useCallback(
-    (ev: any, systemId: string) => {
-      const { selectedSystems, systems } = ref.current;
-      if (selectedSystems.length > 1) {
-        const systemsInfo: Node[] = selectedSystems.map(x => ({ data: getSystemById(systems, x), id: x }) as Node);
+  const handleSystemContextMenu = useCallback((ev: any, systemId: string) => {
+    const { selectedSystems, systems } = ref.current;
+    if (selectedSystems.length > 1) {
+      const systemsInfo: Node[] = selectedSystems.map(x => ({ data: getSystemById(systems, x), id: x }) as Node);
 
-        handleSystemMultipleContext(ev, systemsInfo);
-        return;
-      }
+      handleSystemMultipleContext(ev, systemsInfo);
+      return;
+    }
 
-      open(ev, systemId);
-    },
-    [open],
-  );
+    open(ev, systemId);
+  }, []);
 
   const handleConnectionDbClick = useCallback((e: SolarSystemConnection) => setSelectedConnection(e), []);
 

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

@@ -1,49 +0,0 @@
-.CharacterCard {
-
-}
-
-.EveIcon {
-  display: flex;
-  transition:
-    border-color 250ms,
-    opacity 250ms;
-  min-width: 33px;
-  min-height: 33px;
-  width: 33px;
-  height: 33px;
-  border-width: 1px;
-  border-style: solid;
-  border-color: #272727;
-  background-color: rgba(0, 0, 0, 0);
-  border-radius: 0 !important;
-}
-
-.CharName {
-  max-width: 10rem;
-
-  &.CardBorderLeftIsOwn {
-    color: rgb(251 146 60 / 1)
-  }
-}
-
-.CharIcon {
-  border-radius: 0 !important;
-  border: 1px solid #2b2b2b;
-}
-
-.CharRow {
-  display: grid;
-  gap: 4px;
-
-  &.TwoColumns {
-    grid-template-columns: auto 1fr;
-  }
-
-  &.ThreeColumns {
-    grid-template-columns: auto 1fr auto;
-  }
-}
-
-.CardBorderLeftIsOwn {
-
-}

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

@@ -1,10 +1,10 @@
 import { useCallback } from 'react';
 import clsx from 'clsx';
-import classes from './CharacterCard.module.scss';
 import { SystemView } from '@/hooks/Mapper/components/ui-kit/SystemView';
 import { CharacterTypeRaw, WithIsOwnCharacter } from '@/hooks/Mapper/types';
 import { Commands } from '@/hooks/Mapper/types/mapHandlers';
 import { emitMapEvent } from '@/hooks/Mapper/events';
+import { CharacterPortrait, CharacterPortraitSize } from '@/hooks/Mapper/components/ui-kit';
 
 type CharacterCardProps = {
   compact?: boolean;
@@ -18,12 +18,8 @@ const SHIP_NAME_RX = /u'|'/g;
 export const getShipName = (name: string) => {
   return name
     .replace(SHIP_NAME_RX, '')
-    .replace(/\\u([\dA-Fa-f]{4})/g, (_, grp) =>
-      String.fromCharCode(parseInt(grp, 16))
-    )
-    .replace(/\\x([\dA-Fa-f]{2})/g, (_, grp) =>
-      String.fromCharCode(parseInt(grp, 16))
-    );
+    .replace(/\\u([\dA-Fa-f]{4})/g, (_, grp) => String.fromCharCode(parseInt(grp, 16)))
+    .replace(/\\x([\dA-Fa-f]{2})/g, (_, grp) => String.fromCharCode(parseInt(grp, 16)));
 };
 
 export const CharacterCard = ({
@@ -48,31 +44,14 @@ export const CharacterCard = ({
 
   if (compact) {
     return (
-      <div
-        className={clsx(classes.CharacterCard, 'w-full text-xs box-border')}
-        onClick={handleSelect}
-      >
-        <div className="w-full px-2 py-1 flex items-center gap-2" style={{ minWidth: 0 }}>
-          <img
-            src={`https://images.evetech.net/characters/${char.eve_id}/portrait`}
-            alt={`${char.name} portrait`}
-            style={{
-              width: '18px',
-              height: '18px',
-              borderRadius: 0,
-              flexShrink: 0,
-              border: '1px solid #2b2b2b',
-            }}
-          />
-          <div className="flex flex-grow overflow-hidden text-left" style={{ minWidth: 0 }}>
+      <div className={clsx('w-full text-xs box-border')} onClick={handleSelect}>
+        <div className="w-full flex items-center gap-1">
+          <CharacterPortrait characterEveId={char.eve_id} size={CharacterPortraitSize.w18} />
+          <div className="flex flex-grow overflow-hidden text-left">
             <div className="overflow-hidden text-ellipsis whitespace-nowrap">
-              <span className={clsx(isOwn ? 'text-orange-400' : 'text-gray-200')}>
-                {char.name}
-              </span>{" "}
+              <span className={clsx(isOwn ? 'text-orange-400' : 'text-gray-200')}>{char.name}</span>{' '}
               <span className="text-gray-400">
-                {(!locationShown && showShipName && shipNameText)
-                  ? `- ${shipNameText}`
-                  : `[${tickerText}]`}
+                {!locationShown && showShipName && shipNameText ? `- ${shipNameText}` : `[${tickerText}]`}
               </span>
             </div>
           </div>
@@ -88,58 +67,44 @@ export const CharacterCard = ({
         </div>
       </div>
     );
-  } else {
-    return (
-      <div
-        className={clsx(classes.CharacterCard, 'w-full text-xs box-border')}
-        onClick={handleSelect}
-      >
-        <div className="w-full px-2 py-1 flex items-center gap-2" style={{ minWidth: 0 }}>
-          <span
-            className={clsx(classes.EveIcon, classes.CharIcon, 'wd-bg-default')}
-            style={{
-              backgroundImage: `url(https://images.evetech.net/characters/${char.eve_id}/portrait)`,
-              minWidth: '33px',
-              minHeight: '33px',
-              width: '33px',
-              height: '33px',
-            }}
-          />
-          <div className="flex flex-col flex-grow overflow-hidden" style={{ minWidth: 0 }}>
-            <div className="overflow-hidden text-ellipsis whitespace-nowrap">
-              <span className={clsx(isOwn ? 'text-orange-400' : 'text-gray-200')}>
-                {char.name}
-              </span>{" "}
-              <span className="text-gray-400">[{tickerText}]</span>
-            </div>
-            {locationShown ? (
-              <div className="text-gray-300 text-xs overflow-hidden text-ellipsis whitespace-nowrap">
-                <SystemView
-                  systemId={char?.location?.solar_system_id?.toString() || ''}
-                  useSystemsCache={useSystemsCache}
-                />
-              </div>
-            ) : (
-              shipNameText && (
-                <div className="text-gray-300 text-xs overflow-hidden text-ellipsis whitespace-nowrap">
-                  {shipNameText}
-                </div>
-              )
-            )}
+  }
+
+  return (
+    <div className={clsx('w-full text-xs box-border')} onClick={handleSelect}>
+      <div className="w-full flex items-center gap-2">
+        <CharacterPortrait characterEveId={char.eve_id} size={CharacterPortraitSize.w33} />
+        <div className="flex flex-col flex-grow overflow-hidden">
+          <div className="overflow-hidden text-ellipsis whitespace-nowrap">
+            <span className={clsx(isOwn ? 'text-orange-400' : 'text-gray-200')}>{char.name}</span>{' '}
+            <span className="text-gray-400">[{tickerText}]</span>
           </div>
-          {shipType && (
-            <div className="flex-shrink-0 self-start">
-              <div
-                className="text-gray-300 overflow-hidden text-ellipsis whitespace-nowrap"
-                style={{ maxWidth: '200px' }}
-                title={shipType}
-              >
-                {shipType}
-              </div>
+          {locationShown ? (
+            <div className="text-gray-300 text-xs overflow-hidden text-ellipsis whitespace-nowrap">
+              <SystemView
+                systemId={char?.location?.solar_system_id?.toString() || ''}
+                useSystemsCache={useSystemsCache}
+              />
             </div>
+          ) : (
+            shipNameText && (
+              <div className="text-gray-300 text-xs overflow-hidden text-ellipsis whitespace-nowrap">
+                {shipNameText}
+              </div>
+            )
           )}
         </div>
+        {shipType && (
+          <div className="flex-shrink-0 self-start">
+            <div
+              className="text-gray-300 overflow-hidden text-ellipsis whitespace-nowrap"
+              style={{ maxWidth: '200px' }}
+              title={shipType}
+            >
+              {shipType}
+            </div>
+          </div>
+        )}
       </div>
-    );
-  }
+    </div>
+  );
 };

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

@@ -0,0 +1,47 @@
+import clsx from 'clsx';
+import { WithClassName } from '@/hooks/Mapper/types/common.ts';
+
+export enum CharacterPortraitSize {
+  default,
+  w18,
+  w33,
+}
+
+// TODO IF YOU NEED ANOTHER ONE SIZE PLEASE ADD IT HERE and IN CharacterPortraitSize
+const getSize = (size: CharacterPortraitSize) => {
+  switch (size) {
+    case CharacterPortraitSize.w18:
+      return 'min-w-[18px] min-h-[18px] w-[18px] h-[18px]';
+    case CharacterPortraitSize.w33:
+      return 'min-w-[33px] min-h-[33px] w-[33px] h-[33px]';
+    default:
+      return '';
+  }
+};
+
+export type CharacterPortraitProps = {
+  characterEveId: string | undefined;
+  size?: CharacterPortraitSize;
+} & WithClassName;
+
+export const CharacterPortrait = ({
+  characterEveId,
+  size = CharacterPortraitSize.default,
+  className,
+}: CharacterPortraitProps) => {
+  if (characterEveId == null) {
+    return null;
+  }
+
+  return (
+    <span
+      className={clsx(
+        getSize(size),
+        'flex transition-[border-color,opacity] duration-250 border border-gray-800 bg-transparent rounded-none',
+        'wd-bg-default',
+        className,
+      )}
+      style={{ backgroundImage: `url(https://images.evetech.net/characters/${characterEveId}/portrait)` }}
+    />
+  );
+};

assets/js/hooks/Mapper/components/ui-kit/CharacterPortrait/index.ts

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

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

@@ -1,12 +1,20 @@
 import classes from './InfoDrawer.module.scss';
-import { WithChildren, WithClassName } from '@/hooks/Mapper/types/common.ts';
+import { WithChildren, WithClassName, WithHTMLProps } from '@/hooks/Mapper/types/common.ts';
 import clsx from 'clsx';
 import React from 'react';
 
-export type InfoDrawerProps = { title: React.ReactNode; labelClassName?: string; rightSide?: boolean } & WithChildren &
-  WithClassName;
+export type InfoDrawerProps = { title?: React.ReactNode; labelClassName?: string; rightSide?: boolean } & WithChildren &
+  WithClassName &
+  Omit<WithHTMLProps, 'title'>;
 
-export const InfoDrawer = ({ title, children, className, labelClassName, rightSide }: InfoDrawerProps) => {
+export const InfoDrawer = ({
+  title,
+  children,
+  className,
+  labelClassName,
+  rightSide,
+  ...htmlProps
+}: InfoDrawerProps) => {
   return (
     <div
       className={clsx(classes.InfoDrawerRoot, 'text-xs pl-1', className, {
@@ -14,8 +22,9 @@ export const InfoDrawer = ({ title, children, className, labelClassName, rightSi
         'flex flex-col items-end pr-1': rightSide,
         'pl-1': !rightSide,
       })}
+      {...htmlProps}
     >
-      <div className={clsx(classes.InfoDrawerLabel, 'text-neutral-400', labelClassName)}>{title}</div>
+      {title && <div className={clsx(classes.InfoDrawerLabel, 'text-neutral-400', labelClassName)}>{title}</div>}
       <div>{children}</div>
     </div>
   );

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

@@ -1,10 +1,10 @@
-import React, { useEffect, useState, useRef } from 'react';
+import { useEffect, useState, useRef } from 'react';
 
 interface TimeAgoProps {
   timestamp: string; // Теперь тип string, так как приходит ISO 8601 строка
 }
 
-export const TimeAgo: React.FC<TimeAgoProps> = ({ timestamp }) => {
+export const TimeAgo = ({ timestamp }: TimeAgoProps) => {
   const [timeAgo, setTimeAgo] = useState<string>('');
   const timeoutIdRef = useRef<number | null>(null);
 

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

@@ -3,7 +3,12 @@
   opacity: 0.5;
   pointer-events: initial !important;
 
-  &:hover {
+  &.Disabled {
+    opacity: 0.3;
+    cursor: auto;
+  }
+
+  &:hover:not(&.Disabled) {
     opacity: 1;
   }
 }

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

@@ -29,6 +29,7 @@ export const WdImgButton = ({
   height = 20,
   textSize = WdImageSize.normal,
   tooltip,
+  disabled,
   ...props
 }: WdImgButtonProps) => {
   const content = (
@@ -39,11 +40,12 @@ export const WdImgButton = ({
         {
           [classes.Normal]: textSize === WdImageSize.normal,
           [classes.Large]: textSize === WdImageSize.large,
+          [classes.Disabled]: disabled,
         },
         'pi cursor-pointer',
         className,
       )}
-      onClick={onClick}
+      onClick={disabled ? undefined : onClick}
     >
       {source && <img src={source} width={width} height={height} className="external-icon" />}
     </div>

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

@@ -263,7 +263,8 @@ export const WdTooltip = forwardRef(function WdTooltip(
       className={clsx(
         classes.tooltip,
         interactive ? 'pointer-events-auto' : 'pointer-events-none',
-        'absolute p-1 border rounded-sm border-green-300 border-opacity-10 bg-stone-900 bg-opacity-90',
+        'absolute px-2 py-1',
+        'border rounded-sm border-green-300 border-opacity-10 bg-stone-900 bg-opacity-90',
         className,
         pos === null ? 'invisible' : '',
       )}

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

@@ -0,0 +1,21 @@
+.FadeEnter {
+  opacity: 0;
+  transform: scale(0.95);
+}
+
+.FadeEnterActive {
+  opacity: 1;
+  transform: scale(1);
+  transition: opacity 200ms, transform 200ms;
+}
+
+.FadeExit {
+  opacity: 1;
+  transform: scale(1);
+}
+
+.FadeExitActive {
+  opacity: 0;
+  transform: scale(0.95);
+  transition: opacity 200ms, transform 200ms;
+}

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

@@ -0,0 +1,26 @@
+import classes from './WdTransition.module.scss';
+import { CSSTransition, SwitchTransition } from 'react-transition-group';
+import { WithChildren } from '@/hooks/Mapper/types/common.ts';
+import { TransitionProps } from 'react-transition-group/Transition';
+
+const FADE_CLASSES = {
+  enter: classes.FadeEnter,
+  enterActive: classes.FadeEnterActive,
+  exit: classes.FadeExit,
+  exitActive: classes.FadeExitActive,
+};
+
+export type WdTransitionProps = {
+  active: boolean;
+} & WithChildren &
+  TransitionProps;
+
+export const WdTransition = ({ active, children, ...transition }: WdTransitionProps) => {
+  return (
+    <SwitchTransition>
+      <CSSTransition key={active ? 'one' : 'two'} {...transition} classNames={FADE_CLASSES}>
+        {children}
+      </CSSTransition>
+    </SwitchTransition>
+  );
+};

assets/js/hooks/Mapper/components/ui-kit/WdTransition/index.ts

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

assets/js/hooks/Mapper/components/ui-kit/index.ts

@@ -14,3 +14,5 @@ export * from './TimeAgo';
 export * from './WdTooltipWrapper';
 export * from './WdResponsiveCheckBox';
 export * from './WdRadioButton';
+export * from './CharacterPortrait';
+export * from './WdTransition';

assets/js/hooks/Mapper/hooks/useHotkey.ts

@@ -12,10 +12,12 @@ export const useHotkey = (isMetaKey: boolean, hotkeys: string[], callback: (e: K
       }
     };
 
-    window.addEventListener('keydown', handleKeyDown, { capture: true });
+    // TODO not sure that capture still needs
+    window.addEventListener('keydown', handleKeyDown, { capture: false });
 
     return () => {
-      window.removeEventListener('keydown', handleKeyDown, { capture: true });
+      // TODO not sure that capture still needs
+      window.removeEventListener('keydown', handleKeyDown, { capture: false });
     };
   }, [isMetaKey, hotkeys, callback]);
 };

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

@@ -5,8 +5,10 @@ import {
   MapUnionTypes,
   OutCommandHandler,
   SolarSystemConnection,
+  UseCharactersCacheData,
+  UseCommentsData,
 } from '@/hooks/Mapper/types';
-import { useMapRootHandlers } from '@/hooks/Mapper/mapRootProvider/hooks';
+import { useCharactersCache, useComments, useMapRootHandlers } from '@/hooks/Mapper/mapRootProvider/hooks';
 import { WithChildren } from '@/hooks/Mapper/types/common.ts';
 import useLocalStorageState from 'use-local-storage-state';
 import {
@@ -16,7 +18,7 @@ import {
 } from '@/hooks/Mapper/mapRootProvider/hooks/useStoreWidgets.ts';
 import { WindowsManagerOnChange } from '@/hooks/Mapper/components/ui-kit/WindowManager';
 import { DetailedKill } from '../types/kills';
-import { ActivitySummary } from '../components/mapRootContent/components/CharacterActivity/CharacterActivity';
+import { ActivitySummary } from '../components/mapRootContent/components/CharacterActivity';
 import { TrackingCharacter } from '../components/mapRootContent/components/TrackAndFollow/types';
 
 export type MapRootData = MapUnionTypes & {
@@ -41,7 +43,7 @@ const INITIAL_DATA: MapRootData = {
   showCharacterActivity: false,
   characterActivityData: {
     activity: [],
-    loading: false
+    loading: false,
   },
   showTrackAndFollow: false,
   trackingCharactersData: [],
@@ -110,6 +112,8 @@ export interface MapRootContextProps {
   toggleWidgetVisibility: ToggleWidgetVisibility;
   updateWidgetSettings: WindowsManagerOnChange;
   resetWidgets: () => void;
+  comments: UseCommentsData;
+  charactersCache: UseCharactersCacheData;
 }
 
 const MapRootContext = createContext<MapRootContextProps>({
@@ -119,6 +123,24 @@ const MapRootContext = createContext<MapRootContextProps>({
   outCommand: async () => void 0,
   interfaceSettings: STORED_INTERFACE_DEFAULT_VALUES,
   setInterfaceSettings: () => null,
+  comments: {
+    loadComments: async () => {},
+    comments: new Map(),
+    lastUpdateKey: 0,
+    addComment: function (): void {
+      throw new Error('Function not implemented.');
+    },
+    removeComment: function (): void {
+      throw new Error('Function not implemented.');
+    },
+  },
+  charactersCache: {
+    loadCharacter: function (): Promise<void> {
+      throw new Error('Function not implemented.');
+    },
+    characters: new Map(),
+    lastUpdateKey: 0,
+  },
 });
 
 type MapRootProviderProps = {
@@ -163,18 +185,23 @@ export const MapRootProvider = ({ children, fwdRef, outCommand }: MapRootProvide
     }
   }, []);
 
+  const comments = useComments({ outCommand });
+  const charactersCache = useCharactersCache({ outCommand });
+
   return (
     <MapRootContext.Provider
       value={{
         update,
         data: ref,
-        outCommand: outCommand,
+        outCommand,
         setInterfaceSettings,
         interfaceSettings,
         windowsSettings,
         updateWidgetSettings,
         toggleWidgetVisibility,
         resetWidgets,
+        comments,
+        charactersCache,
       }}
     >
       <MapRootHandlers ref={fwdRef}>{children}</MapRootHandlers>

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

@@ -6,4 +6,6 @@ export * from './useRoutes';
 export * from './useCommandsConnections';
 export * from './useCommandsSystems';
 export * from './useCommandsCharacters';
+export * from './useCommandComments';
+export * from './useGetCacheCharacter';
 export * from './useCommandsActivity';

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

@@ -0,0 +1,19 @@
+import { useMapRootState } from '@/hooks/Mapper/mapRootProvider';
+import { CommandCommentAdd, CommandCommentRemoved } from '@/hooks/Mapper/types';
+import { useCallback, useRef } from 'react';
+
+export const useCommandComments = () => {
+  const { comments } = useMapRootState();
+  const ref = useRef(comments);
+  ref.current = comments;
+
+  const addComment = useCallback((data: CommandCommentAdd) => {
+    ref.current.addComment(data.solarSystemId, data.comment);
+  }, []);
+
+  const removeComment = useCallback((data: CommandCommentRemoved) => {
+    ref.current.removeComment(data.solarSystemId.toString(), data.commentId);
+  }, []);
+
+  return { addComment, removeComment };
+};

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

@@ -45,16 +45,9 @@ export const useCommandsActivity = () => {
     }));
   }, []);
 
-  const hideTracking = useCallback(() => {
-    ref.current.update((state: MapRootData) => ({
-      ...state,
-      showTrackAndFollow: false,
-    }));
-  }, []);
-
   const userSettingsUpdated = useCallback((data: CommandUserSettingsUpdated) => {
     emitMapEvent({ name: Commands.userSettingsUpdated, data });
   }, []);
 
-  return { characterActivityData, trackingCharactersData, userSettingsUpdated, hideActivity, hideTracking };
+  return { characterActivityData, trackingCharactersData, userSettingsUpdated, hideActivity };
 };

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

@@ -0,0 +1,27 @@
+import { useMapRootState } from '@/hooks/Mapper/mapRootProvider';
+import { useEffect, useMemo, useRef } from 'react';
+
+export const useGetCacheCharacter = (characterEveId: string | undefined) => {
+  const {
+    charactersCache: { characters, loadCharacter, lastUpdateKey },
+  } = useMapRootState();
+
+  const ref = useRef({ loadCharacter });
+  ref.current = { loadCharacter };
+
+  useEffect(() => {
+    if (!characterEveId) {
+      return;
+    }
+
+    ref.current.loadCharacter(characterEveId);
+  }, [characterEveId]);
+
+  return useMemo(() => {
+    if (!characterEveId) {
+      return;
+    }
+
+    return characters.get(characterEveId);
+  }, [characters, lastUpdateKey]);
+};

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

@@ -1 +1,3 @@
 export * from './useMapRootHandlers.ts';
+export * from './useComments.ts';
+export * from './useCharactersCache.ts';

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

@@ -0,0 +1,46 @@
+import { useCallback, useRef, useState } from 'react';
+import { CharacterCache, OutCommand, OutCommandHandler, UseCharactersCacheData } from '@/hooks/Mapper/types';
+
+interface UseCharactersCacheProps {
+  outCommand: OutCommandHandler;
+}
+export const useCharactersCache = ({ outCommand }: UseCharactersCacheProps): UseCharactersCacheData => {
+  const charactersRef = useRef<Map<string, CharacterCache>>(new Map());
+  const [lastUpdateKey, setLastUpdateKey] = useState(0);
+
+  const loadCharacter = useCallback(async (characterId: string) => {
+    let character = charactersRef.current.get(characterId);
+
+    if (character?.loading || character?.loaded) {
+      return;
+    }
+
+    if (!character) {
+      character = {
+        loading: false,
+        loaded: false,
+        data: null,
+      };
+    }
+
+    character.loading = true;
+    charactersRef.current.set(characterId, character);
+
+    try {
+      const res = await outCommand({
+        type: OutCommand.getCharacterInfo,
+        data: { characterEveId: characterId },
+      });
+      character.data = res;
+      character.loaded = true;
+    } catch (error) {
+      console.error(error);
+    }
+
+    charactersRef.current.set(characterId, character);
+    character.loading = false;
+    setLastUpdateKey(x => x + 1);
+  }, []);
+
+  return { loadCharacter, characters: charactersRef.current, lastUpdateKey };
+};

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

@@ -0,0 +1,81 @@
+import { useCallback, useRef, useState } from 'react';
+import { CommentSystem, CommentType, OutCommand, OutCommandHandler, UseCommentsData } from '@/hooks/Mapper/types';
+
+interface UseCommentsProps {
+  outCommand: OutCommandHandler;
+}
+
+export const useComments = ({ outCommand }: UseCommentsProps): UseCommentsData => {
+  const [lastUpdateKey, setLastUpdateKey] = useState(0);
+
+  const commentBySystemsRef = useRef<Map<string, CommentSystem>>(new Map());
+
+  const ref = useRef({ outCommand });
+  ref.current = { outCommand };
+
+  const loadComments = useCallback(async (systemId: string) => {
+    let cSystem = commentBySystemsRef.current.get(systemId);
+    if (cSystem?.loading || cSystem?.loaded) {
+      return;
+    }
+
+    if (!cSystem) {
+      cSystem = {
+        loading: false,
+        loaded: false,
+        comments: [],
+      };
+    }
+
+    cSystem.loading = true;
+
+    const result: { comments: CommentType[] } = await ref.current.outCommand({
+      type: OutCommand.getSystemComments,
+      data: {
+        solarSystemId: systemId,
+      },
+    });
+
+    cSystem.loaded = true;
+    cSystem.loading = false;
+    cSystem.comments = [...cSystem.comments, ...result.comments];
+
+    commentBySystemsRef.current.set(systemId, cSystem);
+
+    setLastUpdateKey(x => x + 1);
+  }, []);
+
+  const addComment = useCallback((systemId: string, comment: CommentType) => {
+    const cSystem = commentBySystemsRef.current.get(systemId);
+    if (cSystem) {
+      cSystem.comments.push(comment);
+      setLastUpdateKey(x => x + 1);
+      return;
+    }
+
+    commentBySystemsRef.current.set(systemId, {
+      loading: false,
+      loaded: false,
+      comments: [comment],
+    });
+    setLastUpdateKey(x => x + 1);
+  }, []);
+
+  const removeComment = useCallback((systemId: string, commentId: string) => {
+    const cSystem = commentBySystemsRef.current.get(systemId);
+    if (!cSystem) {
+      return;
+    }
+
+    const index = cSystem.comments.findIndex(x => x.id === commentId);
+
+    if (index === -1) {
+      return;
+    }
+
+    cSystem.comments = [...cSystem.comments.slice(0, index), ...cSystem.comments.splice(index + 1)];
+    setLastUpdateKey(x => x + 1);
+  }, []);
+
+  return { loadComments, comments: commentBySystemsRef.current, lastUpdateKey, addComment, removeComment };
+};

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

@@ -7,6 +7,7 @@ import {
   CommandCharacterRemoved,
   CommandCharactersUpdated,
   CommandCharacterUpdated,
+  CommandCommentAdd,
   CommandInit,
   CommandLinkSignatureToSystem,
   CommandMapUpdated,
@@ -21,9 +22,11 @@ import {
   CommandUserSettingsUpdated,
   Commands,
   MapHandlers,
+  CommandCommentRemoved,
 } from '@/hooks/Mapper/types/mapHandlers.ts';
 
 import {
+  useCommandComments,
   useCommandsCharacters,
   useCommandsConnections,
   useCommandsSystems,
@@ -51,134 +54,115 @@ export const useMapRootHandlers = (ref: ForwardedRef<MapHandlers>) => {
     useCommandsCharacters();
   const mapUpdated = useMapUpdated();
   const mapRoutes = useRoutes();
+  const { addComment, removeComment } = useCommandComments();
   const { characterActivityData, trackingCharactersData, userSettingsUpdated } = useCommandsActivity();
 
-  useImperativeHandle(
-    ref,
-    () => {
-      return {
-        command(type, data) {
-          switch (type) {
-            case Commands.init: // USED
-              mapInit(data as CommandInit);
-              break;
-            case Commands.addSystems: // USED
-              addSystems(data as CommandAddSystems);
-              break;
-            case Commands.updateSystems: // USED
-              updateSystems(data as CommandUpdateSystems);
-              break;
-            case Commands.removeSystems: // USED
-              removeSystems(data as CommandRemoveSystems);
-              break;
-            case Commands.addConnections: // USED
-              addConnections(data as CommandAddConnections);
-              break;
-            case Commands.removeConnections: // USED
-              removeConnections(data as CommandRemoveConnections);
-              break;
-            case Commands.updateConnection: // USED
-              updateConnection(data as CommandUpdateConnection);
-              break;
-            case Commands.charactersUpdated: // USED
-              charactersUpdated(data as CommandCharactersUpdated);
-              break;
-            case Commands.characterAdded: // USED
-              characterAdded(data as CommandCharacterAdded);
-              break;
-            case Commands.characterRemoved: // USED
-              characterRemoved(data as CommandCharacterRemoved);
-              break;
-            case Commands.characterUpdated: // USED
-              characterUpdated(data as CommandCharacterUpdated);
-              break;
-            case Commands.presentCharacters: // USED
-              presentCharacters(data as CommandPresentCharacters);
-              break;
-            case Commands.mapUpdated: // USED
-              mapUpdated(data as CommandMapUpdated);
-              break;
-            case Commands.routes:
-              mapRoutes(data as CommandRoutes);
-              break;
+  useImperativeHandle(ref, () => {
+    return {
+      command(type, data) {
+        switch (type) {
+          case Commands.init: // USED
+            mapInit(data as CommandInit);
+            break;
+          case Commands.addSystems: // USED
+            addSystems(data as CommandAddSystems);
+            break;
+          case Commands.updateSystems: // USED
+            updateSystems(data as CommandUpdateSystems);
+            break;
+          case Commands.removeSystems: // USED
+            removeSystems(data as CommandRemoveSystems);
+            break;
+          case Commands.addConnections: // USED
+            addConnections(data as CommandAddConnections);
+            break;
+          case Commands.removeConnections: // USED
+            removeConnections(data as CommandRemoveConnections);
+            break;
+          case Commands.updateConnection: // USED
+            updateConnection(data as CommandUpdateConnection);
+            break;
+          case Commands.charactersUpdated: // USED
+            charactersUpdated(data as CommandCharactersUpdated);
+            break;
+          case Commands.characterAdded: // USED
+            characterAdded(data as CommandCharacterAdded);
+            break;
+          case Commands.characterRemoved: // USED
+            characterRemoved(data as CommandCharacterRemoved);
+            break;
+          case Commands.characterUpdated: // USED
+            characterUpdated(data as CommandCharacterUpdated);
+            break;
+          case Commands.presentCharacters: // USED
+            presentCharacters(data as CommandPresentCharacters);
+            break;
+          case Commands.mapUpdated: // USED
+            mapUpdated(data as CommandMapUpdated);
+            break;
+          case Commands.routes:
+            mapRoutes(data as CommandRoutes);
+            break;
 
-            case Commands.signaturesUpdated: // USED
-              updateSystemSignatures(data as CommandSignaturesUpdated);
-              break;
+          case Commands.signaturesUpdated: // USED
+            updateSystemSignatures(data as CommandSignaturesUpdated);
+            break;
 
-            case Commands.linkSignatureToSystem: // USED
-              setTimeout(() => {
-                updateLinkSignatureToSystem(data as CommandLinkSignatureToSystem);
-              }, 200);
-              break;
+          case Commands.linkSignatureToSystem: // USED
+            setTimeout(() => {
+              updateLinkSignatureToSystem(data as CommandLinkSignatureToSystem);
+            }, 200);
+            break;
 
-            case Commands.centerSystem: // USED
-              // do nothing here
-              break;
+          case Commands.centerSystem: // USED
+            // do nothing here
+            break;
 
-            case Commands.selectSystem: // USED
-              // do nothing here
-              break;
+          case Commands.selectSystem: // USED
+            // do nothing here
+            break;
 
-            case Commands.killsUpdated:
-              // do nothing here
-              break;
+          case Commands.killsUpdated:
+            // do nothing here
+            break;
 
-            case Commands.detailedKillsUpdated:
-              updateDetailedKills(data as Record<string, DetailedKill[]>);
-              break;
+          case Commands.detailedKillsUpdated:
+            updateDetailedKills(data as Record<string, DetailedKill[]>);
+            break;
 
-            case Commands.characterActivityData:
-              characterActivityData(data as CommandCharacterActivityData);
-              break;
+          case Commands.characterActivityData:
+            characterActivityData(data as CommandCharacterActivityData);
+            break;
 
-            case Commands.trackingCharactersData:
-              trackingCharactersData(data as CommandTrackingCharactersData);
-              break;
+          case Commands.trackingCharactersData:
+            trackingCharactersData(data as CommandTrackingCharactersData);
+            break;
 
-            case Commands.updateActivity:
-              break;
+          case Commands.updateActivity:
+            break;
 
-            case Commands.updateTracking:
-              break;
+          case Commands.updateTracking:
+            break;
 
-            case Commands.userSettingsUpdated:
-              userSettingsUpdated(data as CommandUserSettingsUpdated);
-              break;
+          case Commands.userSettingsUpdated:
+            userSettingsUpdated(data as CommandUserSettingsUpdated);
+            break;
 
-            case Commands.showTracking:
-              // This command is handled by the TrackAndFollow component
-              break;
+          case Commands.systemCommentAdded:
+            addComment(data as CommandCommentAdd);
+            break;
 
-            case Commands.hideTracking:
-              // This command is handled by the TrackAndFollow component
-              break;
+          case Commands.systemCommentRemoved:
+            removeComment(data as CommandCommentRemoved);
+            break;
 
-            case Commands.showActivity:
-              // This command is handled by the CharacterActivity component
-              break;
+          default:
+            console.warn(`JOipP Interface handlers: Unknown command: ${type}`, data);
+            break;
+        }
 
-            case Commands.hideActivity:
-              // This command is handled by the CharacterActivity component
-              break;
-
-            case Commands.toggleTrack:
-              // This command is handled by the TrackAndFollow component
-              break;
-
-            case Commands.toggleFollow:
-              // This command is handled by the TrackAndFollow component
-              break;
-
-            default:
-              console.warn(`JOipP Interface handlers: Unknown command: ${type}`, data);
-              break;
-          }
-
-          emitMapEvent({ name: type, data });
-        },
-      };
-    },
-    [],
-  );
+        emitMapEvent({ name: type, data });
+      },
+    };
+  }, []);
 };

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

@@ -17,6 +17,7 @@ export type ShipTypeRaw = {
 export type LocationRaw = {
   solar_system_id: number | null;
   structure_id: number | null;
+  station_id: number | null;
 };
 
 export type CharacterTypeRaw = {
@@ -37,3 +38,22 @@ export type CharacterTypeRaw = {
 export type WithIsOwnCharacter = {
   isOwn: boolean;
 };
+
+export interface EveCharacterType {
+  alliance_ticker: string;
+  corporation_ticker: string;
+  eve_id: string;
+  name: string;
+}
+
+export interface CharacterCache {
+  loading: boolean;
+  loaded: boolean;
+  data: EveCharacterType | null;
+}
+
+export interface UseCharactersCacheData {
+  loadCharacter: (systemId: string) => Promise<void>;
+  characters: Map<string, CharacterCache>;
+  lastUpdateKey: number;
+}

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

@@ -0,0 +1,21 @@
+export type CommentType = {
+  characterEveId: string;
+  id: string;
+  solarSystemId: number;
+  text: string;
+  updated_at: string;
+};
+
+export type CommentSystem = {
+  loading: boolean;
+  loaded: boolean;
+  comments: CommentType[];
+};
+
+export interface UseCommentsData {
+  loadComments: (systemId: string) => Promise<void>;
+  addComment: (systemId: string, comment: CommentType) => void;
+  removeComment: (systemId: string, commentId: string) => void;
+  comments: Map<string, CommentSystem>;
+  lastUpdateKey: number;
+}

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

@@ -7,3 +7,5 @@ export interface WithChildren {
 export interface WithClassName {
   className?: string;
 }
+
+export type WithHTMLProps = React.HTMLAttributes<HTMLDivElement>;

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

@@ -7,3 +7,4 @@ export * from './mapUnionTypes';
 export * from './signatures';
 export * from './connectionPassages';
 export * from './permissions';
+export * from './comment';

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

@@ -4,14 +4,15 @@ import { WormholeDataRaw } from '@/hooks/Mapper/types/wormholes.ts';
 import { CharacterTypeRaw } from '@/hooks/Mapper/types/character.ts';
 import { RoutesList } from '@/hooks/Mapper/types/routes.ts';
 import { DetailedKill, Kill } from '@/hooks/Mapper/types/kills.ts';
-import { UserPermissions } from '@/hooks/Mapper/types';
-import { ActivitySummary } from '../components/mapRootContent/components/CharacterActivity/CharacterActivity';
+import { ActivitySummary } from '../components/mapRootContent/components/CharacterActivity';
 import { TrackingCharacter } from '../components/mapRootContent/components/TrackAndFollow/types';
+import { CommentType, UserPermissions } from '@/hooks/Mapper/types';
 
 export enum Commands {
   init = 'init',
   addSystems = 'add_systems',
   updateSystems = 'update_systems',
+  systemCommentsUpdated = 'system_comments_updated',
   removeSystems = 'remove_systems',
   addConnections = 'add_connections',
   removeConnections = 'remove_connections',
@@ -29,6 +30,8 @@ export enum Commands {
   selectSystem = 'select_system',
   linkSignatureToSystem = 'link_signature_to_system',
   signaturesUpdated = 'signatures_updated',
+  systemCommentAdded = 'system_comment_added',
+  systemCommentRemoved = 'system_comment_removed',
   characterActivityData = 'character_activity_data',
   trackingCharactersData = 'tracking_characters_data',
   updateActivity = 'update_activity',
@@ -57,6 +60,8 @@ export type Command =
   | Commands.centerSystem
   | Commands.linkSignatureToSystem
   | Commands.signaturesUpdated
+  | Commands.systemCommentAdded
+  | Commands.systemCommentRemoved
   | Commands.characterActivityData
   | Commands.trackingCharactersData
   | Commands.userSettingsUpdated
@@ -104,6 +109,14 @@ export type CommandLinkSignatureToSystem = {
   solar_system_target: number;
 };
 export type CommandLinkSignaturesUpdated = number;
+export type CommandCommentAdd = {
+  solarSystemId: string;
+  comment: CommentType;
+};
+export type CommandCommentRemoved = {
+  commentId: string;
+  solarSystemId: number;
+};
 export type CommandCharacterActivityData = { activity: ActivitySummary[]; loading?: boolean };
 export type CommandTrackingCharactersData = { characters: TrackingCharacter[] };
 export type CommandUserSettingsUpdated = {
@@ -171,6 +184,8 @@ export interface CommandData {
   [Commands.userSettingsUpdated]: CommandUserSettingsUpdated;
   [Commands.updateActivity]: CommandUpdateActivity;
   [Commands.updateTracking]: CommandUpdateTracking;
+  [Commands.systemCommentAdded]: CommandCommentAdd;
+  [Commands.systemCommentRemoved]: CommandCommentRemoved;
 }
 
 export interface MapHandlers {
@@ -216,13 +231,17 @@ export enum OutCommand {
   getCorporationTicker = 'get_corporation_ticker',
   getSystemKills = 'get_system_kills',
   getSystemsKills = 'get_systems_kills',
-  openSettings = 'open_settings',
-  hideActivity = 'hide_activity',
-  showActivity = 'show_activity',
-  hideTracking = 'hide_tracking',
-  showTracking = 'show_tracking',
+  addSystemComment = 'addSystemComment',
+  deleteSystemComment = 'deleteSystemComment',
+  getSystemComments = 'getSystemComments',
   toggleTrack = 'toggle_track',
   toggleFollow = 'toggle_follow',
+  getCharacterInfo = 'getCharacterInfo',
+
+  // Only UI commands
+  openSettings = 'open_settings',
+  showActivity = 'show_activity',
+  showTracking = 'show_tracking',
   getUserSettings = 'get_user_settings',
   updateUserSettings = 'update_user_settings',
   unlinkSignature = 'unlink_signature',

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

@@ -17,6 +17,7 @@ export enum SignatureKind {
   Ship = 'Ship',
   Deployable = 'Deployable',
   Drone = 'Drone',
+  Starbase = 'Starbase',
 }
 
 export type GroupType = {
@@ -47,6 +48,13 @@ export type SystemSignature = {
   updated_at?: string;
 };
 
+export interface ExtendedSystemSignature extends SystemSignature {
+  pendingDeletion?: boolean;
+  pendingAddition?: boolean;
+  pendingUntil?: number;
+  finalTimeoutId?: number;
+}
+
 export enum SignatureKindENG {
   CosmicSignature = 'Cosmic Signature',
   CosmicAnomaly = 'Cosmic Anomaly',
@@ -54,6 +62,7 @@ export enum SignatureKindENG {
   Ship = 'Ship',
   Deployable = 'Deployable',
   Drone = 'Drone',
+  Starbase = 'Starbase',
 }
 
 export enum SignatureKindRU {
@@ -63,6 +72,7 @@ export enum SignatureKindRU {
   Ship = 'Корабль',
   Deployable = 'Полевые блоки',
   Drone = 'Дрон',
+  Starbase = 'Starbase',
 }
 
 export enum SignatureGroupENG {

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

@@ -1,7 +1,6 @@
 import { XYPosition } from 'reactflow';
 
-import { SystemSignature } from '@/hooks/Mapper/types/signatures';
-import { DetailedKill } from './kills';
+import { SystemSignature } from './signatures';
 
 export enum SolarSystemStaticInfoRawNames {
   regionId = 'region_id',

assets/package.json

@@ -12,8 +12,11 @@
     "node": ">= 18.0.0"
   },
   "dependencies": {
+    "@codemirror/lang-markdown": "^6.3.2",
+    "@codemirror/theme-one-dark": "^6.1.2",
     "@formkit/auto-animate": "0.7.0",
     "@shopify/draggable": "^1.1.3",
+    "@uiw/react-codemirror": "^4.23.10",
     "clsx": "^2.1.1",
     "daisyui": "^4.11.1",
     "fast-deep-equal": "^3.1.3",
@@ -25,15 +28,20 @@
     "phoenix_live_view": "file:../deps/phoenix_live_view",
     "primeflex": "^3.3.1",
     "primeicons": "^7.0.0",
-    "primereact": "^10.6.5",
+    "primereact": "10.6.5",
+    "prism-themes": "^1.9.0",
     "react": "^18.3.1",
     "react-dom": "^18.3.1",
     "react-error-boundary": "^4.0.13",
     "react-event-hook": "^3.1.2",
     "react-flow-renderer": "^10.3.17",
     "react-hook-form": "^7.53.1",
+    "react-markdown": "^10.0.1",
+    "react-transition-group": "^4.4.5",
     "react-usestateref": "^1.0.9",
     "reactflow": "^11.11.4",
+    "remark-breaks": "^4.0.0",
+    "remark-gfm": "^4.0.1",
     "tailwindcss": "^3.3.6",
     "topbar": "^3.0.0",
     "use-local-storage-state": "^19.3.1"
@@ -71,15 +79,15 @@
     "vite-plugin-cdn-import": "^1.0.1"
   },
   "peerDependencies": {
-    "react": "18.2.0",
-    "react-dom": "18.2.0"
+    "react": "18.3.1",
+    "react-dom": "18.3.1"
   },
   "optionalDependencies": {
     "@rollup/rollup-linux-x64-gnu": "4.9.5"
   },
   "resolutions": {
-    "react": "18.2.0",
-    "react-dom": "18.2.0"
+    "react": "18.3.1",
+    "react-dom": "18.3.1"
   },
   "keywords": [],
   "author": "",