Compare commits

..

9 Commits

Author SHA1 Message Date
CI
c37d175bec chore: release version v1.40.5
Some checks are pending
Build / 🚀 Deploy to test env (fly.io) (push) Waiting to run
Build / 🛠 Build (1.17, 18.x, 27) (push) Waiting to run
Build / 🛠 Build Docker Images (linux/amd64) (push) Blocked by required conditions
Build / 🛠 Build Docker Images (linux/arm64) (push) Blocked by required conditions
Build / merge (push) Blocked by required conditions
Build / 🏷 Create Release (push) Blocked by required conditions
2025-01-14 22:41:08 +00:00
Dmitry Popov
69c5326e72 fix(Map): Fix follow mode 2025-01-14 23:40:40 +01:00
CI
305f63e11d chore: release version v1.40.4
Some checks are pending
Build / 🚀 Deploy to test env (fly.io) (push) Waiting to run
Build / 🛠 Build (1.17, 18.x, 27) (push) Waiting to run
Build / 🛠 Build Docker Images (linux/amd64) (push) Blocked by required conditions
Build / 🛠 Build Docker Images (linux/arm64) (push) Blocked by required conditions
Build / merge (push) Blocked by required conditions
Build / 🏷 Create Release (push) Blocked by required conditions
2025-01-14 21:35:49 +00:00
guarzo
698fd5e083 fix: center system is not selected text for structures (#122) 2025-01-15 01:35:24 +04:00
CI
1af8342d30 chore: release version v1.40.3 2025-01-14 20:47:50 +00:00
Dmitry Popov
68b59da78e Merge remote-tracking branch 'origin/main' 2025-01-14 21:47:22 +01:00
Dmitry Popov
e784a3f850 fix(Map): Fix system revert issues 2025-01-14 21:47:05 +01:00
CI
a45e2f3fc2 chore: release version v1.40.2 2025-01-14 20:07:10 +00:00
Dmitry Popov
8a3d920c31 fix(Map): Fix issues with splashing signatures select & sig ID in temp names 2025-01-14 21:06:41 +01:00
8 changed files with 57 additions and 14 deletions

View File

@@ -2,6 +2,42 @@
<!-- changelog -->
## [v1.40.5](https://github.com/wanderer-industries/wanderer/compare/v1.40.4...v1.40.5) (2025-01-14)
### Bug Fixes:
* Map: Fix follow mode
## [v1.40.4](https://github.com/wanderer-industries/wanderer/compare/v1.40.3...v1.40.4) (2025-01-14)
### Bug Fixes:
* center system is not selected text for structures (#122)
## [v1.40.3](https://github.com/wanderer-industries/wanderer/compare/v1.40.2...v1.40.3) (2025-01-14)
### Bug Fixes:
* Map: Fix system revert issues
## [v1.40.2](https://github.com/wanderer-industries/wanderer/compare/v1.40.1...v1.40.2) (2025-01-14)
### Bug Fixes:
* Map: Fix issues with splashing signatures select & sig ID in temp names
## [v1.40.1](https://github.com/wanderer-industries/wanderer/compare/v1.40.0...v1.40.1) (2025-01-14)

View File

@@ -61,7 +61,7 @@ export const useMapHandlers = (ref: ForwardedRef<MapHandlers>, onSelectionChange
setTimeout(() => mapAddSystems(data as CommandAddSystems), 100);
break;
case Commands.updateSystems:
setTimeout(() => mapUpdateSystems(data as CommandUpdateSystems), 100);
mapUpdateSystems(data as CommandUpdateSystems);
break;
case Commands.removeSystems:
setTimeout(() => removeSystems(data as CommandRemoveSystems), 100);

View File

@@ -33,7 +33,17 @@ function sortedLabels(labels: string[]) {
export function useSolarSystemNode(props: NodeProps<MapSolarSystemType>) {
const { id, data, selected } = props;
const { system_static_info, system_signatures, locked, name, tag, status, labels, temporary_name } = data;
const {
system_static_info,
system_signatures,
locked,
name,
tag,
status,
labels,
temporary_name,
linked_sig_eve_id: linkedSigEveId = '',
} = data;
const {
system_class,
@@ -71,7 +81,6 @@ export function useSolarSystemNode(props: NodeProps<MapSolarSystemType>) {
visibleNodes,
showKSpaceBG,
isThickConnections,
linkedSigEveId,
},
outCommand,
} = useMapState();
@@ -132,12 +141,12 @@ export function useSolarSystemNode(props: NodeProps<MapSolarSystemType>) {
return '';
}
if (isShowLinkedSigIdTempName) {
return temporary_name ? `${linkedSigPrefix}${temporary_name}` : linkedSigPrefix;
if (isShowLinkedSigIdTempName && linkedSigPrefix) {
return temporary_name ? `${linkedSigPrefix}${temporary_name}` : `${linkedSigPrefix}${solar_system_name}`;
}
return temporary_name;
}, [isShowLinkedSigIdTempName, isTempSystemNameEnabled, linkedSigPrefix, temporary_name]);
}, [isShowLinkedSigIdTempName, isTempSystemNameEnabled, linkedSigPrefix, solar_system_name, temporary_name]);
const systemName = useMemo(() => {
if (isTempSystemNameEnabled && temporaryName) {
@@ -146,7 +155,7 @@ export function useSolarSystemNode(props: NodeProps<MapSolarSystemType>) {
return solar_system_name;
}, [isTempSystemNameEnabled, solar_system_name, temporaryName]);
const customName = (isTempSystemNameEnabled && temporaryName && name) || (solar_system_name !== name && name);
const customName = (isTempSystemNameEnabled && temporary_name && name) || (solar_system_name !== name && name);
const [unsplashedLeft, unsplashedRight] = useMemo(() => {
if (!isShowUnsplashedSignatures) {

View File

@@ -1,4 +1,4 @@
import { useCallback, useRef } from 'react';
import { useCallback, useEffect, useRef } from 'react';
import { Dialog } from 'primereact/dialog';
import { OutCommand } from '@/hooks/Mapper/types/mapHandlers.ts';
@@ -58,7 +58,7 @@ export const SystemLinkSignatureDialog = ({ data, setVisible }: SystemLinkSignat
<Dialog
header="Select signature to link"
visible
draggable={false}
draggable={true}
style={{ width: '500px' }}
onHide={handleHide}
contentClassName="!p-0"

View File

@@ -101,7 +101,7 @@ export const SystemStructures: React.FC = () => {
<div tabIndex={0} onPaste={handlePaste} className="h-full flex flex-col" style={{ outline: 'none' }}>
<Widget label={renderWidgetLabel()}>
{isNotSelectedSystem ? (
<div className="flex-1 flex justify-center items-center select-none text-center text-stone-400/80 text-sm">
<div className="w-full h-full flex justify-center items-center select-none text-center text-stone-400/80 text-sm">
System is not selected
</div>
) : (

View File

@@ -93,9 +93,6 @@ export const MapWrapper = () => {
case OutCommand.openSettings:
setOpenSettings(event.data.system_id);
break;
case OutCommand.linkSignatureToSystem:
setOpenLinkSignatures(event.data);
break;
default:
return outCommand(event);
}

View File

@@ -117,6 +117,7 @@ export type SolarSystemRawType = {
status: number;
name: string | null;
temporary_name: string | null;
linked_sig_eve_id: string | null;
system_static_info: SolarSystemStaticInfoRaw;
system_signatures: SystemSignature[];

View File

@@ -3,7 +3,7 @@ defmodule WandererApp.MixProject do
@source_url "https://github.com/wanderer-industries/wanderer"
@version "1.40.1"
@version "1.40.5"
def project do
[