lee/wanderer
1
0
Fork 0
mirror of https://github.com/wanderer-industries/wanderer synced 2025-10-30 14:07:03 +00:00
Code Issues Actions 3 Packages Projects Releases Wiki Activity

feat(Map): Added option to show signature ID as system temporary name part

Browse Source
This commit is contained in:
Dmitry Popov
2025-01-13 08:59:13 +01:00
parent 39a0ce284f
commit 9122412558
13 changed files with 93 additions and 230 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
.github/workflows/build.yml vendored
View File

@@ -123,6 +123,7 @@ jobs:
needs: build
runs-on: ubuntu-22.04
outputs:
release-tag: ${{ steps.get-latest-tag.outputs.tag }}
release-notes: ${{ steps.get-content.outputs.string }}
permissions:
checks: write
@@ -261,12 +262,13 @@ jobs:
- name: Create manifest list and push
working-directory: /tmp/digests
run: |
docker buildx imagetools create $(jq -cr '.tags | map("-t " + .) | join(" ")' <<< "$DOCKER_METADATA_OUTPUT_JSON") \
docker buildx imagetools create --tag ${{ env.REGISTRY_IMAGE }}:latest \
${{ env.REGISTRY_IMAGE }}:${{ needs.docker.outputs.release-tag }} \
$(printf '${{ env.REGISTRY_IMAGE }}@sha256:%s ' *)
- name: Inspect image
run: |
docker buildx imagetools inspect ${{ env.REGISTRY_IMAGE }}:${{ steps.meta.outputs.version }}
docker buildx imagetools inspect ${{ env.REGISTRY_IMAGE }}:${{ needs.docker.outputs.release-tag }}
create-release:
name: 🏷 Create Release
@@ -279,17 +281,11 @@ jobs:
with:
fetch-depth: 0
- name: Get Release Tag
id: get-latest-tag
uses: "WyriHaximus/github-action-get-previous-tag@v1"
with:
fallback: 1.0.0
- name: 🏷 Create Draft Release
uses: softprops/action-gh-release@v1
with:
tag_name: ${{ steps.get-latest-tag.outputs.tag }}
name: Release ${{ steps.get-latest-tag.outputs.tag }}
tag_name: ${{ needs.docker.outputs.release-tag }}
name: Release ${{ needs.docker.outputs.release-tag }}
body: |
## Info
Commit ${{ github.sha }} was deployed to `staging`. [See code diff](${{ github.event.compare }}).

181
assets/js/hooks/Mapper/components/hooks/useSolarSystemNode.ts
View File

