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

v2.0.3

apps/dispatch-server/socket-events/connect-dispatch.ts

@@ -1,6 +1,6 @@
 import { getPublicUser, prisma, User } from "@repo/db";
 import { addRolesToMember, removeRolesFromMember, renameMember } from "modules/discord";
-import { getNextDateWithTime } from "@repo/shared-components";
+import { getNextDateWithTime, getUserPenaltys } from "@repo/shared-components";
 import { DISCORD_ROLES } from "@repo/db";
 import { Server, Socket } from "socket.io";
 
@@ -28,8 +28,17 @@ export const handleConnectDispatch =
 				return;
 			}
 
-			if (!user.permissions?.includes("DISPO")) {
-				socket.emit("error", "You do not have permission to connect to the dispatch server.");
+			const userPenaltys = await getUserPenaltys(user.id);
+
+			if (
+				userPenaltys.openTimeban.length > 0 ||
+				user.isBanned ||
+				userPenaltys.openBans.length > 0
+			) {
+				socket.emit("connect-message", {
+					message: "Du hast eine aktive Strafe und kannst dich deshalb nicht verbinden.",
+				});
+				socket.disconnect();
 				return;
 			}
 

apps/dispatch-server/socket-events/connect-pilot.ts

@@ -1,8 +1,8 @@
 import { getPublicUser, prisma, User } from "@repo/db";
 import { addRolesToMember, removeRolesFromMember, renameMember } from "modules/discord";
-import { getNextDateWithTime } from "@repo/shared-components";
 import { DISCORD_ROLES } from "@repo/db";
 import { Server, Socket } from "socket.io";
+import { getUserPenaltys } from "@repo/shared-components";
 
 export const handleConnectPilot =
 	(socket: Socket, io: Server) =>
@@ -34,6 +34,19 @@ export const handleConnectPilot =
 				socket.disconnect();
 				return;
 			}
+			const userPenaltys = await getUserPenaltys(userId);
+
+			if (
+				userPenaltys.openTimeban.length > 0 ||
+				user.isBanned ||
+				userPenaltys.openBans.length > 0
+			) {
+				socket.emit("connect-message", {
+					message: "Du hast eine aktive Strafe und kannst dich deshalb nicht verbinden.",
+				});
+				socket.disconnect();
+				return;
+			}
 
 			if (!user) return Error("User not found");
 

apps/dispatch-server/socket-events/send-message.ts

@@ -5,7 +5,7 @@ import { Server, Socket } from "socket.io";
 export const handleSendMessage =
 	(socket: Socket, io: Server) =>
 	async (
-		{ userId, message }: { userId: string; message: string },
+		{ userId, message, role }: { userId: string; message: string; role: string },
 		cb: (err: { error?: string }) => void,
 	) => {
 		const senderId = socket.data.user.id;
@@ -24,7 +24,7 @@ export const handleSendMessage =
 				receiverId: userId,
 				senderId,
 				receiverName: `${receiverUser?.firstname} ${receiverUser?.lastname[0]}. - ${receiverUser?.publicId}`,
-				senderName: `${senderUser?.firstname} ${senderUser?.lastname[0]}. - ${senderUser?.publicId}`,
+				senderName: `${senderUser?.firstname} ${senderUser?.lastname[0]}. - ${role ?? senderUser?.publicId}`,
 			},
 		});
 

apps/dispatch/app/_components/map/AircraftMarker.tsx

@@ -17,7 +17,6 @@ import { getConnectedAircraftPositionLogAPI, getConnectedAircraftsAPI } from "_q
 import { getMissionsAPI } from "_querys/missions";
 import { FMS_STATUS_COLORS, FMS_STATUS_TEXT_COLORS } from "_helpers/fmsStatusColors";
 import { usePilotConnectionStore } from "_store/pilot/connectionStore";
-import { useSession } from "next-auth/react";
 
 const AircraftPopupContent = ({
 	aircraft,
@@ -73,7 +72,7 @@ const AircraftPopupContent = ({
 		}
 	}, [currentTab, aircraft, mission]);
 
-	const { setOpenAircraftMarker, setMap, openAircraftMarker } = useMapStore((state) => state);
+	const { setOpenAircraftMarker, setMap } = useMapStore((state) => state);
 	const { anchor } = useSmartPopup();
 	return (
 		<>
@@ -435,6 +434,9 @@ export const AircraftLayer = () => {
 		}
 	}, [pilotConnectionStatus, followOwnAircraft, ownAircraft, setMap, map]);
 
