PxlLoewe/var-monorepo
1
0
Fork 0
Code Issues 22 Pull Requests Actions Packages Projects Releases 2 Wiki Activity

Merge pull request #101 from VAR-Virtual-Air-Rescue/staging

Browse Source 
fixed #100 // fix Cluster naming, fix Marker Popup settings not used
This commit was merged in pull request #101.
This commit is contained in:
Nicolas
2025-07-25 16:45:24 +02:00
committed by GitHub
parent 4f22d48e83 4eb46cb783
commit 1bcb2dbff7
3 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
apps/dispatch-server/socket-events/connect-dispatch.ts
View File

@@ -70,7 +70,7 @@ export const handleConnectDispatch =
userId: user.id, userId: user.id,
}, },
}); });
if (discordAccount?.id) { if (discordAccount?.id && !ghostMode) {
await renameMember( await renameMember(
discordAccount.discordId.toString(), discordAccount.discordId.toString(),
`${getPublicUser(user).fullName} • ${selectedZone}`, `${getPublicUser(user).fullName} • ${selectedZone}`,
@@ -99,7 +99,7 @@ export const handleConnectDispatch =
io.to("dispatchers").emit("dispatchers-update"); io.to("dispatchers").emit("dispatchers-update");
io.to("pilots").emit("dispatchers-update"); io.to("pilots").emit("dispatchers-update");
if (discordAccount?.id) { if (discordAccount?.id && !ghostMode) {
await renameMember( await renameMember(
discordAccount.discordId.toString(), discordAccount.discordId.toString(),
`${getPublicUser(user).fullName} - ${user.publicId}`, `${getPublicUser(user).fullName} - ${user.publicId}`,

2
apps/dispatch/app/_components/map/MissionMarkers.tsx
View File

@@ -253,7 +253,7 @@ const MissionMarker = ({
tab: "home", tab: "home",
}, },
], ],
close: openMissionMarker?.map((m) => m.id) || [], close: [],
}); });
} }
}; };

2
apps/dispatch/app/_components/map/_components/MarkerCluster.tsx
View File

@@ -158,7 +158,7 @@ const PopupContent = ({
</span> </span>
<span> <span>
{aircraft.Station.bosCallsign.length > 15 {aircraft.Station.bosCallsign.length > 15
? aircraft.Station.locationStateShort ? aircraft.Station.bosCallsignShort
: aircraft.Station.bosCallsign} : aircraft.Station.bosCallsign}
</span> </span>
</div> </div>