@@ -1,181 +0,0 @@
// feel free to rename these imports or the file path as you see fit
import { useMemo } from 'react';
import { useMapRootState } from '@/hooks/Mapper/mapRootProvider';
import { useMapGetOption } from '@/hooks/Mapper/mapRootProvider/hooks/api';
import { useMapState } from '@/hooks/Mapper/components/map/MapProvider.tsx';
import { useDoubleClick } from '@/hooks/Mapper/hooks/useDoubleClick.ts';
import { REGIONS_MAP, Spaces } from '@/hooks/Mapper/constants';
import { MapSolarSystemType } from '../../map.types';
import { LABELS_INFO, LABELS_ORDER, getActivityType } from '@/hooks/Mapper/components/map/constants.ts';
import { isWormholeSpace } from '@/hooks/Mapper/components/map/helpers/isWormholeSpace.ts';
import { getSystemClassStyles, prepareUnsplashedChunks } from '@/hooks/Mapper/components/map/helpers';
import { sortWHClasses } from '@/hooks/Mapper/helpers';
import { LabelsManager } from '@/hooks/Mapper/utils/labelsManager.ts';
import { OutCommand } from '@/hooks/Mapper/types';
const SpaceToClass: Record<string, string> = {
[Spaces.Caldari]: 'Caldaria',
[Spaces.Matar]: 'Mataria',
[Spaces.Amarr]: 'Amarria',
[Spaces.Gallente]: 'Gallente',
};
const sortedLabels = (labels: string[]) => {
if (!labels) return [];
return LABELS_ORDER.filter(x => labels.includes(x)).map(x => LABELS_INFO[x]);
};
interface UseSolarSystemNodeParams {
data: MapSolarSystemType;
selected: boolean;
}
export function useSolarSystemNode({ data, selected }: UseSolarSystemNodeParams) {
// 1) Bring in relevant global state
const { interfaceSettings } = useMapRootState();
const { isShowUnsplashedSignatures } = interfaceSettings;
const isTempSystemNameEnabled = useMapGetOption('show_temp_system_name') === 'true';
const isShowLinkedSigId = useMapGetOption('show_linked_signature_id') === 'true';
const {
data: {
characters,
presentCharacters,
wormholesData,
hubs,
kills,
userCharacters,
isConnecting,
hoverNodeId,
visibleNodes,
showKSpaceBG,
isThickConnections,
},
outCommand,
} = useMapState();
// 2) Extract data from the node
const {
system_class,
security,
class_title,
solar_system_id,
statics,
effect_name,
region_name,
region_id,
is_shattered,
solar_system_name,
} = data.system_static_info;
const {
locked,
name,
tag,
status,
labels,
id,
temporary_name: temporaryName,
linked_sig_eve_id: linkedSigEveId = '',
} = data || {};
const signatures = data.system_signatures;
// 3) Compute derived values
const visible = useMemo(() => visibleNodes.has(id), [id, visibleNodes]);
const charactersInSystem = useMemo(() => {
return characters.filter(c => c.location?.solar_system_id === solar_system_id).filter(c => c.online);
}, [characters, presentCharacters, solar_system_id]);
const isWormhole = isWormholeSpace(system_class);
const classTitleColor = useMemo(
() => getSystemClassStyles({ systemClass: system_class, security }),
[security, system_class],
);
const sortedStatics = useMemo(() => sortWHClasses(wormholesData, statics), [wormholesData, statics]);
const linkedSigPrefix = useMemo(() => (linkedSigEveId ? linkedSigEveId.split('-')[0] : null), [linkedSigEveId]);
const labelsManager = useMemo(() => new LabelsManager(labels ?? ''), [labels]);
const labelsInfo = useMemo(() => sortedLabels(labelsManager.list), [labelsManager]);
const labelCustom = useMemo(
() =>
isShowLinkedSigId && linkedSigPrefix
? `${linkedSigPrefix}・${labelsManager.customLabel}`
: labelsManager.customLabel,
[linkedSigPrefix, isShowLinkedSigId, labelsManager],
);
const killsCount = useMemo(() => {
const systemKills = kills[solar_system_id];
if (!systemKills) return null;
return systemKills;
}, [kills, solar_system_id]);
const hasUserCharacters = useMemo(() => {
return charactersInSystem.some(x => userCharacters.includes(x.eve_id));
}, [charactersInSystem, userCharacters]);
const dbClick = useDoubleClick(() => {
outCommand({
type: OutCommand.openSettings,
data: {
system_id: solar_system_id.toString(),
},
});
});
const showHandlers = isConnecting || hoverNodeId === id;
const space = showKSpaceBG ? REGIONS_MAP[region_id] : '';
const regionClass = showKSpaceBG ? SpaceToClass[space] : null;
const systemName = (isTempSystemNameEnabled && temporaryName) || solar_system_name;
const customName = (isTempSystemNameEnabled && temporaryName && name) || (solar_system_name !== name && name);
const [unsplashedLeft, unsplashedRight] = useMemo(() => {
if (!isShowUnsplashedSignatures) {
return [[], []];
}
return prepareUnsplashedChunks(
signatures
.filter(s => s.group === 'Wormhole' && !s.linked_system)
.map(s => ({
eve_id: s.eve_id,
type: s.type,
custom_info: s.custom_info,
})),
);
}, [isShowUnsplashedSignatures, signatures]);
return {
selected,
visible,
isWormhole,
classTitleColor,
killsCount,
hasUserCharacters,
showHandlers,
regionClass,
systemName,
customName,
labelCustom,
is_shattered,
tag,
status,
labelsInfo,
dbClick,
sortedStatics,
effect_name,
region_name,
solar_system_id,
locked,
hubs,
charactersInSystem,
unsplashedLeft,
unsplashedRight,
isThickConnections,
};
}

2
assets/js/hooks/Mapper/components/map/hooks/api/useMapUpdateSystems.ts
View File

@@ -42,7 +42,7 @@ export const useMapUpdateSystems = () => {
return newSystem;
});
update({ systems: out });
update({ systems: out }, true);
},
[rf, update],
);

2
assets/js/hooks/Mapper/components/map/hooks/useMapHandlers.ts
View File

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

51
assets/js/hooks/Mapper/components/map/hooks/useSolarSystemNode.ts
View File