+	console.debug("Hubschrauber auf Karte:", filteredAircrafts.length, filteredAircrafts);
+	console.debug("Daten vom Server:", aircrafts?.length, aircrafts);
+
 	return (
 		<>
 			{filteredAircrafts?.map((aircraft) => {

apps/dispatch/app/_components/navbar/AdminPanel.tsx

@@ -92,11 +92,6 @@ export default function AdminPanel() {
 
 	const modalRef = useRef<HTMLDialogElement>(null);
 
-	console.debug("piloten von API", {
-		anzahl: pilots?.length,
-		pilots,
-	});
-
 	return (
 		<div>
 			<button

apps/dispatch/app/_store/leftMenuStore.ts

@@ -2,6 +2,8 @@ import { create } from "zustand";
 import { ChatMessage } from "@repo/db";
 import { dispatchSocket } from "(app)/dispatch/socket";
 import { pilotSocket } from "(app)/pilot/socket";
+import { useDispatchConnectionStore } from "_store/dispatch/connectionStore";
+import { usePilotConnectionStore } from "_store/pilot/connectionStore";
 
 interface ChatStore {
 	situationTabOpen: boolean;
@@ -16,7 +18,12 @@ interface ChatStore {
 	setOwnId: (id: string) => void;
 	chats: Record<string, { name: string; notification: boolean; messages: ChatMessage[] }>;
 	setChatNotification: (userId: string, notification: boolean) => void;
-	sendMessage: (userId: string, message: string) => Promise<void>;
+	sendMessage: (
+		userId: string,
+		message: string,
+		senderName?: string,
+		receiverName?: string,
+	) => Promise<void>;
 	addChat: (userId: string, name: string) => void;
 	addMessage: (userId: string, message: ChatMessage) => void;
 	removeChat: (userId: string) => void;
@@ -49,12 +56,13 @@ export const useLeftMenuStore = create<ChatStore>((set, get) => ({
 	},
 	setOwnId: (id: string) => set({ ownId: id }),
 	chats: {},
-	sendMessage: (userId: string, message: string) => {
+	sendMessage: (userId, message) => {
 		return new Promise((resolve, reject) => {
 			if (dispatchSocket.connected) {
+				const zone = useDispatchConnectionStore.getState().selectedZone;
 				dispatchSocket.emit(
 					"send-message",
-					{ userId, message },
+					{ userId, message, role: zone },
 					({ error }: { error?: string }) => {
 						if (error) {
 							reject(error);
@@ -64,13 +72,19 @@ export const useLeftMenuStore = create<ChatStore>((set, get) => ({
 					},
 				);
 			} else if (pilotSocket.connected) {
-				pilotSocket.emit("send-message", { userId, message }, ({ error }: { error?: string }) => {
+				const bosCallsign = usePilotConnectionStore.getState().selectedStation?.bosCallsignShort;
+
+				pilotSocket.emit(
+					"send-message",
+					{ userId, message, role: bosCallsign },
+					({ error }: { error?: string }) => {
 						if (error) {
 							reject(error);
 						} else {
 							resolve();
 						}
-				});
+					},
+				);
 			}
 		});
 	},

apps/hub/app/(app)/admin/penalty/columns.tsx

@@ -30,12 +30,17 @@ export const penaltyColumns: ColumnDef<Penalty & { Report: Report; CreatedUser:
 						new Date(row.original.until || Date.now()),
 						{ locale: de },
 					);
+					const isExpired = new Date(row.original.until || Date.now()) < new Date();
 					return (
 						<div
-							className={cn("text-warning flex gap-3", row.original.suspended && "text-gray-400")}
+							className={cn(
+								"text-warning flex gap-3",
+								(row.original.suspended || isExpired) && "text-gray-400",
+							)}
 						>
 							<Timer />
-							Zeit Sperre ({length}) {row.original.suspended && "(ausgesetzt)"}
+							Zeit Sperre ({length}) {row.original.suspended && "(ausgesetzt)"}{" "}
+							{isExpired && !row.original.suspended && "(abgelaufen)"}
 						</div>
 					);
 				}
@@ -78,14 +83,14 @@ export const penaltyColumns: ColumnDef<Penalty & { Report: Report; CreatedUser:
 				<div className="flex gap-2">
 					<Link href={`/admin/penalty/${row.original.id}`}>
 						<button className="btn btn-sm btn-outline btn-info flex items-center gap-2">
-							<Shield className="w-4 h-4" />
+							<Shield className="h-4 w-4" />
 							Anzeigen
 						</button>
 					</Link>
 					{report && (
 						<Link href={`/admin/report/${report.id}`}>
 							<button className="btn btn-sm btn-outliney flex items-center gap-2">
-								<TriangleAlert className="w-4 h-4" />
+								<TriangleAlert className="h-4 w-4" />
 								Report Anzeigen
 							</button>
 						</Link>

apps/hub/app/(app)/admin/penalty/page.tsx

@@ -10,6 +10,12 @@ export default function ReportPage() {
 				CreatedUser: true,
 				Report: true,
 			}}
+			initialOrderBy={[
+				{
+					id: "timestamp",
+					desc: true,
+				},
+			]}
 			columns={penaltyColumns}
 		/>
 	);

apps/hub/app/(app)/admin/report/_components/NewReport.tsx

@@ -44,7 +44,7 @@ export const NewReportForm = ({
 			reviewerUserId: null,
 		},
 	});
-	console.log(form.formState.errors);
+
 	return (
 		<form
 			className="flex flex-wrap gap-3"

apps/hub/app/(app)/admin/user/[id]/_components/forms.tsx

@@ -6,6 +6,7 @@ import {
 	ConnectedAircraft,
 	ConnectedDispatcher,
 	DiscordAccount,
+	Penalty,
 	PERMISSION,
 	Station,
 	User,
@@ -46,6 +47,7 @@ import {
 	ShieldUser,
 	Timer,
 	Trash2,
+	TriangleAlert,
 	Users,
 } from "lucide-react";
 import Link from "next/link";
@@ -255,6 +257,7 @@ export const ProfileForm: React.FC<ProfileFormProps> = ({ user }: ProfileFormPro
 
 export const ConnectionHistory: React.FC<{ user: User }> = ({ user }: { user: User }) => {
 	const dispoTableRef = useRef<PaginatedTableRef>(null);
+	const pilotTableRef = useRef<PaginatedTableRef>(null);
 	return (
 		<div className="card-body flex-row flex-wrap">
 			<div className="flex-1">
@@ -302,7 +305,7 @@ export const ConnectionHistory: React.FC<{ user: User }> = ({ user }: { user: Us
 								cell: ({ row }) => {
 									return (
 										<div>
-											<button
+											<Button
 												className="btn btn-sm btn-error"
 												onClick={async () => {
 													await deleteDispoHistory(row.original.id);
@@ -310,7 +313,7 @@ export const ConnectionHistory: React.FC<{ user: User }> = ({ user }: { user: Us
 												}}
 											>
 												löschen
-											</button>
+											</Button>
 										</div>
 									);
 								},
@@ -324,7 +327,7 @@ export const ConnectionHistory: React.FC<{ user: User }> = ({ user }: { user: Us
 					<PlaneIcon className="h-5 w-5" /> Pilot-Verbindungs Historie
 				</h2>
 				<PaginatedTable
-					ref={dispoTableRef}
+					ref={pilotTableRef}
 					filter={{
 						userId: user.id,
 					}}
@@ -375,15 +378,15 @@ export const ConnectionHistory: React.FC<{ user: User }> = ({ user }: { user: Us
 								cell: ({ row }) => {
 									return (
 										<div>
-											<button
+											<Button
 												className="btn btn-sm btn-error"
 												onClick={async () => {
 													await deletePilotHistory(row.original.id);
-													dispoTableRef.current?.refresh();
+													pilotTableRef.current?.refresh();
 												}}
 											>
 												löschen
-											</button>
+											</Button>
 										</div>
 									);
 								},
@@ -408,6 +411,7 @@ export const UserPenalties = ({ user }: { user: User }) => {
 				</span>
 				<div className="flex gap-2">
 					<PenaltyDropdown
+						showBtnName
 						btnName="Zeitstrafe hinzufügen"
 						Icon={<Timer size={15} />}
 						onClick={async ({ reason, until }) => {
@@ -437,6 +441,7 @@ export const UserPenalties = ({ user }: { user: User }) => {
 					/>
 					{session.data?.user.permissions.includes("ADMIN_USER_ADVANCED") && (
 						<PenaltyDropdown
+							showBtnName
 							btnName="Bannen"
 							Icon={<LockKeyhole size={15} />}
 							onClick={async ({ reason }) => {
@@ -528,6 +533,12 @@ interface AdminFormProps {
 		open: number;
 		total60Days: number;
 	};
+	openBans: (Penalty & {
+		CreatedUser: User | null;
+	})[];
+	openTimebans: (Penalty & {
+		CreatedUser: User | null;
+	})[];
 }
 
 export const AdminForm = ({
@@ -536,6 +547,8 @@ export const AdminForm = ({
 	pilotTime,
 	reports,
 	discordAccount,
+	openBans,
+	openTimebans,
 }: AdminFormProps) => {
 	const router = useRouter();
 	const { data: session } = useSession();
@@ -627,6 +640,33 @@ export const AdminForm = ({
 					)}
 				</div>
 			</div>
+			{(!!openBans.length || !!openTimebans.length) && (
+				<div role="alert" className="alert alert-warning alert-outline flex flex-col">
+					<div className="flex items-center gap-2">
+						<TriangleAlert />
+						{openBans.map((ban) => (
+							<div key={ban.id}>
+								<h3 className="text-lg font-semibold">Permanent ausgeschlossen</h3>
+								{ban.reason} (von {ban.CreatedUser?.firstname} {ban.CreatedUser?.lastname} -{" "}
+								{ban.CreatedUser?.publicId})
+							</div>
+						))}
+						{openTimebans.map((timeban) => (
+							<div key={timeban.id}>
+								<h3 className="text-lg font-semibold">
+									Zeitstrafe bis{" "}
+									{timeban.until ? new Date(timeban.until).toLocaleString("de-DE") : "unbekannt"}
+								</h3>
+								{timeban.reason} ({timeban.CreatedUser?.firstname} {timeban.CreatedUser?.lastname} -{" "}
+								{timeban.CreatedUser?.publicId})
+							</div>
+						))}
+					</div>
+					<p className="text-sm text-gray-400">
+						Achtung! Die Strafe(n) sind aktiv, die Rechte des Nutzers müssen nicht angepasst werden!
+					</p>
+				</div>
+			)}
 			<h2 className="card-title">
 				<ChartBarBigIcon className="h-5 w-5" /> Aktivität
 			</h2>

apps/hub/app/(app)/admin/user/[id]/page.tsx

@@ -8,10 +8,10 @@ import {
 	UserReports,
 } from "./_components/forms";
 import { Error } from "../../../../_components/Error";
+import { getUserPenaltys } from "@repo/shared-components";
 
 export default async function Page({ params }: { params: Promise<{ id: string }> }) {
 	const { id } = await params;
-
 	const user = await prisma.user.findUnique({
 		where: {
 			id: id,
@@ -20,6 +20,7 @@ export default async function Page({ params }: { params: Promise<{ id: string }>
 			discordAccounts: true,
 		},
 	});
+	if (!user) return <Error statusCode={404} title="User not found" />;
 
 	const dispoSessions = await prisma.connectedDispatcher.findMany({
 		where: {
@@ -97,41 +98,43 @@ export default async function Page({ params }: { params: Promise<{ id: string }>
 		open: totalReportsOpen,
 		total60Days: totalReports60Days,
 	};
-	if (!user) return <Error statusCode={404} title="User not found" />;
+	const { openBans, openTimeban } = await getUserPenaltys(user?.id);
 
 	return (
 		<div className="grid grid-cols-6 gap-4">
-			<div className="col-span-full flex justify-between items-center">
-				<p className="text-2xl font-semibold text-left flex items-center gap-2">
-					<PersonIcon className="w-5 h-5" />
+			<div className="col-span-full flex items-center justify-between">
+				<p className="flex items-center gap-2 text-left text-2xl font-semibold">
+					<PersonIcon className="h-5 w-5" />
 					{user?.firstname} {user?.lastname} #{user?.publicId}
 				</p>
 				<p
-					className="text-sm text-gray-400 font-thin tooltip tooltip-left"
+					className="tooltip tooltip-left text-sm font-thin text-gray-400"
 					data-tip="Account erstellt am"
 				>
 					{new Date(user.createdAt).toLocaleString("de-DE")}
 				</p>
 			</div>
-			<div className="card bg-base-200 shadow-xl mb-4 col-span-6 xl:col-span-3">
+			<div className="card bg-base-200 col-span-6 mb-4 shadow-xl xl:col-span-3">
 				<ProfileForm user={user} />
 			</div>
-			<div className="card bg-base-200 shadow-xl mb-4 col-span-6 xl:col-span-3">
+			<div className="card bg-base-200 col-span-6 mb-4 shadow-xl xl:col-span-3">
 				<AdminForm
 					user={user}
 					dispoTime={dispoTime}
 					pilotTime={pilotTime}
 					reports={reports}
 					discordAccount={user.discordAccounts[0]}
+					openBans={openBans}
+					openTimebans={openTimeban}
 				/>
 			</div>
-			<div className="card bg-base-200 shadow-xl mb-4 col-span-6 xl:col-span-6">
+			<div className="card bg-base-200 col-span-6 mb-4 shadow-xl xl:col-span-6">
 				<UserReports user={user} />
 			</div>
-			<div className="card bg-base-200 shadow-xl mb-4 col-span-6 xl:col-span-6">
+			<div className="card bg-base-200 col-span-6 mb-4 shadow-xl xl:col-span-6">
 				<UserPenalties user={user} />
 			</div>
-			<div className="card bg-base-200 shadow-xl mb-4 col-span-6 xl:col-span-6">
+			<div className="card bg-base-200 col-span-6 mb-4 shadow-xl xl:col-span-6">
 				<ConnectionHistory user={user} />
 			</div>
 		</div>

packages/shared-components/components/Changelog.tsx

@@ -39,7 +39,7 @@ export const ChangelogModal = ({
 					)}
 				</div>
 
-				<div className="text-base-content/80 mb-2 mt-4 text-left">
+				<div className="text-base-content/80 mb-2 mt-4 text-left" data-color-mode="dark">
 					<MDEditor.Markdown
 						source={latestChangelog.text}
 						style={{

packages/shared-components/components/PenaltyDropdown.tsx

@@ -9,12 +9,14 @@ export const PenaltyDropdown = ({
 	btnTip,
 	btnName,
 	Icon,
+	showBtnName = false,
 }: {
 	onClick: (data: { reason: string; until: Date | null }) => void;
 	showDatePicker?: boolean;
 	btnClassName?: string;
 	btnName: string;
 	btnTip?: string;
+	showBtnName?: boolean;
 	Icon: ReactNode;
 }) => {
 	const [open, setOpen] = useState(false);
@@ -25,25 +27,29 @@ export const PenaltyDropdown = ({
 			<div tabIndex={0} role="button"></div>
 			<div className="indicator">
 				<button
-					className={cn("btn btn-xs btn-square btn-soft cursor-pointer", btnClassName)}
+					className={cn(
+						"btn btn-xs btn-soft cursor-pointer",
+						!showBtnName && "btn-square",
+						btnClassName,
+					)}
 					onClick={() => setOpen(!open)}
 				>
-					{Icon}
+					{Icon} {showBtnName && <span className="hidden md:inline-block">{btnName}</span>}
 				</button>
 			</div>
 			{open && (
 				<div
-					className="dropdown-content bg-base-100 rounded-box z-1 p-4 shadow-sm space-y-4 shadow-md"
+					className="dropdown-content bg-base-100 rounded-box z-1 space-y-4 p-4 shadow-md shadow-sm"
 					style={{ minWidth: "500px", right: "40px" }}
 				>
 					<button
-						className="absolute top-2 right-2 btn btn-xs btn-circle btn-ghost"
+						className="btn btn-xs btn-circle btn-ghost absolute right-2 top-2"
 						onClick={() => setOpen(false)}
 						type="button"
 					>
 						<span className="text-xl leading-none">&times;</span>
 					</button>
-					<h2 className="text-xl font-bold text-center">{btnName}</h2>
+					<h2 className="text-center text-xl font-bold">{btnName}</h2>
 					<textarea
 						value={reason}
 						onChange={(e) => setReason(e.target.value)}
@@ -53,7 +59,7 @@ export const PenaltyDropdown = ({
 					/>
 					{showDatePicker && (
 						<select
-							className="select w-full select-bordered"
+							className="select select-bordered w-full"
 							value={until}
 							onChange={(e) => setUntil(e.target.value)}
 						>
@@ -74,7 +80,7 @@ export const PenaltyDropdown = ({
 						</select>
 					)}
 					<button
-						className={cn("btn w-full btn-square btn-soft tooltip tooltip-bottom", btnClassName)}
+						className={cn("btn btn-square btn-soft tooltip tooltip-bottom w-full", btnClassName)}
 						data-tip={btnTip}
 						onClick={() => {
 							let untilDate: Date | null = null;

packages/shared-components/helper/index.ts

@@ -4,3 +4,4 @@ export * from "./dates";
 export * from "./simulatorConnected";
 export * from "./useDebounce";
 export * from "./useTimeout";
+export * from "./penaltys";

packages/shared-components/helper/penaltys.ts

@@ -0,0 +1,32 @@
+import { prisma } from "@repo/db";
+
+export const getUserPenaltys = async (userId: string) => {
+	const openTimeban = await prisma.penalty.findMany({
+		where: {
+			userId: userId,
+			until: {
+				gte: new Date(),
+			},
+			suspended: false,
+			type: "TIME_BAN",
+		},
+		include: {
+			CreatedUser: true,
+		},
+	});
+
+	const openBans = await prisma.penalty.findMany({
+		where: {
+			userId: userId,
+			suspended: false,
+			type: "BAN",
+		},
+		include: {
+			CreatedUser: true,
+		},
+	});
+	return {
+		openTimeban,
+		openBans,
+	};
+};