From a2912ba0ff218119646ed1558dce59adfa5b8bc9 Mon Sep 17 00:00:00 2001 From: Dmitry Popov Date: Wed, 25 Jun 2025 12:05:04 +0200 Subject: [PATCH] feat(Core): Allowed system temp names up to 12 characters. Deprecated showing linked signature ID as part of temporary name. --- .../map/hooks/useSolarSystemNode.ts | 29 +++++++++---------- .../components/map/hooks/useSystemName.ts | 12 ++------ .../SystemSettingsDialog.tsx | 20 ++++++------- .../live/maps/maps_live.html.heex | 5 ---- 4 files changed, 25 insertions(+), 41 deletions(-) diff --git a/assets/js/hooks/Mapper/components/map/hooks/useSolarSystemNode.ts b/assets/js/hooks/Mapper/components/map/hooks/useSolarSystemNode.ts index 3c229bac..d1c1a87f 100644 --- a/assets/js/hooks/Mapper/components/map/hooks/useSolarSystemNode.ts +++ b/assets/js/hooks/Mapper/components/map/hooks/useSolarSystemNode.ts @@ -1,19 +1,19 @@ -import { useMemo } from 'react'; -import { MapSolarSystemType } from '../map.types'; -import { NodeProps } from 'reactflow'; +import { getSystemClassStyles } from '@/hooks/Mapper/components/map/helpers'; +import { isWormholeSpace } from '@/hooks/Mapper/components/map/helpers/isWormholeSpace'; +import { useMapState } from '@/hooks/Mapper/components/map/MapProvider'; +import { REGIONS_MAP, Spaces } from '@/hooks/Mapper/constants'; +import { sortWHClasses } from '@/hooks/Mapper/helpers'; +import { useDoubleClick } from '@/hooks/Mapper/hooks/useDoubleClick'; import { useMapRootState } from '@/hooks/Mapper/mapRootProvider'; import { useMapGetOption } from '@/hooks/Mapper/mapRootProvider/hooks/api'; -import { useMapState } from '@/hooks/Mapper/components/map/MapProvider'; -import { useDoubleClick } from '@/hooks/Mapper/hooks/useDoubleClick'; -import { REGIONS_MAP, Spaces } from '@/hooks/Mapper/constants'; -import { isWormholeSpace } from '@/hooks/Mapper/components/map/helpers/isWormholeSpace'; -import { getSystemClassStyles } from '@/hooks/Mapper/components/map/helpers'; -import { sortWHClasses } from '@/hooks/Mapper/helpers'; -import { CharacterTypeRaw, OutCommand, PingType, SystemSignature } from '@/hooks/Mapper/types'; -import { useUnsplashedSignatures } from './useUnsplashedSignatures'; -import { useSystemName } from './useSystemName'; -import { LabelInfo, useLabelsInfo } from './useLabelsInfo'; import { getSystemStaticInfo } from '@/hooks/Mapper/mapRootProvider/hooks/useLoadSystemStatic'; +import { CharacterTypeRaw, OutCommand, PingType, SystemSignature } from '@/hooks/Mapper/types'; +import { useMemo } from 'react'; +import { NodeProps } from 'reactflow'; +import { MapSolarSystemType } from '../map.types'; +import { LabelInfo, useLabelsInfo } from './useLabelsInfo'; +import { useSystemName } from './useSystemName'; +import { useUnsplashedSignatures } from './useUnsplashedSignatures'; function getActivityType(count: number): string { if (count <= 5) return 'activityNormal'; @@ -117,7 +117,6 @@ export const useSolarSystemNode = (props: NodeProps): SolarS const { isShowUnsplashedSignatures } = interfaceSettings; const isTempSystemNameEnabled = useMapGetOption('show_temp_system_name') === 'true'; const isShowLinkedSigId = useMapGetOption('show_linked_signature_id') === 'true'; - const isShowLinkedSigIdTempName = useMapGetOption('show_linked_signature_id_temp_name') === 'true'; const { data: { @@ -184,8 +183,6 @@ export const useSolarSystemNode = (props: NodeProps): SolarS const { systemName, computedTemporaryName, customName } = useSystemName({ isTempSystemNameEnabled, temporary_name, - isShowLinkedSigIdTempName, - linkedSigPrefix, name, systemStaticInfo, }); diff --git a/assets/js/hooks/Mapper/components/map/hooks/useSystemName.ts b/assets/js/hooks/Mapper/components/map/hooks/useSystemName.ts index 87550245..eeb259a8 100644 --- a/assets/js/hooks/Mapper/components/map/hooks/useSystemName.ts +++ b/assets/js/hooks/Mapper/components/map/hooks/useSystemName.ts @@ -1,11 +1,9 @@ -import { useMemo } from 'react'; import { SolarSystemStaticInfoRaw } from '@/hooks/Mapper/types'; +import { useMemo } from 'react'; interface UseSystemNameParams { isTempSystemNameEnabled: boolean; temporary_name?: string | null; - isShowLinkedSigIdTempName: boolean; - linkedSigPrefix: string | null; name?: string | null; systemStaticInfo: SolarSystemStaticInfoRaw; } @@ -13,8 +11,6 @@ interface UseSystemNameParams { export const useSystemName = ({ isTempSystemNameEnabled, temporary_name, - isShowLinkedSigIdTempName, - linkedSigPrefix, name, systemStaticInfo, }: UseSystemNameParams) => { @@ -25,12 +21,8 @@ export const useSystemName = ({ return ''; } - if (isShowLinkedSigIdTempName && linkedSigPrefix) { - return temporary_name ? `${linkedSigPrefix}・${temporary_name}` : `${linkedSigPrefix}・${solar_system_name}`; - } - return temporary_name ?? ''; - }, [isTempSystemNameEnabled, temporary_name, solar_system_name, isShowLinkedSigIdTempName, linkedSigPrefix]); + }, [isTempSystemNameEnabled, temporary_name]); const systemName = useMemo(() => { if (isTempSystemNameEnabled && computedTemporaryName) { diff --git a/assets/js/hooks/Mapper/components/mapInterface/components/SystemSettingsDialog/SystemSettingsDialog.tsx b/assets/js/hooks/Mapper/components/mapInterface/components/SystemSettingsDialog/SystemSettingsDialog.tsx index a5cc2c18..f2ec307e 100644 --- a/assets/js/hooks/Mapper/components/mapInterface/components/SystemSettingsDialog/SystemSettingsDialog.tsx +++ b/assets/js/hooks/Mapper/components/mapInterface/components/SystemSettingsDialog/SystemSettingsDialog.tsx @@ -1,16 +1,16 @@ -import { InputText } from 'primereact/inputtext'; -import { InputTextarea } from 'primereact/inputtextarea'; -import { Dialog } from 'primereact/dialog'; +import { TooltipPosition, WdImageSize, WdImgButton } from '@/hooks/Mapper/components/ui-kit'; import { getSystemById } from '@/hooks/Mapper/helpers'; import { useMapRootState } from '@/hooks/Mapper/mapRootProvider'; import { useMapGetOption } from '@/hooks/Mapper/mapRootProvider/hooks/api'; -import { useCallback, useEffect, useRef, useState } from 'react'; -import { Button } from 'primereact/button'; -import { OutCommand } from '@/hooks/Mapper/types'; -import { IconField } from 'primereact/iconfield'; -import { TooltipPosition, WdImageSize, WdImgButton } from '@/hooks/Mapper/components/ui-kit'; -import { LabelsManager } from '@/hooks/Mapper/utils/labelsManager.ts'; import { getSystemStaticInfo } from '@/hooks/Mapper/mapRootProvider/hooks/useLoadSystemStatic'; +import { OutCommand } from '@/hooks/Mapper/types'; +import { LabelsManager } from '@/hooks/Mapper/utils/labelsManager.ts'; +import { Button } from 'primereact/button'; +import { Dialog } from 'primereact/dialog'; +import { IconField } from 'primereact/iconfield'; +import { InputText } from 'primereact/inputtext'; +import { InputTextarea } from 'primereact/inputtextarea'; +import { useCallback, useEffect, useRef, useState } from 'react'; interface SystemSettingsDialog { systemId: string; @@ -206,7 +206,7 @@ export const SystemSettingsDialog = ({ systemId, visible, setVisible }: SystemSe aria-describedby="temporaryName" autoComplete="off" value={temporaryName} - maxLength={10} + maxLength={12} onChange={e => setTemporaryName(e.target.value)} /> diff --git a/lib/wanderer_app_web/live/maps/maps_live.html.heex b/lib/wanderer_app_web/live/maps/maps_live.html.heex index c7358dc3..de31f04f 100644 --- a/lib/wanderer_app_web/live/maps/maps_live.html.heex +++ b/lib/wanderer_app_web/live/maps/maps_live.html.heex @@ -413,11 +413,6 @@ field={f[:show_linked_signature_id]} label="Show linked signature ID as custom label part" /> - <.input - type="checkbox" - field={f[:show_linked_signature_id_temp_name]} - label="Show linked signature ID as temporary name part" - /> <.input type="checkbox" field={f[:restrict_offline_showing]}