@@ -58,10 +58,15 @@ export function useSolarSystemNode(props: any) {
} = system_static_info;
// Global map state
const { interfaceSettings } = useMapRootState();
const {
interfaceSettings,
data: { systemSignatures: mapSystemSignatures },
} = useMapRootState();
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: {
@@ -83,6 +88,11 @@ export function useSolarSystemNode(props: any) {
// logic
const visible = useMemo(() => visibleNodes.has(id), [id, visibleNodes]);
const systemSignatures = useMemo(
() => mapSystemSignatures[solar_system_id] || system_signatures,
[system_signatures, solar_system_id, mapSystemSignatures],
);
const charactersInSystem = useMemo(() => {
return characters.filter(c => c.location?.solar_system_id === solar_system_id).filter(c => c.online);
// eslint-disable-next-line
@@ -101,13 +111,12 @@ export function useSolarSystemNode(props: any) {
const labelsManager = useMemo(() => new LabelsManager(labels ?? ''), [labels]);
const labelsInfo = useMemo(() => sortedLabels(labelsManager.list), [labelsManager]);
const labelCustom = useMemo(
() =>
isShowLinkedSigId && linkedSigPrefix
? `${linkedSigPrefix}・${labelsManager.customLabel}`
: labelsManager.customLabel,
[linkedSigPrefix, isShowLinkedSigId, labelsManager],
);
const labelCustom = useMemo(() => {
if (isShowLinkedSigId && linkedSigPrefix) {
return labelsManager.customLabel ? `${linkedSigPrefix}・${labelsManager.customLabel}` : linkedSigPrefix;
}
return labelsManager.customLabel;
}, [linkedSigPrefix, isShowLinkedSigId, labelsManager]);
const killsCount = useMemo(() => kills[solar_system_id] ?? null, [kills, solar_system_id]);
const killsActivityType = killsCount ? getActivityType(killsCount) : null;
@@ -128,15 +137,33 @@ export function useSolarSystemNode(props: any) {
const space = showKSpaceBG ? REGIONS_MAP[region_id] : '';
const regionClass = showKSpaceBG ? SpaceToClass[space] : null;
const systemName = (isTempSystemNameEnabled && temporary_name) || solar_system_name;
const customName = (isTempSystemNameEnabled && temporary_name && name) || (solar_system_name !== name && name);
const temporaryName = useMemo(() => {
if (!isTempSystemNameEnabled) {
return '';
}
if (isShowLinkedSigIdTempName) {
return temporary_name ? `${linkedSigPrefix}・${temporary_name}` : linkedSigPrefix;
}
return temporary_name;
}, [isShowLinkedSigIdTempName, isTempSystemNameEnabled, linkedSigPrefix, temporary_name]);
const systemName = useMemo(() => {
if (isTempSystemNameEnabled && temporaryName) {
return temporaryName;
}
return solar_system_name;
}, [isTempSystemNameEnabled, solar_system_name, temporaryName]);
const customName = (isTempSystemNameEnabled && temporaryName && name) || (solar_system_name !== name && name);
const [unsplashedLeft, unsplashedRight] = useMemo(() => {
if (!isShowUnsplashedSignatures) {
return [[], []];
}
return prepareUnsplashedChunks(
system_signatures
systemSignatures
.filter(s => s.group === 'Wormhole' && !s.linked_system)
.map(s => ({
eve_id: s.eve_id,
@@ -144,7 +171,7 @@ export function useSolarSystemNode(props: any) {
custom_info: s.custom_info,
})),
);
}, [isShowUnsplashedSignatures, system_signatures]);
}, [isShowUnsplashedSignatures, systemSignatures]);
const nodeVars = {
// original props

3
assets/js/hooks/Mapper/mapRootProvider/MapRootProvider.tsx
View File

@@ -18,6 +18,7 @@ const INITIAL_DATA: MapRootData = {
userCharacters: [],
presentCharacters: [],
systems: [],
systemSignatures: {},
hubs: [],
routes: undefined,
kills: [],
@@ -60,7 +61,7 @@ export const STORED_INTERFACE_DEFAULT_VALUES: InterfaceStoredSettings = {
isShowBackgroundPattern: true,
isSoftBackground: false,
theme: 'default',
}
};
export interface MapRootContextProps {
update: ContextStoreDataUpdate<MapRootData>;

25
assets/js/hooks/Mapper/mapRootProvider/hooks/api/useCommandsSystems.ts
View File

@@ -8,14 +8,14 @@ import { Commands } from '@/hooks/Mapper/types/mapHandlers.ts';
export const useCommandsSystems = () => {
const {
update,
data: { systems },
data: { systems, systemSignatures },
outCommand,
} = useMapRootState();
const { addSystemStatic } = useLoadSystemStatic({ systems: [] });
const ref = useRef({ systems, update, addSystemStatic });
ref.current = { systems, update, addSystemStatic };
const ref = useRef({ systems, systemSignatures, update, addSystemStatic });
ref.current = { systems, systemSignatures, update, addSystemStatic };
const addSystems = useCallback((systemsToAdd: CommandAddSystems) => {
const { update, addSystemStatic, systems } = ref.current;
@@ -57,28 +57,19 @@ export const useCommandsSystems = () => {
});
update({ systems: out }, true);
emitMapEvent({ name: Commands.updateSystems, data: out });
}, []);
const updateSystemSignatures = useCallback(
async (systemId: string) => {
const { update, systems } = ref.current;
const { update, systemSignatures } = ref.current;
const { signatures } = await outCommand({
type: OutCommand.getSignatures,
data: { system_id: `${systemId}` },
});
const out = systems.map(current => {
if (current.id === `${systemId}`) {
return { ...current, system_signatures: signatures };
}
return current;
});
update({ systems: out }, true);
emitMapEvent({ name: Commands.updateSystems, data: out });
const out = { ...systemSignatures, [`${systemId}`]: signatures };
update({ systemSignatures: out }, true);
},
[outCommand],
);

2
assets/js/hooks/Mapper/types/mapUnionTypes.ts
View File

@@ -5,6 +5,7 @@ import { SolarSystemRawType } from '@/hooks/Mapper/types/system.ts';
import { RoutesList } from '@/hooks/Mapper/types/routes.ts';
import { SolarSystemConnection } from '@/hooks/Mapper/types/connection.ts';
import { UserPermissions } from '@/hooks/Mapper/types';
import { SystemSignature } from '@/hooks/Mapper/types/signatures';
export type MapUnionTypes = {
wormholesData: Record<string, WormholeDataRaw>;
@@ -15,6 +16,7 @@ export type MapUnionTypes = {
presentCharacters: string[];
hubs: string[];
systems: SolarSystemRawType[];
systemSignatures: Record<string, SystemSignature[]>;
routes?: RoutesList;
kills: Record<number, number>;
connections: SolarSystemConnection[];

4
lib/wanderer_app/map/map_server_impl.ex
View File

@@ -326,6 +326,10 @@ defmodule WandererApp.Map.Server.Impl do
options |> Map.get("store_custom_labels", "false") |> String.to_existing_atom(),
show_linked_signature_id:
options |> Map.get("show_linked_signature_id", "false") |> String.to_existing_atom(),
show_linked_signature_id_temp_name:
options
|> Map.get("show_linked_signature_id_temp_name", "false")
|> String.to_existing_atom(),
show_temp_system_name:
options |> Map.get("show_temp_system_name", "false") |> String.to_existing_atom(),
restrict_offline_showing:

1
lib/wanderer_app/repositories/map_repo.ex
View File

@@ -5,6 +5,7 @@ defmodule WandererApp.MapRepo do
"layout" => "left_to_right",
"store_custom_labels" => "false",
"show_linked_signature_id" => "false",
"show_linked_signature_id_temp_name" => "false",
"show_temp_system_name" => "false",
"restrict_offline_showing" => "false"
}

26
lib/wanderer_app_web/live/maps/event_handlers/map_signatures_event_handler.ex
View File

@@ -134,6 +134,14 @@ defmodule WandererAppWeb.MapSignaturesEventHandler do
})
end
if not is_nil(s.linked_system_id) do
map_id
|> WandererApp.Map.Server.update_system_linked_sig_eve_id(%{
solar_system_id: s.linked_system_id,
linked_sig_eve_id: nil
})
end
s
|> Ash.destroy!()
end)
@@ -234,11 +242,19 @@ defmodule WandererAppWeb.MapSignaturesEventHandler do
})
end)
map_id
|> WandererApp.Map.Server.update_system_linked_sig_eve_id(%{
solar_system_id: solar_system_target,
linked_sig_eve_id: signature_eve_id
})
map_system =
WandererApp.Map.find_system_by_location(
map_id,
%{solar_system_id: solar_system_target}
)
if not is_nil(map_system) && is_nil(map_system.linked_sig_eve_id) do
map_id
|> WandererApp.Map.Server.update_system_linked_sig_eve_id(%{
solar_system_id: solar_system_target,
linked_sig_eve_id: signature_eve_id
})
end
Phoenix.PubSub.broadcast!(WandererApp.PubSub, map_id, %{
event: :signatures_updated,

1
lib/wanderer_app_web/live/maps/maps_live.ex
View File

@@ -684,6 +684,7 @@ defmodule WandererAppWeb.MapsLive do
"layout",
"store_custom_labels",
"show_linked_signature_id",
"show_linked_signature_id_temp_name",
"show_temp_system_name",
"restrict_offline_showing"
])

9
lib/wanderer_app_web/live/maps/maps_live.html.heex
View File

@@ -373,6 +373,11 @@
field={f[:store_custom_labels]}
label="Store system custom labels"
/>
<.input
type="checkbox"
field={f[:show_temp_system_name]}
label="Allow temporary system names"
/>
<.input
type="checkbox"
field={f[:show_linked_signature_id]}
@@ -380,8 +385,8 @@
/>
<.input
type="checkbox"
field={f[:show_temp_system_name]}
label="Allow temporary system names"
field={f[:show_linked_signature_id_temp_name]}
label="Show linked signature ID as temporary name part"
/>
<.input
type="checkbox"